tilt-jbuilder 0.5.3 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dd42ee650b56bdaebc64c4fa25efd63fc968c0ad
-  data.tar.gz: c1d9f66a80b8d47b21a845c5ce5bd05439b5db7b
+  metadata.gz: 8b283dedad1f47c0b518b44f20cf770ec0fc1b35
+  data.tar.gz: b2cb848c88cb66bada087b062734ec331b70fd32
 SHA512:
-  metadata.gz: 9e25a9698fffa03fca56f9f88d1f7e3dc47ba403e3ae0874d8c638cc54663c30e6d6e027b9b4f6d8c27ff201d2c2c10ea1876cee93adb9b27a7dfd9c8b06f18a
-  data.tar.gz: 80d1f6218ca260e24d6bfffc508fc1d05319db983de2777600f22cfa0e1c8bf197d9b0018d71615a96218e67eb0b8a17b54d251f6c39e9ed9871515acc6917cf
+  metadata.gz: 0a732b210b1a5251282b5a52916f9aea1aba0e3b8da43cc563c3839d2bca468add1ea90985ae08a3c0c116b2a14ad3f5e984714d7ed52f6ef19c25838f5c1d50
+  data.tar.gz: 36358ed4e79ec48d5cfd19277a51e068258f192c8a063a29afc49a39286bc85ca9e41853df812f558044a36ac3d4a6bf1064c1c865d24c6bb0906f6bd18f3b5e

data/.travis.yml

@@ -3,9 +3,11 @@ rvm:
   - 1.9.3
   - 2.0.0
   - 2.1.0
+  - 2.1.1
   - ruby-head
   - jruby-19mode
   - jruby-head
 matrix:
   allow_failures:
-    - rvm: ruby-head
+    - rvm: ruby-head
+    - rvm: jruby-head

data/Gemfile

@@ -12,6 +12,7 @@ group :test do
   gem 'rspec'
   gem 'simplecov'
   gem 'sinatra'
+  gem 'sinatra-contrib'
 end
 
 # Specify your gem's dependencies in tilt-jbuilder.gemspec

data/lib/sinatra/jbuilder.rb

@@ -4,13 +4,13 @@ require "sinatra/base"
 module Sinatra
   module Templates
     def jbuilder(template, options={}, locals={})
+      options[:default_content_type] = :json
       render :jbuilder, template, options, locals
     end
 
     def render_with_view_path_support(engine, data, options = {}, locals = {}, &block)
       # Same as `views` extraction in the original method.
-      options[:view_path] = options[:views] || settings.views || "./views" \
-        if engine.to_s.downcase == "jbuilder"
+      options[:view_path] = options[:views] || settings.views || "./views" if engine.to_s.downcase == "jbuilder"
       render_without_view_path_support(engine, data, options, locals, &block)
     end
     alias_method :render_without_view_path_support, :render

data/lib/tilt/jbuilder.rb

@@ -43,26 +43,15 @@ module Tilt
 
     def evaluate(scope, locals, &block)
       scope ||= Object.new
-      context = scope.instance_eval { binding }
-      set_locals(locals, scope, context)
-      klass = ::Tilt::Jbuilder
-      eval %{
-        if defined? json
-          if @_tilt_data.kind_of? Proc
-            return @_tilt_data.call(klass.new(scope))
-          else
-            eval @_tilt_data, binding
-          end
+      ::Tilt::Jbuilder.encode(scope) do |json|
+        context = scope.instance_eval { binding }
+        set_locals(locals, scope, context)
+        if data.kind_of?(Proc)
+          return data.call(::Tilt::Jbuilder.new(scope))
         else
-          klass.encode(scope) do |json|
-            if @_tilt_data.kind_of? Proc
-              return @_tilt_data.call(klass.new(scope))
-            else
-              eval @_tilt_data, binding
-            end
-          end
+          eval(data, context)
         end
-      }, context
+      end
     end
 
     private

data/spec/sinatra_integration_spec.rb

@@ -1,51 +1,5 @@
 require 'spec_helper'
 
 describe "Sinatra Integration" do
-  it "renders inline jbuilder strings" do
-    jbuilder_app { jbuilder "json.author 'Anthony'" }
-    body.should == "{\"author\":\"Anthony\"}"
-  end
-
-  it "renders .jbuilder files in views path" do
-    jbuilder_app { jbuilder :hello }
-    body.should == "{\"author\":\"Anthony\"}"
-  end
-  
-  it "renders instance variables" do
-    jbuilder_app { @last_name = "Smith"; jbuilder "json.last_name @last_name" }
-    body.should == "{\"last_name\":\"Smith\"}"
-  end
-
-  it "renders helper methods" do
-    jbuilder_app { jbuilder "json.is_admin admin?" }
-    body.should == "{\"is_admin\":false}"
-  end
-
-  it "renders partials with local variables" do
-    jbuilder_app { jbuilder "json.partial! :partial_with_local_variable, last_name: \"Smith\"" }
-    body.should == "{\"last_name\":\"Smith\"}"
-  end
-
-  it "renders partials with instance variables" do
-    jbuilder_app { @last_name = "Smith"; jbuilder "json.partial! :partial_with_instance_variable" }
-    body.should == "{\"last_name\":\"Smith\"}"
-  end
-
-  it "renders partials with helper methods" do
-    jbuilder_app { jbuilder "json.partial! :partial_with_helper_method" }
-    body.should == "{\"is_admin\":false}"
-  end
-
-  it "renders partials with local variables and non-Sinatra-application scope" do
-    jbuilder_app { jbuilder "json.partial! :partial_with_local_variable, last_name: \"Smith\"", :scope => Object.new }
-    body.should == "{\"last_name\":\"Smith\"}"
-  end
-
-  it "renders partials multiple times" do
-    lambda do
-      2.times do
-        jbuilder_app { jbuilder "json.partial! :partial_with_local_variable, last_name: \"Smith\"" }
-      end
-    end.should_not raise_error
-  end
+  sinatra_integration_tests
 end

data/spec/sinatra_json_integration_spec.rb

@@ -0,0 +1,7 @@
+require 'spec_helper'
+
+describe 'Sinatra::JSON Integration' do
+  require 'sinatra/json'
+  
+  sinatra_integration_tests
+end

data/spec/support/sinatra_integration_tests.rb

@@ -0,0 +1,49 @@
+  def sinatra_integration_tests
+  it "renders inline jbuilder strings" do
+    jbuilder_app { jbuilder "json.author 'Anthony'" }
+    body.should == "{\"author\":\"Anthony\"}"
+  end
+
+  it "renders .jbuilder files in views path" do
+    jbuilder_app { jbuilder :hello }
+    body.should == "{\"author\":\"Anthony\"}"
+  end
+
+  it "renders instance variables" do
+    jbuilder_app { @last_name = "Smith"; jbuilder "json.last_name @last_name" }
+    body.should == "{\"last_name\":\"Smith\"}"
+  end
+
+  it "renders helper methods" do
+    jbuilder_app { jbuilder "json.is_admin admin?" }
+    body.should == "{\"is_admin\":false}"
+  end
+
+  it "renders partials with local variables" do
+    jbuilder_app { jbuilder "json.partial! :partial_with_local_variable, last_name: \"Smith\"" }
+    body.should == "{\"last_name\":\"Smith\"}"
+  end
+
+  it "renders partials with instance variables" do
+    jbuilder_app { @last_name = "Smith"; jbuilder "json.partial! :partial_with_instance_variable" }
+    body.should == "{\"last_name\":\"Smith\"}"
+  end
+
+  it "renders partials with helper methods" do
+    jbuilder_app { jbuilder "json.partial! :partial_with_helper_method" }
+    body.should == "{\"is_admin\":false}"
+  end
+
+  it "renders partials with local variables and non-Sinatra-application scope" do
+    jbuilder_app { jbuilder "json.partial! :partial_with_local_variable, last_name: \"Smith\"", :scope => Object.new }
+    body.should == "{\"last_name\":\"Smith\"}"
+  end
+
+  it "renders partials multiple times" do
+    lambda do
+      2.times do
+        jbuilder_app { jbuilder "json.partial! :partial_with_local_variable, last_name: \"Smith\"" }
+      end
+    end.should_not raise_error
+  end
+end

data/spec/tilt-jbuilder_spec.rb

@@ -28,8 +28,11 @@ describe Tilt::JbuilderTemplate do
   end
 
   it "should evaluate block style templates" do
-    template = Tilt::JbuilderTemplate.new do |t|
-      lambda { |json| json.author "Anthony"; json.target! }
+    template = Tilt::JbuilderTemplate.new do |json|
+      lambda do |json|
+        json.author 'Anthony'
+        json.target!
+      end
     end
     "{\"author\":\"Anthony\"}".should == template.render
   end

data/tilt-jbuilder.gemspec

@@ -6,7 +6,7 @@ Gem::Specification.new do |gem|
   gem.summary       = %q{Adds support for rendering Jbuilder templates in Tilt.}
   gem.homepage      = "https://github.com/anthonator/tilt-jbuilder"
 
-  gem.add_dependency 'tilt', '<= 1.4.1'
+  gem.add_dependency 'tilt', '<= 1.5.0'
   gem.add_dependency 'jbuilder'
   
   gem.add_development_dependency 'bundler'
@@ -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.5.3'
+  gem.version       = '0.6.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tilt-jbuilder
 version: !ruby/object:Gem::Version
-  version: 0.5.3
+  version: 0.6.0
 platform: ruby
 authors:
 - Anthony Smith
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-09 00:00:00.000000000 Z
+date: 2014-04-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tilt
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "<="
       - !ruby/object:Gem::Version
-        version: 1.4.1
+        version: 1.5.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "<="
       - !ruby/object:Gem::Version
-        version: 1.4.1
+        version: 1.5.0
 - !ruby/object:Gem::Dependency
   name: jbuilder
   requirement: !ruby/object:Gem::Requirement
@@ -69,8 +69,10 @@ files:
 - lib/tilt/jbuilder.rb
 - spec/_partial.json.jbuilder
 - spec/sinatra_integration_spec.rb
+- spec/sinatra_json_integration_spec.rb
 - spec/spec_helper.rb
 - spec/support/sinatra_integration_test_methods.rb
+- spec/support/sinatra_integration_tests.rb
 - spec/support/views/_partial_with_helper_method.jbuilder
 - spec/support/views/_partial_with_instance_variable.jbuilder
 - spec/support/views/_partial_with_local_variable.jbuilder
@@ -96,15 +98,17 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.0
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Adds support for rendering Jbuilder templates in Tilt.
 test_files:
 - spec/_partial.json.jbuilder
 - spec/sinatra_integration_spec.rb
+- spec/sinatra_json_integration_spec.rb
 - spec/spec_helper.rb
 - spec/support/sinatra_integration_test_methods.rb
+- spec/support/sinatra_integration_tests.rb
 - spec/support/views/_partial_with_helper_method.jbuilder
 - spec/support/views/_partial_with_instance_variable.jbuilder
 - spec/support/views/_partial_with_local_variable.jbuilder