active_model_serializers 0.10.0.rc1 → 0.10.0.rc2

data/lib/active_model/serializer/adapter/json_api/fragment_cache.rb

@@ -10,9 +10,10 @@ module ActiveModel
             core_non_cached   = non_cached_hash.first
             no_root_cache     = cached_hash.delete_if {|key, value| key == core_cached[0] }
             no_root_non_cache = non_cached_hash.delete_if {|key, value| key == core_non_cached[0] }
-            cached_resource   = (core_cached[1]) ? core_cached[1].merge(core_non_cached[1]) : core_non_cached[1]
+            cached_resource   = (core_cached[1]) ? core_cached[1].deep_merge(core_non_cached[1]) : core_non_cached[1]
             hash = (root) ? { root => cached_resource } : cached_resource
-            hash.merge no_root_non_cache.merge no_root_cache
+
+            hash.deep_merge no_root_non_cache.deep_merge no_root_cache
           end
 
         end

data/lib/active_model/serializer/array_serializer.rb

@@ -7,21 +7,24 @@ module ActiveModel
       attr_reader :meta, :meta_key
 
       def initialize(objects, options = {})
-        options.merge!(root: nil)
-
-        @objects = objects.map do |object|
+        @resource = objects
+        @objects  = objects.map do |object|
           serializer_class = options.fetch(
             :serializer,
             ActiveModel::Serializer.serializer_for(object)
           )
-          serializer_class.new(object, options)
+          serializer_class.new(object, options.except(:serializer))
         end
         @meta     = options[:meta]
         @meta_key = options[:meta_key]
       end
 
       def json_key
-        @objects.first.json_key if @objects.first
+        if @objects.first
+          @objects.first.json_key.pluralize
+        else
+          @resource.name.downcase.pluralize if @resource.try(:name)
+        end
       end
 
       def root=(root)

data/lib/active_model/serializer/configuration.rb

@@ -6,7 +6,7 @@ module ActiveModel
 
       included do |base|
         base.config.array_serializer = ActiveModel::Serializer::ArraySerializer
-        base.config.adapter = :json
+        base.config.adapter = :flatten_json
       end
     end
   end

data/lib/active_model/serializer/fieldset.rb

@@ -12,8 +12,8 @@ module ActiveModel
       end
 
       def fields_for(serializer)
-        key = serializer.json_key || serializer.class.root_name
-        fields[key.to_sym]
+        key = serializer.json_key
+        fields[key.to_sym] || fields[key.pluralize.to_sym]
       end
 
     private

data/lib/active_model/serializer/railtie.rb

@@ -0,0 +1,8 @@
+module ActiveModel
+  class Railtie < Rails::Railtie
+    initializer 'generators' do |app|
+      app.load_generators
+      require 'generators/serializer/resource_override'
+    end
+  end
+end

data/lib/active_model/serializer/version.rb

@@ -1,5 +1,5 @@
 module ActiveModel
   class Serializer
-    VERSION = "0.10.0.rc1"
+    VERSION = "0.10.0.rc2"
   end
 end

data/lib/active_model_serializers.rb

@@ -2,6 +2,7 @@ require 'active_model'
 require 'active_model/serializer/version'
 require 'active_model/serializer'
 require 'active_model/serializer/fieldset'
+require 'active_model/serializer/railtie'
 
 begin
   require 'action_controller'

data/lib/generators/serializer/resource_override.rb

@@ -0,0 +1,12 @@
+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/test/action_controller/adapter_selector_test.rb

@@ -3,7 +3,7 @@ require 'test_helper'
 module ActionController
   module Serialization
     class AdapterSelectorTest < ActionController::TestCase
-      class MyController < ActionController::Base
+      class AdapterSelectorTestController < ActionController::Base
         def render_using_default_adapter
           @profile = Profile.new({ name: 'Name 1', description: 'Description 1', comments: 'Comments 1' })
           render json: @profile
@@ -20,7 +20,7 @@ module ActionController
         end
       end
 
-      tests MyController
+      tests AdapterSelectorTestController
 
       def test_render_using_default_adapter
         get :render_using_default_adapter
@@ -32,10 +32,12 @@ module ActionController
 
         expected = {
           data: {
-            name: "Name 1",
-            description: "Description 1",
             id: assigns(:profile).id.to_s,
-            type: "profiles"
+            type: "profiles",
+            attributes: {
+              name: "Name 1",
+              description: "Description 1",
+            }
           }
         }
 

data/test/action_controller/explicit_serializer_test.rb

@@ -3,7 +3,7 @@ require 'test_helper'
 module ActionController
   module Serialization
     class ExplicitSerializerTest < ActionController::TestCase
-      class MyController < ActionController::Base
+      class ExplicitSerializerTestController < ActionController::Base
         def render_using_explicit_serializer
           @profile = Profile.new(name: 'Name 1',
                                  description: 'Description 1',
@@ -55,9 +55,16 @@ module ActionController
 
           render json: [@post], each_serializer: PostPreviewSerializer
         end
+
+        def render_using_explicit_each_serializer
+          location       = Location.new(id: 42, lat: '-23.550520', lng: '-46.633309')
+          place          = Place.new(id: 1337, name: 'Amazing Place', locations: [location])
+
+          render json: place, each_serializer: PlaceSerializer
+        end
       end
 
-      tests MyController
+      tests ExplicitSerializerTestController
 
       def test_render_using_explicit_serializer
         get :render_using_explicit_serializer
@@ -70,17 +77,15 @@ module ActionController
         get :render_array_using_explicit_serializer
         assert_equal 'application/json', @response.content_type
 
-        expected = {
-          'paginated' => [
-            { 'name' => 'Name 1' },
-            { 'name' => 'Name 2' }
-          ]
-        }
+        expected = [
+          { 'name' => 'Name 1' },
+          { 'name' => 'Name 2' }
+        ]
 
         assert_equal expected.to_json, @response.body
       end
 
-      def test_render_array_using_explicit_serializer
+      def test_render_array_using_implicit_serializer
         get :render_array_using_implicit_serializer
         assert_equal 'application/json', @response.content_type
 
@@ -105,6 +110,25 @@ module ActionController
 
         assert_equal expected.to_json, @response.body
       end
+
+      def test_render_using_explicit_each_serializer
+        get :render_using_explicit_each_serializer
+
+        expected = {
+          id: 1337,
+          name: "Amazing Place",
+          locations: [
+            {
+              id: 42,
+              lat: "-23.550520",
+              lng: "-46.633309",
+              place: "Nowhere" # is a virtual attribute on LocationSerializer
+            }
+          ]
+        }
+
+        assert_equal expected.to_json, response.body
+      end
     end
   end
 end

data/test/action_controller/json_api_linked_test.rb

@@ -3,7 +3,7 @@ require 'test_helper'
 module ActionController
   module Serialization
     class JsonApiLinkedTest < ActionController::TestCase
-      class MyController < ActionController::Base
+      class JsonApiLinkedTestController < ActionController::Base
         def setup_post
           ActionController::Base.cache_store.clear
           @role1 = Role.new(id: 1, name: 'admin')
@@ -78,7 +78,7 @@ module ActionController
         end
       end
 
-      tests MyController
+      tests JsonApiLinkedTestController
 
       def test_render_resource_without_include
         get :render_resource_without_include
@@ -91,7 +91,7 @@ module ActionController
         response = JSON.parse(@response.body)
         assert response.key? 'included'
         assert_equal 1, response['included'].size
-        assert_equal 'Steve K.', response['included'].first['name']
+        assert_equal 'Steve K.', response['included'].first['attributes']['name']
       end
 
       def test_render_resource_with_nested_has_many_include
@@ -101,29 +101,35 @@ module ActionController
           {
             "id" => "1",
             "type" => "authors",
-            "name" => "Steve K.",
-            "links" => {
-              "posts" => { "linkage" => [] },
-              "roles" => { "linkage" => [{ "type" =>"roles", "id" => "1" }, { "type" =>"roles", "id" => "2" }] },
-              "bio" => { "linkage" => nil }
+            "attributes" => {
+              "name" => "Steve K."
+            },
+            "relationships" => {
+              "posts" => { "data" => [] },
+              "roles" => { "data" => [{ "type" =>"roles", "id" => "1" }, { "type" =>"roles", "id" => "2" }] },
+              "bio" => { "data" => nil }
             }
           }, {
             "id" => "1",
             "type" => "roles",
-            "name" => "admin",
-            "description" => nil,
-            "slug" => "admin-1",
-            "links" => {
-              "author" => { "linkage" => { "type" =>"authors", "id" => "1" } }
+            "attributes" => {
+              "name" => "admin",
+              "description" => nil,
+              "slug" => "admin-1"
+            },
+            "relationships" => {
+              "author" => { "data" => { "type" =>"authors", "id" => "1" } }
             }
           }, {
             "id" => "2",
             "type" => "roles",
-            "name" => "colab",
-            "description" => nil,
-            "slug" => "colab-2",
-            "links" => {
-              "author" => { "linkage" => { "type" =>"authors", "id" => "1" } }
+            "attributes" => {
+              "name" => "colab",
+              "description" => nil,
+              "slug" => "colab-2"
+            },
+            "relationships" => {
+              "author" => { "data" => { "type" =>"authors", "id" => "1" } }
             }
           }
         ]
@@ -135,7 +141,7 @@ module ActionController
         response = JSON.parse(@response.body)
         assert response.key? 'included'
         assert_equal 1, response['included'].size
-        assert_equal 'Anonymous', response['included'].first['name']
+        assert_equal 'Anonymous', response['included'].first['attributes']['name']
       end
 
       def test_render_collection_without_include

data/test/action_controller/rescue_from_test.rb

@@ -0,0 +1,32 @@
+require 'test_helper'
+
+module ActionController
+  module Serialization
+    class RescueFromTest < ActionController::TestCase
+      class RescueFromTestController < ActionController::Base
+        rescue_from Exception, with: :handle_error
+
+        def render_using_raise_error_serializer
+          @profile = Profile.new({ name: 'Name 1', description: 'Description 1', comments: 'Comments 1' })
+          render json: [@profile], serializer: RaiseErrorSerializer
+        end
+
+        def handle_error(exception)
+          render json: { errors: ['Internal Server Error'] }, status: :internal_server_error
+        end
+      end
+
+      tests RescueFromTestController
+
+      def test_rescue_from
+        get :render_using_raise_error_serializer
+
+        expected = {
+          errors: ['Internal Server Error']
+        }.to_json
+
+        assert_equal expected, @response.body
+      end
+    end
+  end
+end

data/test/action_controller/serialization_scope_name_test.rb

@@ -27,7 +27,7 @@ class DefaultScopeNameTest < ActionController::TestCase
 
   def test_default_scope_name
     get :render_new_user
-    assert_equal '{"data":{"admin?":false,"id":"1","type":"users"}}', @response.body
+    assert_equal '{"data":{"id":"1","type":"users","attributes":{"admin?":false}}}', @response.body
   end
 end
 
@@ -58,6 +58,6 @@ class SerializationScopeNameTest < ActionController::TestCase
 
   def test_override_scope_name_with_controller
     get :render_new_user
-    assert_equal '{"data":{"admin?":true,"id":"1","type":"users"}}', @response.body
+    assert_equal '{"data":{"id":"1","type":"users","attributes":{"admin?":true}}}', @response.body
   end
 end

data/test/action_controller/serialization_test.rb

@@ -3,15 +3,24 @@ require 'test_helper'
 module ActionController
   module Serialization
     class ImplicitSerializerTest < ActionController::TestCase
-      class MyController < ActionController::Base
+      class ImplicitSerializationTestController < ActionController::Base
         def render_using_implicit_serializer
           @profile = Profile.new({ name: 'Name 1', description: 'Description 1', comments: 'Comments 1' })
           render json: @profile
         end
 
         def render_using_custom_root
-          @profile = Profile.new({ name: 'Name 1', description: 'Description 1', comments: 'Comments 1' })
-          render json: @profile, root: "custom_root"
+          with_adapter ActiveModel::Serializer::Adapter::Json do
+            @profile = Profile.new({ name: 'Name 1', description: 'Description 1', comments: 'Comments 1' })
+            render json: @profile, root: "custom_root"
+          end
+        end
+
+        def render_using_custom_root_and_meta
+          with_adapter ActiveModel::Serializer::Adapter::Json do
+            @profile = Profile.new({ name: 'Name 1', description: 'Description 1', comments: 'Comments 1' })
+            render json: @profile, root: "custom_root", meta: { total: 10 }
+          end
         end
 
         def render_using_default_adapter_root
@@ -28,6 +37,16 @@ module ActionController
           render json: @profile, root: "profile", adapter: :json_api
         end
 
+        def render_array_using_custom_root_and_meta
+          with_adapter ActiveModel::Serializer::Adapter::Json do
+            array = [
+              Profile.new({ name: 'Name 1', description: 'Description 1', comments: 'Comments 1' }),
+              Profile.new({ name: 'Name 2', description: 'Description 2', comments: 'Comments 2' })
+            ]
+            render json: array, root: "custom_root", meta: { total: 10 }
+          end
+        end
+
         def render_array_using_implicit_serializer
           array = [
             Profile.new({ name: 'Name 1', description: 'Description 1', comments: 'Comments 1' }),
@@ -139,7 +158,7 @@ module ActionController
         end
       end
 
-      tests MyController
+      tests ImplicitSerializationTestController
 
       # We just have Null for now, this will change
       def test_render_using_implicit_serializer
@@ -154,22 +173,17 @@ module ActionController
         assert_equal expected.to_json, @response.body
       end
 
-      def test_render_using_custom_root
-        get :render_using_custom_root
-
-        assert_equal 'application/json', @response.content_type
-        assert_equal '{"custom_root":{"name":"Name 1","description":"Description 1"}}', @response.body
-      end
-
       def test_render_using_default_root
         get :render_using_default_adapter_root
 
         expected = {
           data: {
-            name: "Name 1",
-            description: "Description 1",
             id: assigns(:profile).id.to_s,
-            type: "profiles"
+            type: "profiles",
+            attributes: {
+              name: "Name 1",
+              description: "Description 1"
+            }
           }
         }
 
@@ -182,10 +196,12 @@ module ActionController
 
         expected = {
           data: {
-            name: "Name 1",
-            description: "Description 1",
             id: assigns(:profile).id.to_s,
-            type: "profiles"
+            type: "profiles",
+            attributes: {
+              name: "Name 1",
+              description: "Description 1"
+            }
           }
         }
 
@@ -217,10 +233,12 @@ module ActionController
         expected = {
           data: [
             {
-              name: "Name 1",
-              description: "Description 1",
               id: assigns(:profiles).first.id.to_s,
-              type: "profiles"
+              type: "profiles",
+              attributes: {
+                name: "Name 1",
+                description: "Description 1"
+              }
             }
           ],
           meta: {
@@ -319,13 +337,13 @@ module ActionController
         response = JSON.parse(@response.body)
 
         expected_return = {
+          "id"=>1,
+          "time"=>DateTime.now.to_s,
           "post" => {
             "id"=>1,
             "title"=>"New Post",
             "body"=>"Body"
-          },
-          "id"=>1,
-          "time"=>DateTime.now.to_s
+          }
         }
 
         assert_equal 'application/json', @response.content_type