rocket_pants 1.11.0 → 1.12.0

data/lib/rocket_pants/controller/respondable.rb

@@ -62,11 +62,19 @@ module RocketPants
     end
 
     def self.normalise_object(object, options = {})
+      # So we don't use the wrong options / modify them up the chain...
+      options = options.dup
+
       # 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 }
+      if object.is_a?(Array) || object.is_a?(Set) || (options[:each_serializer] && !options[:serializer])
+        suboptions = options.dup
+        if each_serializer = suboptions.delete(:each_serializer)
+          suboptions[:serializer] = each_serializer
+        end
+        object.map { |o| normalise_object o, suboptions }
       elsif object.respond_to?(:serializable_hash)
         object.serializable_hash options
       elsif object.respond_to?(:as_json)
@@ -79,7 +87,8 @@ module RocketPants
     def self.normalise_to_serializer(object, options)
       return object unless RocketPants.serializers_enabled?
       serializer = options.delete(:serializer)
-      serializer = object.active_model_serializer if object.respond_to?(:active_model_serializer) && serializer.nil?
+      # AMS overrides active_model_serializer, so we ignore it and tell it to go away, generally...
+      serializer = object.active_model_serializer if object.respond_to?(:active_model_serializer) && serializer.nil? && !object.is_a?(Array)
       return object unless serializer
       SerializerWrapper.new serializer, object
     end
@@ -127,6 +136,7 @@ module RocketPants
 
     def respond_with_object_and_type(object, options, type, singular)
       pre_process_exposed_object object, type, singular
+      options = options.reverse_merge(:singular => singular)
       options = options.reverse_merge(:compact => true) unless singular
       meta = expose_metadata metadata_for(object, options, type, singular)
       render_json({:response => normalise_object(object, options)}.merge(meta), options)

data/lib/rocket_pants/controller/versioning.rb

@@ -22,7 +22,7 @@ module RocketPants
     def version
       if !instance_variable_defined?(:@version)
         @version = begin
-          version = extract_version_string_with_prefix params[:version], request.symbolized_path_parameters[:rp_prefix]
+          version = extract_version_string_with_prefix params[:version], request.path_parameters.symbolize_keys[:rp_prefix]
           version.presence && Integer(version)
         rescue ArgumentError
           nil
@@ -51,4 +51,4 @@ module RocketPants
     end
 
   end
-end
+end

data/lib/rocket_pants/routing.rb

@@ -19,7 +19,7 @@ module RocketPants
         defaults[:rp_prefix] = {:text => required_prefix.to_s, :required => true}
       end
       versions_regexp = /(#{versions.uniq.join("|")})/
-      raise ArgumentError, 'please provide atleast one version' if versions.empty?
+      raise ArgumentError, 'please provide at least one version' if versions.empty?
       options = options.deep_merge({
         :constraints => {:version => versions_regexp},
         :path        => ':version',
@@ -40,4 +40,4 @@ module RocketPants
     end
 
   end
-end
+end

data/lib/rocket_pants/rspec_matchers.rb

@@ -42,7 +42,7 @@ module RocketPants
     def self.differ
       return @_differ if instance_variable_defined?(:@_differ)
       if defined?(RSpec::Support::Differ)
-        @_differ = RSpec::Expectations::Differ
+        @_differ = RSpec::Support::Differ.new
       elsif defined?(RSpec::Expectations::Differ)
         @_differ = RSpec::Expectations::Differ.new
       else
@@ -126,4 +126,4 @@ module RocketPants
 
 
   end
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rocket_pants
 version: !ruby/object:Gem::Version
-  version: 1.11.0
+  version: 1.12.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-30 00:00:00.000000000 Z
+date: 2015-05-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack