RubyGems - active_model_serializers - Versions diffs - 0.10.0 → 0.10.3 - Mend

active_model_serializers 0.10.0 → 0.10.3

Files changed (146) hide show

checksums.yaml +4 -4
data/.rubocop.yml +2 -4
data/.travis.yml +9 -1
data/CHANGELOG.md +81 -2
data/CODE_OF_CONDUCT.md +74 -0
data/Gemfile +5 -2
data/README.md +24 -24
data/Rakefile +3 -3
data/active_model_serializers.gemspec +20 -24
data/docs/ARCHITECTURE.md +6 -7
data/docs/README.md +2 -0
data/docs/general/adapters.md +4 -2
data/docs/general/caching.md +7 -1
data/docs/general/configuration_options.md +70 -1
data/docs/general/deserialization.md +1 -1
data/docs/general/fields.md +31 -0
data/docs/general/rendering.md +42 -3
data/docs/general/serializers.md +97 -8
data/docs/howto/add_pagination_links.md +4 -5
data/docs/howto/add_relationship_links.md +137 -0
data/docs/howto/add_root_key.md +4 -0
data/docs/howto/grape_integration.md +42 -0
data/docs/howto/outside_controller_use.md +9 -2
data/docs/howto/passing_arbitrary_options.md +2 -2
data/docs/howto/test.md +2 -0
data/docs/howto/upgrade_from_0_8_to_0_10.md +265 -0
data/docs/integrations/ember-and-json-api.md +64 -32
data/docs/jsonapi/schema.md +1 -1
data/lib/action_controller/serialization.rb +13 -3
data/lib/active_model/serializer/adapter/base.rb +2 -0
data/lib/active_model/serializer/array_serializer.rb +8 -5
data/lib/active_model/serializer/association.rb +19 -4
data/lib/active_model/serializer/belongs_to_reflection.rb +0 -3
data/lib/active_model/serializer/collection_serializer.rb +35 -12
data/lib/active_model/serializer/{associations.rb → concerns/associations.rb} +13 -11
data/lib/active_model/serializer/{attributes.rb → concerns/attributes.rb} +0 -0
data/lib/active_model/serializer/{caching.rb → concerns/caching.rb} +72 -113
data/lib/active_model/serializer/{configuration.rb → concerns/configuration.rb} +25 -1
data/lib/active_model/serializer/{links.rb → concerns/links.rb} +0 -0
data/lib/active_model/serializer/{meta.rb → concerns/meta.rb} +0 -0
data/lib/active_model/serializer/{type.rb → concerns/type.rb} +0 -0
data/lib/active_model/serializer/error_serializer.rb +11 -7
data/lib/active_model/serializer/errors_serializer.rb +25 -20
data/lib/active_model/serializer/has_many_reflection.rb +0 -3
data/lib/active_model/serializer/has_one_reflection.rb +0 -3
data/lib/active_model/serializer/lint.rb +134 -130
data/lib/active_model/serializer/reflection.rb +37 -21
data/lib/active_model/serializer/version.rb +1 -1
data/lib/active_model/serializer.rb +76 -37
data/lib/active_model_serializers/adapter/attributes.rb +3 -66
data/lib/active_model_serializers/adapter/base.rb +38 -38
data/lib/active_model_serializers/adapter/json_api/link.rb +1 -1
data/lib/active_model_serializers/adapter/json_api/pagination_links.rb +8 -1
data/lib/active_model_serializers/adapter/json_api/relationship.rb +30 -19
data/lib/active_model_serializers/adapter/json_api/resource_identifier.rb +23 -9
data/lib/active_model_serializers/adapter/json_api.rb +44 -43
data/lib/active_model_serializers/adapter.rb +6 -0
data/lib/active_model_serializers/deprecate.rb +1 -2
data/lib/active_model_serializers/deserialization.rb +2 -0
data/lib/active_model_serializers/key_transform.rb +4 -0
data/lib/active_model_serializers/lookup_chain.rb +80 -0
data/lib/active_model_serializers/model.rb +4 -2
data/lib/active_model_serializers/railtie.rb +3 -1
data/lib/active_model_serializers/register_jsonapi_renderer.rb +44 -31
data/lib/active_model_serializers/serializable_resource.rb +6 -5
data/lib/active_model_serializers/serialization_context.rb +10 -3
data/lib/active_model_serializers.rb +7 -0
data/lib/generators/rails/serializer_generator.rb +4 -4
data/lib/grape/active_model_serializers.rb +7 -5
data/lib/grape/formatters/active_model_serializers.rb +19 -2
data/lib/grape/helpers/active_model_serializers.rb +1 -0
data/test/action_controller/adapter_selector_test.rb +4 -4
data/test/action_controller/explicit_serializer_test.rb +5 -4
data/test/action_controller/json/include_test.rb +106 -27
data/test/action_controller/json_api/errors_test.rb +6 -7
data/test/action_controller/json_api/fields_test.rb +57 -0
data/test/action_controller/json_api/linked_test.rb +29 -24
data/test/action_controller/json_api/pagination_test.rb +19 -19
data/test/action_controller/json_api/transform_test.rb +3 -3
data/test/action_controller/lookup_proc_test.rb +49 -0
data/test/action_controller/namespace_lookup_test.rb +226 -0
data/test/action_controller/serialization_test.rb +10 -7
data/test/active_model_serializers/json_pointer_test.rb +15 -13
data/test/active_model_serializers/key_transform_test.rb +286 -252
data/test/active_model_serializers/model_test.rb +17 -4
data/test/active_model_serializers/register_jsonapi_renderer_test_isolated.rb +143 -0
data/test/active_model_serializers/serialization_context_test_isolated.rb +23 -10
data/test/adapter/attributes_test.rb +43 -0
data/test/adapter/json/collection_test.rb +14 -0
data/test/adapter/json/transform_test.rb +15 -15
data/test/adapter/json_api/collection_test.rb +4 -3
data/test/adapter/json_api/errors_test.rb +17 -19
data/test/adapter/json_api/fields_test.rb +4 -3
data/test/adapter/json_api/has_many_test.rb +39 -18
data/test/adapter/json_api/include_data_if_sideloaded_test.rb +166 -0
data/test/adapter/json_api/json_api_test.rb +5 -7
data/test/adapter/json_api/linked_test.rb +33 -12
data/test/adapter/json_api/links_test.rb +4 -2
data/test/adapter/json_api/pagination_links_test.rb +35 -8
data/test/adapter/json_api/relationship_test.rb +309 -73
data/test/adapter/json_api/resource_identifier_test.rb +27 -2
data/test/adapter/json_api/resource_meta_test.rb +3 -3
data/test/adapter/json_api/transform_test.rb +255 -253
data/test/adapter/json_api/type_test.rb +1 -1
data/test/adapter/json_test.rb +8 -7
data/test/adapter/null_test.rb +1 -2
data/test/adapter/polymorphic_test.rb +5 -5
data/test/adapter_test.rb +1 -1
data/test/benchmark/app.rb +1 -1
data/test/benchmark/benchmarking_support.rb +1 -1
data/test/benchmark/bm_active_record.rb +81 -0
data/test/benchmark/bm_adapter.rb +38 -0
data/test/benchmark/bm_caching.rb +16 -16
data/test/benchmark/bm_lookup_chain.rb +83 -0
data/test/benchmark/bm_transform.rb +16 -5
data/test/benchmark/controllers.rb +16 -17
data/test/benchmark/fixtures.rb +72 -72
data/test/cache_test.rb +143 -49
data/test/collection_serializer_test.rb +3 -3
data/test/fixtures/poro.rb +52 -48
data/test/generators/serializer_generator_test.rb +22 -5
data/test/grape_test.rb +152 -56
data/test/lint_test.rb +1 -1
data/test/logger_test.rb +13 -11
data/test/serializable_resource_test.rb +18 -22
data/test/serializers/association_macros_test.rb +3 -2
data/test/serializers/associations_test.rb +107 -32
data/test/serializers/attribute_test.rb +2 -2
data/test/serializers/attributes_test.rb +1 -1
data/test/serializers/fieldset_test.rb +1 -1
data/test/serializers/meta_test.rb +12 -6
data/test/serializers/root_test.rb +1 -1
data/test/serializers/serializer_for_test.rb +6 -4
data/test/serializers/serializer_for_with_namespace_test.rb +87 -0
data/test/support/isolated_unit.rb +5 -2
data/test/support/rails5_shims.rb +8 -2
data/test/support/rails_app.rb +0 -9
data/test/support/serialization_testing.rb +23 -5
data/test/test_helper.rb +1 -0
metadata +85 -34
data/.rubocop_todo.yml +0 -167
data/lib/active_model/serializer/include_tree.rb +0 -111
data/test/adapter/json_api/relationships_test.rb +0 -199
data/test/include_tree/from_include_args_test.rb +0 -26
data/test/include_tree/from_string_test.rb +0 -94
data/test/include_tree/include_args_to_hash_test.rb +0 -64

data/test/active_model_serializers/key_transform_test.rb CHANGED Viewed

@@ -1,263 +1,297 @@
 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
+        },
+        {
+          value: [
+            { some_value: 'value' }
+          ],
+          expected: [
+            { SomeValue: 'value' }
+          ]
+        }
+      ]
+      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
+        },
+        {
+          value: [
+            { some_value: 'value' }
+          ],
+          expected: [
+            { someValue: 'value' }
+          ]
+        }
+      ]
+      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
+        },
+        {
+          value: [
+            { 'some_value' => 'value' }
+          ],
+          expected: [
+            { 'some-value' => 'value' }
+          ]
+        }
+      ]
+      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
+        },
+        {
+          value: [
+            { 'some-value' => 'value' }
+          ],
+          expected: [
+            { 'some_value' => 'value' }
+          ]
+        }
+      ]
+      scenarios.each do |s|
+        result = ActiveModelSerializers::KeyTransform.underscore(s[:value])
+        assert_equal s[:expected], result
+      end
     end
   end
 end

data/test/active_model_serializers/model_test.rb CHANGED Viewed

@@ -1,9 +1,22 @@
 require 'test_helper'
-class ActiveModelSerializers::ModelTest < ActiveSupport::TestCase
-  include ActiveModel::Serializer::Lint::Tests
+module ActiveModelSerializers
+  class ModelTest < ActiveSupport::TestCase
+    include ActiveModel::Serializer::Lint::Tests
-  def setup
-    @resource = ActiveModelSerializers::Model.new
+    def setup
+      @resource = ActiveModelSerializers::Model.new
+    end
+    def test_initialization_with_string_keys
+      klass = Class.new(ActiveModelSerializers::Model) do
+        attr_accessor :key
+      end
+      value = 'value'
+      model_instance = klass.new('key' => value)
+      assert_equal model_instance.read_attribute_for_serialization(:key), value
+    end
   end
 end