rabl 0.6.13 → 0.6.14

data/.travis.yml

@@ -1,10 +1,12 @@
 # http://about.travis-ci.org/docs/user/build-configuration/
-before_script: "git submodule update --init"
 rvm:
   - 1.8.7
   - 1.9.2
   - 1.9.3
   - rbx
+gemfile: Gemfile.ci
 notifications:
   recipients:
-    - nesquena@gmail.com
+    - nesquena@gmail.com
+    - databyte@gmail.com
+

data/CHANGELOG.md

@@ -1,8 +1,15 @@
 # CHANGELOG
 
+## 0.6.15 (unreleased)
+
+## 0.6.14
+
+  * Fix RSpec under Rails 3, use render_views to test output (Thanks @agibralter)
+  * Fix extends allows passing in local object when root object is specified
+
 ## 0.6.13
 
-  * Small tweak to is_collection detection (look for each and map) 
+  * Small tweak to is_collection detection (look for each and map)
   * Adds `include_child_root` configuration option (Thanks @yoon)
 
 ## 0.6.12

data/Gemfile

@@ -16,4 +16,8 @@ group :test do
   gem 'activerecord', :require => "active_record"
   gem 'sqlite3'
   gem 'sinatra', '>= 1.2.0'
-end
+end
+
+group :development, :test do
+  gem 'debugger'
+end

data/Gemfile.ci

@@ -0,0 +1,12 @@
+source :rubygems
+
+# Specify your gem's dependencies in rabl.gemspec
+gemspec
+
+gem "rake"
+gem "i18n", '~> 0.6'
+
+platforms :mri_18 do
+  gem 'SystemTimer'
+end
+

data/README.md

@@ -100,7 +100,7 @@ RABL is intended to require little to no configuration to get working. This is t
 Rabl.configure do |config|
   # Commented as these are defaults
   # config.cache_all_output = false
-  # config.cache_sources = false
+  # config.cache_sources = Rails.env != 'development' # Defaults to false
   # config.escape_all_output = false
   # config.json_engine = nil # Any multi\_json engines
   # config.msgpack_engine = nil # Defaults to ::MessagePack
@@ -110,7 +110,7 @@ Rabl.configure do |config|
   # config.include_msgpack_root = true
   # config.include_bson_root = true
   # config.include_plist_root = true
-  # config.include_xml_root  = false      
+  # config.include_xml_root  = false
   # config.include_child_root = true
   # config.enable_json_callbacks = false
   # config.xml_options = { :dasherize  => true, :skip_types => false }
@@ -120,9 +120,9 @@ end
 
 Each option specifies behavior related to RABL's output. If `include_json_root` is disabled that removes the
 root node for each root object in the output, and `enable_json_callbacks` enables support for 'jsonp' style callback
-output if the incoming request has a 'callback' parameter. 
+output if the incoming request has a 'callback' parameter.
 
-If `include_child_root` is set to false then child objects in the response will not include 
+If `include_child_root` is set to false then child objects in the response will not include
 a root node by default. This allows you to further fine-tune your desired response structure.
 
 If `cache_sources` is set to `true`, template lookups will be cached for improved performance.

data/fixtures/ashared/views_rails_3/posts/show.rabl

@@ -14,4 +14,10 @@ end
 
 code(:created_date) do |p|
   partial("posts/date", :object => p.created_at)
-end
+end
+
+node(:foo) { helper_foo }
+
+node(:post) do |post|
+  [post.title, post.body]
+end

data/fixtures/rails2/app/helpers/application_helper.rb

@@ -0,0 +1,2 @@
+module ApplicationHelper
+end

data/fixtures/rails2/app/helpers/posts_helper.rb

@@ -0,0 +1,2 @@
+module PostsHelper
+end

data/fixtures/rails2/app/helpers/users_helper.rb

@@ -0,0 +1,2 @@
+module UsersHelper
+end

data/fixtures/rails3_2/Gemfile

@@ -37,4 +37,5 @@ gem 'jquery-rails'
 # gem 'capistrano'
 
 # To use debugger
-# gem 'ruby-debug19', :require => 'ruby-debug'
+gem 'debugger'
+

data/fixtures/rails3_2/app/helpers/application_helper.rb

@@ -1,2 +1,5 @@
 module ApplicationHelper
+  def helper_foo
+    "BAR!"
+  end
 end

data/fixtures/rails3_2/test/functional/posts_controller_test.rb

@@ -132,6 +132,10 @@ context "PostsController" do
       asserts("contains date partial with hour")  { topic['hour'] }.equals { @post1.created_at.hour }
       asserts("contains date partial with full")  { topic['full'] }.equals { @post1.created_at.iso8601 }
     end # date node
+
+    asserts("contains helper action") { topic["foo"] }.equals { "BAR!" }
+
+    asserts("contains post attributes via node") { topic["post"] }.equals { [@post1.title, @post1.body] }
   end # show action, json
 
   context "for index action rendering JSON within HTML" do

data/lib/rabl/builder.rb

@@ -108,7 +108,7 @@ module Rabl
     # Extends an existing rabl template with additional attributes in the block
     # extends("users/show") { attribute :full_name }
     def extends(file, options={}, &block)
-      options = @options.slice(:child_root).merge(options).merge(:object => @_object)
+      options = @options.slice(:child_root).merge(:object => @_object).merge(options)
       result = self.partial(file, options, &block)
       @_result.merge!(result) if result
     end

data/lib/rabl/template.rb

@@ -45,16 +45,11 @@ if defined?(ActionView) && defined?(Rails) && Rails.version =~ /^3/
   module ActionView
     module Template::Handlers
       class Rabl
-
         class_attribute :default_format
         self.default_format = Mime::JSON
 
         def self.call(template)
-          source = if template.source.empty?
-            File.read(template.identifier)
-          else # use source
-            template.source
-          end
+          source = template.source
 
           %{ ::Rabl::Engine.new(#{source.inspect}).
               render(self, assigns.merge(local_assigns)) }

data/lib/rabl/version.rb

@@ -1,3 +1,3 @@
 module Rabl
-  VERSION = "0.6.13"
+  VERSION = "0.6.14"
 end

data/test/builder_test.rb

@@ -140,5 +140,11 @@ context "Rabl::Builder" do
       mock(b).partial('users/show', { :object => @user }).returns({:user => 'xyz'}).subject
       b.build(@user)
     end.equivalent_to({:user => 'xyz'})
+
+    asserts "that it generates if local data is present but object is false" do
+      b = builder :extends => [{ :file => 'users/show', :options => { :object => @user }, :block => lambda { |u| attribute :name  }}]
+      mock(b).partial('users/show', { :object => @user }).returns({:user => 'xyz'}).subject
+      b.build(false)
+    end.equivalent_to({:user => 'xyz'})
   end
 end

data/test/helpers_test.rb

@@ -1,5 +1,6 @@
 require 'tmpdir'
 require 'pathname'
+require File.expand_path('../teststrap', __FILE__)
 require File.expand_path('../../lib/rabl', __FILE__)
 
 class TestHelperMethods

data/test/integration/rails3_2/posts_controller_test.rb

@@ -132,6 +132,10 @@ context "PostsController" do
       asserts("contains date partial with hour")  { topic['hour'] }.equals { @post1.created_at.hour }
       asserts("contains date partial with full")  { topic['full'] }.equals { @post1.created_at.iso8601 }
     end # date node
+
+    asserts("contains helper action") { topic["foo"] }.equals { "BAR!" }
+
+    asserts("contains post attributes via node") { topic["post"] }.equals { [@post1.title, @post1.body] }
   end # show action, json
 
   context "for index action rendering JSON within HTML" do

data/test/partials_test.rb

@@ -1,5 +1,6 @@
 require 'tmpdir'
 require 'pathname'
+require File.expand_path('../teststrap', __FILE__)
 require File.expand_path('../../lib/rabl', __FILE__)
 
 class TestPartial

data/test/renderer_test.rb

@@ -1,5 +1,7 @@
 require 'tmpdir'
 require 'pathname'
+require File.expand_path('../teststrap', __FILE__)
+require File.expand_path('../../lib/rabl', __FILE__)
 
 context "Rabl::Renderer" do
   helper(:tmp_path) { @tmp_path ||= Pathname.new(Dir.mktmpdir) }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rabl
 version: !ruby/object:Gem::Version
-  version: 0.6.13
+  version: 0.6.14
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-04 00:00:00.000000000 Z
+date: 2012-06-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -182,6 +182,7 @@ files:
 - .travis.yml
 - CHANGELOG.md
 - Gemfile
+- Gemfile.ci
 - MIT-LICENSE
 - README.md
 - Rakefile
@@ -240,6 +241,9 @@ files:
 - fixtures/rails2/app/controllers/application_controller.rb
 - fixtures/rails2/app/controllers/posts_controller.rb
 - fixtures/rails2/app/controllers/users_controller.rb
+- fixtures/rails2/app/helpers/application_helper.rb
+- fixtures/rails2/app/helpers/posts_helper.rb
+- fixtures/rails2/app/helpers/users_helper.rb
 - fixtures/rails2/config/boot.rb
 - fixtures/rails2/config/database.yml
 - fixtures/rails2/config/environment.rb