tilt-jbuilder 0.4.1 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 56939b6d5cafb1b5aa25b1ac0363202fe9909ca1
-  data.tar.gz: cfd50462e4f0782e7c1d7bb2994e530501d5f15f
+  metadata.gz: 7c1e17931a8513c789f4cea3631185ede1832c9b
+  data.tar.gz: 9cfea7e9f46f5c9e11ac0f48465ba21a1bdbdd63
 SHA512:
-  metadata.gz: 05a4f54cc54921860ac6b94e77cab2f26fb7e29af8a80420c627691d00b6e316f759f31a6ad89f3f320127e27f0e6568884b3934788dc94f12aa781910a27f2c
-  data.tar.gz: 5699ca31fe3f1b4d3b23765d49b92420ddcac3b92cd93db8fa5964337dee8cca350e01d73c1095ceaa6551e233379dc23ff5890af2fe8521bfa6c56ef9a2f8e0
+  metadata.gz: 5ad14ae2d4ea7126b9c43cb9ab73fc12d113e2aa0f4700b73ab646ae9b969c7f6d319eeccaea6f41f69f7961402b94f86852804d6cee6759ffa27255981a9bb7
+  data.tar.gz: d37fe4b6a3f504c67e34bc4015eae257d89cbd5a132a22e4d8f9dd555656448e7c9e5ef842192ae881e15a87052f8046fc1985b8f6f2e85f787f67df69dabd45

data/.gitignore

@@ -15,3 +15,5 @@ spec/reports
 test/tmp
 test/version_tmp
 tmp
+.rbenv*
+.rvmrc

data/lib/sinatra/jbuilder.rb

@@ -1,10 +1,20 @@
 require "tilt/jbuilder"
+require "sinatra/base"
 
 module Sinatra
   module Templates
     def jbuilder(template, options={}, locals={})
       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"
+      render_without_view_path_support(engine, data, options, locals, &block)
+    end
+    alias_method :render_without_view_path_support, :render
+    alias_method :render, :render_with_view_path_support
   end
 end
 

data/lib/tilt/jbuilder.rb

@@ -17,12 +17,7 @@ module Tilt
 
     private
     def fetch_partial_path(file, view_path)
-      view_path ||=
-        if defined?(::Sinatra) && @scope.respond_to?(:settings)
-          @scope.settings.views
-        else
-          ::Dir.pwd
-        end
+      view_path ||= ::Dir.pwd
       ::Dir[::File.join(view_path, partialized(file) + ".{*.,}jbuilder")].first
     end
 

data/spec/sinatra_integration_spec.rb

@@ -69,4 +69,9 @@ describe "Sinatra Integration" 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
 end

data/tilt-jbuilder.gemspec

@@ -18,5 +18,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.4.1'
+  gem.version       = '0.5.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tilt-jbuilder
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.5.1
 platform: ruby
 authors:
 - Anthony Smith
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-19 00:00:00.000000000 Z
+date: 2013-05-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tilt
@@ -102,7 +102,6 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
-- .rvmrc
 - .travis.yml
 - Gemfile
 - LICENSE
@@ -114,7 +113,6 @@ files:
 - spec/_partial.json.jbuilder
 - spec/sinatra_integration_spec.rb
 - spec/tilt-jbuilder_spec.rb
-- spec/views/_hello.jbuilder
 - spec/views/_partial_with_helper_method.jbuilder
 - spec/views/_partial_with_instance_variable.jbuilder
 - spec/views/_partial_with_local_variable.jbuilder
@@ -139,7 +137,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.0.0
 signing_key: 
 specification_version: 4
 summary: Adds support for rendering Jbuilder templates in Tilt.
@@ -147,7 +145,6 @@ test_files:
 - spec/_partial.json.jbuilder
 - spec/sinatra_integration_spec.rb
 - spec/tilt-jbuilder_spec.rb
-- spec/views/_hello.jbuilder
 - spec/views/_partial_with_helper_method.jbuilder
 - spec/views/_partial_with_instance_variable.jbuilder
 - spec/views/_partial_with_local_variable.jbuilder

data/.rvmrc

@@ -1,48 +0,0 @@
-#!/usr/bin/env bash
-
-# This is an RVM Project .rvmrc file, used to automatically load the ruby
-# development environment upon cd'ing into the directory
-
-# First we specify our desired <ruby>[@<gemset>], the @gemset name is optional,
-# Only full ruby name is supported here, for short names use:
-#     echo "rvm use 1.9.3" > .rvmrc
-environment_id="ruby-1.9.3-p194@tilt-jbuilder"
-
-# Uncomment the following lines if you want to verify rvm version per project
-# rvmrc_rvm_version="1.14.1 (stable)" # 1.10.1 seams as a safe start
-# eval "$(echo ${rvm_version}.${rvmrc_rvm_version} | awk -F. '{print "[[ "$1*65536+$2*256+$3" -ge "$4*65536+$5*256+$6" ]]"}' )" || {
-#   echo "This .rvmrc file requires at least RVM ${rvmrc_rvm_version}, aborting loading."
-#   return 1
-# }
-
-# First we attempt to load the desired environment directly from the environment
-# file. This is very fast and efficient compared to running through the entire
-# CLI and selector. If you want feedback on which environment was used then
-# insert the word 'use' after --create as this triggers verbose mode.
-if [[ -d "${rvm_path:-$HOME/.rvm}/environments"
-  && -s "${rvm_path:-$HOME/.rvm}/environments/$environment_id" ]]
-then
-  \. "${rvm_path:-$HOME/.rvm}/environments/$environment_id"
-  [[ -s "${rvm_path:-$HOME/.rvm}/hooks/after_use" ]] &&
-    \. "${rvm_path:-$HOME/.rvm}/hooks/after_use" || true
-else
-  # If the environment file has not yet been created, use the RVM CLI to select.
-  rvm --create  "$environment_id" || {
-    echo "Failed to create RVM environment '${environment_id}'."
-    return 1
-  }
-fi
-
-# If you use bundler, this might be useful to you:
-# if [[ -s Gemfile ]] && {
-#   ! builtin command -v bundle >/dev/null ||
-#   builtin command -v bundle | GREP_OPTIONS= \grep $rvm_path/bin/bundle >/dev/null
-# }
-# then
-#   printf "%b" "The rubygem 'bundler' is not installed. Installing it now.\n"
-#   gem install bundler
-# fi
-# if [[ -s Gemfile ]] && builtin command -v bundle >/dev/null
-# then
-#   bundle install | GREP_OPTIONS= \grep -vE '^Using|Your bundle is complete'
-# fi

data/spec/views/_hello.jbuilder

@@ -1,3 +0,0 @@
-json.author "Anthony"
-json.is_admin admin?
-json.last_name @last_name