active_model_serializers 0.10.2 → 0.10.3

data/test/action_controller/json_api/transform_test.rb

@@ -5,7 +5,9 @@ module ActionController
     class JsonApi
       class KeyTransformTest < ActionController::TestCase
         class KeyTransformTestController < ActionController::Base
-          Post = Class.new(::Model)
+          class Post < ::Model; end
+          class Author < ::Model; end
+          class TopComment < ::Model; end
           class PostSerializer < ActiveModel::Serializer
             type 'posts'
             attributes :title, :body, :publish_at
@@ -22,13 +24,11 @@ module ActionController
             end
           end
 
-          Author = Class.new(::Model)
           class AuthorSerializer < ActiveModel::Serializer
             type 'authors'
             attributes :first_name, :last_name
           end
 
-          TopComment = Class.new(::Model)
           class TopCommentSerializer < ActiveModel::Serializer
             type 'top_comments'
             attributes :body

data/test/action_controller/lookup_proc_test.rb

@@ -0,0 +1,49 @@
+require 'test_helper'
+
+module ActionController
+  module Serialization
+    class LookupProcTest < ActionController::TestCase
+      module Api
+        module V3
+          class PostCustomSerializer < ActiveModel::Serializer
+            attributes :title, :body
+
+            belongs_to :author
+          end
+
+          class AuthorCustomSerializer < ActiveModel::Serializer
+            attributes :name
+          end
+
+          class LookupProcTestController < ActionController::Base
+            def implicit_namespaced_serializer
+              author = Author.new(name: 'Bob')
+              post = Post.new(title: 'New Post', body: 'Body', author: author)
+
+              render json: post
+            end
+          end
+        end
+      end
+
+      tests Api::V3::LookupProcTestController
+
+      test 'implicitly uses namespaced serializer' do
+        controller_namespace = lambda do |resource_class, _parent_serializer_class, namespace|
+          "#{namespace}::#{resource_class}CustomSerializer" if namespace
+        end
+
+        with_prepended_lookup(controller_namespace) do
+          get :implicit_namespaced_serializer
+
+          assert_serializer Api::V3::PostCustomSerializer
+
+          expected = { 'title' => 'New Post', 'body' => 'Body', 'author' => { 'name' => 'Bob' } }
+          actual = JSON.parse(@response.body)
+
+          assert_equal expected, actual
+        end
+      end
+    end
+  end
+end

data/test/action_controller/namespace_lookup_test.rb

@@ -0,0 +1,226 @@
+require 'test_helper'
+
+module ActionController
+  module Serialization
+    class NamespaceLookupTest < ActionController::TestCase
+      class Book < ::Model; end
+      class Page < ::Model; end
+      class Chapter < ::Model; end
+      class Writer < ::Model; end
+
+      module Api
+        module V2
+          class BookSerializer < ActiveModel::Serializer
+            attributes :title
+          end
+        end
+
+        module VHeader
+          class BookSerializer < ActiveModel::Serializer
+            attributes :title, :body
+
+            def body
+              'header'
+            end
+          end
+        end
+
+        module V3
+          class BookSerializer < ActiveModel::Serializer
+            attributes :title, :body
+
+            belongs_to :writer
+            has_many :chapters
+          end
+
+          class ChapterSerializer < ActiveModel::Serializer
+            attribute :title do
+              "Chapter - #{object.title}"
+            end
+          end
+
+          class WriterSerializer < ActiveModel::Serializer
+            attributes :name
+          end
+
+          class LookupTestController < ActionController::Base
+            before_action only: [:namespace_set_in_before_filter] do
+              self.namespace_for_serializer = Api::V2
+            end
+
+            def implicit_namespaced_serializer
+              writer = Writer.new(name: 'Bob')
+              book = Book.new(title: 'New Post', body: 'Body', writer: writer, chapters: [])
+
+              render json: book
+            end
+
+            def implicit_namespaced_collection_serializer
+              chapter1 = Chapter.new(title: 'Oh')
+              chapter2 = Chapter.new(title: 'Oh my')
+
+              render json: [chapter1, chapter2]
+            end
+
+            def implicit_has_many_namespaced_serializer
+              chapter1 = Chapter.new(title: 'Odd World')
+              chapter2 = Chapter.new(title: 'New World')
+              book = Book.new(title: 'New Post', body: 'Body', chapters: [chapter1, chapter2])
+
+              render json: book
+            end
+
+            def explicit_namespace_as_module
+              book = Book.new(title: 'New Post', body: 'Body')
+
+              render json: book, namespace: Api::V2
+            end
+
+            def explicit_namespace_as_string
+              book = Book.new(title: 'New Post', body: 'Body')
+
+              # because this is a string, ruby can't auto-lookup the constant, so otherwise
+              # the looku things we mean ::Api::V2
+              render json: book, namespace: 'ActionController::Serialization::NamespaceLookupTest::Api::V2'
+            end
+
+            def explicit_namespace_as_symbol
+              book = Book.new(title: 'New Post', body: 'Body')
+
+              # because this is a string, ruby can't auto-lookup the constant, so otherwise
+              # the looku things we mean ::Api::V2
+              render json: book, namespace: :'ActionController::Serialization::NamespaceLookupTest::Api::V2'
+            end
+
+            def invalid_namespace
+              book = Book.new(title: 'New Post', body: 'Body')
+
+              render json: book, namespace: :api_v2
+            end
+
+            def namespace_set_in_before_filter
+              book = Book.new(title: 'New Post', body: 'Body')
+              render json: book
+            end
+
+            def namespace_set_by_request_headers
+              book = Book.new(title: 'New Post', body: 'Body')
+              version_from_header = request.headers['X-API_VERSION']
+              namespace = "ActionController::Serialization::NamespaceLookupTest::#{version_from_header}"
+
+              render json: book, namespace: namespace
+            end
+          end
+        end
+      end
+
+      tests Api::V3::LookupTestController
+
+      setup do
+        @test_namespace = self.class.parent
+      end
+
+      test 'uses request headers to determine the namespace' do
+        request.env['X-API_VERSION'] = 'Api::VHeader'
+        get :namespace_set_by_request_headers
+
+        assert_serializer Api::VHeader::BookSerializer
+      end
+
+      test 'implicitly uses namespaced serializer' do
+        get :implicit_namespaced_serializer
+
+        assert_serializer Api::V3::BookSerializer
+
+        expected = { 'title' => 'New Post', 'body' => 'Body', 'writer' => { 'name' => 'Bob' }, 'chapters' => [] }
+        actual = JSON.parse(@response.body)
+
+        assert_equal expected, actual
+      end
+
+      test 'implicitly uses namespaced serializer for collection' do
+        get :implicit_namespaced_collection_serializer
+
+        assert_serializer 'ActiveModel::Serializer::CollectionSerializer'
+
+        expected = [{ 'title' => 'Chapter - Oh' }, { 'title' => 'Chapter - Oh my' }]
+        actual = JSON.parse(@response.body)
+
+        assert_equal expected, actual
+      end
+
+      test 'implicitly uses namespaced serializer for has_many' do
+        get :implicit_has_many_namespaced_serializer
+
+        assert_serializer Api::V3::BookSerializer
+
+        expected = {
+          'title' => 'New Post',
+          'body' => 'Body', 'writer' => nil,
+          'chapters' => [
+            { 'title' => 'Chapter - Odd World' },
+            { 'title' => 'Chapter - New World' }
+          ]
+        }
+        actual = JSON.parse(@response.body)
+
+        assert_equal expected, actual
+      end
+
+      test 'explicit namespace as module' do
+        get :explicit_namespace_as_module
+
+        assert_serializer Api::V2::BookSerializer
+
+        expected = { 'title' => 'New Post' }
+        actual = JSON.parse(@response.body)
+
+        assert_equal expected, actual
+      end
+
+      test 'explicit namespace as string' do
+        get :explicit_namespace_as_string
+
+        assert_serializer Api::V2::BookSerializer
+
+        expected = { 'title' => 'New Post' }
+        actual = JSON.parse(@response.body)
+
+        assert_equal expected, actual
+      end
+
+      test 'explicit namespace as symbol' do
+        get :explicit_namespace_as_symbol
+
+        assert_serializer Api::V2::BookSerializer
+
+        expected = { 'title' => 'New Post' }
+        actual = JSON.parse(@response.body)
+
+        assert_equal expected, actual
+      end
+
+      test 'invalid namespace' do
+        get :invalid_namespace
+
+        assert_serializer ActiveModel::Serializer::Null
+
+        expected = { 'title' => 'New Post', 'body' => 'Body' }
+        actual = JSON.parse(@response.body)
+
+        assert_equal expected, actual
+      end
+
+      test 'namespace set in before filter' do
+        get :namespace_set_in_before_filter
+
+        assert_serializer Api::V2::BookSerializer
+
+        expected = { 'title' => 'New Post' }
+        actual = JSON.parse(@response.body)
+
+        assert_equal expected, actual
+      end
+    end
+  end
+end

data/test/active_model_serializers/key_transform_test.rb

@@ -60,6 +60,14 @@ module ActiveModelSerializers
         {
           value: nil,
           expected: nil
+        },
+        {
+          value: [
+            { some_value: 'value' }
+          ],
+          expected: [
+            { SomeValue: 'value' }
+          ]
         }
       ]
       scenarios.each do |s|
@@ -126,6 +134,14 @@ module ActiveModelSerializers
         {
           value: nil,
           expected: nil
+        },
+        {
+          value: [
+            { some_value: 'value' }
+          ],
+          expected: [
+            { someValue: 'value' }
+          ]
         }
       ]
       scenarios.each do |s|
@@ -188,6 +204,14 @@ module ActiveModelSerializers
         {
           value: nil,
           expected: nil
+        },
+        {
+          value: [
+            { 'some_value' => 'value' }
+          ],
+          expected: [
+            { 'some-value' => 'value' }
+          ]
         }
       ]
       scenarios.each do |s|
@@ -254,6 +278,14 @@ module ActiveModelSerializers
         {
           value: nil,
           expected: nil
+        },
+        {
+          value: [
+            { 'some-value' => 'value' }
+          ],
+          expected: [
+            { 'some_value' => 'value' }
+          ]
         }
       ]
       scenarios.each do |s|

data/test/active_model_serializers/model_test.rb

@@ -7,5 +7,16 @@ module ActiveModelSerializers
     def setup
       @resource = ActiveModelSerializers::Model.new
     end
+
+    def test_initialization_with_string_keys
+      klass = Class.new(ActiveModelSerializers::Model) do
+        attr_accessor :key
+      end
+      value = 'value'
+
+      model_instance = klass.new('key' => value)
+
+      assert_equal model_instance.read_attribute_for_serialization(:key), value
+    end
   end
 end

data/test/adapter/attributes_test.rb

@@ -0,0 +1,43 @@
+require 'test_helper'
+
+module ActiveModelSerializers
+  module Adapter
+    class AttributesTest < ActiveSupport::TestCase
+      class Person
+        include ActiveModel::Model
+        include ActiveModel::Serialization
+
+        attr_accessor :first_name, :last_name
+      end
+
+      class PersonSerializer < ActiveModel::Serializer
+        attributes :first_name, :last_name
+      end
+
+      def setup
+        ActionController::Base.cache_store.clear
+      end
+
+      def test_serializable_hash
+        person = Person.new(first_name: 'Arthur', last_name: 'Dent')
+        serializer = PersonSerializer.new(person)
+        adapter = ActiveModelSerializers::Adapter::Attributes.new(serializer)
+
+        assert_equal({ first_name: 'Arthur', last_name: 'Dent' },
+          adapter.serializable_hash)
+      end
+
+      def test_serializable_hash_with_transform_key_casing
+        person = Person.new(first_name: 'Arthur', last_name: 'Dent')
+        serializer = PersonSerializer.new(person)
+        adapter = ActiveModelSerializers::Adapter::Attributes.new(
+          serializer,
+          key_transform: :camel_lower
+        )
+
+        assert_equal({ firstName: 'Arthur', lastName: 'Dent' },
+          adapter.serializable_hash)
+      end
+    end
+  end
+end

data/test/adapter/json/transform_test.rb

@@ -15,7 +15,7 @@ module ActiveModelSerializers
           @adapter = ActiveModelSerializers::Adapter::Json.new(serializer, options)
         end
 
-        Post = Class.new(::Model)
+        class Post < ::Model; end
         class PostSerializer < ActiveModel::Serializer
           attributes :id, :title, :body, :publish_at
         end

data/test/adapter/json_api/fields_test.rb

@@ -4,7 +4,10 @@ module ActiveModelSerializers
   module Adapter
     class JsonApi
       class FieldsTest < ActiveSupport::TestCase
-        Post = Class.new(::Model)
+        class Post < ::Model; end
+        class Author < ::Model; end
+        class Comment < ::Model; end
+
         class PostSerializer < ActiveModel::Serializer
           type 'posts'
           attributes :title, :body
@@ -12,13 +15,11 @@ module ActiveModelSerializers
           has_many :comments
         end
 
-        Author = Class.new(::Model)
         class AuthorSerializer < ActiveModel::Serializer
           type 'authors'
           attributes :name, :birthday
         end
 
-        Comment = Class.new(::Model)
         class CommentSerializer < ActiveModel::Serializer
           type 'comments'
           attributes :body