Merge branch '0-9-1' into 0-9-stable

This will bring back all features in 0.9.1 minus the problematic
Enumerable commit that broke it.

Author: kurko

lib/action_controller/serialization.rb

@@ -87,7 +87,7 @@ def build_json_serializer(resource, options = {})
       if serializer = options.fetch(:serializer, default_serializer(resource))
         options[:scope] = serialization_scope unless options.has_key?(:scope)
 
-        if resource.respond_to?(:each)
+        if resource.respond_to?(:to_ary)
           options[:resource_name] = controller_name 
           options[:namespace] = namespace_for_serializer if namespace_for_serializer
         end

lib/active_model/serializer.rb

@@ -56,7 +56,7 @@ def format_keys(format)
       attr_reader :key_format
 
       def serializer_for(resource, options = {})
-        if resource.respond_to?(:each) && !resource.is_a?(Hash)
+        if resource.respond_to?(:to_ary)
           if Object.constants.include?(:ArraySerializer)
             ::ArraySerializer
           else

lib/active_model/serializer/version.rb

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

test/fixtures/poro.rb

@@ -100,10 +100,6 @@ def description
   attributes :name, :description
 end
 
-class DifferentProfileSerializer < ActiveModel::Serializer
-  attributes :name
-end
-
 class CategorySerializer < ActiveModel::Serializer
   attributes :name
 

test/integration/action_controller/serialization_test.rb

@@ -283,21 +283,5 @@ def test_render_array_embeding_in_root
         assert_equal("{\"my\":[{\"name\":\"Name 1\",\"email\":\"[email protected]\",\"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