rabl-rails 0.3.1 → 0.3.2

data/CHANGELOG.md

@@ -1,6 +1,10 @@
 # CHANGELOG
 
-## 0.3.2 (unreleased)
+## 0.3.2
+  * Using child with a nil value will be correctly formatted as nil
+  * Allow controller's assigns to have symbol keys
+  * Does not modify in place format extracted from context
+  * Add JSONP support
 
 ## 0.3.1
   * Add `merge` keywork

data/README.md

@@ -95,6 +95,7 @@ RablRails.configure do |config|
   # config.xml_engine = 'LibXML'
   # config.use_custom_responder = false
 	# config.default_responder_template = 'show'
+  # config.enable_jsonp_callbacks = false
 end
 ```
 
@@ -207,7 +208,7 @@ node(:full_name) { |u| u.first_name + " " + u.last_name }
 You can add condition on your custom nodes (if the condition is evaluated to false, the node will not be included).
 
 ```ruby
-node(:email, if: -> { |u| u.valid_email? }) do |u|
+node(:email, if: ->(u) { u.valid_email? }) do |u|
 	u.email
 end
 ```

data/lib/rabl-rails/library.rb

@@ -14,8 +14,7 @@ module RablRails
 
       compiled_template = compile_template_from_source(source, path)
 
-      format = context.params[:format] ? context.params[:format].to_s : 'json'
-      format.upcase!
+      format = context.params[:format] ? context.params[:format].to_s.upcase : :JSON
       Renderers.const_get(format).new(context, locals).render(compiled_template)
     end
 
@@ -30,7 +29,7 @@ module RablRails
 
     def compile_template_from_path(path)
       return @cached_templates[path].dup if @cached_templates.has_key?(path)
-      
+
       t = @lookup_context.find_template(path, [], false)
       compile_template_from_source(t.source, path)
     end

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

@@ -57,11 +57,11 @@ module RablRails
             result = instance_exec data, &value
 
             if key.to_s.start_with?('_') # merge
-              raise PartialError, '`merge` block should return a hash' unless result.is_a?(Hash) 
+              raise PartialError, '`merge` block should return a hash' unless result.is_a?(Hash)
               output.merge!(result)
               next output
             else # node
-               result
+              result
             end
           when Array # node with condition
             next output if !instance_exec data, &(value.first)
@@ -81,7 +81,11 @@ module RablRails
               output.merge!(render_resource(object, current_value))
               next output
             else # child
-              object.respond_to?(:each) ? render_collection(object, current_value) : render_resource(object, current_value)
+              if object
+                object.respond_to?(:each) ? render_collection(object, current_value) : render_resource(object, current_value)
+              else
+                nil
+              end
             end
           when Condition
             if instance_exec data, &(value.proc)
@@ -94,6 +98,10 @@ module RablRails
         }
       end
 
+      def params
+        @_context.params
+      end
+
       #
       # Call the render_resource mtehod on each object of the collection
       # and return an array of the returned values.
@@ -132,7 +140,7 @@ module RablRails
       #
       def setup_render_context
         @_context.instance_variable_get(:@_assigns).each_pair { |k, v|
-          instance_variable_set("@#{k}", v) unless k.start_with?('_')
+          instance_variable_set("@#{k}", v) unless k.to_s.start_with?('_')
         }
       end
     end

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

@@ -3,7 +3,9 @@ module RablRails
     class JSON < Base
       def format_output(hash)
         hash = { _options[:root_name] => hash } if _options[:root_name] && RablRails.include_json_root
-        MultiJson.encode(hash)
+        json = MultiJson.encode(hash)
+
+        RablRails.enable_jsonp_callbacks && params.has_key?(:callback) ? "#{params[:callback]}(#{json})" : json
       end
     end
   end

data/lib/rabl-rails/version.rb

@@ -1,3 +1,3 @@
 module RablRails
-  VERSION = '0.3.1'
+  VERSION = '0.3.2'
 end

data/lib/rabl-rails.rb

@@ -39,6 +39,9 @@ module RablRails
   mattr_accessor :include_plist_root
   @@include_plist_root = nil
 
+  mattr_accessor :enable_jsonp_callbacks
+  @@enable_jsonp_callbacks = false
+
   def self.configure
     yield self
 

data/rabl-rails.gemspec

@@ -8,8 +8,8 @@ Gem::Specification.new do |s|
   s.authors     = ["Christopher Cocchi-Perrier"]
   s.email       = ["cocchi.c@gmail.com"]
   s.homepage    = "https://github.com/ccocchi/rabl-rails"
-  s.summary     = "Fast Rails 3+ templating system with JSON and XML support"
-  s.description = "Fast Rails 3+ templating system with JSON and XML support"
+  s.summary     = "Fast Rails 3+ templating system with JSON, XML and PList support"
+  s.description = "Fast Rails 3+ templating system with JSON, XML and PList support"
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- test/*`.split("\n")
@@ -19,4 +19,5 @@ Gem::Specification.new do |s|
   s.add_dependency "railties", "~> 3.0"
 
   s.add_development_dependency "actionpack", "~> 3.0"
+  s.add_development_dependency "rspec-mocks"
 end

data/test/base_renderer_test.rb

@@ -0,0 +1,35 @@
+require 'test_helper'
+
+class TestBaseRenderer < ActiveSupport::TestCase
+
+  RablRails::Renderers::Base.class_eval do
+    def format_output(hash)
+      hash
+    end
+  end
+
+  setup do
+    @data = User.new(1, 'foobar', 'male')
+
+    @context = Context.new
+    @context.assigns['data'] = @data
+
+    @template = RablRails::CompiledTemplate.new
+    @template.data = :@data
+  end
+
+  def render_hash
+    RablRails::Renderers::Base.new(@context).render(@template)
+  end
+
+  test "child with nil data should render nil" do
+    @template.source = { :author => { :_data => :@nil, :name => :name } }
+    assert_equal({ :author => nil }, render_hash)
+  end
+
+  test "properly handle assigns with symbol keys" do
+    @context.assigns[:foo] = 'bar'
+    @template.source = {}
+    assert_nothing_raised { render_hash }
+  end
+end

data/test/keyword_test.rb

@@ -25,7 +25,7 @@ class KeywordTest < ActiveSupport::TestCase
     @context.stub(lookup_context: nil)
   end
 
-  test "collections model should render correctly" do
+  test "collections model should not collide with rabl-rails reserved keyword" do
     source = %{
       object :@user
       child(:@collections => :collections) do

data/test/renderers/json_renderer_test.rb

@@ -13,7 +13,7 @@ class TestJsonRenderer < ActiveSupport::TestCase
   end
 
   def render_json_output
-    RablRails::Renderers::JSON.new(@context).render(@template).to_s
+    RablRails::Renderers::JSON.new(@context).render(@template)
   end
 
   test "render object wth empty template" do
@@ -167,4 +167,11 @@ class TestJsonRenderer < ActiveSupport::TestCase
     @template.source = { :_merge0 => ->(c) { { :custom => c.name } } }
     assert_equal %q({"custom":"foobar"}), render_json_output
   end
+
+  test "render with jsonp callback" do
+    RablRails.enable_jsonp_callbacks = true
+    @context.stub(:params).and_return({ callback: 'some_callback' })
+    @template.source = { :name => :name }
+    assert_equal %q[some_callback({"name":"foobar"})], render_json_output
+  end
 end

data/test/test_helper.rb

@@ -2,7 +2,9 @@ ENV["RAILS_ENV"] = "test"
 $:.unshift File.expand_path('../../lib', __FILE__)
 
 require 'rspec/mocks'
-require 'minitest/autorun'
+require 'minitest/unit'
+MiniTest::Unit.autorun
+
 require 'active_support/test_case'
 
 require 'action_controller'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rabl-rails
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-05 00:00:00.000000000 Z
+date: 2013-05-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -59,7 +59,23 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '3.0'
-description: Fast Rails 3+ templating system with JSON and XML support
+- !ruby/object:Gem::Dependency
+  name: rspec-mocks
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+description: Fast Rails 3+ templating system with JSON, XML and PList support
 email:
 - cocchi.c@gmail.com
 executables: []
@@ -89,6 +105,7 @@ files:
 - lib/rabl-rails/version.rb
 - lib/tasks/rabl-rails.rake
 - rabl-rails.gemspec
+- test/base_renderer_test.rb
 - test/cache_templates_test.rb
 - test/compiler_test.rb
 - test/deep_nesting_test.rb
@@ -119,11 +136,12 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.21
 signing_key: 
 specification_version: 3
-summary: Fast Rails 3+ templating system with JSON and XML support
+summary: Fast Rails 3+ templating system with JSON, XML and PList support
 test_files:
+- test/base_renderer_test.rb
 - test/cache_templates_test.rb
 - test/compiler_test.rb
 - test/deep_nesting_test.rb