tilt-jbuilder 0.1.0 → 0.2.0

data/lib/tilt/jbuilder.rb

@@ -1,4 +1,3 @@
-require 'tilt/template'
 require 'jbuilder'
 
 module Tilt
@@ -20,12 +19,20 @@ module Tilt
       context = scope.instance_eval { binding }
       set_locals(locals, scope, context)
       eval %{
-        Jbuilder.encode do |json|
+        if defined? json
           if @_tilt_data.kind_of? Proc
             return @_tilt_data.call(Jbuilder.new)
           else
             eval @_tilt_data, binding
           end
+        else
+          Jbuilder.encode do |json|
+            if @_tilt_data.kind_of? Proc
+              return @_tilt_data.call(Jbuilder.new)
+            else
+              eval @_tilt_data, binding
+            end
+          end
         end
       }, context
     end
@@ -41,3 +48,12 @@ module Tilt
 
   register Tilt::JbuilderTemplate, 'jbuilder'
 end
+
+class Jbuilder < BlankSlate
+  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/_partial.json.jbuilder

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

data/spec/tilt-jbuilder_spec.rb

@@ -34,4 +34,9 @@ describe Tilt::JbuilderTemplate do
     end
     "{\"author\":\"Anthony\"}".should == template.render
   end
+
+  it "should evaluate partials" do
+    template = Tilt::JbuilderTemplate.new { "json.partial! 'spec/partial', last_name: 'Smith'" }
+    "{\"last_name\":\"Smith\"}".should == template.render
+  end
 end

data/tilt-jbuilder.gemspec

@@ -1,6 +1,4 @@
 # -*- encoding: utf-8 -*-
-require File.expand_path('../lib/tilt/version', __FILE__)
-
 Gem::Specification.new do |gem|
   gem.authors       = ["Anthony Smith"]
   gem.email         = ["anthony@sticksnleaves.com"]
@@ -10,6 +8,7 @@ Gem::Specification.new do |gem|
 
   gem.add_dependency 'tilt'
   gem.add_dependency 'jbuilder'
+  gem.add_development_dependency 'rake'
   gem.add_development_dependency 'rspec'
 
   gem.files         = `git ls-files`.split($\)
@@ -17,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       = Tilt::JbuilderTemplate::VERSION
+  gem.version       = '0.2.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tilt-jbuilder
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-10 00:00:00.000000000 Z
+date: 2012-06-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tilt
@@ -43,6 +43,22 @@ dependencies:
     - - ! '>='
       - !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
@@ -73,7 +89,7 @@ files:
 - README.rdoc
 - Rakefile
 - lib/tilt/jbuilder.rb
-- lib/tilt/version.rb
+- spec/_partial.json.jbuilder
 - spec/tilt-jbuilder_spec.rb
 - tilt-jbuilder.gemspec
 homepage: https://github.com/anthonator/tilt-jbuilder
@@ -88,12 +104,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -3179914202370087647
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -3179914202370087647
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24
@@ -101,4 +123,5 @@ signing_key:
 specification_version: 3
 summary: Adds support for rendering Jbuilder templates in Tilt.
 test_files:
+- spec/_partial.json.jbuilder
 - spec/tilt-jbuilder_spec.rb

data/lib/tilt/version.rb

@@ -1,5 +0,0 @@
-module Tilt
-  module JbuilderTemplate
-    VERSION = "0.1.0"
-  end
-end