active_model_serializers 0.10.7 → 0.10.9

data/test/adapter/json_api/relationship_test.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'test_helper'
 
 module ActiveModelSerializers

data/test/adapter/json_api/resource_meta_test.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'test_helper'
 
 module ActiveModel

data/test/adapter/json_api/toplevel_jsonapi_test.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'test_helper'
 
 module ActiveModelSerializers

data/test/adapter/json_api/transform_test.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'test_helper'
 
 module ActiveModelSerializers

data/test/adapter/json_api/type_test.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'test_helper'
 
 module ActiveModelSerializers

data/test/adapter/json_test.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'test_helper'
 
 module ActiveModelSerializers

data/test/adapter/null_test.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'test_helper'
 
 module ActiveModelSerializers

data/test/adapter/polymorphic_test.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'test_helper'
 
 module ActiveModel

data/test/adapter_test.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'test_helper'
 
 module ActiveModelSerializers

data/test/array_serializer_test.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'test_helper'
 require_relative 'collection_serializer_test'
 

data/test/benchmark/app.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # https://github.com/rails-api/active_model_serializers/pull/872
 # approx ref 792fb8a9053f8db3c562dae4f40907a582dd1720 to test against
 require 'bundler/setup'

data/test/benchmark/benchmarking_support.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'benchmark/ips'
 require 'json'
 

data/test/benchmark/bm_active_record.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative './benchmarking_support'
 require_relative './app'
 

data/test/benchmark/bm_adapter.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative './benchmarking_support'
 require_relative './app'
 

data/test/benchmark/bm_caching.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative './benchmarking_support'
 require_relative './app'
 

data/test/benchmark/bm_lookup_chain.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative './benchmarking_support'
 require_relative './app'
 

data/test/benchmark/bm_transform.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative './benchmarking_support'
 require_relative './app'
 

data/test/benchmark/controllers.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class PrimaryResourceController < ActionController::Base
   PRIMARY_RESOURCE =
     begin

data/test/benchmark/fixtures.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 Rails.configuration.serializers = []
 class HasOneRelationshipSerializer < ActiveModel::Serializer
   attributes :id, :first_name, :last_name

data/test/cache_test.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'test_helper'
 require 'tmpdir'
 require 'tempfile'
@@ -53,6 +55,11 @@ module ActiveModelSerializers
       has_many :roles
       has_one :bio
     end
+    class AuthorSerializerWithCache < ActiveModel::Serializer
+      cache
+
+      attributes :name
+    end
 
     class Blog < ::Model
       attributes :name
@@ -144,6 +151,65 @@ module ActiveModelSerializers
       @blog_serializer     = BlogSerializer.new(@blog)
     end
 
+    def test_expiring_of_cache_at_update_of_record
+      original_cache_versioning = :none
+
+      if ARModels::Author.respond_to?(:cache_versioning)
+        original_cache_versioning = ARModels::Author.cache_versioning
+        ARModels::Author.cache_versioning = true
+      end
+
+      author = ARModels::Author.create(name: 'Foo')
+      author_json = AuthorSerializerWithCache.new(author).as_json
+
+      assert_equal 'Foo', author_json[:name]
+
+      author.update_attributes(name: 'Bar')
+      author_json = AuthorSerializerWithCache.new(author).as_json
+
+      expected = 'Bar'
+      actual = author_json[:name]
+      if ENV['APPVEYOR'] && actual != expected
+        skip('Cache expiration tests sometimes fail on Appveyor. FIXME :)')
+      else
+        assert_equal expected, actual
+      end
+    ensure
+      ARModels::Author.cache_versioning = original_cache_versioning unless original_cache_versioning == :none
+    end
+
+    def test_cache_expiration_in_collection_on_update_of_record
+      original_cache_versioning = :none
+
+      if ARModels::Author.respond_to?(:cache_versioning)
+        original_cache_versioning = ARModels::Author.cache_versioning
+        ARModels::Author.cache_versioning = true
+      end
+
+      foo               = 'Foo'
+      foo2              = 'Foo2'
+      author            = ARModels::Author.create(name: foo)
+      author2           = ARModels::Author.create(name: foo2)
+      author_collection = [author, author, author2]
+
+      collection_json = render_object_with_cache(author_collection, each_serializer: AuthorSerializerWithCache)
+      actual = collection_json
+      expected = [{ name: foo }, { name: foo }, { name: foo2 }]
+      if ENV['APPVEYOR'] && actual != expected
+        skip('Cache expiration tests sometimes fail on Appveyor. FIXME :)')
+      else
+        assert_equal expected, actual
+      end
+
+      bar = 'Bar'
+      author.update!(name: bar)
+
+      collection_json = render_object_with_cache(author_collection, each_serializer: AuthorSerializerWithCache)
+      assert_equal [{ name: bar }, { name: bar }, { name: foo2 }], collection_json
+    ensure
+      ARModels::Author.cache_versioning = original_cache_versioning unless original_cache_versioning == :none
+    end
+
     def test_explicit_cache_store
       default_store = Class.new(ActiveModel::Serializer) do
         cache
@@ -415,7 +481,7 @@ module ActiveModelSerializers
         adapter_options = {}
         adapter_instance = ActiveModelSerializers::Adapter::Attributes.new(serializers, adapter_options)
         serializers.serializable_hash(adapter_options, options, adapter_instance)
-        cached_attributes = adapter_options.fetch(:cached_attributes).with_indifferent_access
+        cached_attributes = options.fetch(:cached_attributes).with_indifferent_access
 
         include_directive = ActiveModelSerializers.default_include_directive
         manual_cached_attributes = ActiveModel::Serializer.cache_read_multi(serializers, adapter_instance, include_directive).with_indifferent_access
@@ -446,9 +512,9 @@ module ActiveModelSerializers
         serializers.serializable_hash(adapter_options, options, adapter_instance)
 
         # Should find something with read_multi now
-        adapter_options = {}
+        options = {}
         serializers.serializable_hash(adapter_options, options, adapter_instance)
-        cached_attributes = adapter_options.fetch(:cached_attributes)
+        cached_attributes = options.fetch(:cached_attributes)
 
         include_directive = ActiveModelSerializers.default_include_directive
         manual_cached_attributes = ActiveModel::Serializer.cache_read_multi(serializers, adapter_instance, include_directive)

data/test/collection_serializer_test.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'test_helper'
 
 module ActiveModel

data/test/fixtures/active_record.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'active_record'
 
 ActiveRecord::Base.establish_connection(adapter: 'sqlite3', database: ':memory:')

data/test/fixtures/poro.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Model < ActiveModelSerializers::Model
   rand(2).zero? && derive_attributes_from_names_and_fix_accessors
 

data/test/generators/scaffold_controller_generator_test.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'test_helper'
 require 'generators/rails/resource_override'
 

data/test/generators/serializer_generator_test.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'test_helper'
 require 'generators/rails/resource_override'
 require 'generators/rails/serializer_generator'

data/test/grape_test.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'test_helper'
 TestHelper.silence_warnings do
   require 'grape'

data/test/lint_test.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'test_helper'
 
 module ActiveModel

data/test/logger_test.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'test_helper'
 
 module ActiveModelSerializers

data/test/poro_test.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'test_helper'
 
 class PoroTest < ActiveSupport::TestCase

data/test/serializable_resource_test.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'test_helper'
 
 module ActiveModelSerializers

data/test/serializers/association_macros_test.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'test_helper'
 
 module ActiveModel

data/test/serializers/associations_test.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'test_helper'
 module ActiveModel
   class Serializer
@@ -285,6 +287,56 @@ module ActiveModel
         end
       end
 
+      class AssociationsNamespacedSerializersTest < ActiveSupport::TestCase
+        class Post < ::Model
+          associations :comments, :author, :description
+
+          def latest_comments
+            comments[0..3]
+          end
+        end
+        class Comment < ::Model; end
+        class Author  < ::Model; end
+        class Description < ::Model; end
+
+        class ResourceNamespace
+          class PostSerializer < ActiveModel::Serializer
+            has_many :comments, namespace: ResourceNamespace
+            has_many :latest_comments, namespace: ResourceNamespace
+            belongs_to :author, namespace: ResourceNamespace
+            has_one :description, namespace: ResourceNamespace
+          end
+          class CommentSerializer     < ActiveModel::Serializer; end
+          class AuthorSerializer      < ActiveModel::Serializer; end
+          class DescriptionSerializer < ActiveModel::Serializer; end
+        end
+
+        def setup
+          @comment = Comment.new
+          @author = Author.new
+          @description = Description.new
+          @post = Post.new(comments: [@comment],
+                           author: @author,
+                           description: @description)
+          @post_serializer = ResourceNamespace::PostSerializer.new(@post)
+        end
+
+        def test_associations_namespaced_serializers
+          @post_serializer.associations.each do |association|
+            case association.key
+            when :comments, :latest_comments
+              assert_instance_of(ResourceNamespace::CommentSerializer, association.lazy_association.serializer.first)
+            when :author
+              assert_instance_of(ResourceNamespace::AuthorSerializer, association.lazy_association.serializer)
+            when :description
+              assert_instance_of(ResourceNamespace::DescriptionSerializer, association.lazy_association.serializer)
+            else
+              flunk "Unknown association: #{key}"
+            end
+          end
+        end
+      end
+
       class NestedSerializersTest < ActiveSupport::TestCase
         class Post < ::Model
           associations :comments, :author, :description

data/test/serializers/attribute_test.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'test_helper'
 
 module ActiveModel

data/test/serializers/attributes_test.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'test_helper'
 
 module ActiveModel

data/test/serializers/caching_configuration_test_isolated.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Execute this test in isolation
 require 'support/isolated_unit'
 

data/test/serializers/configuration_test.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'test_helper'
 
 module ActiveModel

data/test/serializers/fieldset_test.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'test_helper'
 
 module ActiveModel

data/test/serializers/meta_test.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'test_helper'
 
 module ActiveModel

data/test/serializers/options_test.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'test_helper'
 
 module ActiveModel

data/test/serializers/read_attribute_for_serialization_test.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'test_helper'
 
 module ActiveModel

data/test/serializers/reflection_test.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'test_helper'
 module ActiveModel
   class Serializer
@@ -423,5 +425,57 @@ module ActiveModel
       end
       # rubocop:enable Metrics/AbcSize
     end
+    class ThreadedReflectionTest < ActiveSupport::TestCase
+      class Post < ::Model
+        attributes :id, :title, :body
+        associations :comments
+      end
+      class Comment < ::Model
+        attributes :id, :body
+        associations :post
+      end
+      class CommentSerializer < ActiveModel::Serializer
+        type 'comment'
+        attributes :id, :body
+        has_one :post
+      end
+      class PostSerializer < ActiveModel::Serializer
+        type 'post'
+        attributes :id, :title, :body
+        has_many :comments, serializer: CommentSerializer do
+          sleep 0.1
+          object.comments
+        end
+      end
+
+      # per https://github.com/rails-api/active_model_serializers/issues/2270
+      def test_concurrent_serialization
+        post1 = Post.new(id: 1, title: 'Post 1 Title', body: 'Post 1 Body')
+        post1.comments = [Comment.new(id: 1, body: 'Comment on Post 1', post: post1)]
+        post2 = Post.new(id: 2, title: 'Post 2 Title', body: 'Post 2 Body')
+        post2.comments = [Comment.new(id: 2, body: 'Comment on Post 2', post: post2)]
+        serialized_posts = {
+          first: Set.new,
+          second: Set.new
+        }
+        t1 = Thread.new do
+          10.times do
+            serialized_posts[:first] << PostSerializer.new(post1, {}).to_json
+          end
+        end
+        t2 = Thread.new do
+          10.times do
+            serialized_posts[:second] << PostSerializer.new(post2, {}).to_json
+          end
+        end
+        t1.join
+        t2.join
+        expected_first_post_serialization  = '{"id":1,"title":"Post 1 Title","body":"Post 1 Body","comments":[{"id":1,"body":"Comment on Post 1"}]}'
+        expected_second_post_serialization = '{"id":2,"title":"Post 2 Title","body":"Post 2 Body","comments":[{"id":2,"body":"Comment on Post 2"}]}'
+
+        assert_equal [expected_second_post_serialization], serialized_posts[:second].to_a
+        assert_equal [expected_first_post_serialization], serialized_posts[:first].to_a
+      end
+    end
   end
 end

data/test/serializers/root_test.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'test_helper'
 
 module ActiveModel

data/test/serializers/serialization_test.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ActiveModel
   class Serializer
     class SerializationTest < ActiveSupport::TestCase

data/test/serializers/serializer_for_test.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'test_helper'
 
 module ActiveModel

data/test/serializers/serializer_for_with_namespace_test.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'test_helper'
 
 module ActiveModel

data/test/support/isolated_unit.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # https://github.com/rails/rails/blob/v5.0.0.beta1/railties/test/isolation/abstract_unit.rb
 
 # Usage Example:

data/test/support/rails5_shims.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Rails5Shims
   module ControllerTests
     # https://github.com/rails/rails/blob/b217354/actionpack/lib/action_controller/test_case.rb

data/test/support/rails_app.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'support/isolated_unit'
 module ActiveModelSerializers
   RailsApplication = TestHelpers::Generation.make_basic_app do |app|

data/test/support/serialization_testing.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module SerializationTesting
   def config
     ActiveModelSerializers.config

data/test/test_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Configure Rails Environment
 ENV['RAILS_ENV'] = 'test'
 require 'bundler/setup'