rabl-rails 0.1.2 → 0.1.3

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # CHANGELOG
 
+## 0.1.3
+  * Render correcly when variables are not passed via the assigns ivar but as helper methods
+    (decent_exposure, focused_controller)
+  * Add custom Responder
+
 ## 0.1.2
   * Add RablRails#render method (see README or source code)
   * Fix fail when JSON engine is not found. Now fallback to MultiJson.default_adapter

data/lib/rabl-rails.rb

@@ -17,31 +17,41 @@ require 'multi_json'
 
 module RablRails
   extend Renderer
-  
+
+  autoload :Responder, 'rabl-rails/responder'
+
   mattr_accessor :cache_templates
   @@cache_templates = true
-  
+
   mattr_accessor :include_json_root
   @@include_json_root = true
 
   mattr_reader :json_engine
   @@json_engine = :yajl
 
+  mattr_accessor :use_custom_responder
+  @@use_custom_responder = false
+
+  mattr_accessor :responder_default_template
+  @@responder_default_template = 'show'
+
   def self.configure
     yield self
+
+    ActionController::Base.responder = Responder if self.use_custom_responder
   end
-  
+
   def self.json_engine=(name)
     MultiJson.engine = name
     @@json_engine = name
   rescue LoadError
     Rails.logger.warn %Q(WARNING: rabl-rails could not load "#{self.json_engine}" as JSON engine, fallback to default)
   end
-  
+
   def self.cache_templates?
     ActionController::Base.perform_caching && @@cache_templates
   end
-  
+
   def self.load_default_engines!
     self.json_engine = :yajl
   end

data/lib/rabl-rails/compiler.rb

@@ -133,7 +133,7 @@ module RablRails
         name_or_data
       end
     end
-    
+
     def sub_compile(data)
       return {} unless block_given?
       old_template, @template = @template, {}

data/lib/rabl-rails/renderers/base.rb

@@ -18,7 +18,9 @@ module RablRails
       # method defined by the renderer.
       #
       def render(template)
-        collection_or_resource = instance_variable_get(template.data) if template.data
+        collection_or_resource = if template.data
+          template.data.to_s.start_with?('@') ? instance_variable_get(template.data) : @_context.send(template.data)
+        end
         collection_or_resource = @_context.target_object unless collection_or_resource || template.data == false || !@_context.respond_to?(:target_object)
         output_hash = collection_or_resource.respond_to?(:each) ? render_collection(collection_or_resource, template.source) :
           render_resource(collection_or_resource, template.source)
@@ -55,7 +57,13 @@ module RablRails
           when Hash
             current_value = value.dup
             data_symbol = current_value.delete(:_data)
-            object = data_symbol.nil? ? data : data_symbol.to_s.start_with?('@') ? instance_variable_get(data_symbol) : data.send(data_symbol)
+            object = if data_symbol == nil
+              data
+            else
+              data_symbol.to_s.start_with?('@') ? instance_variable_get(data_symbol)
+                                                : data.respond_to?(data_symbol) ? data.send(data_symbol)
+                                                                                : send(data_symbol)
+            end
 
             if key.to_s.start_with?('_') # glue
               current_value.each_pair { |k, v|

data/lib/rabl-rails/responder.rb

@@ -0,0 +1,22 @@
+module RablRails
+  #
+  # Override default responder's api behavior to not
+  # user to_format methods on a resource as a default
+  # representation but instead use a rabl template
+  #
+  class Responder < ActionController::Responder
+    protected
+    
+    def api_behavior(error)
+      rabl_options = options.merge(template: RablRails.responder_default_template)
+      
+      if get?
+        controller.default_render rabl_options
+      elsif post?
+        controller.default_render rabl_options.merge!(status: :created, location: api_location)
+      else
+        head :no_content
+      end
+    end
+  end
+end

data/lib/rabl-rails/version.rb

@@ -1,3 +1,3 @@
 module RablRails
-  VERSION = '0.1.2'
+  VERSION = '0.1.3'
 end

data/test/deep_nesting_test.rb

@@ -19,7 +19,6 @@ class DeepNestingTest < ActiveSupport::TestCase
     @post = Post.new(42, 'I rock !')
     @user = User.new(1, 'foobar', 'male')
     @user.stub(:posts).and_return([@post])
-    @user.stub(:respond_to?).with(:each).and_return(false)
 
     @context = Context.new
     @context.assigns['user'] = @user

data/test/renderers/json_renderer_test.rb

@@ -4,7 +4,6 @@ class TestJsonRenderer < ActiveSupport::TestCase
 
   setup do
     @data = User.new(1, 'foobar', 'male')
-    @data.stub(:respond_to?).with(:each).and_return(false)
 
     @context = Context.new
     @context.assigns['data'] = @data
@@ -28,6 +27,13 @@ class TestJsonRenderer < ActiveSupport::TestCase
     assert_equal %q([{}]), render_json_output
   end
 
+  test "render object with local methods (used by decent_exposure)" do
+    @context.stub(:user).and_return(@data)
+    @template.data = :user
+    @template.source = { :id => :id }
+    assert_equal %q({"id":1}), render_json_output
+  end
+
   test "render single object attributes" do
     @template.source = { :id => :id, :name => :name }
     assert_equal %q({"id":1,"name":"foobar"}), render_json_output
@@ -44,6 +50,12 @@ class TestJsonRenderer < ActiveSupport::TestCase
     assert_equal %q({"author":{"name":"foobar"}}), render_json_output
   end
 
+  test "render child with local methods (used by decent_exposure)" do
+    @context.stub(:user).and_return(@data)
+    @template.source = { :author => { :_data => :user, :name => :name } }
+    assert_equal %q({"author":{"name":"foobar"}}), render_json_output
+  end
+
   test "render glued attributes from single object" do
     @template.source = { :_glue0 => { :_data => :@data, :name => :name } }
     assert_equal %q({"name":"foobar"}), render_json_output
@@ -75,7 +87,7 @@ class TestJsonRenderer < ActiveSupport::TestCase
     @template.source = { :name => [condition, proc] }
     assert_equal %q({}), render_json_output
   end
-  
+
   test "node with context method call" do
     @context.stub(:respond_to?).with(:context_method).and_return(true)
     @context.stub(:context_method).and_return('marty')
@@ -86,7 +98,6 @@ class TestJsonRenderer < ActiveSupport::TestCase
 
   test "partial should be evaluated at rendering time" do
     # Set assigns
-    @data.stub(:respond_to?).with(:empty?).and_return(false)
     @context.assigns['user'] = @data
 
     # Stub Library#get
@@ -114,17 +125,17 @@ class TestJsonRenderer < ActiveSupport::TestCase
 
     assert_equal %q({"users":[]}), render_json_output
   end
-  
+
   test "render object with root node" do
     @template.root_name = :author
     @template.source = { :id => :id, :name => :name }
-    assert_equal %q({"author":{"id":1,"name":"foobar"}}), render_json_output    
+    assert_equal %q({"author":{"id":1,"name":"foobar"}}), render_json_output
   end
-  
+
   test "render object with root options set to false" do
     RablRails.include_json_root = false
     @template.root_name = :author
     @template.source = { :id => :id, :name => :name }
-    assert_equal %q({"id":1,"name":"foobar"}), render_json_output    
+    assert_equal %q({"id":1,"name":"foobar"}), render_json_output
   end
 end

data/test/test_helper.rb

@@ -32,12 +32,12 @@ end
 
 class Context
   attr_writer :virtual_path
-  
+
   def initialize
     @_assigns = {}
     @virtual_path = nil
   end
-  
+
   def assigns
     @_assigns
   end
@@ -47,4 +47,11 @@ class Context
   end
 end
 
-User = Struct.new(:id, :name, :sex)
+class User
+  attr_accessor :id, :name, :sex
+  def initialize(id=nil, name=nil, sex=nil)
+    @id = id
+    @name = name
+    @sex = sex
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rabl-rails
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-03 00:00:00.000000000 Z
+date: 2012-09-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -80,6 +80,7 @@ files:
 - lib/rabl-rails/renderer.rb
 - lib/rabl-rails/renderers/base.rb
 - lib/rabl-rails/renderers/json.rb
+- lib/rabl-rails/responder.rb
 - lib/rabl-rails/template.rb
 - lib/rabl-rails/version.rb
 - lib/tasks/rabl-rails.rake