active_model_serializers 0.9.0 → 0.9.1

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

@@ -1,4 +1,6 @@
 require 'active_model/default_serializer'
+require 'active_model/serializer/association/has_one'
+require 'active_model/serializer/association/has_many'
 
 module ActiveModel
   class Serializer
@@ -13,6 +15,7 @@ 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
@@ -25,21 +28,22 @@ module ActiveModel
         @serializer_from_options = serializer.is_a?(String) ? serializer.constantize : serializer
       end
 
-      attr_reader :name, :embed_ids, :embed_objects
+      attr_reader :name, :embed_ids, :embed_objects, :polymorphic
       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)
-        Serializer.serializer_for(object)
+      def serializer_from_object(object, options = {})
+        Serializer.serializer_for(object, options)
       end
 
       def default_serializer
@@ -47,55 +51,7 @@ module ActiveModel
       end
 
       def build_serializer(object, 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
+        serializer_class(object, options).new(object, options.merge(self.options))
       end
     end
   end

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

@@ -0,0 +1,39 @@
+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

@@ -0,0 +1,25 @@
+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/lib/active_model/serializer/railtie.rb

@@ -6,5 +6,13 @@ 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.0'
+    VERSION = '0.9.1'
   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(:after_initialize) do
+  ActiveSupport.on_load(:action_controller) do
     if ::ActionController::Serialization.enabled
       ActionController::Base.send(:include, ::ActionController::Serialization)
       ActionController::TestCase.send(:include, ::ActionController::SerializationAssertions)

data/test/fixtures/poro.rb

@@ -1,11 +1,13 @@
 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
@@ -22,9 +24,22 @@ 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'),
@@ -32,12 +47,37 @@ 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
 ###
@@ -47,6 +87,10 @@ 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)
@@ -56,12 +100,28 @@ 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
@@ -73,3 +133,52 @@ 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/fixtures/template.html.erb

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

data/test/integration/action_controller/namespaced_serialization_test.rb

@@ -0,0 +1,96 @@
+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