rabl 0.9.0.pre3 → 0.9.0.pre4

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    OWZkODhjODJlYzViMTk1Y2U1MTEyZjVhZjNjZmU3OWZlNjk3YTRmOA==
+    ZjA4NTM5ZDI5ZjQ3YTg5MGVjNjRiODY2YTM2OTRmZmI5OGM2NmRjZQ==
   data.tar.gz: !binary |-
-    YjIwMzgzZjM4NGQ5Njk3NWJlZWQ0ZDY0ODNlNTZjY2UyODMzOWM2Yw==
+    NTM5MWM4MjRkOGExNTJkNDgzZWYyYzhmMjc5MTY3ODFjNDYxYTU1NA==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    MjJiZDhjOTI4N2EwNTIyMTRkZDE5MTFlYTU2YjhlOTczOWJmYWViZjljMjY0
-    ZWU3ZTFkOGQwMjFjY2Y1ZjlkOWZjM2Q1ZjAyZTM0ZjM1Yzk3YmI4OThhYTFm
-    MWU5MjY0ODgxMzllNDEwZGM3OTY0NzNhNDE0OWE4ZThhZmE1NzQ=
+    MmFlODc5NjdkYzEyZGJhZDhkODQ2NTczNTFkZTk0ZTk0OGRlZGQ3NmNiYmI1
+    OTNhNjBkOTQxMDM5ZTM0ODJiMTY5NmE5MzZmY2M0NTBmZDhmMzc5NjY3MDUy
+    NDY2NDRjMDFkZjA2ZGIxMDNlM2NkNWVlMjBkZmYyMGNjNGQwNTU=
   data.tar.gz: !binary |-
-    MmNhNjEyNDg2YjYzZGE0NWJmYzIyMjUxN2NkNDQ5NTBiZDZjOTlmZTA4NzRh
-    NDI3ZGE3NzliNzMxYmQ3M2RhYzgwMDc1ZTMzYzI4N2YxZDY1YTY1OWVhMzQ5
-    NTNmMmE3NTk4NWUyMGQ2YzQzYzJiMDg1YzY1MzliZDExNWI4NWY=
+    MGZhNjI0MjU5ZjU2OTljMjkxZGIyZTA5NzFjYTE3ODcyYWI5Yzk0YzIyZGZj
+    MTZkZjhkNjAyNmZmMWQ0ZWIzZGY5ZWVlM2U4MmUxMTM0M2FmYTJkNTQxYWUz
+    NTllOGZjZjZhZWI2Y2E1OGE4ZDliYzFiYWFiOTYzZTFjZGIyODk=

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # CHANGELOG
 
+## 0.9.0.pre4 (Sept 24 2013)
+
+* FIX #497 Renderer should support partial caching and a digestor bug fixed (Thanks @siong1987)
+
 ## 0.9.0.pre3 (Sept 22 2013)
 
  * FIX #495 Digest cache when rendering from controller (Thanks @siong1987)

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

@@ -2,3 +2,7 @@ object @post
 cache @post
 
 attributes :title, :body
+
+node :partial do |p|
+  partial('posts/renderer_partial', object: p)
+end

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

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

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

@@ -149,6 +149,10 @@ context "PostsController" do
     # Attributes (regular)
     asserts("contains post title") { topic['title'] }.equals { @post1.title }
     asserts("contains post body")  { topic['body'] }.equals { @post1.body }
+
+    # Attributes (partial)
+    asserts("contains post partial title") { topic['partial']['title'] }.equals { @post1.title }
+    asserts("contains post partial body")  { topic['partial']['body'] }.equals { @post1.body }
   end # renderer action, json
 
   context "for index action rendering JSON within HTML" do

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

@@ -149,6 +149,10 @@ context "PostsController" do
     # Attributes (regular)
     asserts("contains post title") { topic['title'] }.equals { @post1.title }
     asserts("contains post body")  { topic['body'] }.equals { @post1.body }
+
+    # Attributes (partial)
+    asserts("contains post partial title") { topic['partial']['title'] }.equals { @post1.title }
+    asserts("contains post partial body")  { topic['partial']['body'] }.equals { @post1.body }
   end # renderer action, json
 
   context "for index action rendering JSON within HTML" do
@@ -199,7 +203,7 @@ context "PostsController" do
 
       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, nil, 'hash', 'e83f65eee5ffb454c418a59105f222c4'])[:title] } }
+      end.equals { @posts.map { |p| cache_hit([p, nil, 'hash', 'e373525f49a3b3b044af05255e84839d'])[:title] } }
     end # index action, caching, json
 
     context "for index action with caching in xml" do

data/lib/rabl/digestor.rb

@@ -12,7 +12,7 @@ module Rabl
     private
       def dependency_digest
         template_digests = dependencies.collect do |template_name|
-          Digestor.digest(template_name, format, finder, partial: true)
+          Digestor.digest(template_name, format, finder)
         end
 
         (template_digests + injected_dependencies).join("-")

data/lib/rabl/engine.rb

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

data/lib/rabl/partials.rb

@@ -10,7 +10,7 @@ module Rabl
       raise ArgumentError, "Must provide an :object option to render a partial" unless options.has_key?(:object)
       object, view_path = options.delete(:object), options[:view_path] || @_view_path
       source, location = self.fetch_source(file, :view_path => view_path)
-      engine_options = options.merge(:source => source, :source_location => location)
+      engine_options = options.merge(:source => source, :source_location => location, :template => file)
       self.object_to_hash(object, engine_options, &block)
     end
 
@@ -43,16 +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
 
-        [File.read(file_path.to_s), file_path.to_s] if file_path
+        [File.read(file_path.to_s), file_path.to_s]
       end
     end
 

data/lib/rabl/renderer.rb

@@ -26,7 +26,8 @@ module Rabl
       options = {
         :format => :json,
         :scope => self,
-        :view_path => []
+        :view_path => [],
+        :template => source
       }.update(options)
 
       @options = options

data/lib/rabl/version.rb

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

data/test/engine_test.rb

@@ -379,7 +379,7 @@ context "Rabl::Engine" do
         scope.instance_variable_set :@user, @user
         any_instance_of(Rabl::Engine) do |b|
           mock(b).fetch_source("foo/bar", :view_path => nil).once
-          mock(b).object_to_hash(@user, :locals => { :foo => "bar" }, :source => nil, :source_location => nil).returns({ :name => 'leo', :city => 'LA', :age => 12 })
+          mock(b).object_to_hash(@user, :locals => { :foo => "bar" }, :source => nil, :source_location => nil, :template => 'foo/bar').returns({ :name => 'leo', :city => 'LA', :age => 12 })
         end
         JSON.parse(template.render(scope))
       end.equals JSON.parse("{ \"foo\" : {\"name\":\"leo\",\"city\":\"LA\",\"age\":12} }")

data/test/integration/rails3_2/posts_controller_test.rb

@@ -149,6 +149,10 @@ context "PostsController" do
     # Attributes (regular)
     asserts("contains post title") { topic['title'] }.equals { @post1.title }
     asserts("contains post body")  { topic['body'] }.equals { @post1.body }
+
+    # Attributes (partial)
+    asserts("contains post partial title") { topic['partial']['title'] }.equals { @post1.title }
+    asserts("contains post partial body")  { topic['partial']['body'] }.equals { @post1.body }
   end # renderer action, json
 
   context "for index action rendering JSON within HTML" do

data/test/integration/rails4/posts_controller_test.rb

@@ -149,6 +149,10 @@ context "PostsController" do
     # Attributes (regular)
     asserts("contains post title") { topic['title'] }.equals { @post1.title }
     asserts("contains post body")  { topic['body'] }.equals { @post1.body }
+
+    # Attributes (partial)
+    asserts("contains post partial title") { topic['partial']['title'] }.equals { @post1.title }
+    asserts("contains post partial body")  { topic['partial']['body'] }.equals { @post1.body }
   end # renderer action, json
 
   context "for index action rendering JSON within HTML" do
@@ -199,7 +203,7 @@ context "PostsController" do
 
       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, nil, 'hash', 'e83f65eee5ffb454c418a59105f222c4'])[:title] } }
+      end.equals { @posts.map { |p| cache_hit([p, nil, 'hash', 'e373525f49a3b3b044af05255e84839d'])[:title] } }
     end # index action, caching, json
 
     context "for index action with caching in xml" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rabl
 version: !ruby/object:Gem::Version
-  version: 0.9.0.pre3
+  version: 0.9.0.pre4
 platform: ruby
 authors:
 - Nathan Esquenazi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-23 00:00:00.000000000 Z
+date: 2013-09-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -178,6 +178,7 @@ files:
 - 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/renderer_partial.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