active_model_serializers 0.8.3 → 0.9.0.alpha1

data/lib/action_controller/serialization.rb

@@ -1,3 +1,5 @@
+require 'active_support/core_ext/class/attribute'
+
 module ActionController
   # Action Controller Serialization
   #
@@ -32,29 +34,41 @@ module ActionController
       self._serialization_scope = :current_user
     end
 
-    def serialization_scope
-      send(_serialization_scope) if _serialization_scope &&
-        respond_to?(_serialization_scope, true)
+    module ClassMethods
+      def serialization_scope(scope)
+        self._serialization_scope = scope
+      end
     end
 
-    def default_serializer_options
+    def _render_option_json(resource, options)
+      serializer = build_json_serializer(resource, options)
+
+      if serializer
+        super(serializer, options)
+      else
+        super
+      end
     end
 
-    [:_render_option_json, :_render_with_renderer_json].each do |renderer_method|
-      define_method renderer_method do |resource, options|
-        json = ActiveModel::Serializer.build_json(self, resource, options)
+    private
 
-        if json
-          super(json, options)
-        else
-          super(resource, options)
-        end
-      end
+    def default_serializer_options
+      {}
     end
 
-    module ClassMethods
-      def serialization_scope(scope)
-        self._serialization_scope = scope
+    def serialization_scope
+      _serialization_scope = self.class._serialization_scope
+      send(_serialization_scope) if _serialization_scope && respond_to?(_serialization_scope, true)
+    end
+
+    def build_json_serializer(resource, options = {})
+      options = default_serializer_options.merge(options)
+
+      if serializer = options.fetch(:serializer, ActiveModel::Serializer.serializer_for(resource))
+        options[:scope] = serialization_scope unless options.has_key?(:scope)
+        options[:resource_name] = controller_name if resource.respond_to?(:to_ary)
+
+        serializer.new(resource, options)
       end
     end
   end

data/lib/active_model/array_serializer.rb

@@ -1,104 +1,58 @@
-require "active_support/core_ext/class/attribute"
-require 'active_support/dependencies'
-require 'active_support/descendants_tracker'
+require 'active_model/default_serializer'
+require 'active_model/serializable'
+require 'active_model/serializer'
 
 module ActiveModel
-  # Active Model Array Serializer
-  #
-  # Serializes an Array, checking if each element implements
-  # the +active_model_serializer+ method.
-  #
-  # To disable serialization of root elements:
-  #
-  #     ActiveModel::ArraySerializer.root = false
-  #
   class ArraySerializer
-    extend ActiveSupport::DescendantsTracker
-
-    attr_reader :object, :options
-
-    class_attribute :root
-
-    class_attribute :cache
-    class_attribute :perform_caching
+    include Serializable
 
     class << self
-      # set perform caching like root
-      def cached(value = true)
-        self.perform_caching = value
-      end
+      attr_accessor :_root
+      alias root  _root=
+      alias root= _root=
     end
 
     def initialize(object, options={})
-      @object, @options = object, options
-    end
-
-    def meta_key
-      @options[:meta_key].try(:to_sym) || :meta
-    end
-
-    def include_meta(hash)
-      hash[meta_key] = @options[:meta] if @options.has_key?(:meta)
-    end
-
-    def as_json(*args)
-      @options[:hash] = hash = {}
-      @options[:unique_values] = {}
-
-      if root = @options[:root]
-        hash.merge!(root => serializable_array)
-        include_meta hash
-        hash
+      @object          = object
+      @scope           = options[:scope]
+      @root            = options.fetch(:root, self.class._root)
+      @meta_key        = options[:meta_key] || :meta
+      @meta            = options[@meta_key]
+      @each_serializer = options[:each_serializer]
+      @resource_name   = options[:resource_name]
+    end
+    attr_accessor :object, :scope, :root, :meta_key, :meta
+
+    def json_key
+      if root.nil?
+        @resource_name
       else
-        serializable_array
+        root
       end
     end
 
-    def to_json(*args)
-      if perform_caching?
-        cache.fetch expand_cache_key([self.class.to_s.underscore, cache_key, 'to-json']) do
-          super
-        end
-      else
-        super
-      end
+    def serializer_for(item)
+      serializer_class = @each_serializer || Serializer.serializer_for(item) || DefaultSerializer
+      serializer_class.new(item, scope: scope)
     end
 
-    def serializable_array
-      if perform_caching?
-        cache.fetch expand_cache_key([self.class.to_s.underscore, cache_key, 'serializable-array']) do
-          _serializable_array
-        end
-      else
-        _serializable_array
+    def serializable_object
+      @object.map do |item|
+        serializer_for(item).serializable_object
       end
     end
+    alias_method :serializable_array, :serializable_object
 
-    private
-    def _serializable_array
-      @object.map do |item|
-        if @options.has_key? :each_serializer
-          serializer = @options[:each_serializer]
-        elsif item.respond_to?(:active_model_serializer)
-          serializer = item.active_model_serializer
-        end
-
-        serializable = serializer ? serializer.new(item, @options) : DefaultSerializer.new(item, @options.merge(:root => false))
-
-        if serializable.respond_to?(:serializable_hash)
-          serializable.serializable_hash
-        else
-          serializable.as_json
+    def embedded_in_root_associations
+      @object.each_with_object({}) do |item, hash|
+        serializer_for(item).embedded_in_root_associations.each_pair do |type, objects|
+          if hash.has_key?(type)
+            hash[type].concat(objects).uniq!
+          else
+            hash[type] = objects
+          end
         end
       end
     end
-
-    def expand_cache_key(*args)
-      ActiveSupport::Cache.expand_cache_key(args)
-    end
-
-    def perform_caching?
-      perform_caching && cache && respond_to?(:cache_key)
-    end
   end
 end

data/lib/active_model/default_serializer.rb

@@ -0,0 +1,22 @@
+require 'active_model/serializable'
+
+module ActiveModel
+  # DefaultSerializer
+  #
+  # Provides a constant interface for all items
+  class DefaultSerializer
+    include ActiveModel::Serializable
+
+    attr_reader :object
+
+    def initialize(object, options=nil)
+      @object = object
+    end
+
+    def as_json(options={})
+      @object.as_json
+    end
+    alias serializable_hash as_json
+    alias serializable_object as_json
+  end
+end

data/lib/active_model/serializable.rb

@@ -0,0 +1,25 @@
+module ActiveModel
+  module Serializable
+    def as_json(options={})
+      if root = options.fetch(:root, json_key)
+        hash = { root => serializable_object }
+        hash.merge!(serializable_data)
+        hash
+      else
+        serializable_object
+      end
+    end
+
+    def serializable_data
+      embedded_in_root_associations.tap do |hash|
+        if respond_to?(:meta) && meta
+          hash[meta_key] = meta
+        end
+      end
+    end
+
+    def embedded_in_root_associations
+      {}
+    end
+  end
+end

data/lib/active_model/serializer/associations.rb

@@ -1,231 +1,73 @@
+require 'active_model/default_serializer'
+require 'active_model/serializer'
+
 module ActiveModel
   class Serializer
-    module Associations #:nodoc:
-      class Config #:nodoc:
-        class_attribute :options
-
-        def self.refine(name, class_options)
-          current_class = self
-
-          Class.new(self) do
-            singleton_class.class_eval do
-              define_method(:to_s) do
-                "(subclass of #{current_class.name})"
-              end
-
-              alias inspect to_s
-            end
-
-            self.options = class_options
-
-            # cache the root so we can reuse it without falling back on a per-instance basis
-            begin
-              self.options[:root] ||= self.new(name, nil).root
-            rescue
-              # this could fail if it needs a valid source, for example a polymorphic association
-            end
-
-          end
-        end
-
-        self.options = {}
-
-        def initialize(name, source, options={})
-          @name = name
-          @source = source
-          @options = options
-        end
-
-        def option(key, default=nil)
-          if @options.key?(key)
-            @options[key]
-          elsif self.class.options.key?(key)
-            self.class.options[key]
-          else
-            default
-          end
-        end
-
-        def target_serializer
-          serializer = option(:serializer)
-          serializer.is_a?(String) ? serializer.constantize : serializer
-        end
-
-        def source_serializer
-          @source
-        end
-
-        def key
-          option(:key) || @name
-        end
-
-        def root
-          option(:root) || @name
-        end
-
-        def name
-          option(:name) || @name
-        end
-
-        def associated_object
-          option(:value) || source_serializer.send(name)
-        end
-
-        def embed_ids?
-          [:id, :ids].include? option(:embed, source_serializer._embed)
-        end
-
-        def embed_objects?
-          [:object, :objects].include? option(:embed, source_serializer._embed)
-        end
-
-        def embed_in_root?
-          option(:include, source_serializer._root_embed)
-        end
-
-        def embeddable?
-          !associated_object.nil?
-        end
-
-      protected
-
-        def find_serializable(object)
-          if target_serializer
-            target_serializer.new(object, source_serializer.options)
-          elsif object.respond_to?(:active_model_serializer) && (ams = object.active_model_serializer)
-            ams.new(object, source_serializer.options)
-          else
-            object
-          end
-        end
+    class Association
+      def initialize(name, options={})
+        if options.has_key?(:include)
+          ActiveSupport::Deprecation.warn <<-WARN
+** Notice: include was renamed to embed_in_root. **
+          WARN
+        end
+
+        @name          = name.to_s
+        @options       = options
+        self.embed     = options.fetch(:embed) { CONFIG.embed }
+        @embed_in_root = options.fetch(:embed_in_root) { options.fetch(:include) { CONFIG.embed_in_root } }
+        @embed_key     = options[:embed_key] || :id
+        @key           = options[:key]
+        @embedded_key  = options[:root] || name
+
+        serializer = @options[:serializer]
+        @serializer_class = serializer.is_a?(String) ? serializer.constantize : serializer
       end
 
-      class HasMany < Config #:nodoc:
-        def key
-          if key = option(:key)
-            key
-          elsif embed_ids?
-            "#{@name.to_s.singularize}_ids".to_sym
-          else
-            @name
-          end
-        end
-
-        def embed_key
-          if key = option(:embed_key)
-            key
-          else
-            :id
-          end
-        end
-
-        def serialize
-          associated_object.map do |item|
-            find_serializable(item).serializable_hash
-          end
-        end
-
-        def serializables
-          associated_object.map do |item|
-            find_serializable(item)
-          end
-        end
+      attr_reader :name, :embed_ids, :embed_objects
+      attr_accessor :embed_in_root, :embed_key, :key, :embedded_key, :root_key, :serializer_class, :options
+      alias embed_ids? embed_ids
+      alias embed_objects? embed_objects
+      alias embed_in_root? embed_in_root
 
-        def serialize_ids
-          ids_key = "#{@name.to_s.singularize}_ids".to_sym
-          if !option(:embed_key) && !source_serializer.respond_to?(@name.to_s) && source_serializer.object.respond_to?(ids_key)
-            source_serializer.object.read_attribute_for_serialization(ids_key)
-          else
-            associated_object.map do |item|
-              item.read_attribute_for_serialization(embed_key)
-            end
-          end
-        end
+      def embed=(embed)
+        @embed_ids     = embed == :id || embed == :ids
+        @embed_objects = embed == :object || embed == :objects
       end
 
-      class HasOne < Config #:nodoc:
-        def embeddable?
-          if polymorphic? && associated_object.nil?
-            false
-          else
-            true
-          end
-        end
+      def build_serializer(object, options = {})
+        @serializer_class.new(object, options.merge(@options))
+      end
 
-        def polymorphic?
-          option :polymorphic
+      class HasOne < Association
+        def initialize(name, *args)
+          super
+          @root_key = @embedded_key.to_s.pluralize
+          @key ||= "#{name}_id"
         end
 
-        def root
-          if root = option(:root)
-            root
-          elsif polymorphic?
-            associated_object.class.to_s.pluralize.demodulize.underscore.to_sym
-          else
-            @name.to_s.pluralize.to_sym
-          end
+        def build_serializer(object, options = {})
+          @serializer_class ||= Serializer.serializer_for(object) || DefaultSerializer
+          options[:_wrap_in_array] = embed_in_root?
+          super
         end
+      end
 
-        def key
-          if key = option(:key)
-            key
-          elsif embed_ids? && !polymorphic?
-            "#{@name}_id".to_sym
-          else
-            @name
-          end
+      class HasMany < Association
+        def initialize(name, *args)
+          super
+          @root_key = @embedded_key
+          @key ||= "#{name.to_s.singularize}_ids"
         end
 
-        def embed_key
-          if key = option(:embed_key)
-            key
+        def build_serializer(object, options = {})
+          if @serializer_class && !(@serializer_class <= ArraySerializer)
+            @options[:each_serializer] = @serializer_class
+            @serializer_class = ArraySerializer
           else
-            :id
+            @serializer_class ||= ArraySerializer
           end
-        end
-
-        def polymorphic_key
-          associated_object.class.to_s.demodulize.underscore.to_sym
-        end
 
-        def serialize
-          object = associated_object
-
-          if object && polymorphic?
-            {
-              :type => polymorphic_key,
-              polymorphic_key => find_serializable(object).serializable_hash
-            }
-          elsif object
-            find_serializable(object).serializable_hash
-          end
-        end
-
-        def serializables
-          object = associated_object
-          value = object && find_serializable(object)
-          value ? [value] : []
-        end
-
-        def serialize_ids
-          id_key = "#{@name}_id".to_sym
-
-          if polymorphic?
-            if associated_object
-              {
-                :type => polymorphic_key,
-                :id => associated_object.read_attribute_for_serialization(embed_key)
-              }
-            else
-              nil
-            end
-          elsif !option(:embed_key) && !source_serializer.respond_to?(@name.to_s) && source_serializer.object.respond_to?(id_key)
-            source_serializer.object.read_attribute_for_serialization(id_key)
-          elsif associated_object
-            associated_object.read_attribute_for_serialization(embed_key)
-          else
-            nil
-          end
+          super
         end
       end
     end

data/lib/active_model/serializer/config.rb

@@ -0,0 +1,31 @@
+module ActiveModel
+  class Serializer
+    class Config
+      def initialize(data = {})
+        @data = data
+      end
+
+      def each(&block)
+        @data.each(&block)
+      end
+
+      def clear
+        @data.clear
+      end
+
+      def method_missing(name, *args)
+        name = name.to_s
+        return @data[name] if @data.include?(name)
+        match = name.match(/\A(.*?)([?=]?)\Z/)
+        case match[2]
+        when "="
+          @data[match[1]] = args.first
+        when "?"
+          !!@data[match[1]]
+        end
+      end
+    end
+
+    CONFIG = Config.new('embed' => :objects) # :nodoc:
+  end
+end

data/lib/active_model/serializer/generators/resource_override.rb

@@ -0,0 +1,13 @@
+require 'rails/generators'
+require 'rails/generators/rails/resource/resource_generator'
+
+module Rails
+  module Generators
+    class ResourceGenerator
+      def add_serializer
+        invoke 'serializer'
+      end
+    end
+  end
+end
+

data/lib/active_model/serializer/generators/serializer/scaffold_controller_generator.rb

@@ -0,0 +1,14 @@
+require 'rails/generators'
+require 'rails/generators/rails/scaffold_controller/scaffold_controller_generator'
+
+module Rails
+  module Generators
+    class ScaffoldControllerGenerator
+      if Rails::VERSION::MAJOR >= 4
+        source_root File.expand_path('../templates', __FILE__)
+
+        hook_for :serializer, default: true
+      end
+    end
+  end
+end

data/lib/active_model/serializer/generators/serializer/serializer_generator.rb

@@ -0,0 +1,37 @@
+module Rails
+  module Generators
+    class SerializerGenerator < NamedBase
+      source_root File.expand_path('../templates', __FILE__)
+      check_class_collision suffix: 'Serializer'
+
+      argument :attributes, type: :array, default: [], banner: 'field:type field:type'
+
+      class_option :parent, type: :string, desc: 'The parent class for the generated serializer'
+
+      def create_serializer_file
+        template 'serializer.rb', File.join('app/serializers', class_path, "#{file_name}_serializer.rb")
+      end
+
+      private
+
+      def attributes_names
+        [:id] + attributes.select { |attr| !attr.reference? }.map { |a| a.name.to_sym }
+      end
+
+      def association_names
+        attributes.select { |attr| attr.reference? }.map { |a| a.name.to_sym }
+      end
+
+      def parent_class_name
+        if options[:parent]
+          options[:parent]
+        elsif (ns = Rails::Generators.namespace) && ns.const_defined?(:ApplicationSerializer) ||
+               defined?(::ApplicationSerializer)
+          'ApplicationSerializer'
+        else
+          'ActiveModel::Serializer'
+        end
+      end
+    end
+  end
+end