active_model_serializers 0.10.9 → 0.10.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e365d9b8e66fd40b66555a2e57faad48fee5bfd82b988ab42aacda73930bb53c
-  data.tar.gz: bbad118b340ea31c7a09f1f0661d0e53866135a99923276182dc159d4eeb2f9c
+  metadata.gz: 20ead782c7fc4fcfbfd9739a0fcb1957f65284c65c53b619b3b2ac5ed7339bc3
+  data.tar.gz: d65bf0ce1f442f19679c36f624fde661f6ce4d97db1f849ac948d104ac3d88d2
 SHA512:
-  metadata.gz: 011fcf63a00a7cfc27a54679551cf6c03b3dd4ff177192fca7d2be34bfbb2c3b6c6ba40bc92395997a392ed9bf1d91823da15afa7bde374d08f5e9d69982d054
-  data.tar.gz: 8311b1ed270c60ae5d00beaa2e421a350201bec131a44096190f40dfb61a84f11d50ace18c357cc77e364863bef94eebaad717dc78a156c923049679c5295d1d
+  metadata.gz: ff70ab49d8bc826f3247ffefe845a169411a2a0767a92fa5de560894f70914c99bdad75d17cf2403c7a1eeff68a1611dcfa35da175d2f2cc711c5f7961ac522f
+  data.tar.gz: d85f6549fb002b01220c0710f3928489d747792b4cd9bf65fef2b712dd3c70a6e628a6e33f306927886e85a0f50d32d195c988c8cb7d6045c30f235d5410f6c6

data/CHANGELOG.md

@@ -1,6 +1,6 @@
 ## 0.10.x
 
-### [master (unreleased)](https://github.com/rails-api/active_model_serializers/compare/v0.10.9...0-10-stable)
+### [master (unreleased)](https://github.com/rails-api/active_model_serializers/compare/v0.10.10...0-10-stable)
 
 Breaking changes:
 
@@ -10,8 +10,24 @@ Fixes:
 
 Misc:
 
-### [v0.10.9 (2019-02-08)](https://github.com/rails-api/active_model_serializers/compare/v0.10.8...v0.10.9)
+### [v0.10.10 (2019-07-13)](https://github.com/rails-api/active_model_serializers/compare/v0.10.9...v0.10.10)
+
+Fixes:
+
+- [#2319](https://github.com/rails-api/active_model_serializers/pull/2319) Fixes #2316. (@kylekeesling)
+    - Fix Rails 6.0 deprication warnings
+    - update test fixture schema to use `timestamps` instead of `timestamp`
+- [#2223](https://github.com/rails-api/active_model_serializers/pull/2223) Support Fieldset in Attributes/JSON adapters documented in [docs/general/fields.md](https://github.com/rails-api/active_model_serializers/blob/0-10-stable/docs/general/fields.md) that worked partially before (@bf4)
+- [#2337](https://github.com/rails-api/active_model_serializers/pull/2337) fix incorrect belongs_to serialization when foreign_key on object and belongs_to is blank (@InteNs)
+    - Fixes incorrect json-api generation when `jsonapi_use_foreign_key_on_belongs_to_relationship` is `true` and the relationship is blank
+- [#2172](https://github.com/rails-api/active_model_serializers/pull/2172) Preserve the namespace when falling back to a superclass serializer
 
+Misc:
+
+- [#2327](https://github.com/rails-api/active_model_serializers/pull/2327) Add support for Ruby 2.6 on Travis CI (@wasifhossain)
+- [#2304](https://github.com/rails-api/active_model_serializers/pull/2304) Slim down bundled gem by excluding test files and docs (@greysteil)
+
+### [v0.10.9 (2019-02-08)](https://github.com/rails-api/active_model_serializers/compare/v0.10.8...v0.10.9)
 
 Fixes:
 

data/lib/action_controller/serialization.rb

@@ -23,7 +23,15 @@ module ActionController
     end
 
     def namespace_for_serializer
-      @namespace_for_serializer ||= self.class.parent unless self.class.parent == Object
+      @namespace_for_serializer ||= namespace_for_class(self.class) unless namespace_for_class(self.class) == Object
+    end
+
+    def namespace_for_class(klass)
+      if Module.method_defined?(:module_parent)
+        klass.module_parent
+      else
+        klass.parent
+      end
     end
 
     def serialization_scope

data/lib/active_model/serializer.rb

@@ -94,7 +94,7 @@ module ActiveModel
         if serializer_class
           serializer_class
         elsif klass.superclass
-          get_serializer_for(klass.superclass)
+          get_serializer_for(klass.superclass, namespace)
         else
           nil # No serializer found
         end
@@ -365,6 +365,9 @@ module ActiveModel
     def serializable_hash(adapter_options = nil, options = {}, adapter_instance = self.class.serialization_adapter_instance)
       adapter_options ||= {}
       options[:include_directive] ||= ActiveModel::Serializer.include_directive_from_options(adapter_options)
+      if (fieldset = adapter_options[:fieldset])
+        options[:fields] = fieldset.fields_for(json_key)
+      end
       resource = attributes_hash(adapter_options, options, adapter_instance)
       relationships = associations_hash(adapter_options, options, adapter_instance)
       resource.merge(relationships)
@@ -379,7 +382,12 @@ module ActiveModel
 
     # Used by adapter as resource root.
     def json_key
-      root || _type || object.class.model_name.to_s.underscore
+      root || _type ||
+        begin
+          object.class.model_name.to_s.underscore
+        rescue ArgumentError
+          'anonymous_object'
+        end
     end
 
     def read_attribute_for_serialization(attr)

data/lib/active_model/serializer/version.rb

@@ -2,6 +2,6 @@
 
 module ActiveModel
   class Serializer
-    VERSION = '0.10.9'.freeze
+    VERSION = '0.10.10'.freeze
   end
 end

data/lib/active_model_serializers/adapter/attributes.rb

@@ -3,6 +3,11 @@
 module ActiveModelSerializers
   module Adapter
     class Attributes < Base
+      def initialize(*)
+        super
+        instance_options[:fieldset] ||= ActiveModel::Serializer::Fieldset.new(fields_to_fieldset(instance_options.delete(:fields)))
+      end
+
       def serializable_hash(options = nil)
         options = serialization_options(options)
         options[:fields] ||= instance_options[:fields]
@@ -10,6 +15,22 @@ module ActiveModelSerializers
 
         self.class.transform_key_casing!(serialized_hash, instance_options)
       end
+
+      private
+
+      def fields_to_fieldset(fields)
+        return fields if fields.nil?
+        resource_fields = []
+        relationship_fields = {}
+        fields.each do |field|
+          case field
+          when Symbol, String then resource_fields << field
+          when Hash then relationship_fields.merge!(field)
+          else fail ArgumentError, "Unknown conversion of fields to fieldset: '#{field.inspect}' in '#{fields.inspect}'"
+          end
+        end
+        relationship_fields.merge!(serializer.json_key.to_sym => resource_fields)
+      end
     end
   end
 end

data/lib/active_model_serializers/adapter/json_api/resource_identifier.rb

@@ -13,7 +13,7 @@ module ActiveModelSerializers
           type = inflect_type(type)
           type = type_for(:no_class_needed, type, options)
           if id.blank?
-            { type: type }
+            nil
           else
             { id: id.to_s, type: type }
           end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_model_serializers
 version: !ruby/object:Gem::Version
-  version: 0.10.9
+  version: 0.10.10
 platform: ruby
 authors:
 - Steve Klabnik
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-02-08 00:00:00.000000000 Z
+date: 2019-07-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -19,7 +19,7 @@ dependencies:
         version: '4.1'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6'
+        version: '6.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -29,7 +29,7 @@ dependencies:
         version: '4.1'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6'
+        version: '6.1'
 - !ruby/object:Gem::Dependency
   name: actionpack
   requirement: !ruby/object:Gem::Requirement
@@ -39,7 +39,7 @@ dependencies:
         version: '4.1'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6'
+        version: '6.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -49,7 +49,7 @@ dependencies:
         version: '4.1'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6'
+        version: '6.1'
 - !ruby/object:Gem::Dependency
   name: railties
   requirement: !ruby/object:Gem::Requirement
@@ -59,7 +59,7 @@ dependencies:
         version: '4.1'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6'
+        version: '6.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -69,7 +69,7 @@ dependencies:
         version: '4.1'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6'
+        version: '6.1'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -133,7 +133,7 @@ dependencies:
         version: '4.1'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6'
+        version: '6.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -143,7 +143,7 @@ dependencies:
         version: '4.1'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6'
+        version: '6.1'
 - !ruby/object:Gem::Dependency
   name: kaminari
   requirement: !ruby/object:Gem::Requirement
@@ -282,55 +282,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".github/ISSUE_TEMPLATE.md"
-- ".github/PULL_REQUEST_TEMPLATE.md"
-- ".gitignore"
-- ".rubocop.yml"
-- ".simplecov"
-- ".travis.yml"
 - CHANGELOG.md
-- CODE_OF_CONDUCT.md
-- CONTRIBUTING.md
-- Gemfile
 - MIT-LICENSE
 - README.md
-- Rakefile
-- active_model_serializers.gemspec
-- appveyor.yml
-- bin/bench
-- bin/bench_regression
-- bin/rubocop
-- bin/serve_benchmark
-- docs/README.md
-- docs/STYLE.md
-- docs/general/adapters.md
-- 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
-- docs/general/logging.md
-- docs/general/rendering.md
-- docs/general/serializers.md
-- docs/how-open-source-maintained.jpg
-- docs/howto/add_pagination_links.md
-- docs/howto/add_relationship_links.md
-- docs/howto/add_root_key.md
-- docs/howto/grape_integration.md
-- docs/howto/outside_controller_use.md
-- docs/howto/passing_arbitrary_options.md
-- docs/howto/serialize_poro.md
-- docs/howto/test.md
-- docs/howto/upgrade_from_0_8_to_0_10.md
-- docs/integrations/ember-and-json-api.md
-- docs/integrations/grape.md
-- docs/jsonapi/errors.md
-- docs/jsonapi/schema.md
-- docs/jsonapi/schema/schema.json
-- docs/rfcs/0000-namespace.md
-- docs/rfcs/template.md
 - lib/action_controller/serialization.rb
 - lib/active_model/serializable_resource.rb
 - lib/active_model/serializer.rb
@@ -395,106 +349,6 @@ files:
 - lib/grape/formatters/active_model_serializers.rb
 - lib/grape/helpers/active_model_serializers.rb
 - lib/tasks/rubocop.rake
-- test/action_controller/adapter_selector_test.rb
-- test/action_controller/explicit_serializer_test.rb
-- test/action_controller/json/include_test.rb
-- test/action_controller/json_api/deserialization_test.rb
-- test/action_controller/json_api/errors_test.rb
-- test/action_controller/json_api/fields_test.rb
-- test/action_controller/json_api/linked_test.rb
-- test/action_controller/json_api/pagination_test.rb
-- test/action_controller/json_api/transform_test.rb
-- test/action_controller/lookup_proc_test.rb
-- test/action_controller/namespace_lookup_test.rb
-- test/action_controller/serialization_scope_name_test.rb
-- test/action_controller/serialization_test.rb
-- test/active_model_serializers/adapter_for_test.rb
-- test/active_model_serializers/json_pointer_test.rb
-- test/active_model_serializers/logging_test.rb
-- test/active_model_serializers/model_test.rb
-- test/active_model_serializers/railtie_test_isolated.rb
-- test/active_model_serializers/register_jsonapi_renderer_test_isolated.rb
-- test/active_model_serializers/serialization_context_test_isolated.rb
-- test/active_model_serializers/test/schema_test.rb
-- test/active_model_serializers/test/serializer_test.rb
-- test/active_record_test.rb
-- test/adapter/attributes_test.rb
-- test/adapter/deprecation_test.rb
-- test/adapter/json/belongs_to_test.rb
-- test/adapter/json/collection_test.rb
-- test/adapter/json/has_many_test.rb
-- test/adapter/json/transform_test.rb
-- test/adapter/json_api/belongs_to_test.rb
-- test/adapter/json_api/collection_test.rb
-- test/adapter/json_api/errors_test.rb
-- test/adapter/json_api/fields_test.rb
-- test/adapter/json_api/has_many_explicit_serializer_test.rb
-- test/adapter/json_api/has_many_test.rb
-- test/adapter/json_api/has_one_test.rb
-- test/adapter/json_api/include_data_if_sideloaded_test.rb
-- test/adapter/json_api/json_api_test.rb
-- test/adapter/json_api/linked_test.rb
-- test/adapter/json_api/links_test.rb
-- test/adapter/json_api/pagination_links_test.rb
-- test/adapter/json_api/parse_test.rb
-- test/adapter/json_api/relationship_test.rb
-- test/adapter/json_api/resource_meta_test.rb
-- test/adapter/json_api/toplevel_jsonapi_test.rb
-- test/adapter/json_api/transform_test.rb
-- test/adapter/json_api/type_test.rb
-- test/adapter/json_test.rb
-- test/adapter/null_test.rb
-- test/adapter/polymorphic_test.rb
-- test/adapter_test.rb
-- test/array_serializer_test.rb
-- test/benchmark/app.rb
-- test/benchmark/benchmarking_support.rb
-- test/benchmark/bm_active_record.rb
-- test/benchmark/bm_adapter.rb
-- test/benchmark/bm_caching.rb
-- test/benchmark/bm_lookup_chain.rb
-- test/benchmark/bm_transform.rb
-- test/benchmark/config.ru
-- test/benchmark/controllers.rb
-- test/benchmark/fixtures.rb
-- test/cache_test.rb
-- test/collection_serializer_test.rb
-- test/fixtures/active_record.rb
-- test/fixtures/poro.rb
-- test/generators/scaffold_controller_generator_test.rb
-- test/generators/serializer_generator_test.rb
-- test/grape_test.rb
-- test/lint_test.rb
-- test/logger_test.rb
-- test/poro_test.rb
-- test/serializable_resource_test.rb
-- test/serializers/association_macros_test.rb
-- test/serializers/associations_test.rb
-- test/serializers/attribute_test.rb
-- test/serializers/attributes_test.rb
-- test/serializers/caching_configuration_test_isolated.rb
-- test/serializers/configuration_test.rb
-- test/serializers/fieldset_test.rb
-- test/serializers/meta_test.rb
-- test/serializers/options_test.rb
-- test/serializers/read_attribute_for_serialization_test.rb
-- test/serializers/reflection_test.rb
-- test/serializers/root_test.rb
-- test/serializers/serialization_test.rb
-- test/serializers/serializer_for_test.rb
-- test/serializers/serializer_for_with_namespace_test.rb
-- test/support/custom_schemas/active_model_serializers/test/schema_test/my/index.json
-- test/support/isolated_unit.rb
-- test/support/rails5_shims.rb
-- test/support/rails_app.rb
-- test/support/schemas/active_model_serializers/test/schema_test/my/index.json
-- test/support/schemas/active_model_serializers/test/schema_test/my/show.json
-- test/support/schemas/custom/show.json
-- test/support/schemas/hyper_schema.json
-- test/support/schemas/render_using_json_api.json
-- test/support/schemas/simple_json_pointers.json
-- test/support/serialization_testing.rb
-- test/test_helper.rb
 homepage: https://github.com/rails-api/active_model_serializers
 licenses:
 - MIT
@@ -514,109 +368,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Conventions-based JSON generation for Rails.
-test_files:
-- test/action_controller/adapter_selector_test.rb
-- test/action_controller/explicit_serializer_test.rb
-- test/action_controller/json/include_test.rb
-- test/action_controller/json_api/deserialization_test.rb
-- test/action_controller/json_api/errors_test.rb
-- test/action_controller/json_api/fields_test.rb
-- test/action_controller/json_api/linked_test.rb
-- test/action_controller/json_api/pagination_test.rb
-- test/action_controller/json_api/transform_test.rb
-- test/action_controller/lookup_proc_test.rb
-- test/action_controller/namespace_lookup_test.rb
-- test/action_controller/serialization_scope_name_test.rb
-- test/action_controller/serialization_test.rb
-- test/active_model_serializers/adapter_for_test.rb
-- test/active_model_serializers/json_pointer_test.rb
-- test/active_model_serializers/logging_test.rb
-- test/active_model_serializers/model_test.rb
-- test/active_model_serializers/railtie_test_isolated.rb
-- test/active_model_serializers/register_jsonapi_renderer_test_isolated.rb
-- test/active_model_serializers/serialization_context_test_isolated.rb
-- test/active_model_serializers/test/schema_test.rb
-- test/active_model_serializers/test/serializer_test.rb
-- test/active_record_test.rb
-- test/adapter/attributes_test.rb
-- test/adapter/deprecation_test.rb
-- test/adapter/json/belongs_to_test.rb
-- test/adapter/json/collection_test.rb
-- test/adapter/json/has_many_test.rb
-- test/adapter/json/transform_test.rb
-- test/adapter/json_api/belongs_to_test.rb
-- test/adapter/json_api/collection_test.rb
-- test/adapter/json_api/errors_test.rb
-- test/adapter/json_api/fields_test.rb
-- test/adapter/json_api/has_many_explicit_serializer_test.rb
-- test/adapter/json_api/has_many_test.rb
-- test/adapter/json_api/has_one_test.rb
-- test/adapter/json_api/include_data_if_sideloaded_test.rb
-- test/adapter/json_api/json_api_test.rb
-- test/adapter/json_api/linked_test.rb
-- test/adapter/json_api/links_test.rb
-- test/adapter/json_api/pagination_links_test.rb
-- test/adapter/json_api/parse_test.rb
-- test/adapter/json_api/relationship_test.rb
-- test/adapter/json_api/resource_meta_test.rb
-- test/adapter/json_api/toplevel_jsonapi_test.rb
-- test/adapter/json_api/transform_test.rb
-- test/adapter/json_api/type_test.rb
-- test/adapter/json_test.rb
-- test/adapter/null_test.rb
-- test/adapter/polymorphic_test.rb
-- test/adapter_test.rb
-- test/array_serializer_test.rb
-- test/benchmark/app.rb
-- test/benchmark/benchmarking_support.rb
-- test/benchmark/bm_active_record.rb
-- test/benchmark/bm_adapter.rb
-- test/benchmark/bm_caching.rb
-- test/benchmark/bm_lookup_chain.rb
-- test/benchmark/bm_transform.rb
-- test/benchmark/config.ru
-- test/benchmark/controllers.rb
-- test/benchmark/fixtures.rb
-- test/cache_test.rb
-- test/collection_serializer_test.rb
-- test/fixtures/active_record.rb
-- test/fixtures/poro.rb
-- test/generators/scaffold_controller_generator_test.rb
-- test/generators/serializer_generator_test.rb
-- test/grape_test.rb
-- test/lint_test.rb
-- test/logger_test.rb
-- test/poro_test.rb
-- test/serializable_resource_test.rb
-- test/serializers/association_macros_test.rb
-- test/serializers/associations_test.rb
-- test/serializers/attribute_test.rb
-- test/serializers/attributes_test.rb
-- test/serializers/caching_configuration_test_isolated.rb
-- test/serializers/configuration_test.rb
-- test/serializers/fieldset_test.rb
-- test/serializers/meta_test.rb
-- test/serializers/options_test.rb
-- test/serializers/read_attribute_for_serialization_test.rb
-- test/serializers/reflection_test.rb
-- test/serializers/root_test.rb
-- test/serializers/serialization_test.rb
-- test/serializers/serializer_for_test.rb
-- test/serializers/serializer_for_with_namespace_test.rb
-- test/support/custom_schemas/active_model_serializers/test/schema_test/my/index.json
-- test/support/isolated_unit.rb
-- test/support/rails5_shims.rb
-- test/support/rails_app.rb
-- test/support/schemas/active_model_serializers/test/schema_test/my/index.json
-- test/support/schemas/active_model_serializers/test/schema_test/my/show.json
-- test/support/schemas/custom/show.json
-- test/support/schemas/hyper_schema.json
-- test/support/schemas/render_using_json_api.json
-- test/support/schemas/simple_json_pointers.json
-- test/support/serialization_testing.rb
-- test/test_helper.rb
+test_files: []