active_model_serializers 0.10.1 → 0.10.2

data/test/lint_test.rb

@@ -30,7 +30,7 @@ module ActiveModel
         def errors
         end
 
-        def self.human_attribute_name(attr, options = {})
+        def self.human_attribute_name(_, _ = {})
         end
 
         def self.lookup_ancestors

data/test/logger_test.rb

@@ -1,18 +1,20 @@
 require 'test_helper'
 
-class ActiveModelSerializers::LoggerTest < ActiveSupport::TestCase
-  def test_logger_is_set_to_action_controller_logger_when_initializer_runs
-    assert_equal $action_controller_logger, ActionController::Base.logger # rubocop:disable Style/GlobalVars
-  end
+module ActiveModelSerializers
+  class LoggerTest < ActiveSupport::TestCase
+    def test_logger_is_set_to_action_controller_logger_when_initializer_runs
+      assert_equal $action_controller_logger, ActionController::Base.logger # rubocop:disable Style/GlobalVars
+    end
 
-  def test_logger_can_be_set
-    original_logger = ActiveModelSerializers.logger
-    logger = Logger.new(STDOUT)
+    def test_logger_can_be_set
+      original_logger = ActiveModelSerializers.logger
+      logger = Logger.new(STDOUT)
 
-    ActiveModelSerializers.logger = logger
+      ActiveModelSerializers.logger = logger
 
-    assert_equal ActiveModelSerializers.logger, logger
-  ensure
-    ActiveModelSerializers.logger = original_logger
+      assert_equal ActiveModelSerializers.logger, logger
+    ensure
+      ActiveModelSerializers.logger = original_logger
+    end
   end
 end

data/test/serializable_resource_test.rb

@@ -3,7 +3,7 @@ require 'test_helper'
 module ActiveModelSerializers
   class SerializableResourceTest < ActiveSupport::TestCase
     def setup
-      @resource = Profile.new({ name: 'Name 1', description: 'Description 1', comments: 'Comments 1' })
+      @resource = Profile.new(name: 'Name 1', description: 'Description 1', comments: 'Comments 1')
       @serializer = ProfileSerializer.new(@resource)
       @adapter = ActiveModelSerializers::Adapter.create(@serializer)
       @serializable_resource = SerializableResource.new(@resource)
@@ -32,11 +32,11 @@ module ActiveModelSerializers
     end
 
     def test_use_adapter_with_adapter_option
-      assert SerializableResource.new(@resource, { adapter: 'json' }).use_adapter?
+      assert SerializableResource.new(@resource, adapter: 'json').use_adapter?
     end
 
     def test_use_adapter_with_adapter_option_as_false
-      refute SerializableResource.new(@resource, { adapter: false }).use_adapter?
+      refute SerializableResource.new(@resource, adapter: false).use_adapter?
     end
 
     class SerializableResourceErrorsTest < Minitest::Test
@@ -45,14 +45,12 @@ module ActiveModelSerializers
         resource = ModelWithErrors.new
         resource.errors.add(:name, 'must be awesome')
         serializable_resource = ActiveModelSerializers::SerializableResource.new(
-          resource, {
-            serializer: ActiveModel::Serializer::ErrorSerializer,
-            adapter: :json_api
-          }
+          resource,             serializer: ActiveModel::Serializer::ErrorSerializer,
+                                adapter: :json_api
         )
         expected_response_document = {
-          :errors => [
-            { :source => { :pointer => '/data/attributes/name' }, :detail => 'must be awesome' }
+          errors: [
+            { source: { pointer: '/data/attributes/name' }, detail: 'must be awesome' }
           ]
         }
         assert_equal serializable_resource.as_json(options), expected_response_document
@@ -65,15 +63,13 @@ module ActiveModelSerializers
         resource.errors.add(:title, 'must be amazing')
         resources << ModelWithErrors.new
         serializable_resource = SerializableResource.new(
-          resources, {
-            serializer: ActiveModel::Serializer::ErrorsSerializer,
-            each_serializer: ActiveModel::Serializer::ErrorSerializer,
-            adapter: :json_api
-          }
+          resources, serializer: ActiveModel::Serializer::ErrorsSerializer,
+                     each_serializer: ActiveModel::Serializer::ErrorSerializer,
+                     adapter: :json_api
         )
         expected_response_document = {
-          :errors => [
-            { :source => { :pointer => '/data/attributes/title' }, :detail => 'must be amazing' }
+          errors: [
+            { source: { pointer: '/data/attributes/title' }, detail: 'must be amazing' }
           ]
         }
         assert_equal serializable_resource.as_json(options), expected_response_document

data/test/serializers/associations_test.rb

@@ -7,10 +7,10 @@ module ActiveModel
         @author = Author.new(name: 'Steve K.')
         @author.bio = nil
         @author.roles = []
-        @blog = Blog.new({ name: 'AMS Blog' })
-        @post = Post.new({ title: 'New Post', body: 'Body' })
-        @tag = Tag.new({ name: '#hashtagged' })
-        @comment = Comment.new({ id: 1, body: 'ZOMG A COMMENT' })
+        @blog = Blog.new(name: 'AMS Blog')
+        @post = Post.new(title: 'New Post', body: 'Body')
+        @tag = Tag.new(name: '#hashtagged')
+        @comment = Comment.new(id: 1, body: 'ZOMG A COMMENT')
         @post.comments = [@comment]
         @post.tags = [@tag]
         @post.blog = @blog
@@ -19,7 +19,7 @@ module ActiveModel
         @post.author = @author
         @author.posts = [@post]
 
-        @post_serializer = PostSerializer.new(@post, { custom_options: true })
+        @post_serializer = PostSerializer.new(@post, custom_options: true)
         @author_serializer = AuthorSerializer.new(@author)
         @comment_serializer = CommentSerializer.new(@comment)
       end
@@ -143,12 +143,12 @@ module ActiveModel
         )
         actual = serializable(post, adapter: :attributes, serializer: InlineAssociationTestPostSerializer).as_json
         expected = {
-          :comments => [
-            { :id => 1, :contents => 'first comment' },
-            { :id => 2, :contents => 'last comment' }
+          comments: [
+            { id: 1, contents: 'first comment' },
+            { id: 2, contents: 'last comment' }
           ],
-          :last_comments => [
-            { :id => 2, :contents => 'last comment' }
+          last_comments: [
+            { id: 2, contents: 'last comment' }
           ]
         }
 

data/test/serializers/attribute_test.rb

@@ -22,7 +22,7 @@ module ActiveModel
         inherited_klass = Class.new(AlternateBlogSerializer)
         blog_serializer = inherited_klass.new(@blog)
         adapter = ActiveModelSerializers::Adapter::Attributes.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

data/test/serializers/attributes_test.rb

@@ -4,7 +4,7 @@ module ActiveModel
   class Serializer
     class AttributesTest < ActiveSupport::TestCase
       def setup
-        @profile = Profile.new({ name: 'Name 1', description: 'Description 1', comments: 'Comments 1' })
+        @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')
         @serializer_klass = Class.new(CommentSerializer)

data/test/serializers/fieldset_test.rb

@@ -5,7 +5,7 @@ module ActiveModel
     class FieldsetTest < ActiveSupport::TestCase
       def test_fieldset_with_hash
         fieldset = ActiveModel::Serializer::Fieldset.new('post' => %w(id title), 'comment' => ['body'])
-        expected = { :post => [:id, :title], :comment => [:body] }
+        expected = { post: [:id, :title], comment: [:body] }
 
         assert_equal(expected, fieldset.fields)
       end

data/test/serializers/root_test.rb

@@ -8,7 +8,7 @@ module ActiveModel
       end
 
       def test_overwrite_root
-        serializer = VirtualValueSerializer.new(@virtual_value, { root: 'smth' })
+        serializer = VirtualValueSerializer.new(@virtual_value, root: 'smth')
         assert_equal('smth', serializer.json_key)
       end
 

data/test/serializers/serializer_for_test.rb

@@ -41,7 +41,9 @@ module ActiveModel
         end
 
         class CustomProfile
-          def serializer_class; ProfileSerializer; end
+          def serializer_class
+            ProfileSerializer
+          end
         end
 
         Tweet = Class.new(::Model)

data/test/support/isolated_unit.rb

@@ -75,6 +75,8 @@ module TestHelpers
   end
 end
 
-class ActiveSupport::TestCase
-  include TestHelpers::Generation
+module ActiveSupport
+  class TestCase
+    include TestHelpers::Generation
+  end
 end

data/test/support/serialization_testing.rb

@@ -44,10 +44,12 @@ module SerializationTesting
   end
 end
 
-class Minitest::Test
-  def before_setup
-    ActionController::Base.cache_store.clear
-  end
+module Minitest
+  class Test
+    def before_setup
+      ActionController::Base.cache_store.clear
+    end
 
-  include SerializationTesting
+    include SerializationTesting
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_model_serializers
 version: !ruby/object:Gem::Version
-  version: 0.10.1
+  version: 0.10.2
 platform: ruby
 authors:
 - Steve Klabnik
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-16 00:00:00.000000000 Z
+date: 2016-07-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -246,7 +246,6 @@ files:
 - ".github/PULL_REQUEST_TEMPLATE.md"
 - ".gitignore"
 - ".rubocop.yml"
-- ".rubocop_todo.yml"
 - ".simplecov"
 - ".travis.yml"
 - CHANGELOG.md
@@ -267,6 +266,7 @@ files:
 - docs/general/caching.md
 - docs/general/configuration_options.md
 - docs/general/deserialization.md
+- docs/general/fields.md
 - docs/general/getting_started.md
 - docs/general/instrumentation.md
 - docs/general/key_transforms.md

data/.rubocop_todo.yml

@@ -1,167 +0,0 @@
-# This configuration was generated by
-# `rubocop --auto-gen-config`
-# on 2016-03-08 22:29:52 +0100 using RuboCop version 0.37.2.
-# 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: 2
-Lint/HandleExceptions:
-  Exclude:
-    - 'Rakefile'
-
-# Offense count: 2
-# Cop supports --auto-correct.
-# Configuration parameters: AllowUnusedKeywordArguments, IgnoreEmptyMethods.
-Lint/UnusedMethodArgument:
-  Exclude:
-    - 'test/lint_test.rb'
-
-# Offense count: 4
-# Configuration parameters: EnforcedStyle, SupportedStyles.
-# SupportedStyles: strict, flexible
-Rails/TimeZone:
-  Exclude:
-    - 'test/action_controller/serialization_test.rb'
-    - 'test/serializers/cache_test.rb'
-
-# Offense count: 16
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedHashRocketStyle, EnforcedColonStyle, EnforcedLastArgumentHashStyle, SupportedLastArgumentHashStyles.
-# SupportedLastArgumentHashStyles: always_inspect, always_ignore, ignore_implicit, ignore_explicit
-Style/AlignHash:
-  Exclude:
-    - 'test/action_controller/json_api/pagination_test.rb'
-
-# Offense count: 27
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, SupportedStyles.
-# SupportedStyles: braces, no_braces, context_dependent
-Style/BracesAroundHashParameters:
-  Exclude:
-    - 'test/action_controller/adapter_selector_test.rb'
-    - 'test/action_controller/json_api/pagination_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/collection_serializer_test.rb'
-    - 'test/serializable_resource_test.rb'
-    - 'test/serializers/associations_test.rb'
-    - 'test/serializers/attributes_test.rb'
-    - 'test/serializers/root_test.rb'
-
-# Offense count: 271
-# Configuration parameters: EnforcedStyle, SupportedStyles.
-# SupportedStyles: nested, compact
-Style/ClassAndModuleChildren:
-  Enabled: false
-
-# Offense count: 6
-# 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
-# Configuration parameters: MinBodyLength.
-Style/GuardClause:
-  Exclude:
-    - 'lib/active_model/serializer.rb'
-
-# Offense count: 58
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, SupportedStyles, UseHashRocketsWithSymbolValues.
-# SupportedStyles: ruby19, ruby19_no_mixed_keys, hash_rockets
-Style/HashSyntax:
-  Enabled: false
-
-# Offense count: 4
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, SupportedStyles, IndentationWidth.
-# SupportedStyles: special_inside_parentheses, consistent, align_brackets
-Style/IndentArray:
-  Enabled: false
-
-# Offense count: 10
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, SupportedStyles, IndentationWidth.
-# SupportedStyles: special_inside_parentheses, consistent, align_braces
-Style/IndentHash:
-  Enabled: false
-
-# Offense count: 1
-# Cop supports --auto-correct.
-Style/Lambda:
-  Exclude:
-    - 'lib/active_model/serializer.rb'
-
-# Offense count: 1
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, SupportedStyles.
-# SupportedStyles: require_parentheses, require_no_parentheses, require_no_parentheses_except_multiline
-Style/MethodDefParentheses:
-  Enabled: false
-
-# Offense count: 1
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, SupportedStyles, IndentationWidth.
-# SupportedStyles: aligned, indented
-Style/MultilineOperationIndentation:
-  Enabled: false
-
-# Offense count: 1
-# Cop supports --auto-correct.
-Style/NegatedIf:
-  Exclude:
-    - 'lib/action_controller/serialization.rb'
-
-# Offense count: 1
-# Cop supports --auto-correct.
-Style/PerlBackrefs:
-  Exclude:
-    - 'test/fixtures/poro.rb'
-
-# Offense count: 3
-# Configuration parameters: NamePrefix, NamePrefixBlacklist, NameWhitelist.
-# NamePrefix: is_, has_, have_
-# NamePrefixBlacklist: is_, has_, have_
-# NameWhitelist: is_a?
-Style/PredicateName:
-  Exclude:
-    - 'lib/active_model/serializer/associations.rb'
-    - 'test/action_controller/json_api/linked_test.rb'
-
-# Offense count: 1
-# Cop supports --auto-correct.
-Style/RedundantSelf:
-  Exclude:
-    - 'test/fixtures/poro.rb'
-
-# Offense count: 1
-# Cop supports --auto-correct.
-# Configuration parameters: AllowIfMethodIsEmpty.
-Style/SingleLineMethods:
-  Exclude:
-    - 'test/serializers/serializer_for_test.rb'
-
-# Offense count: 4
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, SupportedStyles.
-# SupportedStyles: single_quotes, double_quotes
-Style/StringLiteralsInInterpolation:
-  Enabled: false
-
-# Offense count: 1
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, SupportedStyles.
-# SupportedStyles: final_newline, final_blank_line
-Style/TrailingBlankLines:
-  Exclude:
-    - 'test/adapter/null_test.rb'