mirror of
https://github.com/ditkrg/active_model_serializers.git
synced 2026-01-24 14:56:50 +00:00
re: RuboCop - Use nested module/class definition instead of compact style.
This commit is contained in:
parent
8a2beacb6f
commit
85f417f8d2
@ -46,7 +46,7 @@ Style/AlignParameters:
|
|||||||
EnforcedStyle: with_fixed_indentation
|
EnforcedStyle: with_fixed_indentation
|
||||||
|
|
||||||
Style/ClassAndModuleChildren:
|
Style/ClassAndModuleChildren:
|
||||||
EnforcedStyle: compact
|
EnforcedStyle: nested
|
||||||
|
|
||||||
Style/Documentation:
|
Style/Documentation:
|
||||||
Enabled: false
|
Enabled: false
|
||||||
|
|||||||
@ -12,13 +12,6 @@ Lint/HandleExceptions:
|
|||||||
- 'Rakefile'
|
- 'Rakefile'
|
||||||
|
|
||||||
|
|
||||||
# Offense count: 271
|
|
||||||
# Configuration parameters: EnforcedStyle, SupportedStyles.
|
|
||||||
# SupportedStyles: nested, compact
|
|
||||||
Style/ClassAndModuleChildren:
|
|
||||||
Enabled: false
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
# Offense count: 3
|
# Offense count: 3
|
||||||
# Configuration parameters: NamePrefix, NamePrefixBlacklist, NameWhitelist.
|
# Configuration parameters: NamePrefix, NamePrefixBlacklist, NameWhitelist.
|
||||||
|
|||||||
@ -1,9 +1,12 @@
|
|||||||
require 'active_model/serializer/collection_serializer'
|
require 'active_model/serializer/collection_serializer'
|
||||||
class ActiveModel::Serializer
|
|
||||||
|
module ActiveModel
|
||||||
|
class Serializer
|
||||||
class ArraySerializer < CollectionSerializer
|
class ArraySerializer < CollectionSerializer
|
||||||
class << self
|
class << self
|
||||||
extend ActiveModelSerializers::Deprecate
|
extend ActiveModelSerializers::Deprecate
|
||||||
deprecate :new, 'ActiveModel::Serializer::CollectionSerializer.'
|
deprecate :new, 'ActiveModel::Serializer::CollectionSerializer.'
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
|||||||
@ -1,4 +1,6 @@
|
|||||||
class ActiveModel::Serializer::ErrorSerializer < ActiveModel::Serializer
|
module ActiveModel
|
||||||
|
class Serializer
|
||||||
|
class ErrorSerializer < ActiveModel::Serializer
|
||||||
# @return [Hash<field_name,Array<error_message>>]
|
# @return [Hash<field_name,Array<error_message>>]
|
||||||
def as_json
|
def as_json
|
||||||
object.errors.messages
|
object.errors.messages
|
||||||
@ -7,4 +9,6 @@ class ActiveModel::Serializer::ErrorSerializer < ActiveModel::Serializer
|
|||||||
def success?
|
def success?
|
||||||
false
|
false
|
||||||
end
|
end
|
||||||
|
end
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
|||||||
@ -1,5 +1,8 @@
|
|||||||
require 'active_model/serializer/error_serializer'
|
require 'active_model/serializer/error_serializer'
|
||||||
class ActiveModel::Serializer::ErrorsSerializer
|
|
||||||
|
module ActiveModel
|
||||||
|
class Serializer
|
||||||
|
class ErrorsSerializer
|
||||||
include Enumerable
|
include Enumerable
|
||||||
delegate :each, to: :@serializers
|
delegate :each, to: :@serializers
|
||||||
attr_reader :object, :root
|
attr_reader :object, :root
|
||||||
@ -24,4 +27,6 @@ class ActiveModel::Serializer::ErrorsSerializer
|
|||||||
protected
|
protected
|
||||||
|
|
||||||
attr_reader :serializers
|
attr_reader :serializers
|
||||||
|
end
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
|||||||
@ -1,4 +1,6 @@
|
|||||||
module ActiveModel::Serializer::Lint
|
module ActiveModel
|
||||||
|
class Serializer
|
||||||
|
module Lint
|
||||||
# == Active \Model \Serializer \Lint \Tests
|
# == Active \Model \Serializer \Lint \Tests
|
||||||
#
|
#
|
||||||
# You can test whether an object is compliant with the Active \Model \Serializers
|
# You can test whether an object is compliant with the Active \Model \Serializers
|
||||||
@ -143,4 +145,6 @@ module ActiveModel::Serializer::Lint
|
|||||||
assert result.instance_of?(name), "#{result} should be an instance of #{name}"
|
assert result.instance_of?(name), "#{result} should be an instance of #{name}"
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
end
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
|||||||
@ -22,7 +22,8 @@
|
|||||||
# render jsonapi: model
|
# render jsonapi: model
|
||||||
#
|
#
|
||||||
# No wrapper format needed as it does not apply (i.e. no `wrap_parameters format: [jsonapi]`)
|
# No wrapper format needed as it does not apply (i.e. no `wrap_parameters format: [jsonapi]`)
|
||||||
module ActiveModelSerializers::Jsonapi
|
module ActiveModelSerializers
|
||||||
|
module Jsonapi
|
||||||
MEDIA_TYPE = 'application/vnd.api+json'.freeze
|
MEDIA_TYPE = 'application/vnd.api+json'.freeze
|
||||||
HEADERS = {
|
HEADERS = {
|
||||||
response: { 'CONTENT_TYPE'.freeze => MEDIA_TYPE },
|
response: { 'CONTENT_TYPE'.freeze => MEDIA_TYPE },
|
||||||
@ -67,6 +68,7 @@ module ActiveModelSerializers::Jsonapi
|
|||||||
get_serializer(json, options)
|
get_serializer(json, options)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
ActiveModelSerializers::Jsonapi.install
|
ActiveModelSerializers::Jsonapi.install
|
||||||
|
|||||||
@ -4,11 +4,13 @@ require 'active_model_serializers'
|
|||||||
require 'grape/formatters/active_model_serializers'
|
require 'grape/formatters/active_model_serializers'
|
||||||
require 'grape/helpers/active_model_serializers'
|
require 'grape/helpers/active_model_serializers'
|
||||||
|
|
||||||
module Grape::ActiveModelSerializers
|
module Grape
|
||||||
|
module ActiveModelSerializers
|
||||||
extend ActiveSupport::Concern
|
extend ActiveSupport::Concern
|
||||||
|
|
||||||
included do
|
included do
|
||||||
formatter :json, Grape::Formatters::ActiveModelSerializers
|
formatter :json, Grape::Formatters::ActiveModelSerializers
|
||||||
helpers Grape::Helpers::ActiveModelSerializers
|
helpers Grape::Helpers::ActiveModelSerializers
|
||||||
end
|
end
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
|||||||
@ -1,6 +1,7 @@
|
|||||||
require 'test_helper'
|
require 'test_helper'
|
||||||
|
|
||||||
class ActiveModelSerializers::JsonPointerTest < ActiveSupport::TestCase
|
module ActiveModelSerializers
|
||||||
|
class JsonPointerTest < ActiveSupport::TestCase
|
||||||
def test_attribute_pointer
|
def test_attribute_pointer
|
||||||
attribute_name = 'title'
|
attribute_name = 'title'
|
||||||
pointer = ActiveModelSerializers::JsonPointer.new(:attribute, attribute_name)
|
pointer = ActiveModelSerializers::JsonPointer.new(:attribute, attribute_name)
|
||||||
@ -17,4 +18,5 @@ class ActiveModelSerializers::JsonPointerTest < ActiveSupport::TestCase
|
|||||||
ActiveModelSerializers::JsonPointer.new(:unknown)
|
ActiveModelSerializers::JsonPointer.new(:unknown)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
|||||||
@ -1,6 +1,7 @@
|
|||||||
require 'test_helper'
|
require 'test_helper'
|
||||||
|
|
||||||
class ActiveModelSerializers::KeyTransformTest < ActiveSupport::TestCase
|
module ActiveModelSerializers
|
||||||
|
class KeyTransformTest < ActiveSupport::TestCase
|
||||||
def test_camel
|
def test_camel
|
||||||
obj = Object.new
|
obj = Object.new
|
||||||
scenarios = [
|
scenarios = [
|
||||||
@ -260,4 +261,5 @@ class ActiveModelSerializers::KeyTransformTest < ActiveSupport::TestCase
|
|||||||
assert_equal s[:expected], result
|
assert_equal s[:expected], result
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
|||||||
@ -1,9 +1,11 @@
|
|||||||
require 'test_helper'
|
require 'test_helper'
|
||||||
|
|
||||||
class ActiveModelSerializers::ModelTest < ActiveSupport::TestCase
|
module ActiveModelSerializers
|
||||||
|
class ModelTest < ActiveSupport::TestCase
|
||||||
include ActiveModel::Serializer::Lint::Tests
|
include ActiveModel::Serializer::Lint::Tests
|
||||||
|
|
||||||
def setup
|
def setup
|
||||||
@resource = ActiveModelSerializers::Model.new
|
@resource = ActiveModelSerializers::Model.new
|
||||||
end
|
end
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
|||||||
@ -5,7 +5,8 @@ require 'kaminari'
|
|||||||
require 'kaminari/hooks'
|
require 'kaminari/hooks'
|
||||||
::Kaminari::Hooks.init
|
::Kaminari::Hooks.init
|
||||||
|
|
||||||
class ActiveModelSerializers::GrapeTest < ActiveSupport::TestCase
|
module ActiveModelSerializers
|
||||||
|
class GrapeTest < ActiveSupport::TestCase
|
||||||
include Rack::Test::Methods
|
include Rack::Test::Methods
|
||||||
module Models
|
module Models
|
||||||
def self.model1
|
def self.model1
|
||||||
@ -173,4 +174,5 @@ class ActiveModelSerializers::GrapeTest < ActiveSupport::TestCase
|
|||||||
assert representation.include?('links')
|
assert representation.include?('links')
|
||||||
assert representation['links'].count > 0
|
assert representation['links'].count > 0
|
||||||
end
|
end
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
|||||||
@ -1,6 +1,7 @@
|
|||||||
require 'test_helper'
|
require 'test_helper'
|
||||||
|
|
||||||
class ActiveModelSerializers::LoggerTest < ActiveSupport::TestCase
|
module ActiveModelSerializers
|
||||||
|
class LoggerTest < ActiveSupport::TestCase
|
||||||
def test_logger_is_set_to_action_controller_logger_when_initializer_runs
|
def test_logger_is_set_to_action_controller_logger_when_initializer_runs
|
||||||
assert_equal $action_controller_logger, ActionController::Base.logger # rubocop:disable Style/GlobalVars
|
assert_equal $action_controller_logger, ActionController::Base.logger # rubocop:disable Style/GlobalVars
|
||||||
end
|
end
|
||||||
@ -15,4 +16,5 @@ class ActiveModelSerializers::LoggerTest < ActiveSupport::TestCase
|
|||||||
ensure
|
ensure
|
||||||
ActiveModelSerializers.logger = original_logger
|
ActiveModelSerializers.logger = original_logger
|
||||||
end
|
end
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
|||||||
@ -75,6 +75,8 @@ module TestHelpers
|
|||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
class ActiveSupport::TestCase
|
module ActiveSupport
|
||||||
|
class TestCase
|
||||||
include TestHelpers::Generation
|
include TestHelpers::Generation
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
|||||||
@ -44,10 +44,12 @@ module SerializationTesting
|
|||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
class Minitest::Test
|
module Minitest
|
||||||
|
class Test
|
||||||
def before_setup
|
def before_setup
|
||||||
ActionController::Base.cache_store.clear
|
ActionController::Base.cache_store.clear
|
||||||
end
|
end
|
||||||
|
|
||||||
include SerializationTesting
|
include SerializationTesting
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user