active_model_serializers 0.10.1 → 0.10.2

data/test/adapter/json_api/type_test.rb

@@ -47,7 +47,7 @@ module ActiveModel
             assert_equal(expected_type, hash.fetch(:data).fetch(:type))
           end
 
-          def with_jsonapi_resource_type inflection
+          def with_jsonapi_resource_type(inflection)
             old_inflection = ActiveModelSerializers.config.jsonapi_resource_type
             ActiveModelSerializers.config.jsonapi_resource_type = inflection
             yield

data/test/adapter/json_test.rb

@@ -32,14 +32,14 @@ module ActiveModelSerializers
         adapter = ActiveModelSerializers::Adapter::Json.new(serializer)
 
         assert_equal({
-          id: 1,
-          reviews: [
-            { id: 1, body: 'ZOMG A COMMENT' },
-            { id: 2, body: 'ZOMG ANOTHER COMMENT' }
-          ],
-          writer: { id: 1, name: 'Steve K.' },
-          site: { id: 1, name: 'My Blog!!' }
-          }, adapter.serializable_hash[:post])
+                       id: 1,
+                       reviews: [
+                         { id: 1, body: 'ZOMG A COMMENT' },
+                         { id: 2, body: 'ZOMG ANOTHER COMMENT' }
+                       ],
+                       writer: { id: 1, name: 'Steve K.' },
+                       site: { id: 1, name: 'My Blog!!' }
+                     }, adapter.serializable_hash[:post])
       end
     end
   end

data/test/adapter/null_test.rb

@@ -4,7 +4,7 @@ module ActiveModelSerializers
   module Adapter
     class NullTest < ActiveSupport::TestCase
       def setup
-        profile = Profile.new({ name: 'Name 1', description: 'Description 1', comments: 'Comments 1' })
+        profile = Profile.new(name: 'Name 1', description: 'Description 1', comments: 'Comments 1')
         serializer = ProfileSerializer.new(profile)
 
         @adapter = Null.new(serializer)
@@ -20,4 +20,3 @@ module ActiveModelSerializers
     end
   end
 end
-

data/test/adapter/polymorphic_test.rb

@@ -27,11 +27,11 @@ module ActiveModel
               id: 1,
               title: 'headshot-1.jpg',
               imageable: {
-                  type: 'employee',
-                  employee: {
-                    id: 42,
-                    name: 'Zoop Zoopler'
-                  }
+                type: 'employee',
+                employee: {
+                  id: 42,
+                  name: 'Zoop Zoopler'
+                }
               }
             }
 

data/test/adapter_test.rb

@@ -51,7 +51,7 @@ module ActiveModelSerializers
     end
 
     def test_create_adapter_with_override
-      adapter = ActiveModelSerializers::Adapter.create(@serializer, { adapter: :json_api })
+      adapter = ActiveModelSerializers::Adapter.create(@serializer, adapter: :json_api)
       assert_equal ActiveModelSerializers::Adapter::JsonApi, adapter.class
     end
 

data/test/benchmark/bm_caching.rb

@@ -86,7 +86,7 @@ class ApiAssertion
             }
           ]
         }
-    }
+      }
   end
 
   def assert_equal(expected, actual, message)

data/test/cache_test.rb

@@ -101,7 +101,7 @@ module ActiveModelSerializers
       uncached_author_serializer = AuthorSerializer.new(uncached_author)
 
       render_object_with_cache(uncached_author)
-      key = "#{uncached_author_serializer.class._cache_key}/#{uncached_author_serializer.object.id}-#{uncached_author_serializer.object.updated_at.strftime("%Y%m%d%H%M%S%9N")}"
+      key = "#{uncached_author_serializer.class._cache_key}/#{uncached_author_serializer.object.id}-#{uncached_author_serializer.object.updated_at.strftime('%Y%m%d%H%M%S%9N')}"
       key = "#{key}/#{adapter.cache_key}"
       assert_equal(uncached_author_serializer.attributes.to_json, cache_store.fetch(key).to_json)
     end
@@ -321,6 +321,34 @@ module ActiveModelSerializers
       end
     end
 
+    def test_cache_read_multi_with_fragment_cache_enabled
+      post_serializer = Class.new(ActiveModel::Serializer) do
+        cache except: [:body]
+      end
+
+      serializers = ActiveModel::Serializer::CollectionSerializer.new([@post, @post], serializer: post_serializer)
+
+      Timecop.freeze(Time.current) do
+        # Warming up.
+        options = {}
+        adapter_options = {}
+        adapter_instance = ActiveModelSerializers::Adapter::Attributes.new(serializers, adapter_options)
+        serializers.serializable_hash(adapter_options, options, adapter_instance)
+
+        # Should find something with read_multi now
+        adapter_options = {}
+        serializers.serializable_hash(adapter_options, options, adapter_instance)
+        cached_attributes = adapter_options.fetch(:cached_attributes)
+
+        include_directive = ActiveModelSerializers.default_include_directive
+        manual_cached_attributes = ActiveModel::Serializer.cache_read_multi(serializers, adapter_instance, include_directive)
+
+        refute_equal 0, cached_attributes.size
+        refute_equal 0, manual_cached_attributes.size
+        assert_equal manual_cached_attributes, cached_attributes
+      end
+    end
+
     def test_serializer_file_path_on_nix
       path = '/Users/git/emberjs/ember-crm-backend/app/serializers/lead_serializer.rb'
       caller_line = "#{path}:1:in `<top (required)>'"

data/test/collection_serializer_test.rb

@@ -11,7 +11,7 @@ module ActiveModel
         @comment = Comment.new
         @post = Post.new
         @resource = build_named_collection @comment, @post
-        @serializer = collection_serializer.new(@resource, { some: :options })
+        @serializer = collection_serializer.new(@resource, some: :options)
       end
 
       def collection_serializer
@@ -44,7 +44,7 @@ module ActiveModel
       end
 
       def test_serializer_option_not_passed_to_each_serializer
-        serializers = collection_serializer.new([@post], { serializer: PostSerializer }).to_a
+        serializers = collection_serializer.new([@post], serializer: PostSerializer).to_a
 
         refute serializers.first.custom_options.key?(:serializer)
       end

data/test/fixtures/poro.rb

@@ -8,7 +8,7 @@ class Model < ActiveModelSerializers::Model
   # Convenience when not adding @attributes readers and writers
   def method_missing(meth, *args)
     if meth.to_s =~ /^(.*)=$/
-      attributes[$1.to_sym] = args[0]
+      attributes[Regexp.last_match(1).to_sym] = args[0]
     elsif attributes.key?(meth)
       attributes[meth]
     else
@@ -64,7 +64,7 @@ VirtualValue = Class.new(Model)
 Comment = Class.new(Model) do
   # Uses a custom non-time-based cache key
   def cache_key
-    "#{self.class.name.downcase}/#{self.id}"
+    "#{self.class.name.downcase}/#{id}"
   end
 end
 

data/test/grape_test.rb

@@ -5,172 +5,174 @@ require 'kaminari'
 require 'kaminari/hooks'
 ::Kaminari::Hooks.init
 
-class ActiveModelSerializers::GrapeTest < ActiveSupport::TestCase
-  include Rack::Test::Methods
-  module Models
-    def self.model1
-      ARModels::Post.new(id: 1, title: 'Dummy Title', body: 'Lorem Ipsum')
-    end
+module ActiveModelSerializers
+  class GrapeTest < ActiveSupport::TestCase
+    include Rack::Test::Methods
+    module Models
+      def self.model1
+        ARModels::Post.new(id: 1, title: 'Dummy Title', body: 'Lorem Ipsum')
+      end
 
-    def self.model2
-      ARModels::Post.new(id: 2, title: 'Second Dummy Title', body: 'Second Lorem Ipsum')
-    end
+      def self.model2
+        ARModels::Post.new(id: 2, title: 'Second Dummy Title', body: 'Second Lorem Ipsum')
+      end
 
-    def self.all
-      @all ||=
-        begin
-          model1.save!
-          model2.save!
-          ARModels::Post.all
-        end
-    end
+      def self.all
+        @all ||=
+          begin
+            model1.save!
+            model2.save!
+            ARModels::Post.all
+          end
+      end
 
-    def self.reset_all
-      ARModels::Post.delete_all
-      @all = nil
-    end
+      def self.reset_all
+        ARModels::Post.delete_all
+        @all = nil
+      end
 
-    def self.collection_per
-      2
-    end
+      def self.collection_per
+        2
+      end
 
-    def self.collection
-      @collection ||=
-        begin
-          Kaminari.paginate_array(
-            [
-                  Profile.new(id: 1, name: 'Name 1', description: 'Description 1', comments: 'Comments 1'),
-                  Profile.new(id: 2, name: 'Name 2', description: 'Description 2', comments: 'Comments 2'),
-                  Profile.new(id: 3, name: 'Name 3', description: 'Description 3', comments: 'Comments 3'),
-                  Profile.new(id: 4, name: 'Name 4', description: 'Description 4', comments: 'Comments 4'),
-                  Profile.new(id: 5, name: 'Name 5', description: 'Description 5', comments: 'Comments 5')
+      def self.collection
+        @collection ||=
+          begin
+            Kaminari.paginate_array(
+              [
+                Profile.new(id: 1, name: 'Name 1', description: 'Description 1', comments: 'Comments 1'),
+                Profile.new(id: 2, name: 'Name 2', description: 'Description 2', comments: 'Comments 2'),
+                Profile.new(id: 3, name: 'Name 3', description: 'Description 3', comments: 'Comments 3'),
+                Profile.new(id: 4, name: 'Name 4', description: 'Description 4', comments: 'Comments 4'),
+                Profile.new(id: 5, name: 'Name 5', description: 'Description 5', comments: 'Comments 5')
               ]
-          ).page(1).per(collection_per)
-        end
+            ).page(1).per(collection_per)
+          end
+      end
     end
-  end
 
-  class GrapeTest < Grape::API
-    format :json
-    include Grape::ActiveModelSerializers
+    class GrapeTest < Grape::API
+      format :json
+      include Grape::ActiveModelSerializers
 
-    resources :grape do
-      get '/render' do
-        render Models.model1
-      end
+      resources :grape do
+        get '/render' do
+          render Models.model1
+        end
 
-      get '/render_with_json_api' do
-        post = Models.model1
-        render post, meta: { page: 1, total_pages: 2 }, adapter: :json_api
-      end
+        get '/render_with_json_api' do
+          post = Models.model1
+          render post, meta: { page: 1, total_pages: 2 }, adapter: :json_api
+        end
 
-      get '/render_array_with_json_api' do
-        posts = Models.all
-        render posts, adapter: :json_api
-      end
+        get '/render_array_with_json_api' do
+          posts = Models.all
+          render posts, adapter: :json_api
+        end
 
-      get '/render_collection_with_json_api' do
-        posts = Models.collection
-        render posts, adapter: :json_api
-      end
+        get '/render_collection_with_json_api' do
+          posts = Models.collection
+          render posts, adapter: :json_api
+        end
 
-      get '/render_with_implicit_formatter' do
-        Models.model1
-      end
+        get '/render_with_implicit_formatter' do
+          Models.model1
+        end
 
-      get '/render_array_with_implicit_formatter' do
-        Models.all
-      end
+        get '/render_array_with_implicit_formatter' do
+          Models.all
+        end
 
-      get '/render_collection_with_implicit_formatter' do
-        Models.collection
+        get '/render_collection_with_implicit_formatter' do
+          Models.collection
+        end
       end
     end
-  end
 
-  def app
-    Grape::Middleware::Globals.new(GrapeTest.new)
-  end
+    def app
+      Grape::Middleware::Globals.new(GrapeTest.new)
+    end
 
-  def test_formatter_returns_json
-    get '/grape/render'
+    def test_formatter_returns_json
+      get '/grape/render'
 
-    post = Models.model1
-    serializable_resource = serializable(post)
+      post = Models.model1
+      serializable_resource = serializable(post)
 
-    assert last_response.ok?
-    assert_equal serializable_resource.to_json, last_response.body
-  end
+      assert last_response.ok?
+      assert_equal serializable_resource.to_json, last_response.body
+    end
 
-  def test_render_helper_passes_through_options_correctly
-    get '/grape/render_with_json_api'
+    def test_render_helper_passes_through_options_correctly
+      get '/grape/render_with_json_api'
 
-    post = Models.model1
-    serializable_resource = serializable(post, serializer: ARModels::PostSerializer, adapter: :json_api, meta: { page: 1, total_pages: 2 })
+      post = Models.model1
+      serializable_resource = serializable(post, serializer: ARModels::PostSerializer, adapter: :json_api, meta: { page: 1, total_pages: 2 })
 
-    assert last_response.ok?
-    assert_equal serializable_resource.to_json, last_response.body
-  end
+      assert last_response.ok?
+      assert_equal serializable_resource.to_json, last_response.body
+    end
 
-  def test_formatter_handles_arrays
-    get '/grape/render_array_with_json_api'
+    def test_formatter_handles_arrays
+      get '/grape/render_array_with_json_api'
 
-    posts = Models.all
-    serializable_resource = serializable(posts, adapter: :json_api)
+      posts = Models.all
+      serializable_resource = serializable(posts, adapter: :json_api)
 
-    assert last_response.ok?
-    assert_equal serializable_resource.to_json, last_response.body
-  ensure
-    Models.reset_all
-  end
+      assert last_response.ok?
+      assert_equal serializable_resource.to_json, last_response.body
+    ensure
+      Models.reset_all
+    end
 
-  def test_formatter_handles_collections
-    get '/grape/render_collection_with_json_api'
-    assert last_response.ok?
+    def test_formatter_handles_collections
+      get '/grape/render_collection_with_json_api'
+      assert last_response.ok?
 
-    representation = JSON.parse(last_response.body)
-    assert representation.include?('data')
-    assert representation['data'].count == Models.collection_per
-    assert representation.include?('links')
-    assert representation['links'].count > 0
-  end
+      representation = JSON.parse(last_response.body)
+      assert representation.include?('data')
+      assert representation['data'].count == Models.collection_per
+      assert representation.include?('links')
+      assert representation['links'].count > 0
+    end
+
+    def test_implicit_formatter
+      post = Models.model1
+      serializable_resource = serializable(post, adapter: :json_api)
 
-  def test_implicit_formatter
-    post = Models.model1
-    serializable_resource = serializable(post, adapter: :json_api)
+      with_adapter :json_api do
+        get '/grape/render_with_implicit_formatter'
+      end
 
-    with_adapter :json_api do
-      get '/grape/render_with_implicit_formatter'
+      assert last_response.ok?
+      assert_equal serializable_resource.to_json, last_response.body
     end
 
-    assert last_response.ok?
-    assert_equal serializable_resource.to_json, last_response.body
-  end
+    def test_implicit_formatter_handles_arrays
+      posts = Models.all
+      serializable_resource = serializable(posts, adapter: :json_api)
 
-  def test_implicit_formatter_handles_arrays
-    posts = Models.all
-    serializable_resource = serializable(posts, adapter: :json_api)
+      with_adapter :json_api do
+        get '/grape/render_array_with_implicit_formatter'
+      end
 
-    with_adapter :json_api do
-      get '/grape/render_array_with_implicit_formatter'
+      assert last_response.ok?
+      assert_equal serializable_resource.to_json, last_response.body
+    ensure
+      Models.reset_all
     end
 
-    assert last_response.ok?
-    assert_equal serializable_resource.to_json, last_response.body
-  ensure
-    Models.reset_all
-  end
+    def test_implicit_formatter_handles_collections
+      with_adapter :json_api do
+        get '/grape/render_collection_with_implicit_formatter'
+      end
 
-  def test_implicit_formatter_handles_collections
-    with_adapter :json_api do
-      get '/grape/render_collection_with_implicit_formatter'
+      representation = JSON.parse(last_response.body)
+      assert last_response.ok?
+      assert representation.include?('data')
+      assert representation['data'].count == Models.collection_per
+      assert representation.include?('links')
+      assert representation['links'].count > 0
     end
-
-    representation = JSON.parse(last_response.body)
-    assert last_response.ok?
-    assert representation.include?('data')
-    assert representation['data'].count == Models.collection_per
-    assert representation.include?('links')
-    assert representation['links'].count > 0
   end
 end