active_model_serializers 0.10.0 → 0.10.6

data/test/support/rails5_shims.rb

@@ -1,7 +1,7 @@
 module Rails5Shims
   module ControllerTests
     # https://github.com/rails/rails/blob/b217354/actionpack/lib/action_controller/test_case.rb
-    REQUEST_KWARGS = [:params, :session, :flash, :method, :body, :xhr].freeze
+    REQUEST_KWARGS = [:params, :headers, :session, :flash, :method, :body, :xhr].freeze
 
     def get(path, *args)
       fold_kwargs!(args)
@@ -30,7 +30,12 @@ module Rails5Shims
       return unless hash.respond_to?(:key)
       Rails5Shims::ControllerTests::REQUEST_KWARGS.each do |kwarg|
         next unless hash.key?(kwarg)
-        hash.merge! hash.delete(kwarg)
+        value = hash.delete(kwarg)
+        if value.is_a? String
+          args.insert(0, value)
+        else
+          hash.merge! value
+        end
       end
     end
 
@@ -44,4 +49,5 @@ module Rails5Shims
 end
 if Rails::VERSION::MAJOR < 5
   ActionController::TestCase.send :include, Rails5Shims::ControllerTests
+  ActionDispatch::IntegrationTest.send :include, Rails5Shims::ControllerTests
 end

data/test/support/rails_app.rb

@@ -6,6 +6,8 @@ module ActiveModelSerializers
       config.active_support.test_order = :random
       config.action_controller.perform_caching = true
       config.action_controller.cache_store = :memory_store
+
+      config.filter_parameters += [:password]
     end
 
     app.routes.default_url_options = { host: 'example.com' }
@@ -22,15 +24,6 @@ ActionController::TestCase.class_eval do
   def setup
     @routes = Routes
   end
-
-  # For Rails5
-  # https://github.com/rails/rails/commit/ca83436d1b3b6cedd1eca2259f65661e69b01909#diff-b9bbf56e85d3fe1999f16317f2751e76L17
-  def assigns(key = nil)
-    warn "DEPRECATION: Calling 'assigns(#{key})' from #{caller[0]}"
-    assigns = {}.with_indifferent_access
-    @controller.view_assigns.each { |k, v| assigns.regular_writer(k, v) }
-    key.nil? ? assigns : assigns[key]
-  end
 end
 
 # ActiveRecord::Migrator.migrations_paths = [File.expand_path("../../test/dummy/db/migrate", __FILE__)]

data/test/support/serialization_testing.rb

@@ -9,6 +9,22 @@ module SerializationTesting
     ActiveModelSerializers::SerializableResource.new(obj).to_json
   end
 
+  def with_namespace_separator(separator)
+    original_separator = ActiveModelSerializers.config.jsonapi_namespace_separator
+    ActiveModelSerializers.config.jsonapi_namespace_separator = separator
+    yield
+  ensure
+    ActiveModelSerializers.config.jsonapi_namespace_separator = original_separator
+  end
+
+  def with_prepended_lookup(lookup_proc)
+    original_lookup = ActiveModelSerializers.config.serializer_lookup_cahin
+    ActiveModelSerializers.config.serializer_lookup_chain.unshift lookup_proc
+    yield
+  ensure
+    ActiveModelSerializers.config.serializer_lookup_cahin = original_lookup
+  end
+
   # Aliased as :with_configured_adapter to clarify that
   # this method tests the configured adapter.
   # When not testing configuration, it may be preferable
@@ -44,10 +60,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

data/test/test_helper.rb

@@ -9,6 +9,7 @@ rescue LoadError
   STDERR.puts 'Running without SimpleCov'
 end
 
+require 'pry'
 require 'timecop'
 require 'rails'
 require 'action_controller'
@@ -39,6 +40,18 @@ require 'minitest'
 require 'minitest/autorun'
 Minitest.backtrace_filter = Minitest::BacktraceFilter.new
 
+module TestHelper
+  module_function
+
+  def silence_warnings
+    original_verbose = $VERBOSE
+    $VERBOSE = nil
+    yield
+  ensure
+    $VERBOSE = original_verbose
+  end
+end
+
 require 'support/rails_app'
 
 # require "rails/test_help"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_model_serializers
 version: !ruby/object:Gem::Version
-  version: 0.10.0
+  version: 0.10.6
 platform: ruby
 authors:
 - Steve Klabnik
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-17 00:00:00.000000000 Z
+date: 2017-05-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -16,56 +16,114 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '4.1'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '4.1'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '6'
 - !ruby/object:Gem::Dependency
   name: actionpack
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '4.1'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '4.1'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '6'
 - !ruby/object:Gem::Dependency
   name: railties
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '4.1'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '6'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '4.1'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '6'
+- !ruby/object:Gem::Dependency
+  name: jsonapi-renderer
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.1.1.beta1
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '0.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: 0.1.1.beta1
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '0.2'
+- !ruby/object:Gem::Dependency
+  name: case_transform
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0.2'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0.2'
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '4.1'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '4.1'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '6'
 - !ruby/object:Gem::Dependency
   name: kaminari
   requirement: !ruby/object:Gem::Requirement
@@ -151,7 +209,7 @@ dependencies:
         version: '0.13'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: 0.19.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -161,7 +219,7 @@ dependencies:
         version: '0.13'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: 0.19.1
 - !ruby/object:Gem::Dependency
   name: json_schema
   requirement: !ruby/object:Gem::Requirement
@@ -208,10 +266,10 @@ files:
 - ".github/PULL_REQUEST_TEMPLATE.md"
 - ".gitignore"
 - ".rubocop.yml"
-- ".rubocop_todo.yml"
 - ".simplecov"
 - ".travis.yml"
 - CHANGELOG.md
+- CODE_OF_CONDUCT.md
 - CONTRIBUTING.md
 - Gemfile
 - MIT-LICENSE
@@ -221,14 +279,15 @@ files:
 - appveyor.yml
 - bin/bench
 - bin/bench_regression
+- bin/rubocop
 - bin/serve_benchmark
-- docs/ARCHITECTURE.md
 - 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
@@ -237,11 +296,14 @@ files:
 - 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
@@ -260,28 +322,20 @@ files:
 - lib/active_model/serializer/adapter/null.rb
 - lib/active_model/serializer/array_serializer.rb
 - lib/active_model/serializer/association.rb
-- lib/active_model/serializer/associations.rb
 - lib/active_model/serializer/attribute.rb
-- lib/active_model/serializer/attributes.rb
 - lib/active_model/serializer/belongs_to_reflection.rb
-- lib/active_model/serializer/caching.rb
-- lib/active_model/serializer/collection_reflection.rb
 - lib/active_model/serializer/collection_serializer.rb
-- lib/active_model/serializer/configuration.rb
+- lib/active_model/serializer/concerns/caching.rb
 - lib/active_model/serializer/error_serializer.rb
 - lib/active_model/serializer/errors_serializer.rb
 - lib/active_model/serializer/field.rb
 - lib/active_model/serializer/fieldset.rb
 - lib/active_model/serializer/has_many_reflection.rb
 - lib/active_model/serializer/has_one_reflection.rb
-- lib/active_model/serializer/include_tree.rb
-- lib/active_model/serializer/links.rb
+- lib/active_model/serializer/lazy_association.rb
 - lib/active_model/serializer/lint.rb
-- lib/active_model/serializer/meta.rb
 - lib/active_model/serializer/null.rb
 - lib/active_model/serializer/reflection.rb
-- lib/active_model/serializer/singular_reflection.rb
-- lib/active_model/serializer/type.rb
 - lib/active_model/serializer/version.rb
 - lib/active_model_serializers.rb
 - lib/active_model_serializers/adapter.rb
@@ -302,8 +356,8 @@ files:
 - lib/active_model_serializers/deprecate.rb
 - lib/active_model_serializers/deserialization.rb
 - lib/active_model_serializers/json_pointer.rb
-- lib/active_model_serializers/key_transform.rb
 - lib/active_model_serializers/logging.rb
+- lib/active_model_serializers/lookup_chain.rb
 - lib/active_model_serializers/model.rb
 - lib/active_model_serializers/railtie.rb
 - lib/active_model_serializers/register_jsonapi_renderer.rb
@@ -319,26 +373,31 @@ files:
 - lib/grape/active_model_serializers.rb
 - 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/key_transform_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
@@ -352,13 +411,13 @@ files:
 - 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/relationships_test.rb
 - test/adapter/json_api/resource_identifier_test.rb
 - test/adapter/json_api/resource_meta_test.rb
 - test/adapter/json_api/toplevel_jsonapi_test.rb
@@ -371,7 +430,10 @@ files:
 - 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
@@ -383,9 +445,6 @@ files:
 - test/generators/scaffold_controller_generator_test.rb
 - test/generators/serializer_generator_test.rb
 - test/grape_test.rb
-- test/include_tree/from_include_args_test.rb
-- test/include_tree/from_string_test.rb
-- test/include_tree/include_args_to_hash_test.rb
 - test/lint_test.rb
 - test/logger_test.rb
 - test/poro_test.rb
@@ -400,9 +459,11 @@ files:
 - 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
@@ -419,10 +480,7 @@ homepage: https://github.com/rails-api/active_model_serializers
 licenses:
 - MIT
 metadata: {}
-post_install_message: |
-  NOTE: The default key case for the JsonApi adapter has changed to dashed.
-  See https://github.com/rails-api/active_model_serializers/blob/master/docs/general/key_transforms.md
-  for more information on configuring this behavior.
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -430,7 +488,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.0.0
+      version: '2.1'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -438,7 +496,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Conventions-based JSON generation for Rails.
@@ -448,21 +506,25 @@ test_files:
 - 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/key_transform_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
@@ -476,13 +538,13 @@ test_files:
 - 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/relationships_test.rb
 - test/adapter/json_api/resource_identifier_test.rb
 - test/adapter/json_api/resource_meta_test.rb
 - test/adapter/json_api/toplevel_jsonapi_test.rb
@@ -495,7 +557,10 @@ test_files:
 - 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
@@ -507,9 +572,6 @@ test_files:
 - test/generators/scaffold_controller_generator_test.rb
 - test/generators/serializer_generator_test.rb
 - test/grape_test.rb
-- test/include_tree/from_include_args_test.rb
-- test/include_tree/from_string_test.rb
-- test/include_tree/include_args_to_hash_test.rb
 - test/lint_test.rb
 - test/logger_test.rb
 - test/poro_test.rb
@@ -524,9 +586,11 @@ test_files:
 - 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
@@ -539,4 +603,3 @@ test_files:
 - test/support/schemas/simple_json_pointers.json
 - test/support/serialization_testing.rb
 - test/test_helper.rb
-has_rdoc: