active_model_serializers 0.5.0 → 0.5.1

data/lib/action_controller/serialization.rb

@@ -49,6 +49,7 @@ module ActionController
 
       if serializer
         options[:scope] = serialization_scope
+        options[:url_options] = url_options
         json = serializer.new(json, options.merge(default_serializer_options || {}))
       end
       super

data/lib/active_model/serializer.rb

@@ -246,12 +246,16 @@ module ActiveModel
         self._attributes = _attributes.dup
 
         attrs.each do |attr|
-          self._attributes[attr] = attr
+          attribute attr
         end
       end
 
       def attribute(attr, options={})
         self._attributes = _attributes.merge(attr => options[:key] || attr)
+
+        unless method_defined?(attr)
+          class_eval "def #{attr}() object.read_attribute_for_serialization(:#{attr}) end", __FILE__, __LINE__
+        end
       end
 
       def associate(klass, attrs) #:nodoc:
@@ -376,6 +380,10 @@ module ActiveModel
       @object, @options = object, options
     end
 
+    def url_options
+      @options[:url_options]
+    end
+
     # Returns a json representation of the serializable
     # object including the root.
     def as_json(options=nil)
@@ -490,11 +498,13 @@ module ActiveModel
       hash = {}
 
       _attributes.each do |name,key|
-        hash[key] = @object.read_attribute_for_serialization(name)
+        hash[key] = read_attribute_for_serialization(name)
       end
 
       hash
     end
+
+    alias :read_attribute_for_serialization :send
   end
 end
 

data/lib/active_model/serializers/version.rb

@@ -1,5 +1,5 @@
 module ActiveModel
   class Serializer
-    VERSION = "0.5.0"
+    VERSION = "0.5.1"
   end
 end

data/lib/active_model_serializers.rb

@@ -10,6 +10,12 @@ if defined?(Rails)
         Rails::Generators.configure!(app.config.generators)
         require "generators/resource_override"
       end
+
+      initializer "include_routes.active_model_serializer" do |app|
+        ActiveSupport.on_load(:active_model_serializers) do
+          include app.routes.url_helpers
+        end
+      end
     end
   end
 end
@@ -57,3 +63,5 @@ begin
 rescue LoadError => ex
   # rails on installed, continuing
 end
+
+ActiveSupport.run_load_hooks(:active_model_serializers, ActiveModel::Serializer)

data/lib/generators/serializer/serializer_generator.rb

@@ -30,7 +30,7 @@ module Rails
         # Only works on 3.2
         # elsif (n = Rails::Generators.namespace) && n.const_defined?(:ApplicationSerializer)
         #   "ApplicationSerializer"
-        elsif defined?(:ApplicationSerializer)
+        elsif defined?(::ApplicationSerializer)
           "ApplicationSerializer"
         else
           "ActiveModel::Serializer"

data/test/generators_test.rb

@@ -16,12 +16,12 @@ class SerializerGeneratorTest < Rails::Generators::TestCase
 
   def test_generates_a_serializer
     run_generator
-    assert_file "app/serializers/account_serializer.rb", /class AccountSerializer < ApplicationSerializer/
+    assert_file "app/serializers/account_serializer.rb", /class AccountSerializer < ActiveModel::Serializer/
   end
 
   def test_generates_a_namespaced_serializer
     run_generator ["admin/account"]
-    assert_file "app/serializers/admin/account_serializer.rb", /class Admin::AccountSerializer < ApplicationSerializer/
+    assert_file "app/serializers/admin/account_serializer.rb", /class Admin::AccountSerializer < ActiveModel::Serializer/
   end
 
   def test_uses_application_serializer_if_one_exists
@@ -62,6 +62,6 @@ class SerializerGeneratorTest < Rails::Generators::TestCase
 
   def test_with_no_attributes_does_not_add_extra_space
     run_generator ["account"]
-    assert_file "app/serializers/account_serializer.rb", /class AccountSerializer < ApplicationSerializer\nend/
+    assert_file "app/serializers/account_serializer.rb", /class AccountSerializer < ActiveModel::Serializer\nend/
   end
 end

data/test/serialization_test.rb

@@ -54,6 +54,18 @@ class RenderJsonTest < ActionController::TestCase
     end
   end
 
+  class HypermediaSerializable
+    def active_model_serializer
+      HypermediaSerializer
+    end
+  end
+
+  class HypermediaSerializer < ActiveModel::Serializer
+    def as_json(*)
+      { :link => hypermedia_url }
+    end
+  end
+
   class TestController < ActionController::Base
     protect_from_forgery
 
@@ -124,6 +136,10 @@ class RenderJsonTest < ActionController::TestCase
       render :json => [], :serializer => CustomSerializer
     end
 
+    def render_json_with_links
+      render :json => HypermediaSerializable.new
+    end
+
   private
     def default_serializer_options
       if params[:check_defaults]
@@ -229,4 +245,9 @@ class RenderJsonTest < ActionController::TestCase
     get :render_json_with_custom_serializer
     assert_match '{"hello":true}', @response.body
   end
+
+  def test_render_json_with_links
+    get :render_json_with_links
+    assert_match '{"link":"http://www.nextangle.com/hypermedia"}', @response.body
+  end
 end

data/test/serializer_test.rb

@@ -132,6 +132,12 @@ class SerializerTest < ActiveModel::TestCase
     }, hash)
   end
 
+  def test_serializer_receives_url_options
+    user = User.new
+    user_serializer = UserSerializer.new(user, :url_options => { :host => "test.local" })
+    assert_equal({ :host => "test.local" }, user_serializer.url_options)
+  end
+
   def test_pretty_accessors
     user = User.new
     user.superuser = true
@@ -814,4 +820,66 @@ class SerializerTest < ActiveModel::TestCase
       ]
     }, actual)
   end
+
+  def test_can_customize_attributes
+    serializer = Class.new(ActiveModel::Serializer) do
+      attributes :title, :body
+
+      def title
+        object.title.upcase
+      end
+    end
+
+    klass = Class.new do
+      def read_attribute_for_serialization(name)
+        { :title => "New post!", :body => "First post body" }[name]
+      end
+
+      def title
+        read_attribute_for_serialization(:title)
+      end
+
+      def body
+        read_attribute_for_serialization(:body)
+      end
+    end
+
+    object = klass.new
+
+    actual = serializer.new(object, :root => :post).as_json
+
+    assert_equal({
+      :post => {
+        :title => "NEW POST!",
+        :body => "First post body"
+      }
+    }, actual)
+  end
+
+  def test_can_customize_attributes_with_read_attributes
+    serializer = Class.new(ActiveModel::Serializer) do
+      attributes :title, :body
+
+      def read_attribute_for_serialization(name)
+        { :title => "New post!", :body => "First post body" }[name]
+      end
+    end
+
+    actual = serializer.new(Object.new, :root => :post).as_json
+
+    assert_equal({
+      :post => {
+        :title => "New post!",
+        :body => "First post body"
+      }
+    }, actual)
+  end
+
+  def test_active_support_on_load_hooks_fired
+    loaded = nil
+    ActiveSupport.on_load(:active_model_serializers) do
+      loaded = self
+    end
+    assert_equal ActiveModel::Serializer, loaded
+  end
 end

data/test/test_helper.rb

@@ -20,11 +20,13 @@ require 'rails'
 module TestHelper
   Routes = ActionDispatch::Routing::RouteSet.new
   Routes.draw do
+    resource :hypermedia
     match ':controller(/:action(/:id))'
     match ':controller(/:action)'
   end
 
   ActionController::Base.send :include, Routes.url_helpers
+  ActiveModel::Serializer.send :include, Routes.url_helpers
 end
 
 ActiveSupport::TestCase.class_eval do
@@ -32,3 +34,7 @@ ActiveSupport::TestCase.class_eval do
     @routes = ::TestHelper::Routes
   end
 end
+
+class Object
+  undef_method :id if respond_to?(:id)
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active_model_serializers
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.1
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-16 00:00:00.000000000 Z
+date: 2012-05-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &2153228860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -22,15 +22,10 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '3.0'
+  version_requirements: *2153228860
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &2153227780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -38,12 +33,7 @@ dependencies:
         version: '3.0'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '3.0'
+  version_requirements: *2153227780
 description: Making it easy to serialize models for client-side use
 email:
 - jose.valim@gmail.com
@@ -95,7 +85,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: Bringing consistency and object orientation to model serialization. Works
@@ -107,3 +97,4 @@ test_files:
 - test/serializer_support_test.rb
 - test/serializer_test.rb
 - test/test_helper.rb
+has_rdoc: