active_model_serializers 0.10.1 → 0.10.2

data/test/action_controller/json_api/errors_test.rb

@@ -8,12 +8,11 @@ module ActionController
           get :render_resource_with_errors
 
           expected_errors_object = {
-            :errors =>
-              [
-                { :source => { :pointer => '/data/attributes/name' }, :detail => 'cannot be nil' },
-                { :source => { :pointer => '/data/attributes/name' }, :detail => 'must be longer' },
-                { :source => { :pointer => '/data/attributes/id' }, :detail => 'must be a uuid' }
-              ]
+            errors:               [
+              { source: { pointer: '/data/attributes/name' }, detail: 'cannot be nil' },
+              { source: { pointer: '/data/attributes/name' }, detail: 'must be longer' },
+              { source: { pointer: '/data/attributes/id' }, detail: 'must be a uuid' }
+            ]
           }.to_json
           assert_equal json_reponse_body.to_json, expected_errors_object
         end

data/test/action_controller/json_api/linked_test.rb

@@ -87,7 +87,7 @@ module ActionController
         setup do
           @routes = Rails.application.routes.draw do
             ActiveSupport::Deprecation.silence do
-              match ':action', :to => LinkedTestController, via: [:get, :post]
+              match ':action', to: LinkedTestController, via: [:get, :post]
             end
           end
         end
@@ -183,17 +183,17 @@ module ActionController
           get '/render_resource_with_missing_nested_has_many_include'
           response = JSON.parse(@response.body)
           assert response.key? 'included'
-          refute has_type?(response['included'], 'roles')
+          refute include_type?(response['included'], 'roles')
         end
 
         def test_render_collection_with_missing_nested_has_many_include
           get '/render_collection_with_missing_nested_has_many_include'
           response = JSON.parse(@response.body)
           assert response.key? 'included'
-          assert has_type?(response['included'], 'roles')
+          assert include_type?(response['included'], 'roles')
         end
 
-        def has_type?(collection, value)
+        def include_type?(collection, value)
           collection.detect { |i| i['type'] == value }
         end
       end

data/test/action_controller/json_api/pagination_test.rb

@@ -14,9 +14,9 @@ module ActionController
         class PaginationTestController < ActionController::Base
           def setup
             @array = [
-              Profile.new({ name: 'Name 1', description: 'Description 1', comments: 'Comments 1' }),
-              Profile.new({ name: 'Name 2', description: 'Description 2', comments: 'Comments 2' }),
-              Profile.new({ name: 'Name 3', description: 'Description 3', comments: 'Comments 3' })
+              Profile.new(name: 'Name 1', description: 'Description 1', comments: 'Comments 1'),
+              Profile.new(name: 'Name 2', description: 'Description 2', comments: 'Comments 2'),
+              Profile.new(name: 'Name 3', description: 'Description 3', comments: 'Comments 3')
             ]
           end
 
@@ -48,10 +48,10 @@ module ActionController
 
         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" }
+                             '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, params: { page: { number: 2, size: 1 } }
           response = JSON.parse(@response.body)
@@ -60,8 +60,8 @@ module ActionController
 
         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" }
+                             '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, params: { page: { number: 1, size: 2 } }
           response = JSON.parse(@response.body)
           assert_equal expected_links, response['links']
@@ -69,10 +69,10 @@ module ActionController
 
         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" }
+                             '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, params: { page: { number: 2, size: 1 } }
           response = JSON.parse(@response.body)
           assert_equal expected_links, response['links']
@@ -80,8 +80,8 @@ module ActionController
 
         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" }
+                             '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, params: { page: { number: 3, size: 1 } }
           response = JSON.parse(@response.body)
           assert_equal expected_links, response['links']
@@ -89,8 +89,8 @@ module ActionController
 
         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" }
+                             '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, params: { page: { number: 1, size: 2 }, teste: 'additional' }
           response = JSON.parse(@response.body)
           assert_equal expected_links, response['links']
@@ -98,8 +98,8 @@ module ActionController
 
         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" }
+                             '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, params: { page: { number: 3, size: 1 }, teste: 'additional' }
           response = JSON.parse(@response.body)
           assert_equal expected_links, response['links']

data/test/action_controller/serialization_test.rb

@@ -74,7 +74,7 @@ module ActionController
         end
 
         def update_and_render_object_with_cache_enabled
-          @post.updated_at = Time.now
+          @post.updated_at = Time.zone.now
 
           generate_cached_serializer(@post)
           render json: @post

data/test/active_model_serializers/json_pointer_test.rb

@@ -1,20 +1,22 @@
 require 'test_helper'
 
-class ActiveModelSerializers::JsonPointerTest < ActiveSupport::TestCase
-  def test_attribute_pointer
-    attribute_name = 'title'
-    pointer = ActiveModelSerializers::JsonPointer.new(:attribute, attribute_name)
-    assert_equal '/data/attributes/title', pointer
-  end
+module ActiveModelSerializers
+  class JsonPointerTest < ActiveSupport::TestCase
+    def test_attribute_pointer
+      attribute_name = 'title'
+      pointer = ActiveModelSerializers::JsonPointer.new(:attribute, attribute_name)
+      assert_equal '/data/attributes/title', pointer
+    end
 
-  def test_primary_data_pointer
-    pointer = ActiveModelSerializers::JsonPointer.new(:primary_data)
-    assert_equal '/data', pointer
-  end
+    def test_primary_data_pointer
+      pointer = ActiveModelSerializers::JsonPointer.new(:primary_data)
+      assert_equal '/data', pointer
+    end
 
-  def test_unkown_data_pointer
-    assert_raises(TypeError) do
-      ActiveModelSerializers::JsonPointer.new(:unknown)
+    def test_unkown_data_pointer
+      assert_raises(TypeError) do
+        ActiveModelSerializers::JsonPointer.new(:unknown)
+      end
     end
   end
 end

data/test/active_model_serializers/key_transform_test.rb

@@ -1,263 +1,265 @@
 require 'test_helper'
 
-class ActiveModelSerializers::KeyTransformTest < ActiveSupport::TestCase
-  def test_camel
-    obj = Object.new
-    scenarios = [
-      {
-        value: { :"some-key" => 'value' },
-        expected: { :SomeKey => 'value' }
-      },
-      {
-        value: { :someKey => 'value' },
-        expected: { :SomeKey => 'value' }
-      },
-      {
-        value: { :some_key => 'value' },
-        expected: { :SomeKey => 'value' }
-      },
-      {
-        value: { 'some-key' => 'value' },
-        expected: { 'SomeKey' => 'value' }
-      },
-      {
-        value: { 'someKey' => 'value' },
-        expected: { 'SomeKey' => 'value' }
-      },
-      {
-        value: { 'some_key' => 'value' },
-        expected: { 'SomeKey' => 'value' }
-      },
-      {
-        value: :"some-value",
-        expected: :SomeValue
-      },
-      {
-        value: :some_value,
-        expected: :SomeValue
-      },
-      {
-        value: :someValue,
-        expected: :SomeValue
-      },
-      {
-        value: 'some-value',
-        expected: 'SomeValue'
-      },
-      {
-        value: 'someValue',
-        expected: 'SomeValue'
-      },
-      {
-        value: 'some_value',
-        expected: 'SomeValue'
-      },
-      {
-        value: obj,
-        expected: obj
-      },
-      {
-        value: nil,
-        expected: nil
-      }
-    ]
-    scenarios.each do |s|
-      result = ActiveModelSerializers::KeyTransform.camel(s[:value])
-      assert_equal s[:expected], result
+module ActiveModelSerializers
+  class KeyTransformTest < ActiveSupport::TestCase
+    def test_camel
+      obj = Object.new
+      scenarios = [
+        {
+          value: { :"some-key" => 'value' },
+          expected: { SomeKey: 'value' }
+        },
+        {
+          value: { someKey: 'value' },
+          expected: { SomeKey: 'value' }
+        },
+        {
+          value: { some_key: 'value' },
+          expected: { SomeKey: 'value' }
+        },
+        {
+          value: { 'some-key' => 'value' },
+          expected: { 'SomeKey' => 'value' }
+        },
+        {
+          value: { 'someKey' => 'value' },
+          expected: { 'SomeKey' => 'value' }
+        },
+        {
+          value: { 'some_key' => 'value' },
+          expected: { 'SomeKey' => 'value' }
+        },
+        {
+          value: :"some-value",
+          expected: :SomeValue
+        },
+        {
+          value: :some_value,
+          expected: :SomeValue
+        },
+        {
+          value: :someValue,
+          expected: :SomeValue
+        },
+        {
+          value: 'some-value',
+          expected: 'SomeValue'
+        },
+        {
+          value: 'someValue',
+          expected: 'SomeValue'
+        },
+        {
+          value: 'some_value',
+          expected: 'SomeValue'
+        },
+        {
+          value: obj,
+          expected: obj
+        },
+        {
+          value: nil,
+          expected: nil
+        }
+      ]
+      scenarios.each do |s|
+        result = ActiveModelSerializers::KeyTransform.camel(s[:value])
+        assert_equal s[:expected], result
+      end
     end
-  end
 
-  def test_camel_lower
-    obj = Object.new
-    scenarios = [
-      {
-        value: { :"some-key" => 'value' },
-        expected: { :someKey => 'value' }
-      },
-      {
-        value: { :SomeKey => 'value' },
-        expected: { :someKey => 'value' }
-      },
-      {
-        value: { :some_key => 'value' },
-        expected: { :someKey => 'value' }
-      },
-      {
-        value: { 'some-key' => 'value' },
-        expected: { 'someKey' => 'value' }
-      },
-      {
-        value: { 'SomeKey' => 'value' },
-        expected: { 'someKey' => 'value' }
-      },
-      {
-        value: { 'some_key' => 'value' },
-        expected: { 'someKey' => 'value' }
-      },
-      {
-        value: :"some-value",
-        expected: :someValue
-      },
-      {
-        value: :SomeValue,
-        expected: :someValue
-      },
-      {
-        value: :some_value,
-        expected: :someValue
-      },
-      {
-        value: 'some-value',
-        expected: 'someValue'
-      },
-      {
-        value: 'SomeValue',
-        expected: 'someValue'
-      },
-      {
-        value: 'some_value',
-        expected: 'someValue'
-      },
-      {
-        value: obj,
-        expected: obj
-      },
-      {
-        value: nil,
-        expected: nil
-      }
-    ]
-    scenarios.each do |s|
-      result = ActiveModelSerializers::KeyTransform.camel_lower(s[:value])
-      assert_equal s[:expected], result
+    def test_camel_lower
+      obj = Object.new
+      scenarios = [
+        {
+          value: { :"some-key" => 'value' },
+          expected: { someKey: 'value' }
+        },
+        {
+          value: { SomeKey: 'value' },
+          expected: { someKey: 'value' }
+        },
+        {
+          value: { some_key: 'value' },
+          expected: { someKey: 'value' }
+        },
+        {
+          value: { 'some-key' => 'value' },
+          expected: { 'someKey' => 'value' }
+        },
+        {
+          value: { 'SomeKey' => 'value' },
+          expected: { 'someKey' => 'value' }
+        },
+        {
+          value: { 'some_key' => 'value' },
+          expected: { 'someKey' => 'value' }
+        },
+        {
+          value: :"some-value",
+          expected: :someValue
+        },
+        {
+          value: :SomeValue,
+          expected: :someValue
+        },
+        {
+          value: :some_value,
+          expected: :someValue
+        },
+        {
+          value: 'some-value',
+          expected: 'someValue'
+        },
+        {
+          value: 'SomeValue',
+          expected: 'someValue'
+        },
+        {
+          value: 'some_value',
+          expected: 'someValue'
+        },
+        {
+          value: obj,
+          expected: obj
+        },
+        {
+          value: nil,
+          expected: nil
+        }
+      ]
+      scenarios.each do |s|
+        result = ActiveModelSerializers::KeyTransform.camel_lower(s[:value])
+        assert_equal s[:expected], result
+      end
     end
-  end
 
-  def test_dash
-    obj = Object.new
-    scenarios = [
-      {
-        value: { :some_key => 'value' },
-        expected: { :"some-key" => 'value' }
-      },
-      {
-        value: { 'some_key' => 'value' },
-        expected: { 'some-key' => 'value' }
-      },
-      {
-        value: { :SomeKey => 'value' },
-        expected: { :"some-key" => 'value' }
-      },
-      {
-        value: { 'SomeKey' => 'value' },
-        expected: { 'some-key' => 'value' }
-      },
-      {
-        value: { :someKey => 'value' },
-        expected: { :"some-key" => 'value' }
-      },
-      {
-        value: { 'someKey' => 'value' },
-        expected: { 'some-key' => 'value' }
-      },
-      {
-        value: :some_value,
-        expected: :"some-value"
-      },
-      {
-        value: :SomeValue,
-        expected: :"some-value"
-      },
-      {
-        value: 'SomeValue',
-        expected: 'some-value'
-      },
-      {
-        value: :someValue,
-        expected: :"some-value"
-      },
-      {
-        value: 'someValue',
-        expected: 'some-value'
-      },
-      {
-        value: obj,
-        expected: obj
-      },
-      {
-        value: nil,
-        expected: nil
-      }
-    ]
-    scenarios.each do |s|
-      result = ActiveModelSerializers::KeyTransform.dash(s[:value])
-      assert_equal s[:expected], result
+    def test_dash
+      obj = Object.new
+      scenarios = [
+        {
+          value: { some_key: 'value' },
+          expected: { :"some-key" => 'value' }
+        },
+        {
+          value: { 'some_key' => 'value' },
+          expected: { 'some-key' => 'value' }
+        },
+        {
+          value: { SomeKey: 'value' },
+          expected: { :"some-key" => 'value' }
+        },
+        {
+          value: { 'SomeKey' => 'value' },
+          expected: { 'some-key' => 'value' }
+        },
+        {
+          value: { someKey: 'value' },
+          expected: { :"some-key" => 'value' }
+        },
+        {
+          value: { 'someKey' => 'value' },
+          expected: { 'some-key' => 'value' }
+        },
+        {
+          value: :some_value,
+          expected: :"some-value"
+        },
+        {
+          value: :SomeValue,
+          expected: :"some-value"
+        },
+        {
+          value: 'SomeValue',
+          expected: 'some-value'
+        },
+        {
+          value: :someValue,
+          expected: :"some-value"
+        },
+        {
+          value: 'someValue',
+          expected: 'some-value'
+        },
+        {
+          value: obj,
+          expected: obj
+        },
+        {
+          value: nil,
+          expected: nil
+        }
+      ]
+      scenarios.each do |s|
+        result = ActiveModelSerializers::KeyTransform.dash(s[:value])
+        assert_equal s[:expected], result
+      end
     end
-  end
 
-  def test_underscore
-    obj = Object.new
-    scenarios = [
-      {
-        value: { :"some-key" => 'value' },
-        expected: { :some_key => 'value' }
-      },
-      {
-        value: { 'some-key' => 'value' },
-        expected: { 'some_key' => 'value' }
-      },
-      {
-        value: { :SomeKey => 'value' },
-        expected: { :some_key => 'value' }
-      },
-      {
-        value: { 'SomeKey' => 'value' },
-        expected: { 'some_key' => 'value' }
-      },
-      {
-        value: { :someKey => 'value' },
-        expected: { :some_key => 'value' }
-      },
-      {
-        value: { 'someKey' => 'value' },
-        expected: { 'some_key' => 'value' }
-      },
-      {
-        value: :"some-value",
-        expected: :some_value
-      },
-      {
-        value: :SomeValue,
-        expected: :some_value
-      },
-      {
-        value: :someValue,
-        expected: :some_value
-      },
-      {
-        value: 'some-value',
-        expected: 'some_value'
-      },
-      {
-        value: 'SomeValue',
-        expected: 'some_value'
-      },
-      {
-        value: 'someValue',
-        expected: 'some_value'
-      },
-      {
-        value: obj,
-        expected: obj
-      },
-      {
-        value: nil,
-        expected: nil
-      }
-    ]
-    scenarios.each do |s|
-      result = ActiveModelSerializers::KeyTransform.underscore(s[:value])
-      assert_equal s[:expected], result
+    def test_underscore
+      obj = Object.new
+      scenarios = [
+        {
+          value: { :"some-key" => 'value' },
+          expected: { some_key: 'value' }
+        },
+        {
+          value: { 'some-key' => 'value' },
+          expected: { 'some_key' => 'value' }
+        },
+        {
+          value: { SomeKey: 'value' },
+          expected: { some_key: 'value' }
+        },
+        {
+          value: { 'SomeKey' => 'value' },
+          expected: { 'some_key' => 'value' }
+        },
+        {
+          value: { someKey: 'value' },
+          expected: { some_key: 'value' }
+        },
+        {
+          value: { 'someKey' => 'value' },
+          expected: { 'some_key' => 'value' }
+        },
+        {
+          value: :"some-value",
+          expected: :some_value
+        },
+        {
+          value: :SomeValue,
+          expected: :some_value
+        },
+        {
+          value: :someValue,
+          expected: :some_value
+        },
+        {
+          value: 'some-value',
+          expected: 'some_value'
+        },
+        {
+          value: 'SomeValue',
+          expected: 'some_value'
+        },
+        {
+          value: 'someValue',
+          expected: 'some_value'
+        },
+        {
+          value: obj,
+          expected: obj
+        },
+        {
+          value: nil,
+          expected: nil
+        }
+      ]
+      scenarios.each do |s|
+        result = ActiveModelSerializers::KeyTransform.underscore(s[:value])
+        assert_equal s[:expected], result
+      end
     end
   end
 end