tilt-jbuilder 0.6.1 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 40dc9d2196a27a4aadcd81854439e11a71b82272
-  data.tar.gz: 9b7ecd7198ef0523c0dab1fcc42ce9f685558b37
+  metadata.gz: 3479ae47f34755751c8800f0a303dc2452ad0ccd
+  data.tar.gz: edede33e7a7235d4875d36f74a6550cfc5b892d6
 SHA512:
-  metadata.gz: 371fdddbd99b8b594e8b31448fa6222d68489081061f3b7b3941911d17615485b141a8a3637a4f075f6053df6b5397f1af5f96b75498ab1641b4ab0908eb9a62
-  data.tar.gz: ea598e45b92badde16d01814025431de6ce6cad33af672f4c789974be22669d8f18f61c442c64e5f2edc0f5806790bd7c0e057c429ffb448739a2b3917b53a2b
+  metadata.gz: 3c18a29f7da6f6402d91ba959b0677564c504178656070cb4f763b82f2fe085c588a0ceb89fdd4a0ead5b638664e211742864e97deb80457bada32d59838f82b
+  data.tar.gz: bcf3903c08e27aea78be98e7085b35410f936b0ba4fefc7a5ea553176acb12268dc07498a8498d450cfc876494964e3cda328f89f396516b4b480a888eaa56af

data/.gitignore

@@ -16,4 +16,5 @@ test/tmp
 test/version_tmp
 tmp
 .rbenv*
-.rvmrc
+.rvmrc
+.gems

data/.travis.yml

@@ -5,6 +5,10 @@ rvm:
   - 2.1.0
   - 2.1.1
   - 2.1.2
+  - 2.1.3
+  - 2.1.4
+  - 2.1.5
+  - 2.2.0
   - ruby-head
   - jruby-19mode
   - jruby-head

data/Gemfile

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

data/README.md

@@ -1,4 +1,4 @@
-# tilt-jbuilder [![endorse](http://api.coderwall.com/anthonator/endorsecount.png)](http://coderwall.com/anthonator)
+# tilt-jbuilder
 
 Adds support for rendering Jbuilder templates using Tilt.
 
@@ -24,7 +24,7 @@ Or install it yourself as:
 require 'tilt/jbuilder.rb'
 
 template = Tilt::JbuilderTemplate.new("templates/awesomeness.json.jbuilder")
-teplate.render
+template.render
 
 # With locals
 template = Tilt::JbuilderTemplate.new { "json.author name" }
@@ -52,8 +52,8 @@ template.render
 
 ## Credits
 
-[![Sticksnleaves](http://sticksnleaves-wordpress.herokuapp.com/wp-content/themes/sticksnleaves/images/snl-logo-116x116.png)](http://www.sticksnleaves.com)
+[![Sticksnleaves](https://s3.amazonaws.com/sticksnleaves-assets/snl-logo-116x116.png)](http://www.sticksnleaves.com)
 
 tilt-jbuilder is maintained and funded by [Sticksnleaves](http://www.sticksnleaves.com)
 
-Thanks to all of our [contributors](https://github.com/anthonator/tilt-jbuilder/graphs/contributors)
+Thanks to all of our [contributors](https://github.com/anthonator/tilt-jbuilder/graphs/contributors)

data/lib/tilt/jbuilder.rb

@@ -8,11 +8,37 @@ module Tilt
       super(*args, &block)
     end
 
-    def partial!(options, locals = {})
-      locals.merge! :json => self
+    def partial!(name_or_options, locals = {})
+      case name_or_options
+      when ::Hash
+        # partial! partial: 'name', locals: { foo: 'bar' }
+        options = name_or_options
+      else
+        # partial! 'name', foo: 'bar'
+        options = { partial: name_or_options, locals: locals }
+        as = locals.delete(:as)
+        options[:as] = as if as.present?
+        options[:collection] = locals[:collection] if locals.key?(:collection)
+      end
+
       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)
+      @template = ::Tilt::JbuilderTemplate.new(fetch_partial_path(options[:partial].to_s, view_path), nil, view_path: view_path)
+      render_partial_with_options options
+    end
+
+    def array!(collection = [], *attributes, &block)
+      options = attributes.extract_options!
+
+      if options.key?(:partial)
+        partial! options[:partial], options.merge(collection: collection)
+      else
+        super
+      end
+    end
+
+    # for now caching is not supported, but at least we can transparently ignore it
+    def cache!(key=nil, options={}, &block)
+      yield
     end
 
     private
@@ -26,6 +52,26 @@ module Tilt
       partial_file[-1] = "_#{partial_file[-1]}" unless partial_file[-1].start_with?("_")
       partial_file.join("/")
     end
+
+    def render_partial_with_options(options)
+      options[:locals] ||= {}
+      if options[:as] && options.key?(:collection)
+        collection = options.delete(:collection)
+        locals = options.delete(:locals)
+        array! collection do |member|
+          member_locals = locals.clone
+          member_locals.merge! options[:as] => member
+          render_partial member_locals
+        end
+      else
+        render_partial options[:locals]
+      end
+    end
+
+    def render_partial(options)
+      options.merge! json: self
+      @template.render @scope, options
+    end
   end
 
   class JbuilderTemplate < Template

data/spec/sinatra_json_integration_spec.rb

@@ -2,6 +2,6 @@ require 'spec_helper'
 
 describe 'Sinatra::JSON Integration' do
   require 'sinatra/json'
-  
+
   sinatra_integration_tests
-end
+end

data/spec/spec_helper.rb

@@ -4,9 +4,11 @@ SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter[
   SimpleCov::Formatter::HTMLFormatter,
   Coveralls::SimpleCov::Formatter
 ]
-SimpleCov.start
+SimpleCov.start do
+  add_filter('.gems')
+end
 
-ENV['RACK_ENV'] ||= "test"
+ENV['RACK_ENV'] ||= 'test'
 
 require 'tilt/jbuilder'
 require 'sinatra/jbuilder'

data/spec/templates/_collection_partial.json.jbuilder

@@ -0,0 +1 @@
+json.attribute name

data/spec/tilt-jbuilder_spec.rb

@@ -36,6 +36,11 @@ describe Tilt::JbuilderTemplate do
     "{\"author\":\"Anthony\"}".should == template.render(scope)
   end
 
+  it "should ignore cache!" do
+    template = Tilt::JbuilderTemplate.new { "json.cache! { json.author name }" }
+    "{\"author\":\"Anthony\"}".should == template.render(Object.new, :name => 'Anthony')
+  end
+
   it "should evaluate block style templates" do
     template = Tilt::JbuilderTemplate.new do |json|
       lambda do |json|
@@ -46,13 +51,44 @@ describe Tilt::JbuilderTemplate do
     "{\"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
+  describe '.partial!' do
+    it "should evaluate partials" do
+      template = Tilt::JbuilderTemplate.new { "json.partial! 'spec/templates/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! '/templates/partial', last_name: 'Smith'" }
+      "{\"last_name\":\"Smith\"}".should == template.render
+    end
+
+    context 'with jbuilder syntax' do
+      let(:template) { Tilt::JbuilderTemplate.new { template_body } }
+      subject { template.render }
+
+      context 'with json.partial! "partial", collection: [], as: :name' do
+        let(:template_body) { "json.partial! 'spec/templates/collection_partial', collection: ['foo', 'bar'], as: :name" }
+        it { is_expected.to eq %q/[{"attribute":"foo"},{"attribute":"bar"}]/ }
+      end
+
+      context 'with json.partial! partial: "partial", collection: [], as: :name' do
+        let(:template_body) { "json.partial! partial: 'spec/templates/collection_partial', collection: ['foo', 'bar'], as: :name" }
+        it { is_expected.to eq %q/[{"attribute":"foo"},{"attribute":"bar"}]/ }
+      end
+
+      context 'with json.partial! partial: "partial", locals: {}' do
+        let(:template_body) { "json.partial! partial: 'spec/templates/partial', locals: { last_name: 'Smith' }" }
+        it { is_expected.to eq %q/{"last_name":"Smith"}/ }
+      end
+    end
   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
+  describe '.array!' do
+    let(:template) { Tilt::JbuilderTemplate.new { template_body } }
+    subject { template.render }
+    context 'with json.array! [], partial: "partial", as: :name' do
+      let(:template_body) { "json.array! ['foo', 'bar'], partial: 'spec/templates/collection_partial', as: :name" }
+      it { is_expected.to eq %q/[{"attribute":"foo"},{"attribute":"bar"}]/ }
+    end
   end
 end

data/tilt-jbuilder.gemspec

@@ -1,20 +1,20 @@
 # -*- encoding: utf-8 -*-
 Gem::Specification.new do |gem|
-  gem.authors       = ["Anthony Smith"]
-  gem.email         = ["anthony@sticksnleaves.com"]
-  gem.description   = %q{Jbuilder support for Tilt}
-  gem.summary       = %q{Adds support for rendering Jbuilder templates in Tilt.}
-  gem.homepage      = "https://github.com/anthonator/tilt-jbuilder"
+  gem.authors       = ['Anthony Smith']
+  gem.email         = ['anthony@sticksnleaves.com']
+  gem.description   = 'Jbuilder support for Tilt'
+  gem.summary       = 'Adds support for rendering Jbuilder templates in Tilt.'
+  gem.homepage      = 'https://github.com/anthonator/tilt-jbuilder'
 
-  gem.add_dependency 'tilt', '<= 1.5.0'
+  gem.add_dependency 'tilt', '>= 1.3.0', '< 3'
   gem.add_dependency 'jbuilder'
 
   gem.add_development_dependency 'bundler'
 
-  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.6.1'
+  gem.files         = `git ls-files`.split($ORS)
+  gem.executables   = gem.files.grep(/^bin\//).map { |f| File.basename(f) }
+  gem.test_files    = gem.files.grep(/^(test|spec|features)\//)
+  gem.name          = 'tilt-jbuilder'
+  gem.require_paths = ['lib']
+  gem.version       = '0.7.0'
 end

metadata

@@ -1,29 +1,35 @@
 --- !ruby/object:Gem::Specification
 name: tilt-jbuilder
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.7.0
 platform: ruby
 authors:
 - Anthony Smith
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-26 00:00:00.000000000 Z
+date: 2015-07-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tilt
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "<="
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.3.0
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 1.5.0
+        version: '3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "<="
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.3.0
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 1.5.0
+        version: '3'
 - !ruby/object:Gem::Dependency
   name: jbuilder
   requirement: !ruby/object:Gem::Requirement
@@ -67,7 +73,6 @@ files:
 - Rakefile
 - lib/sinatra/jbuilder.rb
 - lib/tilt/jbuilder.rb
-- spec/_partial.json.jbuilder
 - spec/sinatra_integration_spec.rb
 - spec/sinatra_json_integration_spec.rb
 - spec/spec_helper.rb
@@ -78,6 +83,8 @@ files:
 - spec/support/views/_partial_with_local_variable.jbuilder
 - spec/support/views/hello.jbuilder
 - spec/support/views/invalid.jbuilder
+- spec/templates/_collection_partial.json.jbuilder
+- spec/templates/_partial.json.jbuilder
 - spec/tilt-jbuilder_spec.rb
 - tilt-jbuilder.gemspec
 homepage: https://github.com/anthonator/tilt-jbuilder
@@ -99,12 +106,11 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 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
@@ -115,4 +121,6 @@ test_files:
 - spec/support/views/_partial_with_local_variable.jbuilder
 - spec/support/views/hello.jbuilder
 - spec/support/views/invalid.jbuilder
+- spec/templates/_collection_partial.json.jbuilder
+- spec/templates/_partial.json.jbuilder
 - spec/tilt-jbuilder_spec.rb