tilt-jbuilder 0.3.0 → 0.4.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 00e24cf46f2b348806b82a5b80db198a1d8971e5
+  data.tar.gz: 42c17a0504854084781501c9fb4e94a1536e3fb0
+SHA512:
+  metadata.gz: 34922151c7a3712d67ac1e60da326dcab754727ec5730e10f953f7336a9880c2efd3141c84d05972244e509a0221c595771c1c76b5b3be7a5f3dae8f6c37359b
+  data.tar.gz: 31eea542ca37c304be935ead939fd32b6866baf50a87c771deb101e6af4f58f805d0bfb7bd621612f10b7769a2818f717d33c5f7a137dae290d87d6a3f3bcbf1

data/.travis.yml

@@ -1,4 +1,7 @@
 language: ruby
 rvm:
   - 1.9.3
-  - jruby-19mode
+  - 2.0.0
+  - ruby-head
+  - jruby-19mode
+  - jruby-head

data/README.md

@@ -0,0 +1,51 @@
+# tilt-jbuilder [![endorse](http://api.coderwall.com/anthonator/endorsecount.png)](http://coderwall.com/anthonator)
+
+Adds support for rendering Jbuilder templates using Tilt.
+
+[![Build Status](https://secure.travis-ci.org/anthonator/tilt-jbuilder.png)](http://travis-ci.org/anthonator/tilt-jbuilder)
+
+## Installation
+
+Add this line to your application's Gemfile:
+
+    gem 'tilt-jbuilder'
+
+And then execute:
+
+    $ bundle
+
+Or install it yourself as:
+
+    $ gem install tilt-jbuilder
+
+## Usage
+
+```ruby
+require 'tilt/jbuilder.rb'
+
+template = Tilt::JbuilderTemplate.new("templates/awesomeness.json.jbuilder")
+teplate.render
+
+# With locals
+template = Tilt::JbuilderTemplate.new { "json.author name" }
+template.render(nil, :name => 'Anthony')
+
+# With scope
+template = Tilt::JbuilderTemplate.new { "json.author @name" }
+scope = Object.new
+scope.instance_variable_set :@name, 'Anthony'
+template.render(scope)
+
+# Block style
+template = Tilt::JbuilderTemplate.new do |t|
+  lambda { |json| json.author 'Anthony'; json.target! }
+end
+template.render
+```
+
+## Contributing
+1. Fork it
+2. Create your feature branch (`git checkout -b my-new-feature`)
+3. Commit your changes (`git commit -am 'Added some feature'`)
+4. Push to the branch (`git push origin my-new-feature`)
+5. Create new Pull Request

data/lib/sinatra/jbuilder.rb

@@ -0,0 +1,10 @@
+require "tilt/jbuilder"
+
+module Sinatra
+  module Templates
+    def jbuilder(template, options={}, locals={})
+      render :jbuilder, template, options, locals
+    end
+  end
+end
+

data/lib/tilt/jbuilder.rb

@@ -1,6 +1,37 @@
 require 'jbuilder'
 
 module Tilt
+  class Jbuilder < ::Jbuilder
+    def initialize(scope, *args, &block)
+      @scope = scope
+      super(*args, &block)
+    end
+
+    def partial!(options, locals = {})
+      locals.merge! :json => self
+      view_path = @scope.instance_variable_get('@_jbuilder_view_path')
+      template = ::Tilt::JbuilderTemplate.new(fetch_partial_path(options.to_s, view_path), nil, view_path: view_path)
+      template.render(@scope, locals)
+    end
+
+    private
+    def fetch_partial_path(file, view_path)
+      view_path ||=
+        if defined?(::Sinatra) && @scope.respond_to?(:settings)
+          @scope.settings.views
+        else
+          ::Dir.pwd
+        end
+      ::Dir[::File.join(view_path, partialized(file) + ".{*.,}jbuilder")].first
+    end
+
+    def partialized(path)
+      partial_file = path.split("/")
+      partial_file[-1] = "_#{partial_file[-1]}" unless partial_file[-1].start_with?("_")
+      partial_file.join("/")
+    end
+  end
+
   class JbuilderTemplate < Template
     self.default_mime_type = 'application/json'
 
@@ -18,17 +49,18 @@ module Tilt
       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(Jbuilder.new)
+            return @_tilt_data.call(klass.new(scope))
           else
             eval @_tilt_data, binding
           end
         else
-          Jbuilder.encode do |json|
+          klass.encode(scope) do |json|
             if @_tilt_data.kind_of? Proc
-              return @_tilt_data.call(Jbuilder.new)
+              return @_tilt_data.call(klass.new(scope))
             else
               eval @_tilt_data, binding
             end
@@ -39,6 +71,8 @@ module Tilt
 
     private
     def set_locals(locals, scope, context)
+      view_path = options.delete(:view_path)
+      scope.send(:instance_variable_set, '@_jbuilder_view_path', view_path)
       scope.send(:instance_variable_set, '@_jbuilder_locals', locals)
       scope.send(:instance_variable_set, '@_tilt_data', data)
       set_locals = locals.keys.map { |k| "#{k} = @_jbuilder_locals[#{k.inspect}]" }.join("\n")
@@ -48,12 +82,3 @@ module Tilt
 
   register Tilt::JbuilderTemplate, 'jbuilder'
 end
-
-class Jbuilder
-  def partial!(options, locals = {})
-    path = ::Pathname.new(options)
-    locals.merge! :json => self
-    template = ::Tilt::JbuilderTemplate.new("#{path.dirname.to_s}/_#{path.basename}.json.jbuilder")
-    template.render(nil, locals)
-  end
-end

data/spec/sinatra_integration_spec.rb

@@ -0,0 +1,72 @@
+require "tilt"
+require "tilt/jbuilder"
+require "sinatra/jbuilder"
+
+require "rack/test"
+require "sinatra/base"
+
+ENV['RACK_ENV'] ||= "test"
+Sinatra::Base.set :environment,  :test
+
+module SinatraIntegrationTestMethods
+  def jbuilder_app(&block)
+    @app = Sinatra.new(Sinatra::Base) do
+      set :views, File.dirname(__FILE__) + "/views"
+      helpers do
+        def admin?; false end
+      end
+      get("/", &block)
+    end
+    get "/"
+  end
+
+  def app
+    Rack::Lint.new(@app)
+  end
+
+  def body
+    last_response.body.to_s
+  end
+end
+
+RSpec.configure do |config|
+  config.include Rack::Test::Methods
+  config.include SinatraIntegrationTestMethods
+end
+
+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
+end

data/spec/tilt-jbuilder_spec.rb

@@ -39,4 +39,9 @@ describe Tilt::JbuilderTemplate do
     template = Tilt::JbuilderTemplate.new { "json.partial! 'spec/partial', last_name: 'Smith'" }
     "{\"last_name\":\"Smith\"}".should == template.render
   end
+
+  it "should evaluate partials with view_path" do
+    template = Tilt::JbuilderTemplate.new(nil, nil, view_path: 'spec') { "json.partial! '/partial', last_name: 'Smith'" }
+    "{\"last_name\":\"Smith\"}".should == template.render
+  end
 end

data/spec/views/_hello.jbuilder

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

data/spec/views/_partial_with_helper_method.jbuilder

@@ -0,0 +1 @@
+json.is_admin admin?

data/spec/views/_partial_with_instance_variable.jbuilder

@@ -0,0 +1 @@
+json.last_name @last_name

data/spec/views/_partial_with_local_variable.jbuilder

@@ -0,0 +1 @@
+json.last_name last_name

data/spec/views/hello.jbuilder

@@ -0,0 +1 @@
+json.author "Anthony"

data/tilt-jbuilder.gemspec

@@ -10,11 +10,13 @@ Gem::Specification.new do |gem|
   gem.add_dependency 'jbuilder'
   gem.add_development_dependency 'rake'
   gem.add_development_dependency 'rspec'
+  gem.add_development_dependency 'rack-test'
+  gem.add_development_dependency 'sinatra'
 
   gem.files         = `git ls-files`.split($\)
   gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.name          = "tilt-jbuilder"
   gem.require_paths = ["lib"]
-  gem.version       = '0.3.0'
+  gem.version       = '0.4.0'
 end

metadata

@@ -1,78 +1,97 @@
 --- !ruby/object:Gem::Specification
 name: tilt-jbuilder
 version: !ruby/object:Gem::Version
-  version: 0.3.0
-  prerelease: 
+  version: 0.4.0
 platform: ruby
 authors:
 - Anthony Smith
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-27 00:00:00.000000000 Z
+date: 2013-03-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tilt
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: jbuilder
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rack-test
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: sinatra
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: Jbuilder support for Tilt
@@ -87,42 +106,49 @@ files:
 - .travis.yml
 - Gemfile
 - LICENSE
+- README.md
 - README.rdoc
 - Rakefile
+- lib/sinatra/jbuilder.rb
 - lib/tilt/jbuilder.rb
 - 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
+- spec/views/hello.jbuilder
 - tilt-jbuilder.gemspec
 homepage: https://github.com/anthonator/tilt-jbuilder
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 1083047209817213749
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 1083047209817213749
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 2.0.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Adds support for rendering Jbuilder templates in Tilt.
 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
+- spec/views/hello.jbuilder