rabl 0.6.5 → 0.6.6

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # CHANGELOG
 
+## 0.6.6
+
+  * Even more improvements to Rails template resolution (Thanks @databyte)
+  * Added fixture integration tests for rendering rabl inline from html (Thanks @databyte)
+  * Added useful note to README about Padrino (Thanks @simonc)
+
 ## 0.6.5
 
   * Fixed issue with multi_json version use ~> 1.0 (Thanks @sferik)

data/README.md

@@ -36,6 +36,9 @@ and run `bundle install` to install the dependency.
 
 If you are using **Rails 2.X, Rails 3.X or Padrino**, RABL works without configuration.
 
+**Important:** With Padrino, be sure that **the rabl gem is listed after the padrino gem in your Gemfile**, otherwise
+Rabl will not register as a template engine.
+
 With Sinatra, or any other tilt-based framework, simply register:
 
     Rabl.register!
@@ -583,6 +586,7 @@ Thanks to [Miso](http://gomiso.com) for allowing me to create this for our appli
 * [Nathan Esquenazi](https://github.com/nesquena) - Creator of the project
 * [Arthur Chiu](https://github.com/achiu) - Core Maintainer, Riot Testing Guru
 * [Tim Lee](https://github.com/timothy1ee) - RABL is an awesome name and was chosen by the Miso CTO.
+* [David Sommers](https://github.com/databyte) - Enhanced template resolution and added caching support
 * [Rick Thomas](https://github.com/rickthomasjr) - Added options for extends and Sinatra testing
 * [Benjamin Yu](https://github.com/byu) - Added msgpack format support
 * [Chris Kimpton](https://github.com/kimptoc) - Helping with documentation and wiki
@@ -593,7 +597,6 @@ Thanks to [Miso](http://gomiso.com) for allowing me to create this for our appli
 * [Luke van der Hoeven](https://github.com/plukevdh) - Support non-ORM objects in templates
 * [Andrey Voronkov](https://github.com/Antiarchitect) - Added BSON format support
 * [Alli Witheford](https://github.com/alzeih) - Added Plist format support
-* [David Sommers](https://github.com/databyte) - Added template caching support for Rails
 * [Ryan Bigg](https://github.com/radar) - Improved template resolution code
 
 and many more contributors listed in the [CHANGELOG](https://github.com/nesquena/rabl/blob/master/CHANGELOG.md).

data/Rakefile

@@ -32,7 +32,7 @@ task "test:setup" do
   Dir[File.dirname(__FILE__) + "/fixtures/#{fixture_list}"].each do |fixture|
     puts "\n*** Setting up for #{File.basename(fixture)} tests ***\n"
     `export BUNDLE_GEMFILE=#{fixture}/Gemfile` if ENV['TRAVIS']
-    puts `cd #{fixture}; bundle install;`
+    puts `cd #{fixture}; mkdir -p tmp/cache; bundle install;`
   end
 end
 

data/fixtures/ashared/NOTES

@@ -1,11 +1,20 @@
+# Sinatra
+
+cd fixtures/sinatra_test
+ln -s "../ashared/models" models
+ln -s "../ashared/views/" views
+ln -s "../../ashared/migrate" db/migrate
+ln -s ../../../../test/integration/posts_controller_test.rb test/functional/posts_controller_test.rb
+ln -s ../../../../test/integration/users_controller_test.rb test/functional/users_controller_test.rb
+
 # Padrino
 
 cd fixtures/padrino_test
 ln -s "../ashared/models" models
 ln -s "../../ashared/views/" app/views
 ln -s "../../ashared/migrate" db/migrate
-ln ../../test/integration/posts_controller_test.rb test/app/controllers/posts_controller_test.rb
-ln ../../test/integration/users_controller_test.rb test/app/controllers/users_controller_test.rb
+ln -s ../../../../../test/integration/posts_controller_test.rb test/app/controllers/posts_controller_test.rb
+ln -s ../../../../../test/integration/users_controller_test.rb test/app/controllers/users_controller_test.rb
 
 # Rails 2
 
@@ -13,8 +22,8 @@ cd fixtures/rails2
 ln -s "../../ashared/models" app/models
 ln -s "../../ashared/views/" app/views
 ln -s "../../ashared/migrate" db/migrate
-ln ../../test/integration/posts_controller_test.rb test/functionals/posts_controller_test.rb
-ln ../../test/integration/users_controller_test.rb test/functionals/users_controller_test.rb
+ln -s ../../../../test/integration/posts_controller_test.rb test/functionals/posts_controller_test.rb
+ln -s ../../../../test/integration/users_controller_test.rb test/functionals/users_controller_test.rb
 
 # Rails 3
 
@@ -22,23 +31,14 @@ cd fixtures/rails3
 ln -s "../../ashared/models" app/models
 ln -s "../../ashared/views/" app/views
 ln -s "../../ashared/migrate" db/migrate
-ln ../../test/integration/posts_controller_test.rb test/functional/posts_controller_test.rb
-ln ../../test/integration/users_controller_test.rb test/functional/users_controller_test.rb
+ln -s ../../../../test/integration/posts_controller_test.rb test/functional/posts_controller_test.rb
+ln -s ../../../../test/integration/users_controller_test.rb test/functional/users_controller_test.rb
 
 # Rails 3.2
 
 cd fixtures/rails3_2
 ln -s "../../ashared/models" app/models
-ln -s "../../ashared/views/" app/views
-ln -s "../../ashared/migrate" db/migrate
-ln ../../test/integration/posts_controller_test.rb test/functional/posts_controller_test.rb
-ln ../../test/integration/users_controller_test.rb test/functional/users_controller_test.rb
-
-# Sinatra
-
-cd fixtures/sinatra_test
-ln -s "../ashared/models" models
-ln -s "../ashared/views/" views
+ln -s "../../ashared/views_rails_3/" app/views
 ln -s "../../ashared/migrate" db/migrate
-ln ../../test/integration/posts_controller_test.rb test/functional/posts_controller_test.rb
-ln ../../test/integration/users_controller_test.rb test/functional/users_controller_test.rb
+ln -s ../../../../test/integration/rails3_2/posts_controller_test.rb test/functional/posts_controller_test.rb
+ln -s ../../../../test/integration/rails3_2/users_controller_test.rb test/functional/users_controller_test.rb

data/fixtures/ashared/views/layouts/application.html.erb

@@ -1,6 +1,9 @@
-<head>
-  Not for RABL
-</head>
-<body>
-  Not for RABL
-</body>
+<!DOCTYPE html>
+<html>
+  <head>
+    <title>RABL ROCKS!</title>
+  </head>
+  <body>
+    <%= yield %>
+  </body>
+</html>

data/fixtures/ashared/views/posts/_show_footer_script.js.erb

@@ -0,0 +1 @@
+var output = <%= render(file: 'posts/show', formats: :json).html_safe %>;

data/fixtures/ashared/views_rails_3/layouts/application.html.erb

@@ -0,0 +1,13 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <title>RABL ROCKS!</title>
+  </head>
+  <body>
+    <%= yield %>
+
+    <%= javascript_tag do %>
+      <%= yield(:footer_scripts) %>
+    <% end %>
+  </body>
+</html>

data/fixtures/ashared/views_rails_3/posts/_show_footer_script.js.erb

@@ -0,0 +1 @@
+var output = <%= render(file: 'posts/show', formats: :json).html_safe %>;

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

@@ -0,0 +1,3 @@
+code(:day) { |d| d.day }
+code(:hour) { |d| d.hour }
+code(:full) { |d| d.iso8601 }

data/fixtures/ashared/views_rails_3/posts/index.html.erb

@@ -0,0 +1,3 @@
+<%= content_for :footer_scripts do %>
+  var output = <%= render(file: 'posts/index', formats: :json).html_safe %>;
+<% end %>

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

@@ -0,0 +1,12 @@
+collection @posts => :articles
+cache ['kittens!', @posts]
+
+extends "posts/show"
+
+node(:created_by_admin, :if => lambda { |p| p.user.is_admin }) do |p|
+  true
+end
+
+child({ :user => :admin }, { :if => lambda { |p| p.user.is_admin  }}) do |p|
+  extends "users/show"
+end

data/fixtures/ashared/views_rails_3/posts/show.html.erb

@@ -0,0 +1,3 @@
+<%= content_for :footer_scripts do %>
+  <%= render partial: "show_footer_script", formats: :js %>
+<% end %>

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

@@ -0,0 +1,17 @@
+object @post
+cache @post
+
+attributes :title, :body
+attributes :created_at => :posted_at
+
+child :user do
+  extends "users/show"
+end
+
+glue :user do
+  attributes :username => :author_name
+end
+
+code(:created_date) do |p|
+  partial("posts/date", :object => p.created_at)
+end

data/fixtures/ashared/views_rails_3/users/index.json.rabl

@@ -0,0 +1,3 @@
+collection @users
+
+extends "users/show"

data/fixtures/ashared/views_rails_3/users/phone_number.json.rabl

@@ -0,0 +1,6 @@
+attributes :prefix, :suffix, :area_code
+attributes :is_primary => :primary
+
+node :formatted do |n|
+  n.formatted
+end

data/fixtures/ashared/views_rails_3/users/show.json.rabl

@@ -0,0 +1,16 @@
+object @user => :person
+
+attributes :username, :email, :location
+attributes :created_at => :registered_at
+
+node :role do |user|
+  user.is_admin ? 'admin' : 'normal'
+end
+
+child :phone_numbers => :pnumbers do
+  extends "users/phone_number"
+end
+
+node :node_numbers do |u|
+  partial("users/phone_number", :object => u.phone_numbers)
+end

data/fixtures/padrino_test/test/app/controllers/posts_controller_test.rb

@@ -21,7 +21,7 @@ context "PostsController" do
 
   context "for index action" do
     setup do
-      get "/posts"
+      get "/posts", format: :json
     end
 
     # Attributes (regular)
@@ -74,7 +74,7 @@ context "PostsController" do
 
   context "for show action" do
     setup do
-      get "/posts/#{@post1.id}"
+      get "/posts/#{@post1.id}", format: :json
       json_output['post']
     end
 

data/fixtures/rails2/test/functionals/posts_controller_test.rb

@@ -21,7 +21,7 @@ context "PostsController" do
 
   context "for index action" do
     setup do
-      get "/posts"
+      get "/posts", format: :json
     end
 
     # Attributes (regular)
@@ -74,7 +74,7 @@ context "PostsController" do
 
   context "for show action" do
     setup do
-      get "/posts/#{@post1.id}"
+      get "/posts/#{@post1.id}", format: :json
       json_output['post']
     end
 

data/fixtures/rails3/Gemfile

@@ -1,6 +1,6 @@
 source 'http://rubygems.org'
 
-gem 'rails', '3.0.8'
+gem 'rails', '3.0.12'
 
 # Bundle edge Rails instead:
 # gem 'rails', :git => 'git://github.com/rails/rails.git'

data/fixtures/rails3/app/controllers/posts_controller.rb

@@ -1,5 +1,5 @@
 class PostsController < ApplicationController
-  respond_to :json, :xml
+  respond_to :json, :xml, :html
 
   def index
     @posts = Post.all(:order => "id ASC")

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

@@ -7,14 +7,11 @@ rescue LoadError # Rails
   require File.expand_path(File.dirname(__FILE__) + '/../test_helper.rb')
 end
 
-require 'rexml/document'
-
 context "PostsController" do
   helper(:json_output) { JSON.parse(last_response.body) }
 
   setup do
     create_users!
-    Rails.cache.clear
     Post.delete_all
     @post1 = Post.create(:title => "Foo", :body => "Bar", :user_id => @user1.id)
     @post2 = Post.create(:title => "Baz", :body => "Bah", :user_id => @user2.id)
@@ -24,7 +21,7 @@ context "PostsController" do
 
   context "for index action" do
     setup do
-      get "/posts"
+      get "/posts", format: :json
     end
 
     # Attributes (regular)
@@ -77,11 +74,11 @@ context "PostsController" do
 
   context "for show action" do
     setup do
-      get "/posts/#{@post1.id}"
+      get "/posts/#{@post1.id}", format: :json
       json_output['post']
     end
 
-    # Attributes (regular)
+     # Attributes (regular)
     asserts("contains post title") { topic['title'] }.equals { @post1.title }
     asserts("contains post body")  { topic['body'] }.equals { @post1.body }
 
@@ -108,71 +105,4 @@ context "PostsController" do
       asserts("contains date partial with full")  { topic['full'] }.equals { @post1.created_at.iso8601 }
     end # date node
   end # show action
-
-  context "for index action with caching in json" do
-    helper(:cache_hit) do |key|
-      Rails.cache.read(ActiveSupport::Cache.expand_cache_key(key, :rabl))
-    end
-
-    setup do
-      mock(ActionController::Base).perform_caching.any_number_of_times { true }
-      get "/posts.json"
-    end
-
-    asserts("contains post titles") do
-      json_output['articles'].map { |o| o['article']['title'] }
-    end.equals { @posts.map(&:title) }
-
-    asserts(:body).equals { cache_hit ['kittens!', @posts, nil, 'json'] }
-  end # index action, caching, json
-
-  context "for index action with caching in xml" do
-    helper(:cache_hit) do |key|
-      Rails.cache.read(ActiveSupport::Cache.expand_cache_key(key, :rabl))
-    end
-
-    setup do
-      mock(ActionController::Base).perform_caching.any_number_of_times { true }
-      get "/posts.xml"
-    end
-
-    asserts("contains post titles") do
-      doc = REXML::Document.new topic.body
-      doc.elements.inject('articles/article/title', []) {|arr, ele| arr << ele.text}
-    end.equals { @posts.map(&:title) }
-
-    asserts(:body).equals { cache_hit ['kittens!', @posts, nil, 'xml'] }
-  end # index action, caching, xml
-
-  context "for show action with caching" do
-    helper(:cache_hit) do |key|
-      Rails.cache.read(ActiveSupport::Cache.expand_cache_key(key, :rabl))
-    end
-
-    setup do
-      mock(ActionController::Base).perform_caching.any_number_of_times { true }
-      get "/posts/#{@post1.id}"
-    end
-
-    asserts("contains post title") { json_output['post']['title'] }.equals { @post1.title }
-
-    asserts(:body).equals { cache_hit [@post1, nil, 'json'] }
-  end # show action, caching, json
-
-  context "cache_all_output" do
-    helper(:cache_hit) do |key|
-      Rails.cache.read(ActiveSupport::Cache.expand_cache_key([key, 'article', 'json'], :rabl))
-    end
-
-    setup do
-      mock(ActionController::Base).perform_caching.any_number_of_times { true }
-      Rabl.configuration.cache_all_output = true
-      get "/posts"
-    end
-
-    asserts("contains cache hits per object (posts by title)") do
-      json_output['articles'].map { |o| o['article']['title'] }
-    end.equals { @posts.map{ |p| cache_hit(p)['article'][:title] } }
-  end  # index action, cache_all_output
-
 end

data/fixtures/rails3_2/app/controllers/posts_controller.rb

@@ -1,5 +1,5 @@
 class PostsController < ApplicationController
-  respond_to :json, :xml
+  respond_to :json, :xml, :html
 
   def index
     @posts = Post.all(:order => "id ASC")

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

@@ -7,11 +7,14 @@ rescue LoadError # Rails
   require File.expand_path(File.dirname(__FILE__) + '/../test_helper.rb')
 end
 
+require 'rexml/document'
+
 context "PostsController" do
   helper(:json_output) { JSON.parse(last_response.body) }
 
   setup do
     create_users!
+    Rails.cache.clear
     Post.delete_all
     @post1 = Post.create(:title => "Foo", :body => "Bar", :user_id => @user1.id)
     @post2 = Post.create(:title => "Baz", :body => "Bah", :user_id => @user2.id)
@@ -21,7 +24,7 @@ context "PostsController" do
 
   context "for index action" do
     setup do
-      get "/posts"
+      get "/posts", format: :json
     end
 
     # Attributes (regular)
@@ -70,15 +73,15 @@ context "PostsController" do
     denies("contains no created_by_admin node for non-admins") do
       json_output['articles'].first['article']
     end.includes(:created_by_admin)
-  end # index action
+  end # index action, json
 
   context "for show action" do
     setup do
-      get "/posts/#{@post1.id}"
+      get "/posts/#{@post1.id}", format: :json
       json_output['post']
     end
 
-     # Attributes (regular)
+    # Attributes (regular)
     asserts("contains post title") { topic['title'] }.equals { @post1.title }
     asserts("contains post body")  { topic['body'] }.equals { @post1.body }
 
@@ -104,5 +107,82 @@ 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
-  end # show action
+  end # show action, json
+
+  context "for index action rendering JSON within HTML" do
+    setup do
+      get "/posts", format: :html
+    end
+
+    asserts(:body).includes { "<html>" }
+  end # index action, html
+
+  context "for show action rendering JSON within HTML" do
+    setup do
+      get "/posts/#{@post1.id}", format: :html
+    end
+
+    asserts(:body).includes { "<html>" }
+  end # show action, html
+
+  context "caching" do
+    helper(:cache_hit) do |key|
+      Rails.cache.read(ActiveSupport::Cache.expand_cache_key(key, :rabl))
+    end
+
+    setup do
+      mock(ActionController::Base).perform_caching.any_number_of_times { true }
+    end
+
+    context "for index action with caching in json" do
+      setup do
+        get "/posts", format: :json
+      end
+
+      asserts("contains post titles") do
+        json_output['articles'].map { |o| o['article']['title'] }
+      end.equals { @posts.map(&:title) }
+
+      asserts(:body).equals { cache_hit ['kittens!', @posts, nil, 'json'] }
+    end # index action, caching, json
+
+    context "for index action with caching in xml" do
+      setup do
+        get "/posts", format: :xml
+      end
+
+      asserts("contains post titles") do
+        doc = REXML::Document.new topic.body
+        doc.elements.inject('articles/article/title', []) {|arr, ele| arr << ele.text}
+      end.equals { @posts.map(&:title) }
+
+      asserts(:body).equals { cache_hit ['kittens!', @posts, nil, 'xml'] }
+    end # index action, caching, xml
+
+    context "for show action with caching" do
+      setup do
+        get "/posts/#{@post1.id}", format: :json
+      end
+
+      asserts("contains post title") { json_output['post']['title'] }.equals { @post1.title }
+
+      asserts(:body).equals { cache_hit [@post1, nil, 'json'] }
+    end # show action, caching, json
+
+    context "cache_all_output" do
+      helper(:cache_hit) do |key|
+        Rails.cache.read(ActiveSupport::Cache.expand_cache_key([key, 'article', 'json'], :rabl))
+      end
+
+      setup do
+        Rabl.configuration.cache_all_output = true
+        get "/posts", format: :json
+      end
+
+      asserts("contains cache hits per object (posts by title)") do
+        json_output['articles'].map { |o| o['article']['title'] }
+      end.equals { @posts.map{ |p| cache_hit(p)['article'][:title] } }
+    end  # index action, cache_all_output
+  end
+
 end

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

@@ -21,7 +21,7 @@ context "PostsController" do
 
   context "for index action" do
     setup do
-      get "/posts"
+      get "/posts", format: :json
     end
 
     # Attributes (regular)
@@ -74,7 +74,7 @@ context "PostsController" do
 
   context "for show action" do
     setup do
-      get "/posts/#{@post1.id}"
+      get "/posts/#{@post1.id}", format: :json
       json_output['post']
     end
 

data/lib/rabl/partials.rb

@@ -34,7 +34,8 @@ module Rabl
         file_path = if defined? Padrino
           fetch_padrino_source(file, options)
         elsif defined?(Rails) && context_scope
-          fetch_rails_source(file, options)
+          view_path = Array(options[:view_path] || context_scope.view_paths.to_a)
+          fetch_rails_source(file, options) || fetch_manual_template(view_path, file)
         elsif defined? Sinatra
           fetch_sinatra_source(file, options)
         end
@@ -59,16 +60,18 @@ module Rabl
     def fetch_rails_source(file, options={})
       # use Rails template resolution mechanism if possible (find_template)
       source_format = request_format if defined?(request_format)
-      view_path = Array(options[:view_path] || context_scope.view_paths.to_a)
       if source_format && context_scope.respond_to?(:lookup_context) # Rails 3
-        lookup_proc = lambda { |partial| context_scope.lookup_context.find_template(file, [], partial) }
+        lookup_proc = lambda { |partial|
+          if context_scope.lookup_context.method(:find).parameters.count < 5
+            context_scope.lookup_context.find(file, [], partial)
+          else
+            context_scope.lookup_context.find(file, [], partial, [], {:formats => [:json]})
+          end }
         template = lookup_proc.call(false) rescue lookup_proc.call(true)
         template.identifier if template
       elsif source_format && context_scope.respond_to?(:view_paths) # Rails 2
         template = context_scope.view_paths.find_template(file, source_format, false)
         template.filename if template
-      else # manual file lookup
-        fetch_manual_template(view_path, file)
       end
     end
 

data/lib/rabl/version.rb

@@ -1,3 +1,3 @@
 module Rabl
-  VERSION = "0.6.5"
+  VERSION = "0.6.6"
 end

data/test/integration/posts_controller_test.rb

@@ -21,7 +21,7 @@ context "PostsController" do
 
   context "for index action" do
     setup do
-      get "/posts"
+      get "/posts", format: :json
     end
 
     # Attributes (regular)
@@ -74,7 +74,7 @@ context "PostsController" do
 
   context "for show action" do
     setup do
-      get "/posts/#{@post1.id}"
+      get "/posts/#{@post1.id}", format: :json
       json_output['post']
     end
 

data/test/integration/rails3_2/posts_controller_test.rb

@@ -0,0 +1,188 @@
+# Lives in <rabl>/test/integration/posts_controller_test.rb
+# Symlinked to fixture applications
+
+begin # Padrino
+  require File.expand_path(File.dirname(__FILE__) + '/../../test_config.rb')
+rescue LoadError # Rails
+  require File.expand_path(File.dirname(__FILE__) + '/../test_helper.rb')
+end
+
+require 'rexml/document'
+
+context "PostsController" do
+  helper(:json_output) { JSON.parse(last_response.body) }
+
+  setup do
+    create_users!
+    Rails.cache.clear
+    Post.delete_all
+    @post1 = Post.create(:title => "Foo", :body => "Bar", :user_id => @user1.id)
+    @post2 = Post.create(:title => "Baz", :body => "Bah", :user_id => @user2.id)
+    @post3 = Post.create(:title => "Kaz", :body => "Paz", :user_id => @user3.id)
+    @posts = [@post1, @post2, @post3]
+  end
+
+  context "for index action" do
+    setup do
+      get "/posts", format: :json
+    end
+
+    # Attributes (regular)
+    asserts("contains post titles") do
+      json_output['articles'].map { |o| o["article"]["title"] }
+    end.equals { @posts.map(&:title) }
+
+    asserts("contains post bodies") do
+      json_output['articles'].map { |o| o["article"]["body"] }
+    end.equals { @posts.map(&:body) }
+
+    # Attributes (custom name)
+    asserts("contains post posted_at") do
+      json_output['articles'].map { |o| o["article"]["posted_at"] }
+    end.equals { @posts.map(&:created_at).map(&:iso8601) }
+
+    # Child
+    asserts("contains post user child username") do
+      json_output['articles'].map { |o| o["article"]["user"]["username"] }
+    end.equals { @posts.map(&:user).map(&:username) }
+
+    asserts("contains post user child role") do
+      json_output['articles'].map { |o| o["article"]["user"]["role"] }
+    end.equals { ["normal", "normal", "admin"] }
+
+    # Child Numbers of the Child User
+    asserts("contains post user child numbers") do
+      json_output['articles'].map { |o| o["article"]["user"]["pnumbers"][0]["pnumber"]["formatted"] }
+    end.equals { @posts.map(&:user).map(&:phone_numbers).map(&:first).map(&:formatted) }
+
+    # Glue (username to article)
+    asserts("contains glued usernames") do
+      json_output['articles'].map { |o| o["article"]["author_name"] }
+    end.equals { @posts.map(&:user).map(&:username) }
+
+    # Conditional Child (admin)
+    asserts("contains admin child only for admins") do
+      json_output['articles'].map { |o| o["article"]["admin"]["username"] if o["article"].has_key?("admin") }.compact
+    end.equals { [@user3.username] }
+
+    # Conditional Node (created_by_admin)
+    asserts("contains created_by_admin node for admins") do
+      json_output['articles'].last['article']['created_by_admin']
+    end.equals { true }
+
+    denies("contains no created_by_admin node for non-admins") do
+      json_output['articles'].first['article']
+    end.includes(:created_by_admin)
+  end # index action, json
+
+  context "for show action" do
+    setup do
+      get "/posts/#{@post1.id}", format: :json
+      json_output['post']
+    end
+
+    # Attributes (regular)
+    asserts("contains post title") { topic['title'] }.equals { @post1.title }
+    asserts("contains post body")  { topic['body'] }.equals { @post1.body }
+
+    # Attributes (custom name)
+    asserts("contains post posted_at") { topic['posted_at'] }.equals { @post1.created_at.iso8601 }
+
+    # Child
+    asserts("contains post user child username") { topic["user"]["username"] }.equals { @post1.user.username }
+    asserts("contains post user child role") { topic["user"]["role"] }.equals { "normal" }
+
+    # Child Numbers of the Child User
+    asserts("contains post user child numbers") do
+      topic["user"]["pnumbers"][0]["pnumber"]["formatted"]
+    end.equals { @post1.user.phone_numbers[0].formatted }
+
+    # Glue (username to article)
+    asserts("contains glued username") { topic["author_name"] }.equals { @post1.user.username }
+
+    # Non-ORM Date Node Partial
+    context "for date node" do
+      setup { json_output['post']['created_date'] }
+      asserts("contains date partial with day")   { topic['day'] }.equals { @post1.created_at.day }
+      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
+  end # show action, json
+
+  context "for index action rendering JSON within HTML" do
+    setup do
+      get "/posts", format: :html
+    end
+
+    asserts(:body).includes { "<html>" }
+  end # index action, html
+
+  context "for show action rendering JSON within HTML" do
+    setup do
+      get "/posts/#{@post1.id}", format: :html
+    end
+
+    asserts(:body).includes { "<html>" }
+  end # show action, html
+
+  context "caching" do
+    helper(:cache_hit) do |key|
+      Rails.cache.read(ActiveSupport::Cache.expand_cache_key(key, :rabl))
+    end
+
+    setup do
+      mock(ActionController::Base).perform_caching.any_number_of_times { true }
+    end
+
+    context "for index action with caching in json" do
+      setup do
+        get "/posts", format: :json
+      end
+
+      asserts("contains post titles") do
+        json_output['articles'].map { |o| o['article']['title'] }
+      end.equals { @posts.map(&:title) }
+
+      asserts(:body).equals { cache_hit ['kittens!', @posts, nil, 'json'] }
+    end # index action, caching, json
+
+    context "for index action with caching in xml" do
+      setup do
+        get "/posts", format: :xml
+      end
+
+      asserts("contains post titles") do
+        doc = REXML::Document.new topic.body
+        doc.elements.inject('articles/article/title', []) {|arr, ele| arr << ele.text}
+      end.equals { @posts.map(&:title) }
+
+      asserts(:body).equals { cache_hit ['kittens!', @posts, nil, 'xml'] }
+    end # index action, caching, xml
+
+    context "for show action with caching" do
+      setup do
+        get "/posts/#{@post1.id}", format: :json
+      end
+
+      asserts("contains post title") { json_output['post']['title'] }.equals { @post1.title }
+
+      asserts(:body).equals { cache_hit [@post1, nil, 'json'] }
+    end # show action, caching, json
+
+    context "cache_all_output" do
+      helper(:cache_hit) do |key|
+        Rails.cache.read(ActiveSupport::Cache.expand_cache_key([key, 'article', 'json'], :rabl))
+      end
+
+      setup do
+        Rabl.configuration.cache_all_output = true
+        get "/posts", format: :json
+      end
+
+      asserts("contains cache hits per object (posts by title)") do
+        json_output['articles'].map { |o| o['article']['title'] }
+      end.equals { @posts.map{ |p| cache_hit(p)['article'][:title] } }
+    end  # index action, cache_all_output
+  end
+
+end

data/test/integration/rails3_2/users_controller_test.rb

@@ -0,0 +1,87 @@
+# Lives in <rabl>/test/integration/users_controller_test.rb
+# Symlinked to fixture applications
+
+begin # Sinatra
+  require File.expand_path(File.dirname(__FILE__) + '/../../test_config.rb')
+rescue LoadError # Rails
+  require File.expand_path(File.dirname(__FILE__) + '/../test_helper.rb')
+end
+
+context "UsersController" do
+  helper(:json_output) { JSON.parse(last_response.body) }
+
+  setup do
+    create_users!
+  end
+
+  context "for index action" do
+    # Tests `collection @users` extending from 'show' template
+
+    setup do
+      get "/users"
+    end
+
+    # Attributes (regular)
+    asserts("contains user usernames") do
+      json_output.map { |u| u["user"]["username"] }
+    end.equals { @users.map(&:username) }
+    asserts("contains email") do
+      json_output.map { |u| u["user"]["email"] }
+    end.equals { @users.map(&:email) }
+    asserts("contains location") do
+      json_output.map { |u| u["user"]["location"] }
+    end.equals { @users.map(&:location) }
+
+    # Attributes (custom name)
+    asserts("contains registered_at") do
+      json_output.map { |u| u["user"]["registered_at"] }
+    end.equals { @users.map(&:created_at).map(&:iso8601) }
+
+    # Node (renders based on attribute)
+    asserts("contains role") do
+      json_output.map { |u| u["user"]["role"] }
+    end.equals ['normal', 'normal', 'admin']
+
+    # Child (custom collection name)
+    asserts("contains formatted phone numbers") do
+      json_output.map { |u| u["user"]["pnumbers"].map { |n| n["pnumber"]["formatted"] } }
+    end.equals { @users.map { |u| u.phone_numbers.map(&:formatted) } }
+
+    # Node (renders collection partial)
+    asserts("contains formatted node numbers") do
+      json_output.map { |u| u["user"]["node_numbers"].map { |n| n["formatted"] } }
+    end.equals { @users.map { |u| u.phone_numbers.map(&:formatted) } }
+  end # index
+
+  context "for show action" do
+    # Tests `object :user => :person` custom parent node name
+    setup do
+      get "/users/#{@user1.id}"
+    end
+
+    # Attributes (regular)
+    asserts("contains username") { json_output["person"]["username"] }.equals { @user1.username }
+    asserts("contains email") { json_output["person"]["email"] }.equals { @user1.email }
+    asserts("contains location") { json_output["person"]["location"] }.equals { @user1.location }
+    # Attributes (custom name)
+    asserts("contains registered_at") { json_output["person"]["registered_at"] }.equals { @user1.created_at.iso8601 }
+    # Node (renders based on attribute)
+    asserts("contains role node") { json_output["person"]["role"] }.equals "normal"
+
+    # Child (custom collection name)
+    asserts("contains first phone number") {
+      json_output["person"]["pnumbers"][0]["pnumber"]["formatted"]
+    }.equals { @user1.phone_numbers[0].formatted }
+    asserts("contains second phone number") {
+      json_output["person"]["pnumbers"][1]["pnumber"]["formatted"]
+    }.equals { @user1.phone_numbers[1].formatted }
+
+    # Node (renders collection partial)
+    asserts("contains first node number") {
+      json_output["person"]["node_numbers"][0]["formatted"]
+    }.equals { @user1.phone_numbers[0].formatted }
+    asserts("contains second node number") {
+      json_output["person"]["node_numbers"][1]["formatted"]
+    }.equals { @user1.phone_numbers[1].formatted }
+  end # show
+end

metadata

@@ -2,7 +2,7 @@
 name: rabl
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.6.5
+  version: 0.6.6
 platform: ruby
 authors: 
 - Nathan Esquenazi
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-03-28 00:00:00 Z
+date: 2012-03-31 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: activesupport
@@ -152,12 +152,23 @@ files:
 - fixtures/ashared/models/post.rb
 - fixtures/ashared/models/user.rb
 - fixtures/ashared/views/layouts/application.html.erb
+- fixtures/ashared/views/posts/_show_footer_script.js.erb
 - fixtures/ashared/views/posts/date.rabl
 - fixtures/ashared/views/posts/index.rabl
 - fixtures/ashared/views/posts/show.rabl
 - fixtures/ashared/views/users/index.json.rabl
 - fixtures/ashared/views/users/phone_number.json.rabl
 - fixtures/ashared/views/users/show.json.rabl
+- fixtures/ashared/views_rails_3/layouts/application.html.erb
+- fixtures/ashared/views_rails_3/posts/_show_footer_script.js.erb
+- fixtures/ashared/views_rails_3/posts/date.rabl
+- fixtures/ashared/views_rails_3/posts/index.html.erb
+- fixtures/ashared/views_rails_3/posts/index.rabl
+- fixtures/ashared/views_rails_3/posts/show.html.erb
+- fixtures/ashared/views_rails_3/posts/show.rabl
+- fixtures/ashared/views_rails_3/users/index.json.rabl
+- fixtures/ashared/views_rails_3/users/phone_number.json.rabl
+- fixtures/ashared/views_rails_3/users/show.json.rabl
 - fixtures/padrino_test/.components
 - fixtures/padrino_test/.gitignore
 - fixtures/padrino_test/Gemfile
@@ -345,6 +356,8 @@ files:
 - test/engine_test.rb
 - test/helpers_test.rb
 - test/integration/posts_controller_test.rb
+- test/integration/rails3_2/posts_controller_test.rb
+- test/integration/rails3_2/users_controller_test.rb
 - test/integration/test_init.rb
 - test/integration/users_controller_test.rb
 - test/models/ormless.rb
@@ -389,6 +402,8 @@ test_files:
 - test/engine_test.rb
 - test/helpers_test.rb
 - test/integration/posts_controller_test.rb
+- test/integration/rails3_2/posts_controller_test.rb
+- test/integration/rails3_2/users_controller_test.rb
 - test/integration/test_init.rb
 - test/integration/users_controller_test.rb
 - test/models/ormless.rb