rocket_pants 1.5.5 → 1.6.0.rc1

data/lib/rocket_pants/controller/respondable.rb

@@ -2,6 +2,19 @@ module RocketPants
   module Respondable
     extend ActiveSupport::Concern
 
+    SerializerWrapper = Struct.new(:serializer, :object) do
+
+      def serializable_hash(options = {})
+        instance = serializer.new(object, options)
+        if instance.respond_to?(:serializable_hash)
+          instance.serializable_hash
+        else
+          instance.as_json options
+        end
+      end
+
+    end
+
     def self.pagination_type(object)
       if object.respond_to?(:total_entries)
         :will_paginate
@@ -41,6 +54,8 @@ module RocketPants
     end
 
     def self.normalise_object(object, options = {})
+      # First, prepare the object for serialization.
+      object = normalise_to_serializer object, options
       # Convert the object using a standard grape-like lookup chain.
       if object.is_a?(Array) || object.is_a?(Set)
         object.map { |o| normalise_object o, options }
@@ -53,12 +68,26 @@ module RocketPants
       end
     end
 
+    def self.normalise_to_serializer(object, options)
+      serializer = options.delete(:serializer)
+      serializer = object.active_model_serializer if object.respond_to?(:active_model_serializer) && serializer.nil?
+      return object unless serializer
+      SerializerWrapper.new serializer, object
+    end
+
     RENDERING_OPTIONS = [:status, :content_type]
 
     private
 
     def normalise_object(object, options = {})
-      Respondable.normalise_object object, options.except(*RENDERING_OPTIONS)
+      Respondable.normalise_object object, options.except(*RENDERING_OPTIONS).reverse_merge(default_serializer_options)
+    end
+
+    def default_serializer_options
+      {
+        :url_options => url_options,
+        :root        => false
+      }
     end
 
     # Given a json object or encoded json, will encode it

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: rocket_pants
 version: !ruby/object:Gem::Version
-  version: 1.5.5
-  prerelease: 
+  version: 1.6.0.rc1
+  prerelease: 6
 platform: ruby
 authors:
 - Darcy Laycock
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-31 00:00:00.000000000 Z
+date: 2013-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack