active_model_serializers_rails_2.3 0.9.0.alpha1 → 0.9.0.pre1

data/test/test_app.rb

@@ -3,9 +3,6 @@ class TestApp < Rails::Application
     config.eager_load = false
     config.secret_key_base = 'abc123'
   end
-
-  # Set up a logger to avoid creating a log directory on every run.
-  config.logger = Logger.new(nil)
 end
 
-TestApp.initialize!
+TestApp.load_generators

data/test/test_helper.rb

@@ -5,9 +5,6 @@ require 'active_model_serializers'
 require 'fixtures/poro'
 require 'fixtures/active_record'
 
-# Ensure backward compatibility with Minitest 4
-Minitest::Test = MiniTest::Unit::TestCase unless defined?(Minitest::Test)
-
 module TestHelper
 end
 

data/test/unit/active_model/array_serializer/meta_test.rb

@@ -3,7 +3,7 @@ require 'active_model/serializer'
 
 module ActiveModel
   class ArraySerializer
-    class MetaTest < Minitest::Test
+    class MetaTest < ActiveRecord::TestCase
       def setup
         @profile1 = Profile.new({ name: 'Name 1', description: 'Description 1', comments: 'Comments 1' })
         @profile2 = Profile.new({ name: 'Name 2', description: 'Description 2', comments: 'Comments 2' })

data/test/unit/active_model/array_serializer/root_test.rb

@@ -2,7 +2,7 @@ require 'test_helper'
 
 module ActiveModel
   class ArraySerializer
-    class RootAsOptionTest < Minitest::Test
+    class RootAsOptionTest < ActiveRecord::TestCase
       def setup
         @old_root = ArraySerializer._root
         @profile1 = Profile.new({ name: 'Name 1', description: 'Description 1', comments: 'Comments 1' })
@@ -50,7 +50,7 @@ module ActiveModel
       end
     end
 
-    class RootInSerializerTest < Minitest::Test
+    class RootInSerializerTest < ActiveRecord::TestCase
       def setup
         @old_root = ArraySerializer._root
         ArraySerializer._root = :in_serializer

data/test/unit/active_model/array_serializer/scope_test.rb

@@ -2,7 +2,7 @@ require 'test_helper'
 
 module ActiveModel
   class ArraySerializer
-    class ScopeTest < Minitest::Test
+    class ScopeTest < ActiveRecord::TestCase
       def test_array_serializer_pass_options_to_items_serializers
         array = [Profile.new({ name: 'Name 1', description: 'Description 1', comments: 'Comments 1' }),
                  Profile.new({ name: 'Name 2', description: 'Description 2', comments: 'Comments 2' })]

data/test/unit/active_model/array_serializer/serialize_test.rb

@@ -0,0 +1,45 @@
+require 'test_helper'
+
+module ActiveModel
+  class ArraySerializer
+    class SerializeTest < ActiveRecord::TestCase
+      def setup
+        array = [1, 2, 3]
+        @serializer = ActiveModel::Serializer.serializer_for(array).new(array)
+      end
+
+      def test_serializer_for_array_returns_appropriate_type
+        assert_kind_of ArraySerializer, @serializer
+      end
+
+      def test_array_serializer_serializes_simple_objects
+        assert_equal [1, 2, 3], @serializer.serializable_array
+        assert_equal [1, 2, 3], @serializer.as_json
+      end
+
+      def test_array_serializer_serializes_models
+        array = [Profile.new({ name: 'Name 1', description: 'Description 1', comments: 'Comments 1' }),
+                 Profile.new({ name: 'Name 2', description: 'Description 2', comments: 'Comments 2' })]
+        serializer = ArraySerializer.new(array)
+
+        expected = [{ name: 'Name 1', description: 'Description 1' },
+                    { name: 'Name 2', description: 'Description 2' }]
+
+        assert_equal expected, serializer.serializable_array
+        assert_equal expected, serializer.as_json
+      end
+
+      def test_array_serializers_each_serializer
+        array = [::Model.new({ name: 'Name 1', description: 'Description 1', comments: 'Comments 1' }),
+                 ::Model.new({ name: 'Name 2', description: 'Description 2', comments: 'Comments 2' })]
+        serializer = ArraySerializer.new(array, each_serializer: ProfileSerializer)
+
+        expected = [{ name: 'Name 1', description: 'Description 1' },
+                    { name: 'Name 2', description: 'Description 2' }]
+
+        assert_equal expected, serializer.serializable_array
+        assert_equal expected, serializer.as_json
+      end
+    end
+  end
+end

data/test/unit/active_model/default_serializer_test.rb

@@ -2,11 +2,13 @@ require 'test_helper'
 
 module ActiveModel
   class DefaultSerializer
-    class Test < Minitest::Test
+    class Test < ActiveRecord::TestCase
       def test_serialize_objects
-        assert_equal(nil, DefaultSerializer.new(nil).serializable_object)
-        assert_equal(1, DefaultSerializer.new(1).serializable_object)
-        assert_equal('hi', DefaultSerializer.new('hi').serializable_object)
+        assert_equal(nil, DefaultSerializer.new(nil).serializable_hash)
+        assert_equal(1, DefaultSerializer.new(1).serializable_hash)
+        assert_equal('hi', DefaultSerializer.new('hi').serializable_hash)
+        obj = Struct.new(:a, :b).new(1, 2)
+        assert_equal({ a: 1, b: 2 }, DefaultSerializer.new(obj).serializable_hash)
       end
     end
   end

data/test/unit/active_model/serializer/attributes_test.rb

@@ -2,7 +2,7 @@ require 'test_helper'
 
 module ActiveModel
   class Serializer
-    class AttributesTest < Minitest::Test
+    class AttributesTest < ActiveRecord::TestCase
       def setup
         @profile = Profile.new({ name: 'Name 1', description: 'Description 1', comments: 'Comments 1' })
         @profile_serializer = ProfileSerializer.new(@profile)
@@ -24,18 +24,6 @@ module ActiveModel
           'profile' => { name: 'Name 1', description: 'Description 1' }
         }, @profile_serializer.as_json)
       end
-
-      def test_attributes_inheritance
-        inherited_serializer_klass = Class.new(ProfileSerializer) do
-          attributes :comments
-        end
-        another_inherited_serializer_klass = Class.new(ProfileSerializer)
-
-        assert_equal([:name, :description, :comments],
-                     inherited_serializer_klass._attributes)
-        assert_equal([:name, :description],
-                     another_inherited_serializer_klass._attributes)
-      end
     end
   end
 end

data/test/unit/active_model/serializer/config_test.rb

@@ -3,7 +3,7 @@ require 'test_helper'
 module ActiveModel
   class Serializer
     class Config
-      class Test < Minitest::Test
+      class Test < ActiveRecord::TestCase
         def test_config_const_is_an_instance_of_config
           assert_kind_of Config, CONFIG
         end
@@ -30,9 +30,9 @@ module ActiveModel
         end
       end
 
-      class ConfigTest < Minitest::Test
+      class ConfigTest < ActiveRecord::TestCase
         def test_setup
-          Serializer.setup do |config|
+          ActiveModel::Serializer.setup do |config|
             config.a = 'v1'
             config.b = 'v2'
           end
@@ -44,7 +44,7 @@ module ActiveModel
         end
 
         def test_config_accessors
-          Serializer.setup do |config|
+          ActiveModel::Serializer.setup do |config|
             config.foo = 'v1'
             config.bar = 'v2'
           end
@@ -63,7 +63,7 @@ module ActiveModel
         end
       end
 
-      class ApplyConfigTest < Minitest::Test
+      class ApplyConfigTest < ActiveRecord::TestCase
         def test_apply_config_to_associations
           CONFIG.embed     = :ids
           CONFIG.embed_in_root = true

data/test/unit/active_model/serializer/filter_test.rb

@@ -2,7 +2,7 @@ require 'test_helper'
 
 module ActiveModel
   class Serializer
-    class FilterAttributesTest < Minitest::Test
+    class FilterAttributesTest < ActiveRecord::TestCase
       def setup
         @profile = Profile.new({ name: 'Name 1', description: 'Description 1', comments: 'Comments 1' })
         @profile_serializer = ProfileSerializer.new(@profile)
@@ -20,7 +20,7 @@ module ActiveModel
       end
     end
 
-    class FilterAssociationsTest < Minitest::Test
+    class FilterAssociationsTest < ActiveRecord::TestCase
       def setup
         @association = PostSerializer._associations[:comments]
         @old_association = @association.dup

data/test/unit/active_model/serializer/has_many_test.rb

@@ -2,7 +2,7 @@ require 'test_helper'
 
 module ActiveModel
   class Serializer
-    class HasManyTest < Minitest::Test
+    class HasManyTest < ActiveRecord::TestCase
       def setup
         @association = PostSerializer._associations[:comments]
         @old_association = @association.dup
@@ -21,18 +21,6 @@ module ActiveModel
         assert_equal 'comments', @association.name
       end
 
-      def test_associations_inheritance
-        inherited_serializer_klass = Class.new(PostSerializer) do
-          has_many :some_associations
-        end
-        another_inherited_serializer_klass = Class.new(PostSerializer)
-
-        assert_equal(PostSerializer._associations.length + 1,
-          inherited_serializer_klass._associations.length)
-        assert_equal(PostSerializer._associations.length,
-          another_inherited_serializer_klass._associations.length)
-      end
-
       def test_associations_embedding_ids_serialization_using_serializable_hash
         @association.embed = :ids
 
@@ -129,9 +117,9 @@ module ActiveModel
       def test_associations_using_a_given_serializer
         @association.embed = :ids
         @association.embed_in_root = true
-        @association.serializer_from_options = Class.new(Serializer) do
+        @association.serializer_class = Class.new(ActiveModel::Serializer) do
           def content
-            object.read_attribute_for_serialization(:content) + '!'
+            'fake'
           end
 
           attributes :content
@@ -139,14 +127,14 @@ module ActiveModel
 
         assert_equal({
           'post' => { title: 'Title 1', body: 'Body 1', 'comment_ids' => @post.comments.map { |c| c.object_id } },
-          comments: [{ content: 'C1!' }, { content: 'C2!' }]
+          comments: [{ content: 'fake' }, { content: 'fake' }]
         }, @post_serializer.as_json)
       end
 
-      def test_associations_embedding_ids_using_a_given_array_serializer
+      def test_associations_using_a_given_array_serializer
         @association.embed = :ids
         @association.embed_in_root = true
-        @association.serializer_from_options = Class.new(ArraySerializer) do
+        @association.serializer_class = Class.new(ActiveModel::ArraySerializer) do
           def serializable_object
             { my_content: ['fake'] }
           end
@@ -157,18 +145,6 @@ module ActiveModel
           comments: { my_content: ['fake'] }
         }, @post_serializer.as_json)
       end
-
-      def test_associations_embedding_objects_using_a_given_array_serializer
-        @association.serializer_from_options = Class.new(ArraySerializer) do
-          def serializable_object
-            { my_content: ['fake'] }
-          end
-        end
-
-        assert_equal({
-          'post' => { title: 'Title 1', body: 'Body 1', comments: { my_content: ['fake'] } }
-        }, @post_serializer.as_json)
-      end
     end
   end
 end

data/test/unit/active_model/serializer/has_one_test.rb

@@ -2,7 +2,7 @@ require 'test_helper'
 
 module ActiveModel
   class Serializer
-    class HasOneTest < Minitest::Test
+    class HasOneTest < ActiveRecord::TestCase
       def setup
         @association = UserSerializer._associations[:profile]
         @old_association = @association.dup
@@ -112,14 +112,14 @@ module ActiveModel
 
         assert_equal({
           'user' => { name: 'Name 1', email: 'mail@server.com', 'profile_id' => @user.profile.object_id },
-          'profiles' => [{ name: 'N1', description: 'D1' }]
+          profile: { name: 'N1', description: 'D1' }
         }, @user_serializer.as_json)
       end
 
-      def test_associations_embedding_ids_using_a_given_serializer
+      def test_associations_using_a_given_serializer
         @association.embed = :ids
         @association.embed_in_root = true
-        @association.serializer_from_options = Class.new(Serializer) do
+        @association.serializer_class = Class.new(ActiveModel::Serializer) do
           def name
             'fake'
           end
@@ -129,21 +129,7 @@ module ActiveModel
 
         assert_equal({
           'user' => { name: 'Name 1', email: 'mail@server.com', 'profile_id' => @user.profile.object_id },
-          'profiles' => [{ name: 'fake' }]
-        }, @user_serializer.as_json)
-      end
-
-      def test_associations_embedding_objects_using_a_given_serializer
-        @association.serializer_from_options = Class.new(Serializer) do
-          def name
-            'fake'
-          end
-
-          attributes :name
-        end
-
-        assert_equal({
-          'user' => { name: 'Name 1', email: 'mail@server.com', profile: { name: 'fake' } }
+          profile: { name: 'fake' }
         }, @user_serializer.as_json)
       end
     end

data/test/unit/active_model/serializer/meta_test.rb

@@ -2,7 +2,7 @@ require 'test_helper'
 
 module ActiveModel
   class Serializer
-    class MetaTest < Minitest::Test
+    class MetaTest < ActiveRecord::TestCase
       def setup
         @profile = Profile.new({ name: 'Name 1', description: 'Description 1', comments: 'Comments 1' })
       end

data/test/unit/active_model/serializer/root_test.rb

@@ -2,7 +2,7 @@ require 'test_helper'
 
 module ActiveModel
   class Serializer
-    class RootAsOptionTest < Minitest::Test
+    class RootAsOptionTest < ActiveRecord::TestCase
       def setup
         @old_root = ProfileSerializer._root
         @profile = Profile.new({ name: 'Name 1', description: 'Description 1', comments: 'Comments 1' })
@@ -54,23 +54,9 @@ module ActiveModel
           name: 'Name 1', description: 'Description 1'
         }, @serializer.as_json)
       end
-
-      def test_root_inheritance
-        ProfileSerializer._root = 'profile'
-
-        inherited_serializer_klass = Class.new(ProfileSerializer)
-        inherited_serializer_klass._root = 'inherited_profile'
-
-        another_inherited_serializer_klass = Class.new(ProfileSerializer)
-
-        assert_equal('inherited_profile',
-                     inherited_serializer_klass._root)
-        assert_equal('profile',
-                     another_inherited_serializer_klass._root)
-      end
     end
 
-    class RootInSerializerTest < Minitest::Test
+    class RootInSerializerTest < ActiveRecord::TestCase
       def setup
         @old_root = ProfileSerializer._root
         ProfileSerializer._root = :in_serializer

data/test/unit/active_model/serializer/scope_test.rb

@@ -2,7 +2,7 @@ require 'test_helper'
 
 module ActiveModel
   class Serializer
-    class ScopeTest < Minitest::Test
+    class ScopeTest < ActiveRecord::TestCase
       def setup
         @serializer = ProfileSerializer.new(nil, scope: current_user)
       end
@@ -17,33 +17,5 @@ module ActiveModel
         'user'
       end
     end
-
-    class NestedScopeTest < Minitest::Test
-      def setup
-        @association = UserSerializer._associations[:profile]
-        @old_association = @association.dup
-        @user = User.new({ name: 'Name 1', email: 'mail@server.com', gender: 'M' })
-        @user_serializer = UserSerializer.new(@user, scope: 'user')
-      end
-
-      def teardown
-        UserSerializer._associations[:profile] = @old_association
-      end
-
-      def test_scope_passed_through
-        @association.serializer_from_options = Class.new(Serializer) do
-          def name
-            scope
-          end
-
-          attributes :name
-        end
-
-        assert_equal({
-          name: 'Name 1', email: 'mail@server.com', profile: { name: 'user' }
-        }, @user_serializer.serializable_hash)
-      end
-    end
-
   end
 end

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active_model_serializers_rails_2.3
 version: !ruby/object:Gem::Version
-  version: 0.9.0.alpha1
-  prerelease: 6
+  version: 0.9.0.pre1
 platform: ruby
 authors:
 - José Valim
@@ -11,12 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-28 00:00:00.000000000 Z
+date: 2013-11-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -24,7 +22,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -44,12 +41,11 @@ files:
 - DESIGN.textile
 - MIT-LICENSE
 - lib/active_model/array_serializer.rb
+- lib/active_model/as_json_overrides.rb
 - lib/active_model/default_serializer.rb
 - lib/active_model/serializable.rb
 - lib/active_model/serializer/associations.rb
 - lib/active_model/serializer/config.rb
-- lib/active_model/serializer/generators/serializer/scaffold_controller_generator.rb
-- lib/active_model/serializer/generators/serializer/templates/controller.rb
 - lib/active_model/serializer/railtie.rb
 - lib/active_model/serializer/version.rb
 - lib/active_model/serializer.rb
@@ -64,10 +60,8 @@ files:
 - test/unit/active_model/array_serializer/meta_test.rb
 - test/unit/active_model/array_serializer/root_test.rb
 - test/unit/active_model/array_serializer/scope_test.rb
-- test/unit/active_model/array_serializer/serialization_test.rb
+- test/unit/active_model/array_serializer/serialize_test.rb
 - test/unit/active_model/default_serializer_test.rb
-- test/unit/active_model/serializer/associations/build_serializer_test.rb
-- test/unit/active_model/serializer/associations_test.rb
 - test/unit/active_model/serializer/attributes_test.rb
 - test/unit/active_model/serializer/config_test.rb
 - test/unit/active_model/serializer/filter_test.rb
@@ -76,30 +70,29 @@ files:
 - test/unit/active_model/serializer/meta_test.rb
 - test/unit/active_model/serializer/root_test.rb
 - test/unit/active_model/serializer/scope_test.rb
-homepage: https://github.com/rails-api/active_model_serializers
+homepage: https://github.com/fivetanley/active_model_serializers_rails/tree/rails-2.3
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>'
+  - - '>'
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Bringing consistency and object orientation to model serialization. Works
   great for client-side MVC frameworks!
 test_files:
@@ -112,10 +105,8 @@ test_files:
 - test/unit/active_model/array_serializer/meta_test.rb
 - test/unit/active_model/array_serializer/root_test.rb
 - test/unit/active_model/array_serializer/scope_test.rb
-- test/unit/active_model/array_serializer/serialization_test.rb
+- test/unit/active_model/array_serializer/serialize_test.rb
 - test/unit/active_model/default_serializer_test.rb
-- test/unit/active_model/serializer/associations/build_serializer_test.rb
-- test/unit/active_model/serializer/associations_test.rb
 - test/unit/active_model/serializer/attributes_test.rb
 - test/unit/active_model/serializer/config_test.rb
 - test/unit/active_model/serializer/filter_test.rb
@@ -124,4 +115,3 @@ test_files:
 - test/unit/active_model/serializer/meta_test.rb
 - test/unit/active_model/serializer/root_test.rb
 - test/unit/active_model/serializer/scope_test.rb
-has_rdoc: 

data/lib/active_model/serializer/generators/serializer/scaffold_controller_generator.rb

@@ -1,14 +0,0 @@
-require 'rails/generators'
-require 'rails/generators/rails/scaffold_controller/scaffold_controller_generator'
-
-module Rails
-  module Generators
-    class ScaffoldControllerGenerator
-      if Rails::VERSION::MAJOR >= 4
-        source_root File.expand_path('../templates', __FILE__)
-
-        hook_for :serializer, default: true
-      end
-    end
-  end
-end

data/lib/active_model/serializer/generators/serializer/templates/controller.rb

@@ -1,93 +0,0 @@
-<% if namespaced? -%>
-require_dependency "<%= namespaced_file_path %>/application_controller"
-
-<% end -%>
-<% module_namespacing do -%>
-class <%= controller_class_name %>Controller < ApplicationController
-  before_action :set_<%= singular_table_name %>, only: [:show, :edit, :update, :destroy]
-
-  # GET <%= route_url %>
-  # GET <%= route_url %>.json
-  def index
-    @<%= plural_table_name %> = <%= orm_class.all(class_name) %>
-
-    respond_to do |format|
-      format.html # index.html.erb
-      format.json { render json: <%= "@#{plural_table_name}" %> }
-    end
-  end
-
-  # GET <%= route_url %>/1
-  # GET <%= route_url %>/1.json
-  def show
-    respond_to do |format|
-      format.html # show.html.erb
-      format.json { render json: <%= "@#{singular_table_name}" %> }
-    end
-  end
-
-  # GET <%= route_url %>/new
-  def new
-    @<%= singular_table_name %> = <%= orm_class.build(class_name) %>
-  end
-
-  # GET <%= route_url %>/1/edit
-  def edit
-  end
-
-  # POST <%= route_url %>
-  # POST <%= route_url %>.json
-  def create
-    @<%= singular_table_name %> = <%= orm_class.build(class_name, "#{singular_table_name}_params") %>
-
-    respond_to do |format|
-      if @<%= orm_instance.save %>
-        format.html { redirect_to @<%= singular_table_name %>, notice: <%= "'#{human_name} was successfully created.'" %> }
-        format.json { render json: <%= "@#{singular_table_name}" %>, status: :created }
-      else
-        format.html { render action: 'new' }
-        format.json { render json: <%= "@#{orm_instance.errors}" %>, status: :unprocessable_entity }
-      end
-    end
-  end
-
-  # PATCH/PUT <%= route_url %>/1
-  # PATCH/PUT <%= route_url %>/1.json
-  def update
-    respond_to do |format|
-      if @<%= orm_instance.update("#{singular_table_name}_params") %>
-        format.html { redirect_to @<%= singular_table_name %>, notice: <%= "'#{human_name} was successfully updated.'" %> }
-        format.json { head :no_content }
-      else
-        format.html { render action: 'edit' }
-        format.json { render json: <%= "@#{orm_instance.errors}" %>, status: :unprocessable_entity }
-      end
-    end
-  end
-
-  # DELETE <%= route_url %>/1
-  # DELETE <%= route_url %>/1.json
-  def destroy
-    @<%= orm_instance.destroy %>
-    respond_to do |format|
-      format.html { redirect_to <%= index_helper %>_url }
-      format.json { head :no_content }
-    end
-  end
-
-  private
-    # Use callbacks to share common setup or constraints between actions.
-    def set_<%= singular_table_name %>
-      @<%= singular_table_name %> = <%= orm_class.find(class_name, "params[:id]") %>
-    end
-
-    # Never trust parameters from the scary internet, only allow the white list through.
-    def <%= "#{singular_table_name}_params" %>
-      <%- if attributes_names.empty? -%>
-      params[<%= ":#{singular_table_name}" %>]
-      <%- else -%>
-      params.require(<%= ":#{singular_table_name}" %>).permit(<%= attributes_names.map { |name| ":#{name}" }.join(', ') %>)
-      <%- end -%>
-    end
-end
-<% end -%>