active_model_serializers 0.10.0.rc1 → 0.10.0.rc2

data/test/{serializers/generators_test.rb → generators/serializer_generator_test.rb}

@@ -1,16 +1,8 @@
-class Foo < Rails::Application
-  if Rails.version.to_s.start_with? '4'
-    config.eager_load = false
-    config.secret_key_base = 'abc123'
-  end
-end
-
-Rails.application.load_generators
-
+require 'test_helper'
 require 'generators/serializer/serializer_generator'
 
 class SerializerGeneratorTest < Rails::Generators::TestCase
-  destination File.expand_path("../tmp", __FILE__)
+  destination File.expand_path("../../../tmp/generators", __FILE__)
   setup :prepare_destination
 
   tests Rails::Generators::SerializerGenerator

data/test/serializers/adapter_for_test.rb

@@ -11,7 +11,7 @@ module ActiveModel
 
       def test_returns_default_adapter
         adapter = ActiveModel::Serializer.adapter
-        assert_equal ActiveModel::Serializer::Adapter::Json, adapter
+        assert_equal ActiveModel::Serializer::Adapter::FlattenJson, adapter
       end
 
       def test_overwrite_adapter_with_symbol

data/test/serializers/associations_test.rb

@@ -101,6 +101,27 @@ module ActiveModel
 
         assert blog_is_present
       end
+
+      def test_associations_inheritance
+        inherited_klass = Class.new(PostSerializer)
+
+        assert_equal(PostSerializer._associations, inherited_klass._associations)
+      end
+
+      def test_associations_inheritance_with_new_association
+        inherited_klass = Class.new(PostSerializer) do
+          has_many :top_comments, serializer: CommentSerializer
+        end
+        expected_associations = PostSerializer._associations.merge(
+          top_comments: {
+            type: :has_many,
+            association_options: {
+              serializer: CommentSerializer
+            }
+          }
+        )
+        assert_equal(inherited_klass._associations, expected_associations)
+      end
     end
   end
 end

data/test/serializers/attribute_test.rb

@@ -15,9 +15,24 @@ module ActiveModel
 
       def test_json_serializable_hash
         adapter = ActiveModel::Serializer::Adapter::Json.new(@blog_serializer)
+        assert_equal({alternate_blog: { id:1, title:"AMS Hints"}}, adapter.serializable_hash)
+      end
+
+      def test_attribute_inheritance_with_key
+        inherited_klass = Class.new(AlternateBlogSerializer)
+        blog_serializer = inherited_klass.new(@blog)
+        adapter = ActiveModel::Serializer::Adapter::FlattenJson.new(blog_serializer)
         assert_equal({:id=>1, :title=>"AMS Hints"}, adapter.serializable_hash)
       end
+
+      def test_multiple_calls_with_the_same_attribute
+        serializer_class = Class.new(ActiveModel::Serializer) do
+          attribute :title
+          attribute :title
+        end
+
+        assert_equal([:title], serializer_class._attributes)
+      end
     end
   end
 end
-

data/test/serializers/attributes_test.rb

@@ -6,6 +6,11 @@ module ActiveModel
       def setup
         @profile = Profile.new({ name: 'Name 1', description: 'Description 1', comments: 'Comments 1' })
         @profile_serializer = ProfileSerializer.new(@profile)
+        @comment = Comment.new(id: 1, body: "ZOMG!!", date: "2015")
+        @serializer_klass = Class.new(CommentSerializer)
+        @serializer_klass_with_new_attributes = Class.new(CommentSerializer) do
+          attributes :date, :likes
+        end
       end
 
       def test_attributes_definition
@@ -23,6 +28,36 @@ module ActiveModel
                      @profile_serializer.attributes(fields: [:name, :description], required_fields: [:name]))
 
       end
+
+      def test_attributes_inheritance_definition
+        assert_equal([:id, :body], @serializer_klass._attributes)
+      end
+
+      def test_attributes_inheritance
+        serializer = @serializer_klass.new(@comment)
+        assert_equal({id: 1, body: "ZOMG!!"},
+                     serializer.attributes)
+      end
+
+      def test_attribute_inheritance_with_new_attribute_definition
+        assert_equal([:id, :body, :date, :likes], @serializer_klass_with_new_attributes._attributes)
+        assert_equal([:id, :body], CommentSerializer._attributes)
+      end
+
+      def test_attribute_inheritance_with_new_attribute
+        serializer = @serializer_klass_with_new_attributes.new(@comment)
+        assert_equal({id: 1, body: "ZOMG!!", date: "2015", likes: nil},
+                     serializer.attributes)
+      end
+
+      def test_multiple_calls_with_the_same_attribute
+        serializer_class = Class.new(ActiveModel::Serializer) do
+          attributes :id, :title
+          attributes :id, :title, :title, :body
+        end
+
+        assert_equal([:id, :title, :body], serializer_class._attributes)
+      end
     end
   end
 end

data/test/serializers/cache_test.rb

@@ -5,10 +5,10 @@ module ActiveModel
       def setup
         ActionController::Base.cache_store.clear
         @comment        = Comment.new(id: 1, body: 'ZOMG A COMMENT')
-        @blog           = Blog.new(id: 999, name: "Custom blog")
         @post           = Post.new(title: 'New Post', body: 'Body')
         @bio            = Bio.new(id: 1, content: 'AMS Contributor')
         @author         = Author.new(name: 'Joao M. D. Moura')
+        @blog           = Blog.new(id: 999, name: "Custom blog", writer: @author, articles: [])
         @role           = Role.new(name: 'Great Author')
         @location       = Location.new(lat: '-23.550520', lng: '-46.633309')
         @place          = Place.new(name: 'Amazing Place')
@@ -30,6 +30,7 @@ module ActiveModel
         @post_serializer     = PostSerializer.new(@post)
         @author_serializer   = AuthorSerializer.new(@author)
         @comment_serializer  = CommentSerializer.new(@comment)
+        @blog_serializer     = BlogSerializer.new(@blog)
       end
 
       def test_cache_definition
@@ -56,9 +57,9 @@ module ActiveModel
       end
 
       def test_cache_options_definition
-        assert_equal({expires_in: 0.1}, @post_serializer.class._cache_options)
-        assert_equal(nil, @author_serializer.class._cache_options)
-        assert_equal({expires_in: 1.day}, @comment_serializer.class._cache_options)
+        assert_equal({expires_in: 0.1, skip_digest: true}, @post_serializer.class._cache_options)
+        assert_equal(nil, @blog_serializer.class._cache_options)
+        assert_equal({expires_in: 1.day, skip_digest: true}, @comment_serializer.class._cache_options)
       end
 
       def test_fragment_cache_definition
@@ -115,6 +116,15 @@ module ActiveModel
         assert_equal({place: 'Nowhere'}, ActionController::Base.cache_store.fetch(@location.cache_key))
       end
 
+      def test_uses_file_digest_in_cahe_key
+        blog = render_object_with_cache(@blog)
+        assert_equal(@blog_serializer.attributes, ActionController::Base.cache_store.fetch(@blog.cache_key_with_digest))
+      end
+
+      def _cache_digest_definition
+        assert_equal(::Model::FILE_DIGEST, @post_serializer.class._cache_digest)
+      end
+
       private
       def render_object_with_cache(obj)
         serializer_class = ActiveModel::Serializer.serializer_for(obj)

data/test/serializers/configuration_test.rb

@@ -8,7 +8,7 @@ module ActiveModel
       end
 
       def test_default_adapter
-        assert_equal :json, ActiveModel::Serializer.config.adapter
+        assert_equal :flatten_json, ActiveModel::Serializer.config.adapter
       end
     end
   end

data/test/serializers/meta_test.rb

@@ -12,9 +12,10 @@ module ActiveModel
       end
 
       def test_meta_is_present_with_root
-        adapter = load_adapter(root: "blog", meta: {total: 10})
+        serializer = AlternateBlogSerializer.new(@blog, meta: {total: 10})
+        adapter = ActiveModel::Serializer::Adapter::Json.new(serializer, root: 'blog')
         expected = {
-          "blog" => {
+          alternate_blog: {
             id: 1,
             title: "AMS Hints"
           },
@@ -35,9 +36,10 @@ module ActiveModel
       end
 
       def test_meta_key_is_used
-        adapter = load_adapter(root: "blog", meta: {total: 10}, meta_key: "haha_meta")
+        serializer = AlternateBlogSerializer.new(@blog, root: 'blog', meta: {total: 10}, meta_key: "haha_meta")
+        adapter = ActiveModel::Serializer::Adapter::Json.new(serializer, root: 'blog')
         expected = {
-          "blog" => {
+          alternate_blog: {
             id: 1,
             title: "AMS Hints"
           },
@@ -48,9 +50,9 @@ module ActiveModel
         assert_equal expected, adapter.as_json
       end
 
-      def test_meta_is_not_used_on_arrays
-        serializer = ArraySerializer.new([@blog], root: "blog", meta: {total: 10}, meta_key: "haha_meta")
-        adapter = ActiveModel::Serializer::Adapter::Json.new(serializer)
+      def test_meta_is_not_present_on_arrays_without_root
+        serializer = ArraySerializer.new([@blog], meta: {total: 10})
+        adapter = ActiveModel::Serializer::Adapter::FlattenJson.new(serializer)
         expected = [{
           id: 1,
           name: "AMS Hints",
@@ -67,11 +69,38 @@ module ActiveModel
         assert_equal expected, adapter.as_json
       end
 
+      def test_meta_is_present_on_arrays_with_root
+        serializer = ArraySerializer.new([@blog], meta: {total: 10}, meta_key: "haha_meta")
+        adapter = ActiveModel::Serializer::Adapter::Json.new(serializer, root: 'blog')
+        expected = {
+          blogs: [{
+            id: 1,
+            name: "AMS Hints",
+            writer: {
+              id: 2,
+              name: "Steve"
+            },
+            articles: [{
+              id: 3,
+              title: "AMS",
+              body: nil
+            }]
+          }],
+          'haha_meta' => {
+            total: 10
+          }
+        }
+        assert_equal expected, adapter.as_json
+      end
+
       private
 
       def load_adapter(options)
-        serializer = AlternateBlogSerializer.new(@blog, options)
-        ActiveModel::Serializer::Adapter::Json.new(serializer)
+        adapter_opts, serializer_opts =
+          options.partition { |k, _| ActionController::Serialization::ADAPTER_OPTION_KEYS.include? k }.map { |h| Hash[h] }
+
+        serializer = AlternateBlogSerializer.new(@blog, serializer_opts)
+        ActiveModel::Serializer::Adapter::FlattenJson.new(serializer, adapter_opts)
       end
     end
   end

data/test/serializers/serializer_for_test.rb

@@ -29,10 +29,14 @@ module ActiveModel
       class SerializerTest <  Minitest::Test
         class MyProfile < Profile
         end
+        class CustomProfile
+          def serializer_class; ProfileSerializer; end
+        end
 
         def setup
           @profile = Profile.new
           @my_profile = MyProfile.new
+          @custom_profile = CustomProfile.new
           @model = ::Model.new
         end
 
@@ -50,6 +54,11 @@ module ActiveModel
           serializer = ActiveModel::Serializer.serializer_for(@my_profile)
           assert_equal ProfileSerializer, serializer
         end
+
+        def test_serializer_custom_serializer
+          serializer = ActiveModel::Serializer.serializer_for(@custom_profile)
+          assert_equal ProfileSerializer, serializer
+        end
       end
     end
   end

data/test/test_helper.rb

@@ -6,17 +6,24 @@ require 'action_controller/test_case'
 require 'action_controller/railtie'
 require 'active_support/json'
 require 'minitest/autorun'
+require 'fileutils'
 # Ensure backward compatibility with Minitest 4
 Minitest::Test = MiniTest::Unit::TestCase unless defined?(Minitest::Test)
 
+require 'active_model_serializers'
+
 class Foo < Rails::Application
-  if Rails.version.to_s.start_with? '4'
+  if Rails::VERSION::MAJOR >= 4
+    config.eager_load = false
+    config.secret_key_base = 'abc123'
     config.action_controller.perform_caching = true
+    config.active_support.test_order = :random
+    config.logger = Logger.new(nil)
     ActionController::Base.cache_store = :memory_store
   end
 end
-
-require "active_model_serializers"
+FileUtils.mkdir_p(File.expand_path('../../tmp/cache', __FILE__))
+Foo.initialize!
 
 require 'fixtures/poro'
 
@@ -35,7 +42,3 @@ ActionController::TestCase.class_eval do
     @routes = TestHelper::Routes
   end
 end
-
-def def_serializer(&block)
-  Class.new(ActiveModel::Serializer, &block)
-end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_model_serializers
 version: !ruby/object:Gem::Version
-  version: 0.10.0.rc1
+  version: 0.10.0.rc2
 platform: ruby
 authors:
 - Steve Klabnik
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-22 00:00:00.000000000 Z
+date: 2015-06-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -86,6 +86,7 @@ files:
 - lib/action_controller/serialization.rb
 - lib/active_model/serializer.rb
 - lib/active_model/serializer/adapter.rb
+- lib/active_model/serializer/adapter/flatten_json.rb
 - lib/active_model/serializer/adapter/fragment_cache.rb
 - lib/active_model/serializer/adapter/json.rb
 - lib/active_model/serializer/adapter/json/fragment_cache.rb
@@ -95,14 +96,17 @@ files:
 - lib/active_model/serializer/array_serializer.rb
 - lib/active_model/serializer/configuration.rb
 - lib/active_model/serializer/fieldset.rb
+- lib/active_model/serializer/railtie.rb
 - lib/active_model/serializer/version.rb
 - lib/active_model_serializers.rb
 - lib/generators/serializer/USAGE
+- lib/generators/serializer/resource_override.rb
 - lib/generators/serializer/serializer_generator.rb
 - lib/generators/serializer/templates/serializer.rb
 - test/action_controller/adapter_selector_test.rb
 - test/action_controller/explicit_serializer_test.rb
 - test/action_controller/json_api_linked_test.rb
+- test/action_controller/rescue_from_test.rb
 - test/action_controller/serialization_scope_name_test.rb
 - test/action_controller/serialization_test.rb
 - test/adapter/fragment_cache_test.rb
@@ -121,6 +125,8 @@ files:
 - test/adapter_test.rb
 - test/array_serializer_test.rb
 - test/fixtures/poro.rb
+- test/generators/scaffold_controller_generator_test.rb
+- test/generators/serializer_generator_test.rb
 - test/serializers/adapter_for_test.rb
 - test/serializers/associations_test.rb
 - test/serializers/attribute_test.rb
@@ -128,7 +134,6 @@ files:
 - test/serializers/cache_test.rb
 - test/serializers/configuration_test.rb
 - test/serializers/fieldset_test.rb
-- test/serializers/generators_test.rb
 - test/serializers/meta_test.rb
 - test/serializers/options_test.rb
 - test/serializers/serializer_for_test.rb
@@ -154,7 +159,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Conventions-based JSON generation for Rails.
@@ -162,6 +167,7 @@ test_files:
 - test/action_controller/adapter_selector_test.rb
 - test/action_controller/explicit_serializer_test.rb
 - test/action_controller/json_api_linked_test.rb
+- test/action_controller/rescue_from_test.rb
 - test/action_controller/serialization_scope_name_test.rb
 - test/action_controller/serialization_test.rb
 - test/adapter/fragment_cache_test.rb
@@ -180,6 +186,8 @@ test_files:
 - test/adapter_test.rb
 - test/array_serializer_test.rb
 - test/fixtures/poro.rb
+- test/generators/scaffold_controller_generator_test.rb
+- test/generators/serializer_generator_test.rb
 - test/serializers/adapter_for_test.rb
 - test/serializers/associations_test.rb
 - test/serializers/attribute_test.rb
@@ -187,7 +195,6 @@ test_files:
 - test/serializers/cache_test.rb
 - test/serializers/configuration_test.rb
 - test/serializers/fieldset_test.rb
-- test/serializers/generators_test.rb
 - test/serializers/meta_test.rb
 - test/serializers/options_test.rb
 - test/serializers/serializer_for_test.rb