rabl 0.11.4 → 0.11.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 653e59826616815f5be896620c6e11bfde575596
-  data.tar.gz: e3cf65575ec7aa5698a24119e761c0959433aefb
+  metadata.gz: 8e537c7beaab5536e66f93405989bf5cee8eb01c
+  data.tar.gz: ba40dd0c56d79991be8348f316012fe7d0642653
 SHA512:
-  metadata.gz: 6ff1aa2e4f4b7f7f91d70210d8faec3063dabe58a06d9d313e9c9ab195177296ee40ffbd0e8873ff65258fca4f4f32d9132d0ce74424a3f6c7a036ff411037e3
-  data.tar.gz: e3112ccd7ff15031956053833d59c49bacf908db0998352015fe975d500570b2f5395c9f972cca25b52864c3e1d5170ef97f0c6ce45c3bdafe56196bc4befc97
+  metadata.gz: 9120f78fa8c6c01522b56df715e95fa5fdf23851f0d6ce485a797c43a82d182b9141fa5bbd58884a484dce88619bc591e4d3ea9a25d41df5b184b84aa58671e5
+  data.tar.gz: 7b8cae3fed1ef957e4ef39b6b4af16366e4444eb2d591a8bb1320426cabf4af16d3beda7344600efa53abd8929ab54989602e8a25326fcc75a379bb0419a5432

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # CHANGELOG
 
+## 0.11.5 (December 5th)
+
+* Check if context_scope includes ".settings.views" for Sinatra (@LTe)
+* Fix view path issue for partials (@LTe)
+
 ## 0.11.4 (November 7th)
 
 * FIX Get MultiBuilder to behave properly around nil engines (@DouweM)

data/lib/rabl/partials.rb

@@ -7,7 +7,7 @@ module Rabl
       raise ArgumentError, "Must provide an :object option to render a partial" unless options.has_key?(:object)
 
       object    = options.delete(:object)
-      view_path = options[:view_path] || view_path
+      view_path = options[:view_path] || self.view_path
 
       source, location = fetch_source(file, :view_path => view_path)
 

data/lib/rabl/sources.rb

@@ -14,7 +14,7 @@ module Rabl
           elsif defined?(Rails) && context_scope.respond_to?(:view_paths)
             _view_paths = view_paths + Array(context_scope.view_paths.to_a)
             fetch_rails_source(file, options) || fetch_manual_template(_view_paths, file)
-          elsif defined?(Sinatra) && context_scope.respond_to?(:settings)
+          elsif defined?(Sinatra) && context_scope.respond_to?(:settings) && context_scope.settings.respond_to?(:views)
             fetch_sinatra_source(file, options)
           else # generic template resolution
             fetch_manual_template(view_paths, file)

data/lib/rabl/version.rb

@@ -1,3 +1,3 @@
 module Rabl
-  VERSION = "0.11.4"
+  VERSION = "0.11.5"
 end

data/test/partials_test.rb

@@ -89,6 +89,26 @@ context "Rabl::Partials" do
     end
   end
 
+  context "partial_as_engine using configured view paths" do
+    helper(:tmp_path) { @tmp_path ||= Pathname.new(Dir.mktmpdir) }
+
+    setup do
+      File.open(tmp_path + "_test.rabl", "w")
+      engine = Rabl::Engine.new('', :view_path => tmp_path)
+    end
+
+    asserts('returns new engine with given view_path') do
+      topic.partial_as_engine('test', :object => {}).view_path
+    end.equals do
+      tmp_path
+    end
+
+    teardown do
+      Rabl.configuration.view_paths = []
+    end
+  end
+
+
   context "fetch source with custom scope" do
     context "when Padrino is defined" do
       helper(:tmp_path) { @tmp_path ||= Pathname.new(Dir.mktmpdir) }
@@ -113,6 +133,30 @@ context "Rabl::Partials" do
 
       teardown { Object.send(:remove_const, :Padrino) }
     end
+
+    context "when Sinatra is defined" do
+      helper(:tmp_path) { @tmp_path ||= Pathname.new(Dir.mktmpdir) }
+
+      setup do
+        ::Sinatra = stub(Class.new)
+        Rabl.configuration.cache_sources = false
+        @it = TestPartial.new
+
+        def @it.context_scope; @context_scope ||= Object.new; end
+        context_scope = @it.context_scope
+        def context_scope.settings; @settings ||= Object.new end
+
+        File.open(tmp_path + "test.json.rabl", "w") { |f| f.puts "content" }
+      end
+
+      asserts('Sinatra constant dont break manual lookup') do
+        @it.fetch_source((tmp_path + "test").to_s)
+      end.equals do
+        ["content\n", "/" + (tmp_path + "test.json.rabl").to_s ]
+      end
+
+      teardown { Object.send(:remove_const, :Sinatra) }
+    end
   end
 
   context "fetch source with Rails" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rabl
 version: !ruby/object:Gem::Version
-  version: 0.11.4
+  version: 0.11.5
 platform: ruby
 authors:
 - Nathan Esquenazi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-08 00:00:00.000000000 Z
+date: 2014-12-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport