active_model_serializers 0.9.1 → 0.9.2

data/lib/active_model/serializer/{association.rb → associations.rb}

@@ -1,6 +1,4 @@
 require 'active_model/default_serializer'
-require 'active_model/serializer/association/has_one'
-require 'active_model/serializer/association/has_many'
 
 module ActiveModel
   class Serializer
@@ -15,7 +13,6 @@ module ActiveModel
         @name          = name.to_s
         @options       = options
         self.embed     = options.fetch(:embed) { CONFIG.embed }
-        @polymorphic   = options.fetch(:polymorphic, false)
         @embed_in_root = options.fetch(:embed_in_root) { options.fetch(:include) { CONFIG.embed_in_root } }
         @key_format    = options.fetch(:key_format) { CONFIG.key_format }
         @embed_key     = options[:embed_key] || :id
@@ -28,22 +25,21 @@ module ActiveModel
         @serializer_from_options = serializer.is_a?(String) ? serializer.constantize : serializer
       end
 
-      attr_reader :name, :embed_ids, :embed_objects, :polymorphic
+      attr_reader :name, :embed_ids, :embed_objects
       attr_accessor :embed_in_root, :embed_key, :key, :embedded_key, :root_key, :serializer_from_options, :options, :key_format, :embed_in_root_key, :embed_namespace
       alias embed_ids? embed_ids
       alias embed_objects? embed_objects
       alias embed_in_root? embed_in_root
       alias embed_in_root_key? embed_in_root_key
       alias embed_namespace? embed_namespace
-      alias polymorphic? polymorphic
 
       def embed=(embed)
         @embed_ids     = embed == :id || embed == :ids
         @embed_objects = embed == :object || embed == :objects
       end
 
-      def serializer_from_object(object, options = {})
-        Serializer.serializer_for(object, options)
+      def serializer_from_object(object)
+        Serializer.serializer_for(object)
       end
 
       def default_serializer
@@ -51,7 +47,55 @@ module ActiveModel
       end
 
       def build_serializer(object, options = {})
-        serializer_class(object, options).new(object, options.merge(self.options))
+        serializer_class(object).new(object, options.merge(self.options))
+      end
+
+      class HasOne < Association
+        def initialize(name, *args)
+          super
+          @root_key = @embedded_key.to_s.pluralize
+          @key ||= "#{name}_id"
+        end
+
+        def serializer_class(object)
+          serializer_from_options || serializer_from_object(object) || default_serializer
+        end
+
+        def build_serializer(object, options = {})
+          options[:_wrap_in_array] = embed_in_root?
+          super
+        end
+      end
+
+      class HasMany < Association
+        def initialize(name, *args)
+          super
+          @root_key = @embedded_key
+          @key ||= "#{name.to_s.singularize}_ids"
+        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

data/lib/active_model/serializer/railtie.rb

@@ -6,13 +6,5 @@ module ActiveModel
       require 'active_model/serializer/generators/serializer/scaffold_controller_generator'
       require 'active_model/serializer/generators/resource_override'
     end
-
-    initializer 'include_routes.active_model_serializer' do |app|
-      ActiveSupport.on_load(:active_model_serializers) do
-        include app.routes.url_helpers
-      end
-    end
   end
 end
-
-ActiveSupport.run_load_hooks(:active_model_serializers, ActiveModel::Serializer)

data/lib/active_model/serializer/version.rb

@@ -1,5 +1,5 @@
 module ActiveModel
   class Serializer
-    VERSION = '0.9.1'
+    VERSION = '0.9.2'
   end
 end

data/lib/active_model_serializers.rb

@@ -9,7 +9,7 @@ begin
   require 'action_controller/serialization'
   require 'action_controller/serialization_test_case'
 
-  ActiveSupport.on_load(:action_controller) do
+  ActiveSupport.on_load(:after_initialize) do
     if ::ActionController::Serialization.enabled
       ActionController::Base.send(:include, ::ActionController::Serialization)
       ActionController::TestCase.send(:include, ::ActionController::SerializationAssertions)

data/test/fixtures/poro.rb

@@ -1,13 +1,11 @@
 class Model
-  def initialize(hash = {})
+  def initialize(hash={})
     @attributes = hash
   end
 
   def read_attribute_for_serialization(name)
     if name == :id || name == 'id'
       object_id
-    elsif respond_to?(name)
-      send name
     else
       @attributes[name]
     end
@@ -24,22 +22,9 @@ class User < Model
   end
 end
 
-class UserInfo < Model
-  def user
-    @user ||= User.new(name: 'N1', email: 'E1')
-  end
-end
-
 class Profile < Model
 end
 
-class Category < Model
-  def posts
-    @posts ||= [Post.new(title: 'T1', body: 'B1'),
-                Post.new(title: 'T2', body: 'B2')]
-  end
-end
-
 class Post < Model
   def comments
     @comments ||= [Comment.new(content: 'C1'),
@@ -47,37 +32,12 @@ class Post < Model
   end
 end
 
-class SpecialPost < Post
-  def special_comment
-    @speical_comment ||= Comment.new(content: 'special')
-  end
-end
-
 class Comment < Model
 end
 
 class WebLog < Model
 end
 
-class Interview < Model
-  def attachment
-    @attachment ||= Image.new(url: 'U1')
-  end
-end
-
-class Mail < Model
-  def attachments
-    @attachments ||= [Image.new(url: 'U1'),
-                      Video.new(html: 'H1')]
-  end
-end
-
-class Image < Model
-end
-
-class Video < Model
-end
-
 ###
 ## Serializers
 ###
@@ -87,10 +47,6 @@ class UserSerializer < ActiveModel::Serializer
   has_one :profile
 end
 
-class UserInfoSerializer < ActiveModel::Serializer
-  has_one :user
-end
-
 class ProfileSerializer < ActiveModel::Serializer
   def description
     description = object.read_attribute_for_serialization(:description)
@@ -100,28 +56,12 @@ class ProfileSerializer < ActiveModel::Serializer
   attributes :name, :description
 end
 
-class DifferentProfileSerializer < ActiveModel::Serializer
-  attributes :name
-end
-
-class CategorySerializer < ActiveModel::Serializer
-  attributes :name
-
-  has_many :posts
-end
-
 class PostSerializer < ActiveModel::Serializer
   attributes :title, :body
 
   has_many :comments
 end
 
-class SpecialPostSerializer < ActiveModel::Serializer
-  attributes :title, :body
-  has_many :comments, root: :comments, embed_in_root: true, embed: :ids
-  has_one :special_comment, root: :comments, embed_in_root: true, embed: :ids
-end
-
 class CommentSerializer < ActiveModel::Serializer
   attributes :content
 end
@@ -133,52 +73,3 @@ end
 class WebLogLowerCamelSerializer < WebLogSerializer
   format_keys :lower_camel
 end
-
-class InterviewSerializer < ActiveModel::Serializer
-  attributes :text
-
-  has_one :attachment, polymorphic: true
-end
-
-class MailSerializer < ActiveModel::Serializer
-  attributes :body
-
-  has_many :attachments, polymorphic: true
-end
-
-class ImageSerializer < ActiveModel::Serializer
-  attributes :url
-end
-
-class VideoSerializer < ActiveModel::Serializer
-  attributes :html
-end
-
-class ShortProfileSerializer < ::ProfileSerializer; end
-
-module TestNamespace
-  class ProfileSerializer < ::ProfileSerializer; end
-  class UserSerializer    < ::UserSerializer;    end
-end
-
-ActiveModel::Serializer.setup do |config|
-  config.default_key_type = :name
-end
-
-class NameKeyUserSerializer < ActiveModel::Serializer
-  attributes :name, :email
-
-  has_one :profile
-end
-
-class NameKeyPostSerializer < ActiveModel::Serializer
-  attributes :title, :body
-  
-  has_many :comments
-end
-
-ActiveModel::Serializer.setup do |config|
-  config.default_key_type = nil
-end
-
-

data/test/integration/action_controller/serialization_test.rb

@@ -283,21 +283,5 @@ module ActionController
         assert_equal("{\"my\":[{\"name\":\"Name 1\",\"email\":\"mail@server.com\",\"profile_id\":#{@controller.user.profile.object_id}}],\"profiles\":[{\"name\":\"N1\",\"description\":\"D1\"}]}", @response.body)
       end
     end
-  
-    class ExplicitEachSerializerWithEnumarableObjectTest < ActionController::TestCase
-      class MyController < ActionController::Base
-        def render_array
-          render json: [Profile.new({ name: 'Name 1', description: 'Description 1', comments: 'Comments 1' })].to_enum, each_serializer: DifferentProfileSerializer
-        end
-      end
-
-      tests MyController
-
-      def test_render_array
-        get :render_array
-        assert_equal 'application/json', @response.content_type
-        assert_equal '{"my":[{"name":"Name 1"}]}', @response.body
-      end
-    end
   end
 end

data/test/integration/action_controller/serialization_test_case_test.rb

@@ -11,11 +11,6 @@ module ActionController
         def render_text
           render text: 'ok'
         end
-
-        def render_template
-          prepend_view_path "./test/fixtures"
-          render template: "template"
-        end
       end
 
       tests MyController
@@ -61,11 +56,6 @@ module ActionController
         end
         assert_match 'assert_serializer only accepts a String, Symbol, Regexp, ActiveModel::Serializer, or nil', e.message
       end
-
-      def test_does_not_overwrite_notification_subscriptions
-        get :render_template
-        assert_template "template"
-      end
     end
   end
 end

data/test/integration/active_record/active_record_test.rb

@@ -49,9 +49,9 @@ module ActiveModel
                 'ar_tag_ids' => [1, 2],
                 'ar_section_id' => 1
               },
-              'ar_comments' => [{ body: 'what a dumb post', 'ar_tag_ids' => [3, 2] },
+              ar_comments: [{ body: 'what a dumb post', 'ar_tag_ids' => [3, 2] },
                             { body: 'i liked it', 'ar_tag_ids' => [3, 1] }],
-              'ar_tags' => [{ name: 'happy' }, { name: 'whiny' }, { name: 'short' }],
+              ar_tags: [{ name: 'happy' }, { name: 'whiny' }, { name: 'short' }],
               'ar_sections' => [{ 'name' => 'ruby' }]
             }, post_serializer.as_json)
           end

data/test/test_app.rb

@@ -3,9 +3,6 @@ class TestApp < Rails::Application
     config.eager_load = false
     config.secret_key_base = 'abc123'
   end
-  config.after_initialize do
-    Rails.application.routes.default_url_options = { host: 'http://example.com' }
-  end
 
   # Set up a logger to avoid creating a log directory on every run.
   config.logger = Logger.new(nil)

data/test/unit/active_model/array_serializer/serialization_test.rb

@@ -85,7 +85,7 @@ module ActiveModel
               {title: "Title 1", body: "Body 1", "comment_ids" => @post1.comments.map(&:object_id) },
               {title: "Title 2", body: "Body 2", "comment_ids" => @post2.comments.map(&:object_id) }
             ],
-            'comments' => [
+            comments: [
               {content: "C1"},
               {content: "C2"},
               {content: "C3"},

data/test/unit/active_model/serializer/associations/build_serializer_test.rb

@@ -7,7 +7,6 @@ module ActiveModel
         def setup
           @association = Association::HasOne.new('post', serializer: PostSerializer)
           @post = Post.new({ title: 'Title 1', body: 'Body 1', date: '1/1/2000' })
-          @user = User.new
         end
 
         def test_build_serializer_for_array_called_twice
@@ -16,20 +15,6 @@ module ActiveModel
             assert_instance_of(PostSerializer, serializer)
           end
         end
-
-        def test_build_serializer_from_in_a_namespace
-          assoc      = Association::HasOne.new('profile')
-          serializer = TestNamespace::UserSerializer.new(@user).build_serializer(assoc)
-
-          assert_instance_of(TestNamespace::ProfileSerializer, serializer)
-        end
-
-        def test_build_serializer_with_prefix
-          assoc      = Association::HasOne.new('profile', prefix: :short)
-          serializer = UserSerializer.new(@user).build_serializer(assoc)
-
-          assert_instance_of(ShortProfileSerializer, serializer)
-        end
       end
     end
   end

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

@@ -36,22 +36,6 @@ module ActiveModel
         assert_equal([:name, :description],
                      another_inherited_serializer_klass._attributes)
       end
-
-      def tests_query_attributes_strip_question_mark
-        model = Class.new(::Model) do
-          def strip?
-            true
-          end
-        end
-
-        serializer = Class.new(ActiveModel::Serializer) do
-          attributes :strip?
-        end
-
-        actual = serializer.new(model.new).as_json
-
-        assert_equal({ strip: true }, actual)
-      end
     end
   end
 end

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

@@ -78,9 +78,6 @@ module ActiveModel
           assert !association.embed_objects?
           assert association.embed_in_root
           assert_equal :lower_camel, association.key_format
-          assert_equal 'post', PostSerializer.root_name
-          CONFIG.plural_default_root = true
-          assert_equal 'posts', PostSerializer.root_name
         ensure
           PostSerializer._associations[:comments] = old_association
           CONFIG.clear

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

@@ -111,34 +111,17 @@ module ActiveModel
 
         assert_equal({
           'post' => { title: 'Title 1', body: 'Body 1', 'comment_ids' => @post.comments.map { |c| c.object_id } },
-          'comments' => [{ content: 'C1' }, { content: 'C2' }]
+          comments: [{ content: 'C1' }, { content: 'C2' }]
         }, @post_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
-
-        category = Category.new(name: 'Name 1')
-        category.instance_variable_set(:@posts, [@post])
-        category_serializer = CategorySerializer.new(category)
-
-        assert_equal({
-          'category' => {
-            name: 'Name 1',
-            posts: [{ title: 'Title 1', body: 'Body 1', 'comment_ids' => @post.comments.map { |c| c.object_id } }]
-          },
-          "comments" => [{ content: 'C1' }, { content: 'C2' }]
-        }, category_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({
           'post' => { title: 'Title 1', body: 'Body 1' },
-          'comments' => [{ content: 'C1' }, { content: 'C2' }]
+          comments: [{ content: 'C1' }, { content: 'C2' }]
         }, @post_serializer.as_json)
       end
 
@@ -155,7 +138,7 @@ module ActiveModel
 
         assert_equal({
           'post' => { title: 'Title 1', body: 'Body 1', 'comment_ids' => @post.comments.map { |c| c.object_id } },
-          'comments' => [{ content: 'C1!' }, { content: 'C2!' }]
+          comments: [{ content: 'C1!' }, { content: 'C2!' }]
         }, @post_serializer.as_json)
       end
 
@@ -170,7 +153,7 @@ module ActiveModel
 
         assert_equal({
           'post' => { title: 'Title 1', body: 'Body 1', 'comment_ids' => @post.comments.map { |c| c.object_id } },
-          'comments' => { my_content: ['fake'] }
+          comments: { my_content: ['fake'] }
         }, @post_serializer.as_json)
       end
 
@@ -191,16 +174,16 @@ module ActiveModel
         @association.embed_in_root_key = :linked
         @association.embed = :ids
         assert_equal({
-          'post' => {
-            title: 'Title 1', body: 'Body 1',
-            'comment_ids' => @post.comments.map(&:object_id)
-          },
           linked: {
-            'comments' => [
+            comments: [
               { content: 'C1' },
               { content: 'C2' }
             ]
           },
+          'post' => {
+            title: 'Title 1', body: 'Body 1',
+            'comment_ids' => @post.comments.map(&:object_id)
+          }
         }, @post_serializer.as_json)
       end
 
@@ -211,18 +194,18 @@ module ActiveModel
         @association.embed_namespace = :links
         @association.key = :comments
         assert_equal({
-          'post' => {
-            title: 'Title 1', body: 'Body 1',
-            links: {
-              comments: @post.comments.map(&:object_id)
-            }
-          },
           linked: {
-            'comments' => [
+            comments: [
               { content: 'C1' },
               { content: 'C2' }
             ]
           },
+          'post' => {
+            title: 'Title 1', body: 'Body 1',
+            links: {
+              comments: @post.comments.map(&:object_id)
+            }
+          }
         }, @post_serializer.as_json)
       end
 
@@ -242,24 +225,6 @@ module ActiveModel
           }
         }, @post_serializer.as_json)
       end
-
-      def test_associations_name_key_embedding_ids_serialization_using_serializable_hash
-        @association = NameKeyPostSerializer._associations[:comments]
-        @association.embed = :ids
-
-        assert_equal({
-          title: 'Title 1', body: 'Body 1', 'comments' => @post.comments.map { |c| c.object_id }
-        }, NameKeyPostSerializer.new(@post).serializable_hash)
-      end
-
-      def test_associations_name_key_embedding_ids_serialization_using_as_json
-        @association = NameKeyPostSerializer._associations[:comments]
-        @association.embed = :ids
-
-        assert_equal({
-          'name_key_post' => { title: 'Title 1', body: 'Body 1', 'comments' => @post.comments.map { |c| c.object_id } }
-        }, NameKeyPostSerializer.new(@post).as_json)
-      end
     end
   end
 end