rabl 0.9.0.pre2 → 0.9.0.pre3

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NzJmMmM2ZjU0NWFmNGI3YmUzZGRiNmJlODhmYzQ2M2E2NTkwMDNiOA==
+    OWZkODhjODJlYzViMTk1Y2U1MTEyZjVhZjNjZmU3OWZlNjk3YTRmOA==
   data.tar.gz: !binary |-
-    YWU5NWU4ZWMyNzc1MmFiNmVjYzNmOGZlOTE0ODk3NDY5YTQ2ODIxMA==
+    YjIwMzgzZjM4NGQ5Njk3NWJlZWQ0ZDY0ODNlNTZjY2UyODMzOWM2Yw==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    MzJlM2ZkMmFmNDE3ZTU0YzY4NGQ1NTJkNDQzMDgxODZiNDI0OGRiMGMwZTg1
-    ZTRhY2E3ZTQ2NDU2Yjk5OWRiZWVjZDY4OTA2NDkzODNhYWM3MzdiMTJiNjQw
-    YzM3NzgyMGFiZjIxYjA0MzYyMDRlNjg3OTdjMmViYWFkMzhkZjM=
+    MjJiZDhjOTI4N2EwNTIyMTRkZDE5MTFlYTU2YjhlOTczOWJmYWViZjljMjY0
+    ZWU3ZTFkOGQwMjFjY2Y1ZjlkOWZjM2Q1ZjAyZTM0ZjM1Yzk3YmI4OThhYTFm
+    MWU5MjY0ODgxMzllNDEwZGM3OTY0NzNhNDE0OWE4ZThhZmE1NzQ=
   data.tar.gz: !binary |-
-    Y2RjNDI0NjlkZDU0MjQxOWI4OTg2MGM3MDk3YmRhYTI3YjE3MzA3OGEzYjlh
-    ZWEwNThjMzNmNmVkMGM4ZjhmNzE5MWIwYWFiMDc2ZTEwYzI0ZDk5NmFjODRl
-    MzA1YTJkMjEyMTY1ZmZkZGUzNmNkM2YxNTE3MjRmMTFkMGFlOTM=
+    MmNhNjEyNDg2YjYzZGE0NWJmYzIyMjUxN2NkNDQ5NTBiZDZjOTlmZTA4NzRh
+    NDI3ZGE3NzliNzMxYmQ3M2RhYzgwMDc1ZTMzYzI4N2YxZDY1YTY1OWVhMzQ5
+    NTNmMmE3NTk4NWUyMGQ2YzQzYzJiMDg1YzY1MzliZDExNWI4NWY=

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # CHANGELOG
 
+## 0.9.0.pre3 (Sept 22 2013)
+
+ * FIX #495 Digest cache when rendering from controller (Thanks @siong1987)
+
 ## 0.9.0.pre2 (Sept 02 2013)
 
  * FIX #142 Better resource resolution for AR Scopes

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

@@ -0,0 +1,4 @@
+object @post
+cache @post
+
+attributes :title, :body

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

@@ -8,4 +8,9 @@ class PostsController < ApplicationController
   def show
     @post = Post.find(params[:id])
   end
+
+  def renderer
+    post = Post.find(params[:id])
+    render json: Rabl.render(post, 'posts/renderer', view_path: 'app/views', format: :json, scope: view_context)
+  end
 end

data/fixtures/rails3_2/config/routes.rb

@@ -1,6 +1,10 @@
 Rails32::Application.routes.draw do
   resources :users
-  resources :posts
+  resources :posts do
+    member do
+      get 'renderer'
+    end
+  end
   # The priority is based upon order of creation:
   # first created -> highest priority.
 

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

@@ -139,6 +139,18 @@ context "PostsController" do
     asserts("contains post attributes via node") { topic["post"] }.equals { [@post1.title, @post1.body] }
   end # show action, json
 
+  context "renderer" do
+    setup do
+      mock(ActionController::Base).perform_caching.any_number_of_times { true }
+      get "/posts/#{@post1.id}/renderer"
+      json_output['post']
+    end
+
+    # Attributes (regular)
+    asserts("contains post title") { topic['title'] }.equals { @post1.title }
+    asserts("contains post body")  { topic['body'] }.equals { @post1.body }
+  end # renderer action, json
+
   context "for index action rendering JSON within HTML" do
     setup do
       get "/posts", format: :html

data/fixtures/rails4/Gemfile

@@ -1,7 +1,7 @@
 source 'https://rubygems.org'
 
 # Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
-gem 'rails', '4.0.0.rc1'
+gem 'rails', '4.0.0'
 
 # Use sqlite3 as the database for Active Record
 gem 'sqlite3'
@@ -9,7 +9,7 @@ gem 'rabl', :path => File.expand_path(File.dirname(__FILE__) + "/../../")
 gem 'riot', :group => "test"
 
 # Use SCSS for stylesheets
-gem 'sass-rails', '~> 4.0.0.rc1'
+gem 'sass-rails', '~> 4.0.0'
 
 # Use Uglifier as compressor for JavaScript assets
 gem 'uglifier', '>= 1.3.0'

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

@@ -8,4 +8,9 @@ class PostsController < ApplicationController
   def show
     @post = Post.find(params[:id])
   end
+
+  def renderer
+    post = Post.find(params[:id])
+    render json: Rabl.render(post, 'posts/renderer', view_path: 'app/views', format: :json, scope: view_context)
+  end
 end

data/fixtures/rails4/config/routes.rb

@@ -1,6 +1,10 @@
 Rails4::Application.routes.draw do
   resources :users
-  resources :posts
+  resources :posts do
+    member do
+      get 'renderer'
+    end
+  end
   # The priority is based upon order of creation: first created -> highest priority.
   # See how all your routes lay out with "rake routes".
 

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

@@ -139,6 +139,18 @@ context "PostsController" do
     asserts("contains post attributes via node") { topic["post"] }.equals { [@post1.title, @post1.body] }
   end # show action, json
 
+  context "renderer" do
+    setup do
+      mock(ActionController::Base).perform_caching.any_number_of_times { true }
+      get "/posts/#{@post1.id}/renderer"
+      json_output['post']
+    end
+
+    # Attributes (regular)
+    asserts("contains post title") { topic['title'] }.equals { @post1.title }
+    asserts("contains post body")  { topic['body'] }.equals { @post1.body }
+  end # renderer action, json
+
   context "for index action rendering JSON within HTML" do
     setup do
       get "/posts", format: :html

data/lib/rabl/engine.rb

@@ -287,17 +287,16 @@ module Rabl
     end
 
     def cache_key_with_digest(cache_key)
+      virtual_path = @_virtual_path ? @_virtual_path : @virtual_path
       Array(cache_key) + [
         @_options[:root_name],
         @_options[:format],
-        Digestor.digest(@virtual_path, :rabl, lookup_context, dependencies: view_cache_dependencies)
+        Digestor.digest(virtual_path, :rabl, lookup_context, dependencies: view_cache_dependencies)
       ]
     end
 
     def cache_key_simple(key)
       Array(key) + [@_options[:root_name], @_options[:format]]
     end
-
-
   end
 end

data/lib/rabl/partials.rb

@@ -43,6 +43,11 @@ module Rabl
           fetch_manual_template(view_paths, file)
         end
 
+        # being used by cache digestor
+        if defined?(Rails) && Rails.version =~ /^[4]/
+          @_virtual_path = file_path.gsub('app/views/', '').gsub('.rabl', '')
+        end
+
         unless File.exist?(file_path.to_s)
           raise "Cannot find rabl template '#{file}' within registered (#{view_paths.map(&:to_s).inspect}) view paths!"
         end

data/lib/rabl/version.rb

@@ -1,3 +1,3 @@
 module Rabl
-  VERSION = "0.9.0.pre2"
+  VERSION = "0.9.0.pre3"
 end

data/rabl.gemspec

@@ -11,6 +11,7 @@ Gem::Specification.new do |s|
   s.homepage    = "https://github.com/nesquena/rabl"
   s.summary     = %q{General ruby templating with json, bson, xml and msgpack support}
   s.description = %q{General ruby templating with json, bson, xml and msgpack support}
+  s.license     = 'MIT'
 
   s.rubyforge_project = "rabl"
 

data/test/builder_test.rb

@@ -129,6 +129,13 @@ context "Rabl::Builder" do
       mock(b).object_to_hash(@users, { :root => false, :child_root => false }).returns('xyz').subject
       b.build(@user)
     end.equivalent_to({ :users => 'xyz'})
+
+    asserts "that it generates with an collection and a specified object_root_name and root" do
+      ops = { :object_root => "person", :root => :people }
+      b = builder :child => [{ :data => @users, :options => ops, :block => lambda { |u| attribute :name } }], :child_root => true
+      mock(b).object_to_hash(@users, { :root => "person", :object_root_name => "person", :child_root => true }).returns('xyz').subject
+      b.build(@user)
+    end.equivalent_to({ :people => 'xyz'})
   end
 
   context "#glue" do

data/test/engine_test.rb

@@ -329,7 +329,7 @@ context "Rabl::Engine" do
         template.render(scope)
       end.equals "{\"user\":{\"name\":\"leo\",\"users\":[{\"person\":{\"city\":\"UNO\"}},{\"person\":{\"city\":\"DOS\"}}]}}"
 
-      asserts "it allows modification of both root labels for child collection" do
+      asserts "it allows modification of both labels for a child collection" do
         template = rabl %{
           object @user
           attribute :name

data/test/integration/rails3_2/posts_controller_test.rb

@@ -139,6 +139,18 @@ context "PostsController" do
     asserts("contains post attributes via node") { topic["post"] }.equals { [@post1.title, @post1.body] }
   end # show action, json
 
+  context "renderer" do
+    setup do
+      mock(ActionController::Base).perform_caching.any_number_of_times { true }
+      get "/posts/#{@post1.id}/renderer"
+      json_output['post']
+    end
+
+    # Attributes (regular)
+    asserts("contains post title") { topic['title'] }.equals { @post1.title }
+    asserts("contains post body")  { topic['body'] }.equals { @post1.body }
+  end # renderer action, json
+
   context "for index action rendering JSON within HTML" do
     setup do
       get "/posts", format: :html

data/test/integration/rails4/posts_controller_test.rb

@@ -139,6 +139,18 @@ context "PostsController" do
     asserts("contains post attributes via node") { topic["post"] }.equals { [@post1.title, @post1.body] }
   end # show action, json
 
+  context "renderer" do
+    setup do
+      mock(ActionController::Base).perform_caching.any_number_of_times { true }
+      get "/posts/#{@post1.id}/renderer"
+      json_output['post']
+    end
+
+    # Attributes (regular)
+    asserts("contains post title") { topic['title'] }.equals { @post1.title }
+    asserts("contains post body")  { topic['body'] }.equals { @post1.body }
+  end # renderer action, json
+
   context "for index action rendering JSON within HTML" do
     setup do
       get "/posts", format: :html

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rabl
 version: !ruby/object:Gem::Version
-  version: 0.9.0.pre2
+  version: 0.9.0.pre3
 platform: ruby
 authors:
 - Nathan Esquenazi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-03 00:00:00.000000000 Z
+date: 2013-09-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -177,6 +177,7 @@ files:
 - 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/renderer.rabl
 - fixtures/ashared/views_rails_3/posts/show.html.erb
 - fixtures/ashared/views_rails_3/posts/show.rabl
 - fixtures/ashared/views_rails_3/posts/show.rabl_test_v1.rabl
@@ -445,7 +446,8 @@ files:
 - test/teststrap.rb
 - test/xml_test.rb
 homepage: https://github.com/nesquena/rabl
-licenses: []
+licenses:
+- MIT
 metadata: {}
 post_install_message: 
 rdoc_options: []