tilt-jbuilder 0.6.0 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8b283dedad1f47c0b518b44f20cf770ec0fc1b35
-  data.tar.gz: b2cb848c88cb66bada087b062734ec331b70fd32
+  metadata.gz: 40dc9d2196a27a4aadcd81854439e11a71b82272
+  data.tar.gz: 9b7ecd7198ef0523c0dab1fcc42ce9f685558b37
 SHA512:
-  metadata.gz: 0a732b210b1a5251282b5a52916f9aea1aba0e3b8da43cc563c3839d2bca468add1ea90985ae08a3c0c116b2a14ad3f5e984714d7ed52f6ef19c25838f5c1d50
-  data.tar.gz: 36358ed4e79ec48d5cfd19277a51e068258f192c8a063a29afc49a39286bc85ca9e41853df812f558044a36ac3d4a6bf1064c1c865d24c6bb0906f6bd18f3b5e
+  metadata.gz: 371fdddbd99b8b594e8b31448fa6222d68489081061f3b7b3941911d17615485b141a8a3637a4f075f6053df6b5397f1af5f96b75498ab1641b4ab0908eb9a62
+  data.tar.gz: ea598e45b92badde16d01814025431de6ce6cad33af672f4c789974be22669d8f18f61c442c64e5f2edc0f5806790bd7c0e057c429ffb448739a2b3917b53a2b

data/.travis.yml

@@ -4,10 +4,11 @@ rvm:
   - 2.0.0
   - 2.1.0
   - 2.1.1
+  - 2.1.2
   - ruby-head
   - jruby-19mode
   - jruby-head
 matrix:
   allow_failures:
     - rvm: ruby-head
-    - rvm: jruby-head
+    - rvm: jruby-head

data/Gemfile

@@ -3,7 +3,6 @@ source 'https://rubygems.org'
 gem 'rake'
 
 group :development do
-  gem 'bundler'
   gem 'coveralls', :require => false
 end
 

data/lib/tilt/jbuilder.rb

@@ -49,7 +49,7 @@ module Tilt
         if data.kind_of?(Proc)
           return data.call(::Tilt::Jbuilder.new(scope))
         else
-          eval(data, context)
+          file.is_a?(String) ? eval(data, context, file) : eval(data, context)
         end
       end
     end

data/spec/support/views/invalid.jbuilder

@@ -0,0 +1,2 @@
+json.author "Anthony"
+json.trigger_error_on_this_line nil.name

data/spec/tilt-jbuilder_spec.rb

@@ -5,6 +5,15 @@ describe Tilt::JbuilderTemplate do
     Tilt::JbuilderTemplate.should == Tilt['test.jbuilder']
   end
 
+  it "contains information about source file when error in .jbuilder file" do
+    template = Tilt::JbuilderTemplate.new(File.join('spec', 'support', 'views', 'invalid.jbuilder'))
+    begin
+      template.render
+    rescue => e
+      expect(e.backtrace.join).to include 'invalid.jbuilder:2' # we should see error on line 2 in file invalid.jbuilder in stacktrace
+    end
+  end
+
   it "should evaluate the template on #render" do
     template = Tilt::JbuilderTemplate.new { "json.author 'Anthony'" }
     "{\"author\":\"Anthony\"}".should == template.render

data/tilt-jbuilder.gemspec

@@ -8,7 +8,7 @@ Gem::Specification.new do |gem|
 
   gem.add_dependency 'tilt', '<= 1.5.0'
   gem.add_dependency 'jbuilder'
-  
+
   gem.add_development_dependency 'bundler'
 
   gem.files         = `git ls-files`.split($\)
@@ -16,5 +16,5 @@ Gem::Specification.new do |gem|
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.name          = "tilt-jbuilder"
   gem.require_paths = ["lib"]
-  gem.version       = '0.6.0'
+  gem.version       = '0.6.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tilt-jbuilder
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.1
 platform: ruby
 authors:
 - Anthony Smith
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-09 00:00:00.000000000 Z
+date: 2014-08-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tilt
@@ -77,6 +77,7 @@ files:
 - spec/support/views/_partial_with_instance_variable.jbuilder
 - spec/support/views/_partial_with_local_variable.jbuilder
 - spec/support/views/hello.jbuilder
+- spec/support/views/invalid.jbuilder
 - spec/tilt-jbuilder_spec.rb
 - tilt-jbuilder.gemspec
 homepage: https://github.com/anthonator/tilt-jbuilder
@@ -113,4 +114,5 @@ test_files:
 - spec/support/views/_partial_with_instance_variable.jbuilder
 - spec/support/views/_partial_with_local_variable.jbuilder
 - spec/support/views/hello.jbuilder
+- spec/support/views/invalid.jbuilder
 - spec/tilt-jbuilder_spec.rb