Merge remote-tracking branch 'upstream/master' into fix-jsonapi-ri

.rubocop.yml

@@ -0,0 +1,49 @@
+inherit_from: .rubocop_todo.yml
+
+AllCops:
+  Exclude:
+    - config/initializers/forbidden_yaml.rb
+    - !ruby/regexp /(vendor|bundle|bin|db|tmp)\/.*/
+  RunRailsCops: true
+  DisplayCopNames: true
+  DisplayStyleGuide: true
+
+Lint/NestedMethodDefinition:
+  Enabled: false
+  Exclude:
+    - test/action_controller/serialization_test.rb
+
+Style/StringLiterals:
+  EnforcedStyle: single_quotes
+
+Metrics/AbcSize:
+  Max: 35 # TODO: Lower to 15
+
+Metrics/ClassLength:
+  Max: 261 # TODO: Lower to 100
+  Exclude:
+    - test/**/*.rb
+
+Metrics/CyclomaticComplexity:
+  Max: 7 # TODO: Lower to 6
+
+Metrics/LineLength:
+  Max: 251 # TODO: Lower to 80
+
+Metrics/MethodLength:
+  Max: 106 # TODO: Lower to 10
+
+Metrics/PerceivedComplexity:
+  Max: 9 # TODO: Lower to 7
+
+Style/AlignParameters:
+  EnforcedStyle: with_fixed_indentation
+
+Style/ClassAndModuleChildren:
+  EnforcedStyle: compact
+
+Style/Documentation:
+  Enabled: false
+
+Style/MultilineOperationIndentation:
+  EnforcedStyle: indented

.rubocop_todo.yml

@@ -0,0 +1,315 @@
+# This configuration was generated by
+# `rubocop --auto-gen-config`
+# on 2015-08-31 04:23:33 -0500 using RuboCop version 0.33.0.
+# The point is for the user to remove these configuration records
+# one by one as the offenses are removed from the code base.
+# Note that changes in the inspected code, or installation of new
+# versions of RuboCop, may require this file to be generated again.
+
+# Offense count: 1
+# Configuration parameters: AllowSafeAssignment.
+Lint/AssignmentInCondition:
+  Exclude:
+    - 'lib/active_model/serializer/adapter/json_api.rb'
+
+# Offense count: 1
+Lint/EmptyEnsure:
+  Exclude:
+    - 'test/serializers/adapter_for_test.rb'
+
+# Offense count: 1
+Lint/HandleExceptions:
+  Exclude:
+    - 'Rakefile'
+
+# Offense count: 2
+# Cop supports --auto-correct.
+Lint/UnusedBlockArgument:
+  Exclude:
+    - 'lib/active_model/serializer/adapter/json_api/fragment_cache.rb'
+
+# Offense count: 9
+# Cop supports --auto-correct.
+Lint/UnusedMethodArgument:
+  Exclude:
+    - 'lib/active_model/serializer/adapter.rb'
+    - 'lib/active_model/serializer/adapter/null.rb'
+    - 'lib/active_model/serializer/pass_through_serializer.rb'
+    - 'test/fixtures/poro.rb'
+    - 'test/lint_test.rb'
+
+# Offense count: 1
+Lint/UselessAccessModifier:
+  Exclude:
+    - 'lib/active_model/serializable_resource.rb'
+
+# Offense count: 3
+Lint/UselessAssignment:
+  Exclude:
+    - 'bench/perf.rb'
+    - 'lib/active_model/serializer/adapter/json_api/fragment_cache.rb'
+    - 'test/test_helper.rb'
+
+# Offense count: 1
+# Configuration parameters: EnforcedStyle, SupportedStyles.
+Rails/Date:
+  Exclude:
+    - 'test/fixtures/poro.rb'
+
+# Offense count: 8
+# Configuration parameters: EnforcedStyle, SupportedStyles.
+Rails/TimeZone:
+  Exclude:
+    - 'test/action_controller/serialization_test.rb'
+    - 'test/fixtures/poro.rb'
+    - 'test/serializers/cache_test.rb'
+
+# Offense count: 16
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedHashRocketStyle, EnforcedColonStyle, EnforcedLastArgumentHashStyle, SupportedLastArgumentHashStyles.
+Style/AlignHash:
+  Exclude:
+    - 'test/action_controller/json_api/pagination_test.rb'
+
+# Offense count: 1
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle, SupportedStyles.
+Style/AndOr:
+  Exclude:
+    - 'lib/active_model/serializer/lint.rb'
+
+# Offense count: 6
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle, SupportedStyles, ProceduralMethods, FunctionalMethods, IgnoredMethods.
+Style/BlockDelimiters:
+  Enabled: false
+
+# Offense count: 46
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle, SupportedStyles.
+Style/BracesAroundHashParameters:
+  Exclude:
+    - 'test/action_controller/adapter_selector_test.rb'
+    - 'test/action_controller/json_api/pagination_test.rb'
+    - 'test/action_controller/serialization_test.rb'
+    - 'test/adapter/json_api/linked_test.rb'
+    - 'test/adapter/json_api/pagination_links_test.rb'
+    - 'test/adapter/null_test.rb'
+    - 'test/adapter_test.rb'
+    - 'test/array_serializer_test.rb'
+    - 'test/serializable_resource_test.rb'
+    - 'test/serializers/associations_test.rb'
+    - 'test/serializers/attribute_test.rb'
+    - 'test/serializers/attributes_test.rb'
+    - 'test/serializers/fieldset_test.rb'
+    - 'test/serializers/root_test.rb'
+    - 'test/serializers/urls_test.rb'
+
+# Offense count: 167
+# Configuration parameters: EnforcedStyle, SupportedStyles.
+Style/ClassAndModuleChildren:
+  Enabled: false
+
+# Offense count: 5
+# Cop supports --auto-correct.
+Style/CommentIndentation:
+  Exclude:
+    - 'active_model_serializers.gemspec'
+
+# Offense count: 1
+Style/DoubleNegation:
+  Exclude:
+    - 'lib/active_model/serializable_resource.rb'
+
+# Offense count: 1
+Style/EachWithObject:
+  Exclude:
+    - 'lib/active_model/serializer/fieldset.rb'
+
+# Offense count: 3
+# Configuration parameters: MinBodyLength.
+Style/GuardClause:
+  Exclude:
+    - 'lib/active_model/serializer.rb'
+    - 'lib/active_model/serializer/adapter/json_api.rb'
+    - 'test/capture_warnings.rb'
+
+# Offense count: 12
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle, SupportedStyles, UseHashRocketsWithSymbolValues.
+Style/HashSyntax:
+  Enabled: false
+
+# Offense count: 9
+# Cop supports --auto-correct.
+Style/IndentArray:
+  Exclude:
+    - 'test/adapter/json/has_many_test.rb'
+    - 'test/adapter/json_api/json_api_test.rb'
+    - 'test/adapter/json_api/pagination_links_test.rb'
+    - 'test/adapter/json_test.rb'
+
+# Offense count: 8
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle, SupportedStyles.
+Style/IndentHash:
+  Enabled: false
+
+# Offense count: 1
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle, SupportedStyles.
+Style/IndentationConsistency:
+  Exclude:
+    - 'test/action_controller/serialization_scope_name_test.rb'
+
+# Offense count: 2
+# Cop supports --auto-correct.
+# Configuration parameters: Width.
+Style/IndentationWidth:
+  Exclude:
+    - 'lib/active_model/serializable_resource.rb'
+    - 'lib/active_model/serializer/fieldset.rb'
+
+# Offense count: 1
+# Cop supports --auto-correct.
+Style/Lambda:
+  Exclude:
+    - 'lib/active_model/serializer.rb'
+
+# Offense count: 2
+# Cop supports --auto-correct.
+Style/MethodCallParentheses:
+  Exclude:
+    - 'lib/active_model/serializer/adapter/json.rb'
+    - 'lib/active_model/serializer/adapter/json_api.rb'
+
+# Offense count: 1
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle, SupportedStyles.
+Style/MethodDefParentheses:
+  Enabled: false
+
+# Offense count: 3
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle, SupportedStyles.
+Style/MultilineOperationIndentation:
+  Enabled: false
+
+# Offense count: 1
+# Cop supports --auto-correct.
+Style/NegatedIf:
+  Exclude:
+    - 'lib/action_controller/serialization.rb'
+
+# Offense count: 1
+# Configuration parameters: EnforcedStyle, MinBodyLength, SupportedStyles.
+Style/Next:
+  Exclude:
+    - 'lib/active_model/serializer/adapter/json_api.rb'
+
+# Offense count: 1
+# Cop supports --auto-correct.
+Style/NumericLiterals:
+  MinDigits: 7
+
+# Offense count: 2
+# Cop supports --auto-correct.
+# Configuration parameters: PreferredDelimiters.
+Style/PercentLiteralDelimiters:
+  Exclude:
+    - 'active_model_serializers.gemspec'
+
+# Offense count: 2
+# Cop supports --auto-correct.
+Style/PerlBackrefs:
+  Exclude:
+    - 'test/fixtures/poro.rb'
+    - 'test/serializers/associations_test.rb'
+
+# Offense count: 6
+# Configuration parameters: NamePrefix, NamePrefixBlacklist.
+Style/PredicateName:
+  Exclude:
+    - 'lib/active_model/serializer/adapter.rb'
+    - 'lib/active_model/serializer/adapter/json_api.rb'
+    - 'lib/active_model/serializer/associations.rb'
+    - 'test/action_controller/json_api/linked_test.rb'
+
+# Offense count: 7
+# Cop supports --auto-correct.
+Style/RedundantSelf:
+  Exclude:
+    - 'lib/active_model/serializer.rb'
+    - 'lib/active_model/serializer/associations.rb'
+    - 'test/fixtures/poro.rb'
+
+# Offense count: 1
+# Cop supports --auto-correct.
+# Configuration parameters: AllowAsExpressionSeparator.
+Style/Semicolon:
+  Exclude:
+    - 'lib/active_model/serializer/fieldset.rb'
+
+# Offense count: 6
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle, SupportedStyles.
+Style/SignalException:
+  Exclude:
+    - 'lib/active_model/serializer.rb'
+    - 'lib/active_model/serializer/adapter.rb'
+    - 'lib/active_model/serializer/fieldset.rb'
+    - 'lib/active_model/serializer/pass_through_serializer.rb'
+
+# Offense count: 1
+# Cop supports --auto-correct.
+# Configuration parameters: AllowIfMethodIsEmpty.
+Style/SingleLineMethods:
+  Exclude:
+    - 'test/serializers/serializer_for_test.rb'
+
+# Offense count: 2
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle, SupportedStyles.
+Style/StringLiteralsInInterpolation:
+  Enabled: false
+
+# Offense count: 1
+Style/StructInheritance:
+  Exclude:
+    - 'bench/perf.rb'
+
+# Offense count: 1
+# Cop supports --auto-correct.
+# Configuration parameters: IgnoredMethods.
+Style/SymbolProc:
+  Exclude:
+    - 'lib/generators/serializer/serializer_generator.rb'
+
+# Offense count: 8
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle, SupportedStyles.
+Style/TrailingBlankLines:
+  Exclude:
+    - 'lib/active_model/serializer/pass_through_serializer.rb'
+    - 'lib/generators/serializer/serializer_generator.rb'
+    - 'test/adapter/fragment_cache_test.rb'
+    - 'test/adapter/json_api/json_api_test.rb'
+    - 'test/adapter/null_test.rb'
+    - 'test/serializers/cache_test.rb'
+    - 'test/serializers/fieldset_test.rb'
+    - 'test/support/stream_capture.rb'
+
+# Offense count: 6
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyleForMultiline, SupportedStyles.
+Style/TrailingComma:
+  Exclude:
+    - 'test/action_controller/adapter_selector_test.rb'
+    - 'test/action_controller/serialization_test.rb'
+    - 'test/adapter/json_api/belongs_to_test.rb'
+    - 'test/adapter/json_api/linked_test.rb'
+
+# Offense count: 1
+Style/UnlessElse:
+  Exclude:
+    - 'lib/active_model/serializer.rb'

.travis.yml

@@ -2,6 +2,9 @@ language: ruby
 
 sudo: false
 
+cache:
+  bundler: true
+
 rvm:
   - 1.9.3
   - 2.0.0
@@ -14,6 +17,10 @@ rvm:
 install:
   - bundle install --retry=3
 
+script:
+  - bundle exec rake
+  - bundle exec rake rubocop
+
 env:
   - "RAILS_VERSION=4.0"
   - "RAILS_VERSION=4.1"
@@ -24,3 +31,4 @@ matrix:
   allow_failures:
     - rvm: ruby-head
     - env: "RAILS_VERSION=master"
+  fast_finish: true

Gemfile

@@ -3,18 +3,37 @@ source 'https://rubygems.org'
 # Specify your gem's dependencies in active_model_serializers.gemspec
 gemspec
 
-gem "minitest"
+version = ENV['RAILS_VERSION'] || '4.2'
 
-version = ENV["RAILS_VERSION"] || "4.2"
-
-if version == "master"
-  gem "rails", github: "rails/rails"
-
-  # ugh https://github.com/rails/rails/issues/16063#issuecomment-48090125
-  gem "arel", github: "rails/arel"
+if version == 'master'
+  gem 'rack', github: 'rack/rack'
+  git 'https://github.com/rails/rails.git' do
+    gem 'railties'
+    gem 'activesupport'
+    gem 'activemodel'
+    gem 'actionpack'
+    # Rails 5
+    gem 'actionview'
+  end
+  # Rails 5
+  gem 'rails-controller-testing', github: 'rails/rails-controller-testing'
 else
-  gem "rails", "~> #{version}.0"
+  gem_version = "~> #{version}.0"
+  gem 'railties', gem_version
+  gem 'activesupport', gem_version
+  gem 'activemodel', gem_version
+  gem 'actionpack', gem_version
+end
+
+group :test do
+  gem 'activerecord'
+  gem 'sqlite3', platform: :ruby
+  gem 'activerecord-jdbcsqlite3-adapter', platform: :jruby
 end
 
 # Windows does not include zoneinfo files, so bundle the tzinfo-data gem
 gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby]
+
+group :development, :test do
+  gem 'rubocop', '~> 0.33.0', require: false
+end

Rakefile

@@ -1,9 +1,31 @@
-require "bundler/gem_tasks"
+require 'bundler/gem_tasks'
+
+begin
+  require 'rubocop'
+  require 'rubocop/rake_task'
+rescue LoadError
+else
+  Rake::Task[:rubocop].clear if Rake::Task.task_defined?(:rubocop)
+  if !defined?(::Rubinius)
+    Rake::Task[:rubocop].clear if Rake::Task.task_defined?(:rubocop)
+    desc 'Execute rubocop'
+    RuboCop::RakeTask.new(:rubocop) do |task|
+      task.options = ['--rails', '--display-cop-names', '--display-style-guide']
+      task.fail_on_error = true
+    end
+  else
+    desc 'No-op rubocop to avoid rbx segfault'
+    task :rubocop do
+      puts 'Skipping rubocop on rbx due to segfault'
+      puts 'https://github.com/rubinius/rubinius/issues/3499'
+    end
+  end
+end
 
 require 'rake/testtask'
 
 Rake::TestTask.new do |t|
-  t.libs << "test"
+  t.libs << 'test'
   t.test_files = FileList['test/**/*_test.rb']
   t.ruby_opts = ['-r./test/test_helper.rb']
   t.verbose = true

active_model_serializers.gemspec

@@ -4,26 +4,47 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'active_model/serializer/version'
 
 Gem::Specification.new do |spec|
-  spec.name          = "active_model_serializers"
+  spec.name          = 'active_model_serializers'
   spec.version       = ActiveModel::Serializer::VERSION
-  spec.authors       = ["Steve Klabnik"]
-  spec.email         = ["steve@steveklabnik.com"]
-  spec.summary       = %q{Conventions-based JSON generation for Rails.}
-  spec.description   = %q{ActiveModel::Serializers allows you to generate your JSON in an object-oriented and convention-driven manner.}
-  spec.homepage      = "https://github.com/rails-api/active_model_serializers"
-  spec.license       = "MIT"
+  spec.platform      = Gem::Platform::RUBY
+  spec.authors       = ['Steve Klabnik']
+  spec.email         = ['steve@steveklabnik.com']
+  spec.summary       = 'Conventions-based JSON generation for Rails.'
+  spec.description   = 'ActiveModel::Serializers allows you to generate your JSON in an object-oriented and convention-driven manner.'
+  spec.homepage      = 'https://github.com/rails-api/active_model_serializers'
+  spec.license       = 'MIT'
 
   spec.files         = `git ls-files -z`.split("\x0")
-  spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
-  spec.require_paths = ["lib"]
+  spec.require_paths = ['lib']
 
-  spec.add_dependency "activemodel", ">= 4.0"
+  spec.required_ruby_version = '>= 1.9.3'
 
-  spec.add_development_dependency "rails", ">= 4.0"
-  spec.add_development_dependency "bundler", "~> 1.6"
-  spec.add_development_dependency "timecop", ">= 0.7"
-  spec.add_development_dependency "rake"
-  spec.add_development_dependency "kaminari"
-  spec.add_development_dependency "will_paginate"
+  rails_versions = '>= 4.0'
+  spec.add_runtime_dependency 'activemodel', rails_versions
+    # 'activesupport', rails_versions
+    # 'builder'
+
+  spec.add_runtime_dependency 'actionpack', rails_versions
+    # 'activesupport', rails_versions
+    # 'rack'
+    # 'rack-test', '~> 0.6.2'
+
+  spec.add_runtime_dependency 'railties', rails_versions
+    # 'activesupport', rails_versions
+    # 'actionpack', rails_versions
+    # 'rake', '>= 0.8.7'
+
+  # 'activesupport', rails_versions
+    # 'i18n,
+    # 'tzinfo'
+    # 'minitest'
+    # 'thread_safe'
+
+  # Soft dependency for pagination
+  spec.add_development_dependency 'kaminari'
+  spec.add_development_dependency 'will_paginate'
+
+  spec.add_development_dependency 'bundler', '~> 1.6'
+  spec.add_development_dependency 'timecop', '>= 0.7'
 end

lib/action_controller/serialization.rb

@@ -21,7 +21,7 @@ module ActionController
 
     def get_serializer(resource, options = {})
       if !use_adapter?
-        warn "ActionController::Serialization#use_adapter? has been removed. "\
+        warn 'ActionController::Serialization#use_adapter? has been removed. '\
           "Please pass 'adapter: false' or see ActiveSupport::SerializableResource#serialize"
         options[:adapter] = false
       end

lib/active_model/serializable_resource.rb

@@ -1,7 +1,6 @@
 require 'set'
 module ActiveModel
   class SerializableResource
-
     ADAPTER_OPTION_KEYS = Set.new([:include, :fields, :adapter])
 
     def initialize(resource, options = {})
@@ -79,6 +78,5 @@ module ActiveModel
     ActiveModelSerializers.silence_warnings do
     attr_reader :resource, :adapter_opts, :serializer_opts
     end
-
   end
 end

lib/active_model/serializer.rb

@@ -13,7 +13,6 @@ module ActiveModel
     include Configuration
     include Associations
 
-
     # Matches
     #  "c:/git/emberjs/ember-crm-backend/app/serializers/lead_serializer.rb:1:in `<top (required)>'"
     #  AND
@@ -70,7 +69,7 @@ module ActiveModel
       ActiveModelSerializers.silence_warnings do
         define_method key do
           object.read_attribute_for_serialization(attr)
-        end unless respond_to?(key, false) || _fragmented.respond_to?(attr)
+        end unless (key != :id && method_defined?(key)) || _fragmented.respond_to?(attr)
       end
     end
 

lib/active_model/serializer/adapter.rb

@@ -15,7 +15,7 @@ module ActiveModel
       end
 
       def self.adapter_class(adapter)
-        adapter_name = adapter.to_s.classify.sub("API", "Api")
+        adapter_name = adapter.to_s.classify.sub('API', 'Api')
         "ActiveModel::Serializer::Adapter::#{adapter_name}".safe_constantize
       end
 
@@ -68,12 +68,12 @@ module ActiveModel
         parts = []
         parts << object_cache_key
         parts << @klass._cache_digest unless @klass._cache_options && @klass._cache_options[:skip_digest]
-        parts.join("/")
+        parts.join('/')
       end
 
       def object_cache_key
         object_time_safe = @cached_serializer.object.updated_at
-        object_time_safe = object_time_safe.strftime("%Y%m%d%H%M%S%9N") if object_time_safe.respond_to?(:strftime)
+        object_time_safe = object_time_safe.strftime('%Y%m%d%H%M%S%9N') if object_time_safe.respond_to?(:strftime)
         (@klass._cache_key) ? "#{@klass._cache_key}/#{@cached_serializer.object.id}-#{object_time_safe}" : @cached_serializer.object.cache_key
       end
 
@@ -82,7 +82,7 @@ module ActiveModel
       end
 
       def meta_key
-        serializer.meta_key || "meta"
+        serializer.meta_key || 'meta'
       end
 
       def root

lib/active_model/serializer/adapter/fragment_cache.rb

@@ -2,7 +2,6 @@ module ActiveModel
   class Serializer
     class Adapter
       class FragmentCache
-
         attr_reader :serializer
 
         def initialize(adapter, serializer, options)

lib/active_model/serializer/adapter/json.rb

@@ -46,7 +46,6 @@ module ActiveModel
         def fragment_cache(cached_hash, non_cached_hash)
           Json::FragmentCache.new().fragment_cache(cached_hash, non_cached_hash)
         end
-
       end
     end
   end

lib/active_model/serializer/adapter/json/fragment_cache.rb

@@ -4,11 +4,9 @@ module ActiveModel
     class Adapter
       class Json < Adapter
         class FragmentCache
-
           def fragment_cache(cached_hash, non_cached_hash)
             non_cached_hash.merge cached_hash
           end
-
         end
       end
     end

lib/active_model/serializer/adapter/json_api.rb

@@ -159,19 +159,21 @@ module ActiveModel
 
         def add_links(options)
           links = @hash.fetch(:links) { {} }
-          resources = serializer.instance_variable_get(:@resource)
-          @hash[:links] = add_pagination_links(links, resources, options) if is_paginated?(resources)
+          collection = serializer.object
+          if is_paginated?(collection)
+            @hash[:links] = add_pagination_links(links, collection, options)
+          end
         end
 
-        def add_pagination_links(links, resources, options)
-          pagination_links = JsonApi::PaginationLinks.new(resources, options[:context]).serializable_hash(options)
+        def add_pagination_links(links, collection, options)
+          pagination_links = JsonApi::PaginationLinks.new(collection, options[:context]).serializable_hash(options)
           links.update(pagination_links)
         end
 
-        def is_paginated?(resource)
-          resource.respond_to?(:current_page) &&
-            resource.respond_to?(:total_pages) &&
-            resource.respond_to?(:size)
+        def is_paginated?(collection)
+          collection.respond_to?(:current_page) &&
+            collection.respond_to?(:total_pages) &&
+            collection.respond_to?(:size)
         end
       end
     end

lib/active_model/serializer/adapter/json_api/fragment_cache.rb

@@ -4,7 +4,6 @@ module ActiveModel
     class Adapter
       class JsonApi < Adapter
         class FragmentCache
-
           def fragment_cache(root, cached_hash, non_cached_hash)
             hash              = {}
             core_cached       = cached_hash.first
@@ -16,7 +15,6 @@ module ActiveModel
 
             hash.deep_merge no_root_non_cache.deep_merge no_root_cache
           end
-
         end
       end
     end

lib/active_model/serializer/array_serializer.rb

@@ -3,23 +3,22 @@ module ActiveModel
     class ArraySerializer
       NoSerializerError = Class.new(StandardError)
       include Enumerable
-      delegate :each, to: :@objects
+      delegate :each, to: :@serializers
 
-      attr_reader :root, :meta, :meta_key
+      attr_reader :object, :root, :meta, :meta_key
 
-      def initialize(objects, options = {})
+      def initialize(resources, options = {})
         @root = options[:root]
-        @resource = objects
-        @objects  = objects.map do |object|
-          serializer_class = options.fetch(
-            :serializer,
-            ActiveModel::Serializer.serializer_for(object)
-          )
+        @object = resources
+        @serializers = resources.map do |resource|
+          serializer_class = options.fetch(:serializer) {
+            ActiveModel::Serializer.serializer_for(resource)
+          }
 
           if serializer_class.nil?
-            fail NoSerializerError, "No serializer found for object: #{object.inspect}"
+            fail NoSerializerError, "No serializer found for resource: #{resource.inspect}"
           else
-            serializer_class.new(object, options.except(:serializer))
+            serializer_class.new(resource, options.except(:serializer))
           end
         end
         @meta     = options[:meta]
@@ -27,7 +26,7 @@ module ActiveModel
       end
 
       def json_key
-        key = root || @objects.first.try(:json_key) || @resource.try(:name).try(:underscore)
+        key = root || @serializers.first.try(:json_key) || object.try(:name).try(:underscore)
         key.try(:pluralize)
       end
     end

lib/active_model/serializer/association.rb

@@ -7,10 +7,9 @@ module ActiveModel
     # @param [Hash{Symbol => Object}] options
     #
     # @example
-    #  Association.new(:comments, CommentSummarySerializer, embed: :ids)
+    #  Association.new(:comments, CommentSummarySerializer)
     #
     Association = Struct.new(:name, :serializer, :options) do
-
       # @return [Symbol]
       #
       def key

lib/active_model/serializer/fieldset.rb

@@ -1,7 +1,6 @@
 module ActiveModel
   class Serializer
     class Fieldset
-
       def initialize(fields, root = nil)
         @root       = root
         @raw_fields = fields
@@ -36,7 +35,6 @@ module ActiveModel
           {}
         end
       end
-
     end
   end
 end

lib/active_model/serializer/lint.rb

@@ -15,7 +15,6 @@ module ActiveModel::Serializer::Lint
   # always return +{}+, and the tests would pass. It is up to you to ensure
   # that the values are semantically meaningful.
   module Tests
-
     # Passes if the object responds to <tt>serializable_hash</tt> and if it takes
     # zero or one arguments.
     # Fails otherwise.
@@ -23,7 +22,7 @@ module ActiveModel::Serializer::Lint
     # <tt>serializable_hash</tt> returns a hash representation of a object's attributes.
     # Typically, it is implemented by including ActiveModel::Serialization.
     def test_serializable_hash
-      assert_respond_to resource, :serializable_hash, "The resource should respond to serializable_hash"
+      assert_respond_to resource, :serializable_hash, 'The resource should respond to serializable_hash'
       resource.serializable_hash
       resource.serializable_hash(nil)
     end
@@ -35,8 +34,18 @@ module ActiveModel::Serializer::Lint
     # <tt>read_attribute_for_serialization</tt> gets the attribute value for serialization
     # Typically, it is implemented by including ActiveModel::Serialization.
     def test_read_attribute_for_serialization
-      assert_respond_to resource, :read_attribute_for_serialization, "The resource should respond to read_attribute_for_serialization"
-      assert_equal resource.method(:read_attribute_for_serialization).arity, 1
+      assert_respond_to resource, :read_attribute_for_serialization, 'The resource should respond to read_attribute_for_serialization'
+      actual_arity = resource.method(:read_attribute_for_serialization).arity
+      if defined?(::Rubinius)
+        #  1 for def read_attribute_for_serialization(name); end
+        # -2 for alias :read_attribute_for_serialization :send for rbx because :shrug:
+        assert_includes [1, -2], actual_arity, "expected #{actual_arity.inspect} to be 1 or -2"
+      else
+        # using absolute value since arity is:
+        #  1 for def read_attribute_for_serialization(name); end
+        # -1 for alias :read_attribute_for_serialization :send
+        assert_includes [1, -1], actual_arity, "expected #{actual_arity.inspect} to be 1 or -1"
+      end
     end
 
     # Passes if the object responds to <tt>as_json</tt> and if it takes
@@ -68,7 +77,7 @@ module ActiveModel::Serializer::Lint
     end
 
     # Passes if the object responds to <tt>cache_key</tt> and if it takes no
-    # arguments.
+    # arguments (Rails 4.0) or a splat (Rails 4.1+).
     # Fails otherwise.
     #
     # <tt>cache_key</tt> returns a (self-expiring) unique key for the object,
@@ -76,7 +85,11 @@ module ActiveModel::Serializer::Lint
     # It is not required unless caching is enabled.
     def test_cache_key
       assert_respond_to resource, :cache_key
-      assert_equal resource.method(:cache_key).arity, 0
+      actual_arity = resource.method(:cache_key).arity
+      # using absolute value since arity is:
+      #   0 for Rails 4.1+, *timestamp_names
+      #  -1 for Rails 4.0, no arguments
+      assert_includes [-1, 0], actual_arity, "expected #{actual_arity.inspect} to be 0 or -1"
     end
 
     # Passes if the object responds to <tt>id</tt> and if it takes no
@@ -112,6 +125,5 @@ module ActiveModel::Serializer::Lint
     def assert_instance_of(result, name)
       assert result.instance_of?(name), "#{result} should be an instance of #{name}"
     end
-
   end
 end

lib/active_model/serializer/version.rb

@@ -1,5 +1,5 @@
 module ActiveModel
   class Serializer
-    VERSION = "0.10.0.rc2"
+    VERSION = '0.10.0.rc2'
   end
 end

lib/active_model_serializers.rb

@@ -8,24 +8,21 @@ module ActiveModelSerializers
   ensure
     $VERBOSE = verbose
   end
-
 end
+
 require 'active_model'
-require 'active_model/serializer/version'
+require 'action_controller'
+
 require 'active_model/serializer'
 require 'active_model/serializable_resource'
+require 'active_model/serializer/version'
 
-begin
-  require 'active_model/serializer/railtie'
-  require 'action_controller'
 require 'action_controller/serialization'
-
 ActiveSupport.on_load(:action_controller) do
   include ::ActionController::Serialization
   ActionDispatch::Reloader.to_prepare do
     ActiveModel::Serializer.serializers_cache.clear
   end
 end
-rescue LoadError
-  # rails not installed, continuing
-end
+
+require 'active_model/serializer/railtie'

lib/generators/serializer/serializer_generator.rb

@@ -1,15 +1,15 @@
 module Rails
   module Generators
     class SerializerGenerator < NamedBase
-      source_root File.expand_path("../templates", __FILE__)
-      check_class_collision :suffix => "Serializer"
+      source_root File.expand_path('../templates', __FILE__)
+      check_class_collision :suffix => 'Serializer'
 
-      argument :attributes, :type => :array, :default => [], :banner => "field:type field:type"
+      argument :attributes, :type => :array, :default => [], :banner => 'field:type field:type'
 
-      class_option :parent, :type => :string, :desc => "The parent class for the generated serializer"
+      class_option :parent, :type => :string, :desc => 'The parent class for the generated serializer'
 
       def create_serializer_file
-        template 'serializer.rb', File.join('app/serializers', class_path, "#{file_name}_serializer.rb")
+        template 'serializer.rb.erb', File.join('app/serializers', class_path, "#{file_name}_serializer.rb")
       end
 
       private
@@ -26,9 +26,9 @@ module Rails
         if options[:parent]
           options[:parent]
         elsif defined?(::ApplicationSerializer)
-          "ApplicationSerializer"
+          'ApplicationSerializer'
         else
-          "ActiveModel::Serializer"
+          'ActiveModel::Serializer'
         end
       end
     end

test/action_controller/adapter_selector_test.rb

@@ -33,10 +33,10 @@ module ActionController
         expected = {
           data: {
             id: assigns(:profile).id.to_s,
-            type: "profiles",
+            type: 'profiles',
             attributes: {
-              name: "Name 1",
-              description: "Description 1",
+              name: 'Name 1',
+              description: 'Description 1',
             }
           }
         }

test/action_controller/explicit_serializer_test.rb

@@ -100,11 +100,11 @@ module ActionController
         get :render_array_using_explicit_serializer_and_custom_serializers
 
         expected = [
-          { "title" => "New Post",
-            "body" => "Body",
-            "id" => assigns(:post).id,
-            "comments" => [{"id" => 1}, {"id" => 2}],
-            "author" => { "id" => assigns(:author).id }
+          { 'title' => 'New Post',
+            'body' => 'Body',
+            'id' => assigns(:post).id,
+            'comments' => [{ 'id' => 1 }, { 'id' => 2 }],
+            'author' => { 'id' => assigns(:author).id }
           }
         ]
 
@@ -116,13 +116,13 @@ module ActionController
 
         expected = {
           id: 1337,
-          name: "Amazing Place",
+          name: 'Amazing Place',
           locations: [
             {
               id: 42,
-              lat: "-23.550520",
-              lng: "-46.633309",
-              place: "Nowhere" # is a virtual attribute on LocationSerializer
+              lat: '-23.550520',
+              lng: '-46.633309',
+              place: 'Nowhere' # is a virtual attribute on LocationSerializer
             }
           ]
         }

test/action_controller/json_api/linked_test.rb

@@ -28,10 +28,10 @@ module ActionController
             @first_comment.author = @author2
             @second_comment.post = @post
             @second_comment.author = nil
-            @post2 = Post.new(id: 2, title: "Another Post", body: "Body")
+            @post2 = Post.new(id: 2, title: 'Another Post', body: 'Body')
             @post2.author = @author
             @post2.comments = []
-            @blog = Blog.new(id: 1, name: "My Blog!!")
+            @blog = Blog.new(id: 1, name: 'My Blog!!')
             @post.blog = @blog
             @post2.blog = @blog
           end
@@ -75,7 +75,7 @@ module ActionController
 
           def render_collection_with_include
             setup_post
-            render json: [@post], include: ['author', 'comments'], adapter: :json_api
+            render json: [@post], include: %w(author comments), adapter: :json_api
           end
         end
 
@@ -100,37 +100,37 @@ module ActionController
           response = JSON.parse(@response.body)
           expected_linked = [
             {
-              "id" => "1",
-              "type" => "authors",
-              "attributes" => {
-                "name" => "Steve K."
+              'id' => '1',
+              'type' => 'authors',
+              'attributes' => {
+                'name' => 'Steve K.'
               },
-              "relationships" => {
-                "posts" => { "data" => [] },
-                "roles" => { "data" => [{ "type" =>"roles", "id" => "1" }, { "type" =>"roles", "id" => "2" }] },
-                "bio" => { "data" => nil }
+              'relationships' => {
+                'posts' => { 'data' => [] },
+                'roles' => { 'data' => [{ 'type' => 'roles', 'id' => '1' }, { 'type' => 'roles', 'id' => '2' }] },
+                'bio' => { 'data' => nil }
               }
             }, {
-              "id" => "1",
-              "type" => "roles",
-              "attributes" => {
-                "name" => "admin",
-                "description" => nil,
-                "slug" => "admin-1"
+              'id' => '1',
+              'type' => 'roles',
+              'attributes' => {
+                'name' => 'admin',
+                'description' => nil,
+                'slug' => 'admin-1'
               },
-              "relationships" => {
-                "author" => { "data" => { "type" =>"authors", "id" => "1" } }
+              'relationships' => {
+                'author' => { 'data' => { 'type' => 'authors', 'id' => '1' } }
               }
             }, {
-              "id" => "2",
-              "type" => "roles",
-              "attributes" => {
-                "name" => "colab",
-                "description" => nil,
-                "slug" => "colab-2"
+              'id' => '2',
+              'type' => 'roles',
+              'attributes' => {
+                'name' => 'colab',
+                'description' => nil,
+                'slug' => 'colab-2'
               },
-              "relationships" => {
-                "author" => { "data" => { "type" =>"authors", "id" => "1" } }
+              'relationships' => {
+                'author' => { 'data' => { 'type' => 'authors', 'id' => '1' } }
               }
             }
           ]

test/action_controller/json_api/pagination_test.rb

@@ -47,11 +47,11 @@ module ActionController
         tests PaginationTestController
 
         def test_render_pagination_links_with_will_paginate
-          expected_links = { "self"=>"#{WILL_PAGINATE_URI}?page%5Bnumber%5D=2&page%5Bsize%5D=1",
-            "first"=>"#{WILL_PAGINATE_URI}?page%5Bnumber%5D=1&page%5Bsize%5D=1",
-            "prev"=>"#{WILL_PAGINATE_URI}?page%5Bnumber%5D=1&page%5Bsize%5D=1",
-            "next"=>"#{WILL_PAGINATE_URI}?page%5Bnumber%5D=3&page%5Bsize%5D=1",
-            "last"=>"#{WILL_PAGINATE_URI}?page%5Bnumber%5D=3&page%5Bsize%5D=1"}
+          expected_links = { 'self' => "#{WILL_PAGINATE_URI}?page%5Bnumber%5D=2&page%5Bsize%5D=1",
+            'first' => "#{WILL_PAGINATE_URI}?page%5Bnumber%5D=1&page%5Bsize%5D=1",
+            'prev' => "#{WILL_PAGINATE_URI}?page%5Bnumber%5D=1&page%5Bsize%5D=1",
+            'next' => "#{WILL_PAGINATE_URI}?page%5Bnumber%5D=3&page%5Bsize%5D=1",
+            'last' => "#{WILL_PAGINATE_URI}?page%5Bnumber%5D=3&page%5Bsize%5D=1" }
 
           get :render_pagination_using_will_paginate, page: { number: 2, size: 1 }
           response = JSON.parse(@response.body)
@@ -59,48 +59,48 @@ module ActionController
         end
 
         def test_render_only_last_and_next_pagination_links
-          expected_links = { "self"=>"#{WILL_PAGINATE_URI}?page%5Bnumber%5D=1&page%5Bsize%5D=2",
-            "next"=>"#{WILL_PAGINATE_URI}?page%5Bnumber%5D=2&page%5Bsize%5D=2",
-            "last"=>"#{WILL_PAGINATE_URI}?page%5Bnumber%5D=2&page%5Bsize%5D=2"}
+          expected_links = { 'self' => "#{WILL_PAGINATE_URI}?page%5Bnumber%5D=1&page%5Bsize%5D=2",
+            'next' => "#{WILL_PAGINATE_URI}?page%5Bnumber%5D=2&page%5Bsize%5D=2",
+            'last' => "#{WILL_PAGINATE_URI}?page%5Bnumber%5D=2&page%5Bsize%5D=2" }
           get :render_pagination_using_will_paginate, page: { number: 1, size: 2 }
           response = JSON.parse(@response.body)
           assert_equal expected_links, response['links']
         end
 
         def test_render_pagination_links_with_kaminari
-          expected_links = { "self"=>"#{KAMINARI_URI}?page%5Bnumber%5D=2&page%5Bsize%5D=1",
-            "first"=>"#{KAMINARI_URI}?page%5Bnumber%5D=1&page%5Bsize%5D=1",
-            "prev"=>"#{KAMINARI_URI}?page%5Bnumber%5D=1&page%5Bsize%5D=1",
-            "next"=>"#{KAMINARI_URI}?page%5Bnumber%5D=3&page%5Bsize%5D=1",
-            "last"=>"#{KAMINARI_URI}?page%5Bnumber%5D=3&page%5Bsize%5D=1"}
+          expected_links = { 'self' => "#{KAMINARI_URI}?page%5Bnumber%5D=2&page%5Bsize%5D=1",
+            'first' => "#{KAMINARI_URI}?page%5Bnumber%5D=1&page%5Bsize%5D=1",
+            'prev' => "#{KAMINARI_URI}?page%5Bnumber%5D=1&page%5Bsize%5D=1",
+            'next' => "#{KAMINARI_URI}?page%5Bnumber%5D=3&page%5Bsize%5D=1",
+            'last' => "#{KAMINARI_URI}?page%5Bnumber%5D=3&page%5Bsize%5D=1" }
           get :render_pagination_using_kaminari, page: { number: 2, size: 1 }
           response = JSON.parse(@response.body)
           assert_equal expected_links, response['links']
         end
 
         def test_render_only_prev_and_first_pagination_links
-          expected_links = { "self"=>"#{KAMINARI_URI}?page%5Bnumber%5D=3&page%5Bsize%5D=1",
-            "first"=>"#{KAMINARI_URI}?page%5Bnumber%5D=1&page%5Bsize%5D=1",
-            "prev"=>"#{KAMINARI_URI}?page%5Bnumber%5D=2&page%5Bsize%5D=1"}
+          expected_links = { 'self' => "#{KAMINARI_URI}?page%5Bnumber%5D=3&page%5Bsize%5D=1",
+            'first' => "#{KAMINARI_URI}?page%5Bnumber%5D=1&page%5Bsize%5D=1",
+            'prev' => "#{KAMINARI_URI}?page%5Bnumber%5D=2&page%5Bsize%5D=1" }
           get :render_pagination_using_kaminari, page: { number: 3, size: 1 }
           response = JSON.parse(@response.body)
           assert_equal expected_links, response['links']
         end
 
         def test_render_only_last_and_next_pagination_links_with_additional_params
-          expected_links = { "self"=>"#{WILL_PAGINATE_URI}?page%5Bnumber%5D=1&page%5Bsize%5D=2&teste=additional",
-            "next"=>"#{WILL_PAGINATE_URI}?page%5Bnumber%5D=2&page%5Bsize%5D=2&teste=additional",
-            "last"=>"#{WILL_PAGINATE_URI}?page%5Bnumber%5D=2&page%5Bsize%5D=2&teste=additional"}
-          get :render_pagination_using_will_paginate, page: { number: 1, size: 2 }, teste: "additional"
+          expected_links = { 'self' => "#{WILL_PAGINATE_URI}?page%5Bnumber%5D=1&page%5Bsize%5D=2&teste=additional",
+            'next' => "#{WILL_PAGINATE_URI}?page%5Bnumber%5D=2&page%5Bsize%5D=2&teste=additional",
+            'last' => "#{WILL_PAGINATE_URI}?page%5Bnumber%5D=2&page%5Bsize%5D=2&teste=additional" }
+          get :render_pagination_using_will_paginate, page: { number: 1, size: 2 }, teste: 'additional'
           response = JSON.parse(@response.body)
           assert_equal expected_links, response['links']
         end
 
         def test_render_only_prev_and_first_pagination_links_with_additional_params
-          expected_links = { "self"=>"#{KAMINARI_URI}?page%5Bnumber%5D=3&page%5Bsize%5D=1&teste=additional",
-            "first"=>"#{KAMINARI_URI}?page%5Bnumber%5D=1&page%5Bsize%5D=1&teste=additional",
-            "prev"=>"#{KAMINARI_URI}?page%5Bnumber%5D=2&page%5Bsize%5D=1&teste=additional"}
-          get :render_pagination_using_kaminari, page: { number: 3, size: 1 }, teste: "additional"
+          expected_links = { 'self' => "#{KAMINARI_URI}?page%5Bnumber%5D=3&page%5Bsize%5D=1&teste=additional",
+            'first' => "#{KAMINARI_URI}?page%5Bnumber%5D=1&page%5Bsize%5D=1&teste=additional",
+            'prev' => "#{KAMINARI_URI}?page%5Bnumber%5D=2&page%5Bsize%5D=1&teste=additional" }
+          get :render_pagination_using_kaminari, page: { number: 3, size: 1 }, teste: 'additional'
           response = JSON.parse(@response.body)
           assert_equal expected_links, response['links']
         end

test/action_controller/serialization_test.rb

@@ -1,4 +1,3 @@
-
 require 'test_helper'
 
 module ActionController
@@ -22,20 +21,20 @@ module ActionController
         def render_array_using_custom_root
           with_adapter ActiveModel::Serializer::Adapter::Json do
             @profile = Profile.new({ name: 'Name 1', description: 'Description 1', comments: 'Comments 1' })
-            render json: [@profile], root: "custom_root"
+            render json: [@profile], root: 'custom_root'
           end
         end
 
         def render_array_that_is_empty_using_custom_root
           with_adapter ActiveModel::Serializer::Adapter::Json do
-            render json: [], root: "custom_root"
+            render json: [], root: 'custom_root'
           end
         end
 
         def render_object_using_custom_root
           with_adapter ActiveModel::Serializer::Adapter::Json do
             @profile = Profile.new({ name: 'Name 1', description: 'Description 1', comments: 'Comments 1' })
-            render json: @profile, root: "custom_root"
+            render json: @profile, root: 'custom_root'
           end
         end
 
@@ -49,7 +48,6 @@ module ActionController
 
         def render_array_using_implicit_serializer_and_meta
           with_adapter ActiveModel::Serializer::Adapter::JsonApi do
-
             @profiles = [
               Profile.new({ name: 'Name 1', description: 'Description 1', comments: 'Comments 1' })
             ]
@@ -139,6 +137,7 @@ module ActionController
         end
 
         private
+
         def generate_cached_serializer(obj)
           ActiveModel::SerializableResource.new(obj).to_json
         end
@@ -160,8 +159,8 @@ module ActionController
         get :render_using_implicit_serializer
 
         expected = {
-          name: "Name 1",
-          description: "Description 1"
+          name: 'Name 1',
+          description: 'Description 1'
         }
 
         assert_equal 'application/json', @response.content_type
@@ -174,10 +173,10 @@ module ActionController
         expected = {
           data: {
             id: assigns(:profile).id.to_s,
-            type: "profiles",
+            type: 'profiles',
             attributes: {
-              name: "Name 1",
-              description: "Description 1"
+              name: 'Name 1',
+              description: 'Description 1'
             }
           }
         }
@@ -189,7 +188,7 @@ module ActionController
       def test_render_array_using_custom_root
         get :render_array_using_custom_root
 
-        expected =  {custom_roots: [{name: "Name 1", description: "Description 1"}]}
+        expected = { custom_roots: [{ name: 'Name 1', description: 'Description 1' }] }
         assert_equal 'application/json', @response.content_type
         assert_equal expected.to_json, @response.body
       end
@@ -205,7 +204,7 @@ module ActionController
       def test_render_object_using_custom_root
         get :render_object_using_custom_root
 
-        expected =  {custom_root: {name: "Name 1", description: "Description 1"}}
+        expected = { custom_root: { name: 'Name 1', description: 'Description 1' } }
         assert_equal 'application/json', @response.content_type
         assert_equal expected.to_json, @response.body
       end
@@ -251,10 +250,10 @@ module ActionController
           data: [
             {
               id: assigns(:profiles).first.id.to_s,
-              type: "profiles",
+              type: 'profiles',
               attributes: {
-                name: "Name 1",
-                description: "Description 1"
+                name: 'Name 1',
+                description: 'Description 1'
               }
             }
           ],
@@ -336,8 +335,8 @@ module ActionController
         response = JSON.parse(@response.body)
 
         assert_equal 'application/json', @response.content_type
-        assert_equal 'ZOMG A ROLE', response["name"]
-        assert_equal 'HUEHUEBRBR', response["description"]
+        assert_equal 'ZOMG A ROLE', response['name']
+        assert_equal 'HUEHUEBRBR', response['description']
       end
 
       def test_render_with_fragment_except_cache_enable
@@ -346,8 +345,8 @@ module ActionController
         response = JSON.parse(@response.body)
 
         assert_equal 'application/json', @response.content_type
-        assert_equal 5, response["rating"]
-        assert_equal 'lol', response["content"]
+        assert_equal 5, response['rating']
+        assert_equal 'lol', response['content']
       end
 
       def test_render_fragment_changed_object_with_relationship
@@ -358,11 +357,11 @@ module ActionController
           response = JSON.parse(@response.body)
 
           expected_return = {
-            "id"=>1,
-            "time"=>Time.now.to_s,
-            "likeable" => {
-              "id"=>1,
-              "body"=>"ZOMG A COMMENT"
+            'id' => 1,
+            'time' => Time.now.to_s,
+            'likeable' => {
+              'id' => 1,
+              'body' => 'ZOMG A COMMENT'
             }
           }
 
@@ -386,7 +385,7 @@ module ActionController
           ],
           blog: {
             id: 999,
-            name: "Custom blog"
+            name: 'Custom blog'
           },
           author: {
             id: 1,
@@ -417,7 +416,7 @@ module ActionController
             true
           end
         }.new
-        assert_equal "", (capture(:stderr) {
+        assert_equal '', (capture(:stderr) {
           controller.get_serializer(Profile.new)
         })
       end

test/adapter/fragment_cache_test.rb

@@ -4,7 +4,7 @@ module ActiveModel
     class Adapter
       class FragmentCacheTest < Minitest::Test
         def setup
-          @spam            = Spam::UnrelatedLink.new(id: "spam-id-1")
+          @spam            = Spam::UnrelatedLink.new(id: 'spam-id-1')
           @author          = Author.new(name: 'Joao M. D. Moura')
           @role            = Role.new(name: 'Great Author', description: nil)
           @role.author     = [@author]

test/adapter/json/belongs_to_test.rb

@@ -14,7 +14,7 @@ module ActiveModel
             @comment.post = @post
             @comment.author = nil
             @anonymous_post.author = nil
-            @blog = Blog.new(id: 1, name: "My Blog!!")
+            @blog = Blog.new(id: 1, name: 'My Blog!!')
             @post.blog = @blog
             @anonymous_post.blog = nil
 
@@ -31,14 +31,14 @@ module ActiveModel
             serializer = PostSerializer.new(@anonymous_post)
             adapter = ActiveModel::Serializer::Adapter::Json.new(serializer)
 
-            assert_equal({post: {title: "Hello!!", body: "Hello, world!!", id: 43, comments: [], blog: {id: 999, name: "Custom blog"}, author: nil}}, adapter.serializable_hash)
+            assert_equal({ post: { title: 'Hello!!', body: 'Hello, world!!', id: 43, comments: [], blog: { id: 999, name: 'Custom blog' }, author: nil } }, adapter.serializable_hash)
           end
 
           def test_include_nil_author_with_specified_serializer
             serializer = PostPreviewSerializer.new(@anonymous_post)
             adapter = ActiveModel::Serializer::Adapter::Json.new(serializer)
 
-            assert_equal({post: {title: "Hello!!", body: "Hello, world!!", id: 43, comments: [], author: nil}}, adapter.serializable_hash)
+            assert_equal({ post: { title: 'Hello!!', body: 'Hello, world!!', id: 43, comments: [], author: nil } }, adapter.serializable_hash)
           end
         end
       end

test/adapter/json/collection_test.rb

@@ -13,7 +13,7 @@ module ActiveModel
             @second_post.comments = []
             @first_post.author = @author
             @second_post.author = @author
-            @blog = Blog.new(id: 1, name: "My Blog!!")
+            @blog = Blog.new(id: 1, name: 'My Blog!!')
             @first_post.blog = @blog
             @second_post.blog = nil
 
@@ -21,15 +21,15 @@ module ActiveModel
           end
 
           def test_with_serializer_option
-            @blog.special_attribute = "Special"
+            @blog.special_attribute = 'Special'
             @blog.articles = [@first_post, @second_post]
             serializer = ArraySerializer.new([@blog], serializer: CustomBlogSerializer)
             adapter = ActiveModel::Serializer::Adapter::Json.new(serializer)
 
             expected = { blogs: [{
               id: 1,
-              special_attribute: "Special",
-              articles: [{id: 1,title: "Hello!!", body: "Hello, world!!"}, {id: 2, title: "New Post", body: "Body"}]
+              special_attribute: 'Special',
+              articles: [{ id: 1, title: 'Hello!!', body: 'Hello, world!!' }, { id: 2, title: 'New Post', body: 'Body' }]
             }] }
             assert_equal expected, adapter.serializable_hash
           end
@@ -39,30 +39,30 @@ module ActiveModel
             adapter = ActiveModel::Serializer::Adapter::Json.new(serializer)
 
             expected = { posts: [{
-              title: "Hello!!",
-              body: "Hello, world!!",
+              title: 'Hello!!',
+              body: 'Hello, world!!',
               id: 1,
               comments: [],
               author: {
                 id: 1,
-                name: "Steve K."
+                name: 'Steve K.'
               },
               blog: {
                 id: 999,
-                name: "Custom blog"
+                name: 'Custom blog'
               }
             }, {
-              title: "New Post",
-              body: "Body",
+              title: 'New Post',
+              body: 'Body',
               id: 2,
               comments: [],
               author: {
                 id: 1,
-                name: "Steve K."
+                name: 'Steve K.'
               },
               blog: {
                 id: 999,
-                name: "Custom blog"
+                name: 'Custom blog'
               }
             }] }
             assert_equal expected, adapter.serializable_hash

test/adapter/json/has_many_test.rb

@@ -15,9 +15,9 @@ module ActiveModel
             @post.author = @author
             @first_comment.post = @post
             @second_comment.post = @post
-            @blog = Blog.new(id: 1, name: "My Blog!!")
+            @blog = Blog.new(id: 1, name: 'My Blog!!')
             @post.blog = @blog
-            @tag = Tag.new(id: 1, name: "#hash_tag")
+            @tag = Tag.new(id: 1, name: '#hash_tag')
             @post.tags = [@tag]
           end
 
@@ -36,7 +36,7 @@ module ActiveModel
             assert_equal({
               id: 42,
               tags: [
-                {"attributes"=>{"id"=>1, "name"=>"#hash_tag"}}
+                { 'attributes' => { 'id' => 1, 'name' => '#hash_tag' } }
               ]
             }.to_json, adapter.serializable_hash[:post].to_json)
           end

test/adapter/json_api/belongs_to_test.rb

@@ -21,7 +21,7 @@ module ActiveModel
             @comment.author = nil
             @post.author = @author
             @anonymous_post.author = nil
-            @blog = Blog.new(id: 1, name: "My Blog!!")
+            @blog = Blog.new(id: 1, name: 'My Blog!!')
             @blog.writer = @author
             @blog.articles = [@post, @anonymous_post]
             @author.posts = []
@@ -32,7 +32,7 @@ module ActiveModel
           end
 
           def test_includes_post_id
-            expected = { data: { type: "posts", id: "42" } }
+            expected = { data: { type: 'posts', id: '42' } }
 
             assert_equal(expected, @adapter.serializable_hash[:data][:relationships][:post])
           end
@@ -40,16 +40,16 @@ module ActiveModel
           def test_includes_linked_post
             @adapter = ActiveModel::Serializer::Adapter::JsonApi.new(@serializer, include: 'post')
             expected = [{
-              id: "42",
-              type: "posts",
+              id: '42',
+              type: 'posts',
               attributes: {
                 title: 'New Post',
                 body: 'Body',
               },
               relationships: {
-                comments: { data: [ { type: "comments", id: "1" } ] },
-                blog: { data: { type: "blogs", id: "999" } },
-                author: { data: { type: "authors", id: "1" } }
+                comments: { data: [{ type: 'comments', id: '1' }] },
+                blog: { data: { type: 'blogs', id: '999' } },
+                author: { data: { type: 'authors', id: '1' } }
               }
             }]
             assert_equal expected, @adapter.serializable_hash[:included]
@@ -58,15 +58,15 @@ module ActiveModel
           def test_limiting_linked_post_fields
             @adapter = ActiveModel::Serializer::Adapter::JsonApi.new(@serializer, include: 'post', fields: { post: [:title] })
             expected = [{
-              id: "42",
-              type: "posts",
+              id: '42',
+              type: 'posts',
               attributes: {
                 title: 'New Post'
               },
               relationships: {
-                comments: { data: [ { type: "comments", id: "1" } ] },
-                blog: { data: { type: "blogs", id: "999" } },
-                author: { data: { type: "authors", id: "1" } }
+                comments: { data: [{ type: 'comments', id: '1' }] },
+                blog: { data: { type: 'blogs', id: '999' } },
+                author: { data: { type: 'authors', id: '1' } }
               }
             }]
             assert_equal expected, @adapter.serializable_hash[:included]
@@ -76,7 +76,7 @@ module ActiveModel
             serializer = PostSerializer.new(@anonymous_post)
             adapter = ActiveModel::Serializer::Adapter::JsonApi.new(serializer)
 
-            assert_equal({comments: { data: [] }, blog: { data: { type: "blogs", id: "999" } }, author: { data: nil }}, adapter.serializable_hash[:data][:relationships])
+            assert_equal({ comments: { data: [] }, blog: { data: { type: 'blogs', id: '999' } }, author: { data: nil } }, adapter.serializable_hash[:data][:relationships])
           end
 
           def test_include_type_for_association_when_different_than_name
@@ -86,19 +86,19 @@ module ActiveModel
             expected = {
               writer: {
                 data: {
-                  type: "authors",
-                  id: "1"
+                  type: 'authors',
+                  id: '1'
                 }
               },
               articles: {
                 data: [
                   {
-                    type: "posts",
-                    id: "42"
+                    type: 'posts',
+                    id: '42'
                   },
                   {
-                    type: "posts",
-                    id: "43"
+                    type: 'posts',
+                    id: '43'
                   }
                 ]
               }
@@ -108,14 +108,14 @@ module ActiveModel
 
           def test_include_linked_resources_with_type_name
             serializer = BlogSerializer.new(@blog)
-            adapter = ActiveModel::Serializer::Adapter::JsonApi.new(serializer, include: ['writer', 'articles'])
+            adapter = ActiveModel::Serializer::Adapter::JsonApi.new(serializer, include: %w(writer articles))
             linked = adapter.serializable_hash[:included]
             expected = [
               {
-                id: "1",
-                type: "authors",
+                id: '1',
+                type: 'authors',
                 attributes: {
-                  name: "Steve K."
+                  name: 'Steve K.'
                 },
                 relationships: {
                   posts: { data: [] },
@@ -123,27 +123,27 @@ module ActiveModel
                   bio: { data: nil }
                 }
               }, {
-                id: "42",
-                type: "posts",
+                id: '42',
+                type: 'posts',
                 attributes: {
-                  title: "New Post",
-                  body: "Body"
+                  title: 'New Post',
+                  body: 'Body'
                 },
                 relationships: {
-                  comments: { data: [ { type: "comments", id: "1" } ] },
-                  blog: { data: { type: "blogs", id: "999" } },
-                  author: { data: { type: "authors", id: "1" } }
+                  comments: { data: [{ type: 'comments', id: '1' }] },
+                  blog: { data: { type: 'blogs', id: '999' } },
+                  author: { data: { type: 'authors', id: '1' } }
                 }
               }, {
-                id: "43",
-                type: "posts",
+                id: '43',
+                type: 'posts',
                 attributes: {
-                  title: "Hello!!",
-                  body: "Hello, world!!"
+                  title: 'Hello!!',
+                  body: 'Hello, world!!'
                 },
                 relationships: {
                   comments: { data: [] },
-                  blog: { data: { type: "blogs", id: "999" } },
+                  blog: { data: { type: 'blogs', id: '999' } },
                   author: { data: nil }
                 }
               }

test/adapter/json_api/collection_test.rb

@@ -27,29 +27,29 @@ module ActiveModel
           def test_include_multiple_posts
             expected = [
               {
-                id: "1",
-                type: "posts",
+                id: '1',
+                type: 'posts',
                 attributes: {
-                  title: "Hello!!",
-                  body: "Hello, world!!"
+                  title: 'Hello!!',
+                  body: 'Hello, world!!'
                 },
                 relationships: {
                   comments: { data: [] },
-                  blog: { data: { type: "blogs", id: "999" } },
-                  author: { data: { type: "authors", id: "1" } }
+                  blog: { data: { type: 'blogs', id: '999' } },
+                  author: { data: { type: 'authors', id: '1' } }
                 }
               },
               {
-                id: "2",
-                type: "posts",
+                id: '2',
+                type: 'posts',
                 attributes: {
-                  title: "New Post",
-                  body: "Body"
+                  title: 'New Post',
+                  body: 'Body'
                 },
                 relationships: {
                   comments: { data: [] },
-                  blog: { data: { type: "blogs", id: "999" } },
-                  author: { data: { type: "authors", id: "1" } }
+                  blog: { data: { type: 'blogs', id: '999' } },
+                  author: { data: { type: 'authors', id: '1' } }
                 }
               }
             ]
@@ -62,33 +62,32 @@ module ActiveModel
 
             expected = [
               {
-                id: "1",
-                type: "posts",
+                id: '1',
+                type: 'posts',
                 attributes: {
-                  title: "Hello!!"
+                  title: 'Hello!!'
                 },
                 relationships: {
                   comments: { data: [] },
-                  blog: { data: { type: "blogs", id: "999" } },
-                  author: { data: { type: "authors", id: "1" } }
+                  blog: { data: { type: 'blogs', id: '999' } },
+                  author: { data: { type: 'authors', id: '1' } }
                 }
               },
               {
-                id: "2",
-                type: "posts",
+                id: '2',
+                type: 'posts',
                 attributes: {
-                  title: "New Post"
+                  title: 'New Post'
                 },
                 relationships: {
                   comments: { data: [] },
-                  blog: { data: { type: "blogs", id: "999" } },
-                  author: { data: { type: "authors", id: "1" } }
+                  blog: { data: { type: 'blogs', id: '999' } },
+                  author: { data: { type: 'authors', id: '1' } }
                 }
               }
             ]
             assert_equal(expected, @adapter.serializable_hash[:data])
           end
-
         end
       end
     end

test/adapter/json_api/has_many_embed_ids_test.rb

@@ -27,8 +27,8 @@ module ActiveModel
           def test_includes_comment_ids
             expected = {
               data: [
-                { type: "posts", id: "1"},
-                { type: "posts", id: "2"}
+                { type: 'posts', id: '1' },
+                { type: 'posts', id: '2' }
               ]
             }
 

test/adapter/json_api/has_many_explicit_serializer_test.rb

@@ -24,7 +24,7 @@ module ActiveModel
             @serializer = PostPreviewSerializer.new(@post)
             @adapter = ActiveModel::Serializer::Adapter::JsonApi.new(
               @serializer,
-              include: ['comments', 'author']
+              include: %w(comments author)
             )
           end
 
@@ -58,9 +58,9 @@ module ActiveModel
               },
               {
                 id: @author.id.to_s,
-                type: "authors",
+                type: 'authors',
                 relationships: {
-                  posts: { data: [ {type: "posts", id: @post.id.to_s } ] }
+                  posts: { data: [{ type: 'posts', id: @post.id.to_s }] }
                 }
               }
             ]
@@ -70,7 +70,7 @@ module ActiveModel
 
           def test_includes_author_id
             expected = {
-              data: { type: "authors", id: @author.id.to_s }
+              data: { type: 'authors', id: @author.id.to_s }
             }
 
             assert_equal(expected, @adapter.serializable_hash[:data][:relationships][:author])

test/adapter/json_api/has_many_test.rb

@@ -22,12 +22,12 @@ module ActiveModel
             @second_comment.post = @post
             @post.author = @author
             @post_without_comments.author = nil
-            @blog = Blog.new(id: 1, name: "My Blog!!")
+            @blog = Blog.new(id: 1, name: 'My Blog!!')
             @blog.writer = @author
             @blog.articles = [@post]
             @post.blog = @blog
             @post_without_comments.blog = nil
-            @tag = Tag.new(id: 1, name: "#hash_tag")
+            @tag = Tag.new(id: 1, name: '#hash_tag')
             @post.tags = [@tag]
             @serializer = PostSerializer.new(@post)
             @adapter = ActiveModel::Serializer::Adapter::JsonApi.new(@serializer)
@@ -36,7 +36,7 @@ module ActiveModel
           end
 
           def test_includes_comment_ids
-            expected = { data: [ { type: "comments", id: "1" }, { type: "comments", id: "2" } ] }
+            expected = { data: [{ type: 'comments', id: '1' }, { type: 'comments', id: '2' }] }
 
             assert_equal(expected, @adapter.serializable_hash[:data][:relationships][:comments])
           end
@@ -44,23 +44,23 @@ module ActiveModel
           def test_includes_linked_comments
             @adapter = ActiveModel::Serializer::Adapter::JsonApi.new(@serializer, include: 'comments')
             expected = [{
-              id: "1",
-              type: "comments",
+              id: '1',
+              type: 'comments',
               attributes: {
                 body: 'ZOMG A COMMENT'
               },
               relationships: {
-                post: { data: { type: "posts", id: "1" } },
+                post: { data: { type: 'posts', id: '1' } },
                 author: { data: nil }
               }
             }, {
-              id: "2",
-              type: "comments",
+              id: '2',
+              type: 'comments',
               attributes: {
                 body: 'ZOMG ANOTHER COMMENT'
               },
               relationships: {
-                post: { data: { type: "posts", id: "1" } },
+                post: { data: { type: 'posts', id: '1' } },
                 author: { data: nil }
               }
             }]
@@ -70,17 +70,17 @@ module ActiveModel
           def test_limit_fields_of_linked_comments
             @adapter = ActiveModel::Serializer::Adapter::JsonApi.new(@serializer, include: 'comments', fields: { comment: [:id] })
             expected = [{
-              id: "1",
-              type: "comments",
+              id: '1',
+              type: 'comments',
               relationships: {
-                post: { data: { type: "posts", id: "1" } },
+                post: { data: { type: 'posts', id: '1' } },
                 author: { data: nil }
               }
             }, {
-              id: "2",
-              type: "comments",
+              id: '2',
+              type: 'comments',
               relationships: {
-                post: { data: { type: "posts", id: "1" } },
+                post: { data: { type: 'posts', id: '1' } },
                 author: { data: nil }
               }
             }]
@@ -101,8 +101,8 @@ module ActiveModel
 
             expected = {
               data: [{
-                type: "posts",
-                id: "1"
+                type: 'posts',
+                id: '1'
               }]
             }
             assert_equal expected, actual
@@ -114,8 +114,8 @@ module ActiveModel
 
             assert_equal({
               data: {
-                id: "1",
-                type: "posts",
+                id: '1',
+                type: 'posts',
                 relationships: {
                   tags: { data: [@tag.as_json] }
                 }
@@ -129,8 +129,8 @@ module ActiveModel
 
             assert_equal({
               data: {
-                id: "1",
-                type: "virtual_values",
+                id: '1',
+                type: 'virtual_values',
                 relationships: {
                   maker: { data: { id: 1 } },
                   reviews: { data: [{ id: 1 }, { id: 2 }] }

test/adapter/json_api/has_one_test.rb

@@ -19,7 +19,7 @@ module ActiveModel
             @comment.author = nil
             @post.author = @author
             @anonymous_post.author = nil
-            @blog = Blog.new(id: 1, name: "My Blog!!")
+            @blog = Blog.new(id: 1, name: 'My Blog!!')
             @blog.writer = @author
             @blog.articles = [@post, @anonymous_post]
             @author.posts = []
@@ -32,7 +32,7 @@ module ActiveModel
           end
 
           def test_includes_bio_id
-            expected = { data: { type: "bios", id: "43" } }
+            expected = { data: { type: 'bios', id: '43' } }
 
             assert_equal(expected, @adapter.serializable_hash[:data][:relationships][:bio])
           end
@@ -42,14 +42,14 @@ module ActiveModel
 
             expected = [
               {
-                id: "43",
-                type: "bios",
+                id: '43',
+                type: 'bios',
                 attributes: {
-                  content:"AMS Contributor",
+                  content: 'AMS Contributor',
                   rating: nil
                 },
                 relationships: {
-                  author: { data: { type: "authors", id: "1" } }
+                  author: { data: { type: 'authors', id: '1' } }
                 }
               }
             ]
@@ -63,8 +63,8 @@ module ActiveModel
 
             expected = {
               data: {
-                id: "1",
-                type: "virtual_values",
+                id: '1',
+                type: 'virtual_values',
                 relationships: {
                   maker: { data: { id: 1 } },
                   reviews: { data: [{ id: 1 }, { id: 2 }] }

test/adapter/json_api/json_api_test.rb

@@ -14,9 +14,8 @@ module ActiveModel
           @first_comment.post = @post
           @second_comment.post = @post
           @post.author = @author
-          @blog = Blog.new(id: 1, name: "My Blog!!")
+          @blog = Blog.new(id: 1, name: 'My Blog!!')
           @post.blog = @blog
-
         end
 
         def test_custom_keys
@@ -25,11 +24,11 @@ module ActiveModel
 
           assert_equal({
             reviews: { data: [
-                        {type: "comments", id: "1"},
-                        {type: "comments", id: "2"}
+                        { type: 'comments', id: '1' },
+                        { type: 'comments', id: '2' }
                     ] },
-            writer: { data: {type: "authors", id: "1"} },
-            site: { data: {type: "blogs", id: "1" } }
+            writer: { data: { type: 'authors', id: '1' } },
+            site: { data: { type: 'blogs', id: '1' } }
             }, adapter.serializable_hash[:data][:relationships])
         end
       end

test/adapter/json_api/linked_test.rb

@@ -53,94 +53,94 @@ module ActiveModel
             expected = {
               data: [
                 {
-                  id: "10",
-                  type: "posts",
+                  id: '10',
+                  type: 'posts',
                   attributes: {
-                    title: "Hello!!",
-                    body: "Hello, world!!"
+                    title: 'Hello!!',
+                    body: 'Hello, world!!'
                   },
                   relationships: {
-                    comments: { data: [ { type: "comments", id: '1' }, { type: "comments", id: '2' } ] },
-                    blog: { data: { type: "blogs", id: "999" } },
-                    author: { data: { type: "authors", id: "1" } }
+                    comments: { data: [{ type: 'comments', id: '1' }, { type: 'comments', id: '2' }] },
+                    blog: { data: { type: 'blogs', id: '999' } },
+                    author: { data: { type: 'authors', id: '1' } }
                   }
                 },
                 {
-                  id: "20",
-                  type: "posts",
+                  id: '20',
+                  type: 'posts',
                   attributes: {
-                    title: "New Post",
-                    body: "Body"
+                    title: 'New Post',
+                    body: 'Body'
                   },
                   relationships: {
                     comments: { data: [] },
-                    blog: { data: { type: "blogs", id: "999" } },
-                    author: { data: { type: "authors", id: "2" } }
+                    blog: { data: { type: 'blogs', id: '999' } },
+                    author: { data: { type: 'authors', id: '2' } }
                   }
                 }
               ],
               included: [
                 {
-                  id: "1",
-                  type: "comments",
+                  id: '1',
+                  type: 'comments',
                   attributes: {
-                    body: "ZOMG A COMMENT"
+                    body: 'ZOMG A COMMENT'
                   },
                   relationships: {
-                    post: { data: { type: "posts", id: "10" } },
+                    post: { data: { type: 'posts', id: '10' } },
                     author: { data: nil }
                   }
                 }, {
-                  id: "2",
-                  type: "comments",
+                  id: '2',
+                  type: 'comments',
                   attributes: {
-                    body: "ZOMG ANOTHER COMMENT",
+                    body: 'ZOMG ANOTHER COMMENT',
                   },
                   relationships: {
-                    post: { data: { type: "posts", id: "10" } },
+                    post: { data: { type: 'posts', id: '10' } },
                     author: { data: nil }
                   }
                 }, {
-                  id: "1",
-                  type: "authors",
+                  id: '1',
+                  type: 'authors',
                   attributes: {
-                    name: "Steve K."
+                    name: 'Steve K.'
                   },
                   relationships: {
-                    posts: { data: [ { type: "posts", id: "10" }, { type: "posts", id: "30" } ] },
+                    posts: { data: [{ type: 'posts', id: '10' }, { type: 'posts', id: '30' }] },
                     roles: { data: [] },
-                    bio: { data: { type: "bios", id: "1" } }
+                    bio: { data: { type: 'bios', id: '1' } }
                   }
                 }, {
-                  id: "1",
-                  type: "bios",
+                  id: '1',
+                  type: 'bios',
                   attributes: {
-                    content: "AMS Contributor",
+                    content: 'AMS Contributor',
                     rating: nil
                   },
                   relationships: {
-                    author: { data: { type: "authors", id: "1" } }
+                    author: { data: { type: 'authors', id: '1' } }
                   }
                 }, {
-                  id: "2",
-                  type: "authors",
+                  id: '2',
+                  type: 'authors',
                   attributes: {
-                    name: "Tenderlove"
+                    name: 'Tenderlove'
                   },
                   relationships: {
-                    posts: { data: [ { type: "posts", id:"20" } ] },
+                    posts: { data: [{ type: 'posts', id: '20' }] },
                     roles: { data: [] },
-                    bio: { data: { type: "bios", id: "2" } }
+                    bio: { data: { type: 'bios', id: '2' } }
                   }
                 }, {
-                  id: "2",
-                  type: "bios",
+                  id: '2',
+                  type: 'bios',
                   attributes: {
                     rating: nil,
-                    content: "Rails Contributor",
+                    content: 'Rails Contributor',
                   },
                   relationships: {
-                    author: { data: { type: "authors", id: "2" } }
+                    author: { data: { type: 'authors', id: '2' } }
                   }
                 }
               ]
@@ -162,39 +162,39 @@ module ActiveModel
 
             expected = [
               {
-                id: "1",
-                type: "authors",
+                id: '1',
+                type: 'authors',
                 attributes: {
-                  name: "Steve K."
+                  name: 'Steve K.'
                 },
                 relationships: {
-                  posts: { data: [ { type: "posts", id: "10"}, { type: "posts", id: "30" }] },
+                  posts: { data: [{ type: 'posts', id: '10' }, { type: 'posts', id: '30' }] },
                   roles: { data: [] },
-                  bio: { data: { type: "bios", id: "1" }}
+                  bio: { data: { type: 'bios', id: '1' } }
                 }
               }, {
-                id: "10",
-                type: "posts",
+                id: '10',
+                type: 'posts',
                 attributes: {
-                  title: "Hello!!",
-                  body: "Hello, world!!"
+                  title: 'Hello!!',
+                  body: 'Hello, world!!'
                 },
                 relationships: {
-                  comments: { data: [ { type: "comments", id: "1"}, { type: "comments", id: "2" }] },
-                  blog: { data: { type: "blogs", id: "999" } },
-                  author: { data: { type: "authors", id: "1" } }
+                  comments: { data: [{ type: 'comments', id: '1' }, { type: 'comments', id: '2' }] },
+                  blog: { data: { type: 'blogs', id: '999' } },
+                  author: { data: { type: 'authors', id: '1' } }
                 }
               }, {
-                id: "30",
-                type: "posts",
+                id: '30',
+                type: 'posts',
                 attributes: {
-                  title: "Yet Another Post",
-                  body: "Body"
+                  title: 'Yet Another Post',
+                  body: 'Body'
                 },
                 relationships: {
                   comments: { data: [] },
-                  blog: { data: { type: "blogs", id: "999" } },
-                  author: { data: { type: "authors", id: "1" } }
+                  blog: { data: { type: 'blogs', id: '999' } },
+                  author: { data: { type: 'authors', id: '1' } }
                 }
               }
             ]
@@ -229,21 +229,21 @@ module ActiveModel
 
             expected = [
               {
-                id: "10",
-                type: "posts",
+                id: '10',
+                type: 'posts',
                 attributes: {
-                  title: "Hello!!",
-                  body: "Hello, world!!"
+                  title: 'Hello!!',
+                  body: 'Hello, world!!'
                 },
                 relationships: {
                   comments: {
-                    data: [{type: "comments", id: "1"}, {type: "comments", id: "2"}]
+                    data: [{ type: 'comments', id: '1' }, { type: 'comments', id: '2' }]
                   },
                   blog: {
-                    data: {type: "blogs", id: "999"}
+                    data: { type: 'blogs', id: '999' }
                   },
                   author: {
-                    data: {type: "authors", id: "1"}
+                    data: { type: 'authors', id: '1' }
                   }
                 }
               }
@@ -262,14 +262,14 @@ module ActiveModel
 
             expected = {
               data: {
-                id: "10",
-                type: "posts",
+                id: '10',
+                type: 'posts',
                 attributes: {
-                  title: "Hello!!",
-                  body: "Hello, world!!"
+                  title: 'Hello!!',
+                  body: 'Hello, world!!'
                 },
                 relationships: {
-                  comments: { data: [ { type: "comments", id: '1' }, { type: "comments", id: '2' } ] },
+                  comments: { data: [{ type: 'comments', id: '1' }, { type: 'comments', id: '2' }] },
                   author: { data: nil }
                 }
               }

test/adapter/json_api/pagination_links_test.rb

@@ -43,9 +43,9 @@ module ActiveModel
 
           def data
             { data: [
-                { id:"1", type:"profiles", attributes:{name:"Name 1", description:"Description 1" } },
-                { id:"2", type:"profiles", attributes:{name:"Name 2", description:"Description 2" } },
-                { id:"3", type:"profiles", attributes:{name:"Name 3", description:"Description 3" } }
+                { id: '1', type: 'profiles', attributes: { name: 'Name 1', description: 'Description 1' } },
+                { id: '2', type: 'profiles', attributes: { name: 'Name 2', description: 'Description 2' } },
+                { id: '3', type: 'profiles', attributes: { name: 'Name 3', description: 'Description 3' } }
               ]
             }
           end

test/adapter/json_api/resource_type_config_test.rb

@@ -21,7 +21,7 @@ module ActiveModel
             @comment.author = nil
             @post.author = @author
             @anonymous_post.author = nil
-            @blog = Blog.new(id: 1, name: "My Blog!!")
+            @blog = Blog.new(id: 1, name: 'My Blog!!')
             @blog.writer = @author
             @blog.articles = [@post, @anonymous_post]
             @author.posts = []

test/adapter/json_test.rb

@@ -14,7 +14,7 @@ module ActiveModel
           @first_comment.post = @post
           @second_comment.post = @post
           @post.author = @author
-          @blog = Blog.new(id: 1, name: "My Blog!!")
+          @blog = Blog.new(id: 1, name: 'My Blog!!')
           @post.blog = @blog
 
           @serializer = PostSerializer.new(@post)
@@ -34,11 +34,11 @@ module ActiveModel
 
           assert_equal({
             id: 1,
-            reviews: [{id: 1, body: "ZOMG A COMMENT"},
-                      {id: 2, body: "ZOMG ANOTHER COMMENT"}
+            reviews: [{ id: 1, body: 'ZOMG A COMMENT' },
+                      { id: 2, body: 'ZOMG ANOTHER COMMENT' }
                     ],
-            writer: {id: 1, name: "Steve K."},
-            site: {id: 1, name: "My Blog!!"}
+            writer: { id: 1, name: 'Steve K.' },
+            site: { id: 1, name: 'My Blog!!' }
             }, adapter.serializable_hash[:post])
         end
       end

test/array_serializer_test.rb

@@ -15,6 +15,10 @@ module ActiveModel
         resource
       end
 
+      def test_has_object_reader_serializer_interface
+        assert_equal @serializer.object, @resource
+      end
+
       def test_respond_to_each
         assert_respond_to @serializer, :each
       end
@@ -38,11 +42,11 @@ module ActiveModel
       end
 
       def test_meta_and_meta_key_attr_readers
-        meta_content = {meta: "the meta", meta_key: "the meta key"}
+        meta_content = { meta: 'the meta', meta_key: 'the meta key' }
         @serializer = ArraySerializer.new([@comment, @post], meta_content)
 
-        assert_equal @serializer.meta, "the meta"
-        assert_equal @serializer.meta_key, "the meta key"
+        assert_equal @serializer.meta, 'the meta'
+        assert_equal @serializer.meta_key, 'the meta key'
       end
 
       def test_root_default

test/capture_warnings.rb

@@ -1,15 +1,15 @@
 # https://raw.githubusercontent.com/metric_fu/metric_fu/master/spec/capture_warnings.rb
-require "tempfile"
-require "fileutils"
+require 'tempfile'
+require 'fileutils'
 
 class CaptureWarnings
   def initialize(fail_on_warnings = true)
     @fail_on_warnings = fail_on_warnings
-    @stderr_file = Tempfile.new("app.stderr")
+    @stderr_file = Tempfile.new('app.stderr')
     @app_root ||= Dir.pwd
-    @output_dir = File.join(app_root, "tmp")
+    @output_dir = File.join(app_root, 'tmp')
     FileUtils.mkdir_p(output_dir)
-    @bundle_dir = File.join(app_root, "bundle")
+    @bundle_dir = File.join(app_root, 'bundle')
   end
 
   def before_tests
@@ -40,9 +40,9 @@ class CaptureWarnings
     end
 
     if other_warnings.any?
-      File.write(File.join(output_dir, "warnings.txt"), other_warnings.join("\n") << "\n")
+      File.write(File.join(output_dir, 'warnings.txt'), other_warnings.join("\n") << "\n")
       puts
-      puts "Non-app warnings written to tmp/warnings.txt"
+      puts 'Non-app warnings written to tmp/warnings.txt'
       puts
     end
 
@@ -53,5 +53,6 @@ class CaptureWarnings
   end
 
   private
+
   attr_reader :stderr_file, :app_root, :output_dir, :bundle_dir, :fail_on_warnings
 end

test/fixtures/active_record.rb

@@ -0,0 +1,57 @@
+require 'active_record'
+
+ActiveRecord::Base.establish_connection(adapter: 'sqlite3', database: ':memory:')
+ActiveRecord::Schema.define do
+  create_table :posts, force: true do |t|
+    t.string :title
+    t.text :body
+    t.references :author
+    t.timestamps null: false
+  end
+  create_table :authors, force: true do |t|
+    t.string :name
+    t.timestamps null: false
+  end
+  create_table :comments, force: true do |t|
+    t.text :contents
+    t.references :author
+    t.references :post
+    t.timestamp null: false
+  end
+end
+
+module ARModels
+  class Post < ActiveRecord::Base
+    has_many :comments
+    belongs_to :author
+  end
+
+  class Comment < ActiveRecord::Base
+    belongs_to :post
+    belongs_to :author
+  end
+
+  class Author < ActiveRecord::Base
+    has_many :posts
+  end
+
+  class PostSerializer < ActiveModel::Serializer
+    attributes :id, :title, :body
+
+    has_many :comments
+    belongs_to :author
+    url :comments
+  end
+
+  class CommentSerializer < ActiveModel::Serializer
+    attributes :id, :contents
+
+    belongs_to :author
+  end
+
+  class AuthorSerializer < ActiveModel::Serializer
+    attributes :id, :name
+
+    has_many :posts
+  end
+end

test/fixtures/poro.rb

@@ -103,7 +103,7 @@ PostSerializer = Class.new(ActiveModel::Serializer) do
   url :comments
 
   def blog
-    Blog.new(id: 999, name: "Custom blog")
+    Blog.new(id: 999, name: 'Custom blog')
   end
 
   def custom_options
@@ -134,10 +134,11 @@ end
 
 AuthorSerializer = Class.new(ActiveModel::Serializer) do
   cache key: 'writer', skip_digest: true
-  attributes :id, :name
+  attribute :id
+  attribute :name
 
-  has_many :posts, embed: :ids
-  has_many :roles, embed: :ids
+  has_many :posts
+  has_many :roles
   has_one :bio
 end
 

test/generators/scaffold_controller_generator_test.rb

@@ -1,5 +1,4 @@
 require 'test_helper'
-# require 'active_model/serializer/railtie'
 
 class ResourceGeneratorTest < Rails::Generators::TestCase
   destination File.expand_path('../../../tmp/generators', __FILE__)

test/generators/serializer_generator_test.rb

@@ -2,7 +2,7 @@ require 'test_helper'
 require 'generators/serializer/serializer_generator'
 
 class SerializerGeneratorTest < Rails::Generators::TestCase
-  destination File.expand_path("../../../tmp/generators", __FILE__)
+  destination File.expand_path('../../../tmp/generators', __FILE__)
   setup :prepare_destination
 
   tests Rails::Generators::SerializerGenerator
@@ -10,33 +10,33 @@ class SerializerGeneratorTest < Rails::Generators::TestCase
 
   def test_generates_a_serializer
     run_generator
-    assert_file "app/serializers/account_serializer.rb", /class AccountSerializer < ActiveModel::Serializer/
+    assert_file 'app/serializers/account_serializer.rb', /class AccountSerializer < ActiveModel::Serializer/
   end
 
   def test_generates_a_namespaced_serializer
-    run_generator ["admin/account"]
-    assert_file "app/serializers/admin/account_serializer.rb", /class Admin::AccountSerializer < ActiveModel::Serializer/
+    run_generator ['admin/account']
+    assert_file 'app/serializers/admin/account_serializer.rb', /class Admin::AccountSerializer < ActiveModel::Serializer/
   end
 
   def test_uses_application_serializer_if_one_exists
     Object.const_set(:ApplicationSerializer, Class.new)
     run_generator
-    assert_file "app/serializers/account_serializer.rb", /class AccountSerializer < ApplicationSerializer/
+    assert_file 'app/serializers/account_serializer.rb', /class AccountSerializer < ApplicationSerializer/
   ensure
     Object.send :remove_const, :ApplicationSerializer
   end
 
   def test_uses_given_parent
     Object.const_set(:ApplicationSerializer, Class.new)
-    run_generator ["Account", "--parent=MySerializer"]
-    assert_file "app/serializers/account_serializer.rb", /class AccountSerializer < MySerializer/
+    run_generator ['Account', '--parent=MySerializer']
+    assert_file 'app/serializers/account_serializer.rb', /class AccountSerializer < MySerializer/
   ensure
     Object.send :remove_const, :ApplicationSerializer
   end
 
   def test_generates_attributes_and_associations
     run_generator
-    assert_file "app/serializers/account_serializer.rb" do |serializer|
+    assert_file 'app/serializers/account_serializer.rb' do |serializer|
       assert_match(/^  attributes :id, :name, :description$/, serializer)
       assert_match(/^  has_one :business$/, serializer)
       assert_match(/^end\n*\z/, serializer)
@@ -44,8 +44,8 @@ class SerializerGeneratorTest < Rails::Generators::TestCase
   end
 
   def test_with_no_attributes_does_not_add_extra_space
-    run_generator ["account"]
-    assert_file "app/serializers/account_serializer.rb" do |content|
+    run_generator ['account']
+    assert_file 'app/serializers/account_serializer.rb' do |content|
       if RUBY_PLATFORM =~ /mingw/
         assert_no_match(/\r\n\r\nend/, content)
       else

test/lint_test.rb

@@ -7,27 +7,21 @@ module ActiveModel
 
       class CompliantResource
         def serializable_hash(options = nil)
-
         end
 
         def read_attribute_for_serialization(name)
-
         end
 
         def as_json(options = nil)
-
         end
 
         def to_json(options = nil)
-
         end
 
         def cache_key
-
         end
 
         def id
-
         end
 
         def self.model_name
@@ -38,7 +32,6 @@ module ActiveModel
       def setup
         @resource = CompliantResource.new
       end
-
     end
   end
 end

test/serializers/adapter_for_test.rb

@@ -20,7 +20,6 @@ module ActiveModel
         adapter = ActiveModel::Serializer.adapter
         assert_equal ActiveModel::Serializer::Adapter::Null, adapter
       ensure
-
       end
 
       def test_overwrite_adapter_with_class

test/serializers/association_macros_test.rb

@@ -6,7 +6,7 @@ module ActiveModel
       AuthorSummarySerializer = Class.new
       class AssociationsTestSerializer < Serializer
         belongs_to :author, serializer: AuthorSummarySerializer
-        has_many :comments, embed: :ids
+        has_many :comments
         has_one :category
       end
 
@@ -21,7 +21,7 @@ module ActiveModel
       end
 
       def test_has_many_defines_reflection
-        has_many_reflection = HasManyReflection.new(:comments, embed: :ids)
+        has_many_reflection = HasManyReflection.new(:comments, {})
 
         assert_includes(@reflections, has_many_reflection)
       end

test/serializers/associations_test.rb

@@ -52,13 +52,13 @@ module ActiveModel
 
           case key
           when :posts
-            assert_equal({ embed: :ids }, options)
+            assert_equal({}, options)
             assert_kind_of(ActiveModel::Serializer.config.array_serializer, serializer)
           when :bio
             assert_equal({}, options)
             assert_nil serializer
           when :roles
-            assert_equal({ embed: :ids }, options)
+            assert_equal({}, options)
             assert_kind_of(ActiveModel::Serializer.config.array_serializer, serializer)
           else
             flunk "Unknown association: #{key}"
@@ -74,7 +74,7 @@ module ActiveModel
 
           assert_equal key, :tags
           assert_equal serializer, nil
-          assert_equal [{ attributes: { name: "#hashtagged" }}].to_json, options[:virtual_value].to_json
+          assert_equal [{ attributes: { name: '#hashtagged' } }].to_json, options[:virtual_value].to_json
         end
       end
 

test/serializers/attribute_test.rb

@@ -4,7 +4,7 @@ module ActiveModel
   class Serializer
     class AttributeTest < Minitest::Test
       def setup
-        @blog = Blog.new({ id: 1, name: 'AMS Hints', type: "stuff" })
+        @blog = Blog.new({ id: 1, name: 'AMS Hints', type: 'stuff' })
         @blog_serializer = AlternateBlogSerializer.new(@blog)
       end
 
@@ -15,14 +15,14 @@ module ActiveModel
 
       def test_json_serializable_hash
         adapter = ActiveModel::Serializer::Adapter::Json.new(@blog_serializer)
-        assert_equal({blog: { id:1, title:"AMS Hints"}}, adapter.serializable_hash)
+        assert_equal({ blog: { id: 1, title: 'AMS Hints' } }, adapter.serializable_hash)
       end
 
       def test_attribute_inheritance_with_key
         inherited_klass = Class.new(AlternateBlogSerializer)
         blog_serializer = inherited_klass.new(@blog)
         adapter = ActiveModel::Serializer::Adapter::FlattenJson.new(blog_serializer)
-        assert_equal({:id=>1, :title=>"AMS Hints"}, adapter.serializable_hash)
+        assert_equal({ :id => 1, :title => 'AMS Hints' }, adapter.serializable_hash)
       end
 
       def test_multiple_calls_with_the_same_attribute
@@ -40,7 +40,7 @@ module ActiveModel
         end
 
         adapter = ActiveModel::Serializer::Adapter::Json.new(serializer.new(@blog))
-        assert_equal({ blog: { id: "AMS Hints" } }, adapter.serializable_hash)
+        assert_equal({ blog: { id: 'AMS Hints' } }, adapter.serializable_hash)
       end
 
       def test_type_attribute
@@ -55,7 +55,7 @@ module ActiveModel
         assert_equal({ blog: { type: 1 } }, adapter.serializable_hash)
 
         adapter = ActiveModel::Serializer::Adapter::Json.new(attributes_serializer.new(@blog))
-        assert_equal({ blog: { type: "stuff" } }, adapter.serializable_hash)
+        assert_equal({ blog: { type: 'stuff' } }, adapter.serializable_hash)
       end
     end
   end

test/serializers/attributes_test.rb

@@ -6,7 +6,7 @@ module ActiveModel
       def setup
         @profile = Profile.new({ name: 'Name 1', description: 'Description 1', comments: 'Comments 1' })
         @profile_serializer = ProfileSerializer.new(@profile)
-        @comment = Comment.new(id: 1, body: "ZOMG!!", date: "2015")
+        @comment = Comment.new(id: 1, body: 'ZOMG!!', date: '2015')
         @serializer_klass = Class.new(CommentSerializer)
         @serializer_klass_with_new_attributes = Class.new(CommentSerializer) do
           attributes :date, :likes
@@ -29,7 +29,7 @@ module ActiveModel
 
       def test_attributes_inheritance
         serializer = @serializer_klass.new(@comment)
-        assert_equal({id: 1, body: "ZOMG!!"},
+        assert_equal({ id: 1, body: 'ZOMG!!' },
           serializer.attributes)
       end
 
@@ -40,7 +40,7 @@ module ActiveModel
 
       def test_attribute_inheritance_with_new_attribute
         serializer = @serializer_klass_with_new_attributes.new(@comment)
-        assert_equal({id: 1, body: "ZOMG!!", date: "2015", likes: nil},
+        assert_equal({ id: 1, body: 'ZOMG!!', date: '2015', likes: nil },
           serializer.attributes)
       end
 

test/serializers/cache_test.rb

@@ -9,7 +9,7 @@ module ActiveModel
         @post           = Post.new(title: 'New Post', body: 'Body')
         @bio            = Bio.new(id: 1, content: 'AMS Contributor')
         @author         = Author.new(name: 'Joao M. D. Moura')
-        @blog           = Blog.new(id: 999, name: "Custom blog", writer: @author, articles: [])
+        @blog           = Blog.new(id: 999, name: 'Custom blog', writer: @author, articles: [])
         @role           = Role.new(name: 'Great Author')
         @location       = Location.new(lat: '-23.550520', lng: '-46.633309')
         @place          = Place.new(name: 'Amazing Place')
@@ -131,20 +131,20 @@ module ActiveModel
       end
 
       def test_serializer_file_path_on_nix
-        path = "/Users/git/emberjs/ember-crm-backend/app/serializers/lead_serializer.rb"
+        path = '/Users/git/emberjs/ember-crm-backend/app/serializers/lead_serializer.rb'
         caller_line = "#{path}:1:in `<top (required)>'"
         assert_equal caller_line[ActiveModel::Serializer::CALLER_FILE], path
       end
 
       def test_serializer_file_path_on_windows
-        path = "c:/git/emberjs/ember-crm-backend/app/serializers/lead_serializer.rb"
+        path = 'c:/git/emberjs/ember-crm-backend/app/serializers/lead_serializer.rb'
         caller_line = "#{path}:1:in `<top (required)>'"
         assert_equal caller_line[ActiveModel::Serializer::CALLER_FILE], path
       end
 
       def test_digest_caller_file
         contents = "puts 'AMS rocks'!"
-        file = Tempfile.new("some_ruby.rb")
+        file = Tempfile.new('some_ruby.rb')
         file.write(contents)
         path = file.path
         caller_line = "#{path}:1:in `<top (required)>'"
@@ -155,6 +155,7 @@ module ActiveModel
       end
 
       private
+
       def render_object_with_cache(obj)
         ActiveModel::SerializableResource.new(obj).serializable_hash
       end

test/serializers/fieldset_test.rb

@@ -3,9 +3,8 @@ require 'test_helper'
 module ActiveModel
   class Serializer
     class FieldsetTest < Minitest::Test
-
       def test_fieldset_with_hash
-        fieldset = ActiveModel::Serializer::Fieldset.new({'post' => ['id', 'title'], 'coment' => ['body']})
+        fieldset = ActiveModel::Serializer::Fieldset.new({ 'post' => %w(id title), 'coment' => ['body'] })
 
         assert_equal(
           { :post => [:id, :title], :coment => [:body] },

test/serializers/meta_test.rb

@@ -7,8 +7,8 @@ module ActiveModel
         ActionController::Base.cache_store.clear
         @blog = Blog.new(id: 1,
                          name: 'AMS Hints',
-                         writer: Author.new(id: 2, name: "Steve"),
-                         articles: [Post.new(id: 3, title: "AMS")])
+                         writer: Author.new(id: 2, name: 'Steve'),
+                         articles: [Post.new(id: 3, title: 'AMS')])
       end
 
       def test_meta_is_present_with_root
@@ -17,9 +17,9 @@ module ActiveModel
         expected = {
           blog: {
             id: 1,
-            title: "AMS Hints"
+            title: 'AMS Hints'
           },
-          "meta" => {
+          'meta' => {
             total: 10
           }
         }
@@ -31,20 +31,20 @@ module ActiveModel
         adapter = load_adapter(meta: { total: 10 })
         expected = {
           id: 1,
-          title: "AMS Hints"
+          title: 'AMS Hints'
         }
         assert_equal expected, adapter.as_json
       end
 
       def test_meta_key_is_used
-        serializer = AlternateBlogSerializer.new(@blog, meta: {total: 10}, meta_key: "haha_meta")
+        serializer = AlternateBlogSerializer.new(@blog, meta: { total: 10 }, meta_key: 'haha_meta')
         adapter = ActiveModel::Serializer::Adapter::Json.new(serializer)
         expected = {
           blog: {
             id: 1,
-            title: "AMS Hints"
+            title: 'AMS Hints'
           },
-          "haha_meta" => {
+          'haha_meta' => {
             total: 10
           }
         }
@@ -52,15 +52,15 @@ module ActiveModel
       end
 
       def test_meta_key_is_used_with_json_api
-        serializer = AlternateBlogSerializer.new(@blog, meta: {total: 10}, meta_key: "haha_meta")
+        serializer = AlternateBlogSerializer.new(@blog, meta: { total: 10 }, meta_key: 'haha_meta')
         adapter = ActiveModel::Serializer::Adapter::JsonApi.new(serializer)
         expected = {
           data: {
-            id: "1",
-            type: "blogs",
-            attributes: { title: "AMS Hints" }
+            id: '1',
+            type: 'blogs',
+            attributes: { title: 'AMS Hints' }
           },
-          "haha_meta" => { total: 10 }
+          'haha_meta' => { total: 10 }
         }
         assert_equal expected, adapter.as_json
       end
@@ -71,14 +71,14 @@ module ActiveModel
         adapter = ActiveModel::Serializer::Adapter::FlattenJson.new(serializer)
         expected = [{
           id: 1,
-          name: "AMS Hints",
+          name: 'AMS Hints',
           writer: {
             id: 2,
-            name: "Steve"
+            name: 'Steve'
           },
           articles: [{
             id: 3,
-            title: "AMS",
+            title: 'AMS',
             body: nil
           }]
         }]
@@ -86,20 +86,20 @@ module ActiveModel
       end
 
       def test_meta_is_present_on_arrays_with_root
-        serializer = ArraySerializer.new([@blog], meta: {total: 10}, meta_key: "haha_meta")
+        serializer = ArraySerializer.new([@blog], meta: { total: 10 }, meta_key: 'haha_meta')
         # JSON adapter adds root by default
         adapter = ActiveModel::Serializer::Adapter::Json.new(serializer)
         expected = {
           blogs: [{
             id: 1,
-            name: "AMS Hints",
+            name: 'AMS Hints',
             writer: {
               id: 2,
-              name: "Steve"
+              name: 'Steve'
             },
             articles: [{
               id: 3,
-              title: "AMS",
+              title: 'AMS',
               body: nil
             }]
           }],

test/serializers/root_test.rb

@@ -3,7 +3,6 @@ require 'test_helper'
 module ActiveModel
   class Serializer
     class RootTest < Minitest::Test
-
       def setup
         @virtual_value = VirtualValue.new(id: 1)
       end
@@ -17,7 +16,6 @@ module ActiveModel
         serializer = VirtualValueSerializer.new(@virtual_value)
         assert_equal('virtual_value', serializer.json_key)
       end
-
     end
   end
 end

test/serializers/urls_test.rb

@@ -3,7 +3,6 @@ require 'test_helper'
 module ActiveModel
   class Serializer
     class UrlsTest < Minitest::Test
-
       def setup
         @profile = Profile.new({ name: 'Name 1', description: 'Description 1', comments: 'Comments 1' })
         @post = Post.new({ title: 'New Post', body: 'Body' })

test/support/stream_capture.rb

@@ -1,7 +1,7 @@
 # Use cleaner stream testing interface from Rails 5 if available
 # see https://github.com/rails/rails/blob/29959eb59d/activesupport/lib/active_support/testing/stream.rb
 begin
-  require "active_support/testing/stream"
+  require 'active_support/testing/stream'
 rescue LoadError
   module ActiveSupport
     module Testing
@@ -29,7 +29,7 @@ rescue LoadError
         def capture(stream)
           stream = stream.to_s
           captured_stream = Tempfile.new(stream)
-          stream_io = eval("$#{stream}")
+          stream_io = eval("$#{stream}") # rubocop:disable Lint/Eval
           origin_stream = stream_io.dup
           stream_io.reopen(captured_stream)
 

test/test_helper.rb

@@ -13,7 +13,6 @@ require 'minitest/autorun'
 # Ensure backward compatibility with Minitest 4
 Minitest::Test = MiniTest::Unit::TestCase unless defined?(Minitest::Test)
 
-
 require 'capture_warnings'
 @capture_warnings = CaptureWarnings.new(fail_build = true)
 @capture_warnings.before_tests
@@ -23,7 +22,7 @@ if Minitest.respond_to?(:after_run)
   end
 else
   at_exit do
-    STDOUT.puts "Minitest.after_run not available."
+    STDOUT.puts 'Minitest.after_run not available.'
     @capture_warnings.after_tests
   end
 end
@@ -34,6 +33,8 @@ require 'support/stream_capture'
 
 require 'support/rails_app'
 
-require 'fixtures/poro'
-
 require 'support/test_case'
+
+require 'fixtures/active_record'
+
+require 'fixtures/poro'