active_model_serializers 0.9.1 → 0.9.2

data/test/unit/active_model/serializer/has_one_test.rb

@@ -131,20 +131,6 @@ module ActiveModel
         }, @user_serializer.as_json)
       end
 
-      def test_associations_embedding_ids_including_objects_serialization_when_invoked_from_parent_serializer
-        @association.embed = :ids
-        @association.embed_in_root = true
-
-        user_info = UserInfo.new
-        user_info.instance_variable_set(:@user, @user)
-        user_info_serializer = UserInfoSerializer.new(user_info)
-
-        assert_equal({
-          'user_info' => { user: { name: 'Name 1', email: 'mail@server.com', 'profile_id' => @user.profile.object_id } },
-          'profiles' => [{ name: 'N1', description: 'D1' }]
-        }, user_info_serializer.as_json)
-      end
-
       def test_associations_embedding_ids_using_a_given_serializer
         @association.embed = :ids
         @association.embed_in_root = true
@@ -216,24 +202,6 @@ module ActiveModel
           }
         }, @user_serializer.as_json)
       end
-
-      def test_associations_name_key_embedding_ids_serialization_using_serializable_hash
-        @association = NameKeyUserSerializer._associations[:profile]
-        @association.embed = :ids
-
-        assert_equal({
-          name: 'Name 1', email: 'mail@server.com', 'profile' => @user.profile.object_id
-        }, NameKeyUserSerializer.new(@user).serializable_hash)
-      end
-
-      def test_associations_name_key_embedding_ids_serialization_using_as_json
-        @association = NameKeyUserSerializer._associations[:profile]
-        @association.embed = :ids
-
-        assert_equal({
-          'name_key_user' => { name: 'Name 1', email: 'mail@server.com', 'profile' => @user.profile.object_id }
-        }, NameKeyUserSerializer.new(@user).as_json)
-      end
     end
   end
 end

data/test/unit/active_model/serializer/options_test.rb

@@ -11,24 +11,5 @@ module ActiveModel
         assert_equal({foo: :bar}, @serializer.context)
       end
     end
-
-    class SerializationOptionsTest < Minitest::Test
-      def setup
-        @profile = Profile.new({ name: 'Name 1', description: 'Description 1', comments: 'Comments 1' })
-        @profile_serializer = ProfileSerializer.new(@profile)
-        @profile_serializer.instance_eval do
-          def description
-            serialization_options[:force_the_description]
-          end
-        end
-      end
-
-      def test_filtered_attributes_serialization
-        forced_description = "This is a test"
-        assert_equal({
-          'profile' => { name: 'Name 1', description: forced_description }
-        }, @profile_serializer.as_json(force_the_description: forced_description))
-      end
-    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active_model_serializers
 version: !ruby/object:Gem::Version
-  version: 0.9.1
+  version: 0.9.2
 platform: ruby
 authors:
 - José Valim
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-04 00:00:00.000000000 Z
+date: 2014-12-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -59,11 +59,8 @@ files:
 - lib/active_model/array_serializer.rb
 - lib/active_model/default_serializer.rb
 - lib/active_model/serializable.rb
-- lib/active_model/serializable/utils.rb
 - lib/active_model/serializer.rb
-- lib/active_model/serializer/association.rb
-- lib/active_model/serializer/association/has_many.rb
-- lib/active_model/serializer/association/has_one.rb
+- lib/active_model/serializer/associations.rb
 - lib/active_model/serializer/config.rb
 - lib/active_model/serializer/generators/resource_override.rb
 - lib/active_model/serializer/generators/serializer/USAGE
@@ -77,8 +74,6 @@ files:
 - lib/active_model_serializers.rb
 - test/fixtures/active_record.rb
 - test/fixtures/poro.rb
-- test/fixtures/template.html.erb
-- test/integration/action_controller/namespaced_serialization_test.rb
 - test/integration/action_controller/serialization_test.rb
 - test/integration/action_controller/serialization_test_case_test.rb
 - test/integration/active_record/active_record_test.rb
@@ -101,17 +96,13 @@ files:
 - test/unit/active_model/serializer/attributes_test.rb
 - test/unit/active_model/serializer/config_test.rb
 - test/unit/active_model/serializer/filter_test.rb
-- test/unit/active_model/serializer/has_many_polymorphic_test.rb
 - test/unit/active_model/serializer/has_many_test.rb
-- test/unit/active_model/serializer/has_one_and_has_many_test.rb
-- test/unit/active_model/serializer/has_one_polymorphic_test.rb
 - test/unit/active_model/serializer/has_one_test.rb
 - test/unit/active_model/serializer/key_format_test.rb
 - test/unit/active_model/serializer/meta_test.rb
 - test/unit/active_model/serializer/options_test.rb
 - test/unit/active_model/serializer/root_test.rb
 - test/unit/active_model/serializer/scope_test.rb
-- test/unit/active_model/serializer/url_helpers_test.rb
 homepage: https://github.com/rails-api/active_model_serializers
 licenses:
 - MIT
@@ -141,7 +132,6 @@ test_files:
 - test/test_app.rb
 - test/tmp/app/serializers/account_serializer.rb
 - test/integration/active_record/active_record_test.rb
-- test/integration/action_controller/namespaced_serialization_test.rb
 - test/integration/action_controller/serialization_test.rb
 - test/integration/action_controller/serialization_test_case_test.rb
 - test/integration/generators/resource_generator_test.rb
@@ -157,21 +147,16 @@ test_files:
 - test/unit/active_model/array_serializer/key_format_test.rb
 - test/unit/active_model/serializer/config_test.rb
 - test/unit/active_model/serializer/has_one_test.rb
-- test/unit/active_model/serializer/url_helpers_test.rb
 - test/unit/active_model/serializer/has_many_test.rb
-- test/unit/active_model/serializer/has_one_and_has_many_test.rb
 - test/unit/active_model/serializer/filter_test.rb
 - test/unit/active_model/serializer/scope_test.rb
 - test/unit/active_model/serializer/meta_test.rb
 - test/unit/active_model/serializer/root_test.rb
-- test/unit/active_model/serializer/has_many_polymorphic_test.rb
 - test/unit/active_model/serializer/associations/build_serializer_test.rb
-- test/unit/active_model/serializer/has_one_polymorphic_test.rb
 - test/unit/active_model/serializer/attributes_test.rb
 - test/unit/active_model/serializer/options_test.rb
 - test/unit/active_model/serializer/key_format_test.rb
 - test/unit/active_model/serializer/associations_test.rb
 - test/unit/active_model/default_serializer_test.rb
 - test/fixtures/poro.rb
-- test/fixtures/template.html.erb
 - test/fixtures/active_record.rb

data/lib/active_model/serializable/utils.rb

@@ -1,16 +0,0 @@
-module ActiveModel
-  module Serializable
-    module Utils
-      extend self
-
-      def _const_get(const)
-        begin
-          method = RUBY_VERSION >= '2.0' ? :const_get : :qualified_const_get
-          Object.send method, const
-        rescue NameError
-          const.safe_constantize
-        end
-      end
-    end
-  end
-end

data/lib/active_model/serializer/association/has_many.rb

@@ -1,39 +0,0 @@
-module ActiveModel
-  class Serializer
-    class Association
-      class HasMany < Association
-        def initialize(name, *args)
-          super
-          @root_key = @embedded_key.to_s
-          @key ||= case CONFIG.default_key_type
-            when :name then name.to_s.pluralize
-            else "#{name.to_s.singularize}_ids"
-          end
-        end
-
-        def serializer_class(object, _)
-          if use_array_serializer?
-            ArraySerializer
-          else
-            serializer_from_options
-          end
-        end
-
-        def options
-          if use_array_serializer?
-            { each_serializer: serializer_from_options }.merge! super
-          else
-            super
-          end
-        end
-
-        private
-
-        def use_array_serializer?
-          !serializer_from_options ||
-            serializer_from_options && !(serializer_from_options <= ArraySerializer)
-        end
-      end
-    end
-  end
-end

data/lib/active_model/serializer/association/has_one.rb

@@ -1,25 +0,0 @@
-module ActiveModel
-  class Serializer
-    class Association
-      class HasOne < Association
-        def initialize(name, *args)
-          super
-          @root_key = @embedded_key.to_s.pluralize
-          @key ||= case CONFIG.default_key_type
-            when :name then name.to_s.singularize
-            else "#{name}_id"
-          end
-        end
-
-        def serializer_class(object, options = {})
-          serializer_from_options || serializer_from_object(object, options) || default_serializer
-        end
-
-        def build_serializer(object, options = {})
-          options[:_wrap_in_array] = embed_in_root?
-          super
-        end
-      end
-    end
-  end
-end

data/test/fixtures/template.html.erb

@@ -1 +0,0 @@
-<p>Hello.</p>

data/test/integration/action_controller/namespaced_serialization_test.rb

@@ -1,96 +0,0 @@
-require 'test_helper'
-
-module ActionController
-  module Serialization
-    class NamespacedSerializationTest < ActionController::TestCase
-      class TestNamespace::MyController < ActionController::Base
-        def render_profile_with_namespace
-          render json: Profile.new({ name: 'Name 1', description: 'Description 1'})
-        end
-
-        def render_profiles_with_namespace
-          render json: [Profile.new({ name: 'Name 1', description: 'Description 1'})]
-        end
-
-        def render_comment
-          render json: Comment.new(content: 'Comment 1')
-        end
-
-        def render_comments
-          render json: [Comment.new(content: 'Comment 1')]
-        end
-      end
-
-      tests TestNamespace::MyController
-
-      def test_render_profile_with_namespace
-        get :render_profile_with_namespace
-        assert_serializer TestNamespace::ProfileSerializer
-      end
-
-      def test_render_profiles_with_namespace
-        get :render_profiles_with_namespace
-        assert_serializer TestNamespace::ProfileSerializer
-      end
-
-      def test_fallback_to_a_version_without_namespace
-        get :render_comment
-        assert_serializer CommentSerializer
-      end
-
-      def test_array_fallback_to_a_version_without_namespace
-        get :render_comments
-        assert_serializer CommentSerializer
-      end
-    end
-
-    class OptionNamespacedSerializationTest < ActionController::TestCase
-      class MyController < ActionController::Base
-        def default_serializer_options
-          {
-            namespace: TestNamespace
-          }
-        end
-
-        def render_profile_with_namespace_option
-          render json: Profile.new({ name: 'Name 1', description: 'Description 1'})
-        end
-
-        def render_profiles_with_namespace_option
-          render json: [Profile.new({ name: 'Name 1', description: 'Description 1'})]
-        end
-
-        def render_comment
-          render json: Comment.new(content: 'Comment 1')
-        end
-
-        def render_comments
-          render json: [Comment.new(content: 'Comment 1')]
-        end
-      end
-
-      tests MyController
-
-      def test_render_profile_with_namespace_option
-        get :render_profile_with_namespace_option
-        assert_serializer TestNamespace::ProfileSerializer
-      end
-
-      def test_render_profiles_with_namespace_option
-        get :render_profiles_with_namespace_option
-        assert_serializer TestNamespace::ProfileSerializer
-      end
-
-      def test_fallback_to_a_version_without_namespace
-        get :render_comment
-        assert_serializer CommentSerializer
-      end
-
-      def test_array_fallback_to_a_version_without_namespace
-        get :render_comments
-        assert_serializer CommentSerializer
-      end
-    end
-
-  end
-end

data/test/unit/active_model/serializer/has_many_polymorphic_test.rb

@@ -1,189 +0,0 @@
-require 'test_helper'
-
-module ActiveModel
-  class Serializer
-    class HasManyPolymorphicTest < ActiveModel::TestCase
-      def setup
-        @association = MailSerializer._associations[:attachments]
-        @old_association = @association.dup
-
-        @mail = Mail.new({ body: 'Body 1' })
-        @mail_serializer = MailSerializer.new(@mail)
-      end
-
-      def teardown
-        MailSerializer._associations[:attachments] = @old_association
-      end
-
-      def model_name(object)
-        object.class.to_s.demodulize.underscore.to_sym
-      end
-
-      def test_associations_definition
-        assert_equal 1, MailSerializer._associations.length
-        assert_kind_of Association::HasMany, @association
-        assert_equal true, @association.polymorphic
-        assert_equal 'attachments', @association.name
-      end
-
-      def test_associations_embedding_ids_serialization_using_serializable_hash
-        @association.embed = :ids
-
-        assert_equal({
-          body: 'Body 1',
-          'attachment_ids' => @mail.attachments.map do |c|
-            { id: c.object_id, type: model_name(c) }
-          end
-        }, @mail_serializer.serializable_hash)
-      end
-
-      def test_associations_embedding_ids_serialization_using_as_json
-        @association.embed = :ids
-
-        assert_equal({
-          'mail' => {
-            :body => 'Body 1',
-            'attachment_ids' => @mail.attachments.map do |c|
-              { id: c.object_id, type: model_name(c) }
-            end
-          }
-        }, @mail_serializer.as_json)
-      end
-
-      def test_associations_embedding_ids_serialization_using_serializable_hash_and_key_from_options
-        @association.embed = :ids
-        @association.key = 'key'
-
-        assert_equal({
-          body: 'Body 1',
-          'key' => @mail.attachments.map do |c|
-            { id: c.object_id, type: model_name(c) }
-          end
-        }, @mail_serializer.serializable_hash)
-      end
-
-      def test_associations_embedding_objects_serialization_using_serializable_hash
-        @association.embed = :objects
-
-        assert_equal({
-          body: 'Body 1',
-          :attachments => [
-            { type: :image, image: { url: 'U1' }},
-            { type: :video, video: { html: 'H1' }}
-          ]
-        }, @mail_serializer.serializable_hash)
-      end
-
-      def test_associations_embedding_objects_serialization_using_as_json
-        @association.embed = :objects
-
-        assert_equal({
-          'mail' => {
-            body: 'Body 1',
-            attachments: [
-              { type: :image, image: { url: 'U1' }},
-              { type: :video, video: { html: 'H1' }}
-            ]
-          }
-        }, @mail_serializer.as_json)
-      end
-
-      def test_associations_embedding_nil_objects_serialization_using_as_json
-        @association.embed = :objects
-        @mail.instance_eval do
-          def attachments
-            [nil]
-          end
-        end
-
-        assert_equal({
-          'mail' => {
-            :body => 'Body 1',
-            :attachments => [nil]
-          }
-        }, @mail_serializer.as_json)
-      end
-
-      def test_associations_embedding_objects_serialization_using_serializable_hash_and_root_from_options
-        @association.embed = :objects
-        @association.embedded_key = 'root'
-
-        assert_equal({
-          body: 'Body 1',
-          'root' => [
-            { type: :image, image: { url: 'U1' }},
-            { type: :video, video: { html: 'H1' }}
-          ]
-        }, @mail_serializer.serializable_hash)
-      end
-
-      def test_associations_embedding_ids_including_objects_serialization_using_serializable_hash
-        @association.embed = :ids
-        @association.embed_in_root = true
-
-        assert_equal({
-          body: 'Body 1',
-          'attachment_ids' => @mail.attachments.map do |c|
-            { id: c.object_id, type: model_name(c) }
-          end
-        }, @mail_serializer.serializable_hash)
-      end
-
-      def test_associations_embedding_ids_including_objects_serialization_using_as_json
-        @association.embed = :ids
-        @association.embed_in_root = true
-
-        assert_equal({
-          'mail' => {
-            body: 'Body 1',
-            'attachment_ids' => @mail.attachments.map do |c|
-              { id: c.object_id, type: model_name(c) }
-            end,
-          },
-          'attachments' => [
-            { type: :image, image: { url: 'U1' }},
-            { type: :video, video: { html: 'H1' }}
-          ]
-        }, @mail_serializer.as_json)
-      end
-
-      def test_associations_embedding_nothing_including_objects_serialization_using_as_json
-        @association.embed = nil
-        @association.embed_in_root = true
-
-        assert_equal({
-          'mail' => { body: 'Body 1' },
-          'attachments' => [
-            { type: :image, image: { url: 'U1' }},
-            { type: :video, video: { html: 'H1' }}
-          ]
-        }, @mail_serializer.as_json)
-      end
-
-      def test_associations_using_a_given_serializer
-        @association.embed = :ids
-        @association.embed_in_root = true
-        @association.serializer_from_options = Class.new(ActiveModel::Serializer) do
-          def fake
-            'fake'
-          end
-
-          attributes :fake
-        end
-
-        assert_equal({
-          'mail' => {
-            body: 'Body 1',
-            'attachment_ids' => @mail.attachments.map do |c|
-              { id: c.object_id, type: model_name(c) }
-            end
-          },
-          'attachments' => [
-            { type: :image, image: { fake: 'fake' }},
-            { type: :video, video: { fake: 'fake' }}
-          ]
-        }, @mail_serializer.as_json)
-      end
-    end
-  end
-end