sinatra-mustache 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
---- 
-SHA1: 
-  metadata.gz: ded35ec238e6c8a6f65164bdeaf4959e22c70a81
-  data.tar.gz: aeec0912727bec095462cf8e0c941ecda9c827b2
-SHA512: 
-  metadata.gz: b95c580cbb80648ca1a485650b59d8001fa072dec156ae0503ddd2f0b971e2b135ce40e077082acb76b9870c7c5b3109a4b69070d1a25503b1fbafec2f66d72c
-  data.tar.gz: 4cf79ef9fd58bfb67408e480bea80fdc555b2376e915acdd76bc632ca116383ab14d78e1da4f2f9ce80f837d3a178658baebea3cf2693a1e5c1f8493fe045733
+---
+SHA1:
+  metadata.gz: ef5fa0b128fe11e4e91838f0259c3de65fa001f4
+  data.tar.gz: 8963decca40aa6e236f9fec4f253c511f06a8b43
+SHA512:
+  metadata.gz: 2a69cb27f8f2262e09751d940fe6ddfdc92e45833bd7dbde78ea7d8cd6a642be54188f3028bb797bd029054b07265420cfda44eed3a62add2e1aaff069ffb305
+  data.tar.gz: e2bf0495389ecf7f8627d71029af7e6ca95d1f03cec032e4072fc12b02da427915403a9a314bdef16eb52e2130bd273ea3143f4b66213df955fc010ab4537334

data/.travis.yml

@@ -2,9 +2,14 @@ language: ruby
 rvm:
   - 1.9.3
   - 2.0.0
-  - 2.1.0
-  - rbx
+  - 2.1.2
+  - rbx-2
   - jruby-19mode
-  - jruby-20mode
-  
-script: bundle exec rspec
+  - jruby-head
+
+script: bundle exec rspec
+
+matrix:
+  allow_failures:
+    - rvm: rbx-2
+    - rvm: jruby-head

data/lib/proxies/currystache.rb

@@ -7,26 +7,30 @@ module Proxies
       @proc     = my_proc
       @args     = []
     end
-  
+
     def has_key? arg
       true
     end
 
+    def respond_to? method, private=false
+      method == :to_hash
+    end
+
     def call arg
       args << arg
       self
     end
     alias :[] :call
-  
+
     def to_s
       result = proc.call(*args)
       args.clear
       result.to_s
     end
-    
+
     def inspect
       proc
     end
 
   end
-end
+end

data/lib/sinatra-mustache/version.rb

@@ -1,5 +1,5 @@
 module Sinatra
   module Mustache
-    VERSION = "0.3.1".freeze
+    VERSION = "0.3.2".freeze
   end
 end

data/lib/sinatra/helpers/mustache.rb

@@ -1,7 +1,7 @@
 module Sinatra
   module MustacheHelper
     METHODS = {}
-    
+
     def mustache_helper *args
       args.each do |arg|
         if arg.is_a? Symbol
@@ -14,21 +14,21 @@ module Sinatra
       end
     end
     alias :mustache_helpers :mustache_helper
-    
+
     private
-    
+
     def add_to_mustache_helper_methods *meths
       scope = meths.last.is_a?(Module) ? meths.pop : self
       meths.each do |meth|
         METHODS[meth] = Proxies::Currystache.new(rebind_method!(meth, scope))
       end
     end
-    
-    def rebind_method! meth,scope=self
+
+    def rebind_method! meth, scope=self
       scope.instance_method(meth).bind(self.new!)
     end
-    
+
   end
-  
+
   register MustacheHelper
-end
+end

data/lib/tilt/mustache_template.rb

@@ -4,7 +4,7 @@ require 'yaml'
 
 module Tilt
   class MustacheTemplate < Template
-    
+
     def initialize_engine
       return if defined? ::Mustache
       require_template_library 'mustache'
@@ -18,30 +18,30 @@ module Tilt
 
     def evaluate scope, locals, &block
       mustache_locals = locals.dup
-      
+
       template = assign_template_and_front_matter! mustache_locals, data
       assign_instance_variables! mustache_locals, scope
       assign_helper_methods! mustache_locals
 
       mustache_locals[:yield]   = yield if block_given?
       mustache_locals[:content] = mustache_locals.fetch(:yield, '')
-      
+
       @output = ::Mustache.render(template, mustache_locals)
     end
-    
+
     private
-    
+
     def assign_helper_methods! mustache_locals
       mustache_locals.merge! Sinatra::MustacheHelper::METHODS.dup.delete_if{|k,v| mustache_locals.member?(k) }
     end
-    
+
     def assign_instance_variables! mustache_locals, scope
       scope.instance_variables.each do |instance_variable|
         symbol = instance_variable.to_s.delete('@').to_sym
         mustache_locals[symbol] = scope.instance_variable_get(instance_variable) unless mustache_locals.member?(symbol)
       end
     end
-    
+
     def assign_template_and_front_matter! mustache_locals, data
       if yaml = data.match(/\A(\s*-{3}(.+)-{3}\s*)/m)
         template = data.sub(yaml[1], '')
@@ -51,10 +51,10 @@ module Tilt
       else
         template = data
       end
-      
+
       template
     end
   end
-  
+
   register 'mustache', MustacheTemplate
 end

data/sinatra-mustache.gemspec

@@ -21,12 +21,12 @@ Gem::Specification.new do |s|
   s.extensions    = 'ext/mkrf_conf.rb'
 
   s.add_dependency 'sinatra', '~> 1.3', '~> 1.4'
-  s.add_dependency 'mustache', '~> 0.99'
+  s.add_dependency 'mustache', '~> 0.99', '>= 0.99.6'
   s.add_dependency 'tilt', '>= 1.3', '<= 2.0'
 
   s.add_development_dependency 'rspec', '~> 2'
   s.add_development_dependency 'rack-test', '~> 0'
-  
+
   if 'rbx' == RUBY_ENGINE
     s.add_development_dependency 'rubysl-logger'
   end

data/spec/mustache_spec.rb

@@ -16,9 +16,9 @@ describe 'sinatra-mustache', :type => :request do
     describe "two requests" do
       it "does not cache wrong" do
         get '/foo'
-        response.body.should == 'Hello from foo!'
+        expect(response.body).to eq('Hello from foo!')
         get '/bar'
-        response.body.should == 'Hello from bar!'
+        expect(response.body).to eq('Hello from bar!')
       end
     end
   end
@@ -51,7 +51,7 @@ describe 'sinatra-mustache', :type => :request do
     end
     it "should include them and make them usable" do
       get '/foo'
-      response.body.should == "Hello, I am Moto Tantra and these are my friends Hazy & Lazy & Crazy! Come and join us for a Whiskey Sour or just a Beer"
+      expect(response.body).to eq("Hello, I am Moto Tantra and these are my friends Hazy & Lazy & Crazy! Come and join us for a Whiskey Sour or just a Beer")
     end
   end
   
@@ -70,7 +70,7 @@ describe 'sinatra-mustache', :type => :request do
     end
     it "should include them and make them usable" do
       get '/foo'
-      response.body.should == "Hello, I am Moto Tantra and these are my friends Hazy & Lazy & Crazy! Come and join us for a Whiskey Sour or just a Beer"
+      expect(response.body).to eq("Hello, I am Moto Tantra and these are my friends Hazy & Lazy & Crazy! Come and join us for a Whiskey Sour or just a Beer")
     end
   end
 
@@ -78,8 +78,12 @@ describe 'sinatra-mustache', :type => :request do
     context 'without the :locals option' do
       before(:each) { mustache_app { mustache('Hello') } }
 
-      it { should be_ok }
-      its(:body) { should == 'Hello' }
+      it { is_expected.to be_ok }
+
+      describe '#body' do
+        subject { super().body }
+        it { is_expected.to eq('Hello') }
+      end
     end
 
     context 'with :locals option' do
@@ -88,8 +92,12 @@ describe 'sinatra-mustache', :type => :request do
         mustache_app { mustache('Hello {{ subject }}!', :locals => locals) }
       end
 
-      it { should be_ok }
-      its(:body) { should == 'Hello World!' }
+      it { is_expected.to be_ok }
+
+      describe '#body' do
+        subject { super().body }
+        it { is_expected.to eq('Hello World!') }
+      end
     end
 
     context 'with an inline layout' do
@@ -102,8 +110,12 @@ describe 'sinatra-mustache', :type => :request do
         get '/'
       end
 
-      it { should be_ok }
-      its(:body) { should == 'This is a layout!' }
+      it { is_expected.to be_ok }
+
+      describe '#body' do
+        subject { super().body }
+        it { is_expected.to eq('This is a layout!') }
+      end
     end
 
     context 'with a file layout' do
@@ -111,8 +123,12 @@ describe 'sinatra-mustache', :type => :request do
         mustache_app { mustache('Hello World!', :layout => :layout_too) }
       end
 
-      it { should be_ok }
-      its(:body) { should == "From a layout!\nHello World!\n" }
+      it { is_expected.to be_ok }
+
+      describe '#body' do
+        subject { super().body }
+        it { is_expected.to eq("From a layout!\nHello World!\n") }
+      end
     end
   end
 
@@ -120,22 +136,34 @@ describe 'sinatra-mustache', :type => :request do
     context 'without a layout' do
       before(:each) { mustache_app { mustache :hello } }
 
-      it { should be_ok }
-      its(:body) { should == "Hello \n" }
+      it { is_expected.to be_ok }
+
+      describe '#body' do
+        subject { super().body }
+        it { is_expected.to eq("Hello \n") }
+      end
     end
 
     context 'that calls a partial' do
       before(:each) { mustache_app { mustache :needs_partial } }
 
-      it { should be_ok }
-      its(:body) { should == "Hello\nfrom a partial\n" }
+      it { is_expected.to be_ok }
+
+      describe '#body' do
+        subject { super().body }
+        it { is_expected.to eq("Hello\nfrom a partial\n") }
+      end
     end
 
     context 'that has yaml front matter' do
       before(:each) { mustache_app { mustache :yaml } }
 
-      it { should be_ok }
-      its(:body) { should == "Hello\nfrom yaml\n" }
+      it { is_expected.to be_ok }
+
+      describe '#body' do
+        subject { super().body }
+        it { is_expected.to eq("Hello\nfrom yaml\n") }
+      end
     end
   end
 end

data/spec/mustache_template_spec.rb

@@ -4,8 +4,8 @@ describe Tilt::MustacheTemplate do
   describe 'registered for mustache files' do
     subject { Tilt::MustacheTemplate }
 
-    it { should == Tilt['test.mustache'] }
-    it { should == Tilt['test.html.mustache'] }
+    it { is_expected.to eq(Tilt['test.mustache']) }
+    it { is_expected.to eq(Tilt['test.html.mustache']) }
   end
 
   describe '#render' do
@@ -14,13 +14,13 @@ describe Tilt::MustacheTemplate do
     context 'without locals or a scope' do
       subject { template.render }
 
-      it { should == 'Hello !' }
+      it { is_expected.to eq('Hello !') }
     end
 
     context 'with locals' do
       subject { template.render(Object.new, :someone => 'World') }
 
-      it { should == 'Hello World!' }
+      it { is_expected.to eq('Hello World!') }
     end
 
     context 'with an objects scope' do
@@ -32,7 +32,7 @@ describe Tilt::MustacheTemplate do
 
       subject { template.render(scope) }
 
-      it { should == 'Hello World!' }
+      it { is_expected.to eq('Hello World!') }
     end
 
     context 'methods of the scope' do
@@ -41,7 +41,7 @@ describe Tilt::MustacheTemplate do
           'Hello, I am {{ name.Moto.Tantra }} and these are my friends {{ friends.Hazy.Lazy.Crazy }}! Come and join us for a {{ sour_drink.Whiskey }} or just a {{ random_drink }}'
         end
       end
-      
+
       let(:scope) do
         scope = Object.new
         def scope.name first_name, last_name
@@ -58,10 +58,10 @@ describe Tilt::MustacheTemplate do
         end
         scope
       end
-      
+
       subject { template.render(scope) }
 
-      it { should == "Hello, I am Moto Tantra and these are my friends Hazy & Lazy & Crazy! Come and join us for a Whiskey Sour or just a Beer" }
+      it { is_expected.to eq("Hello, I am Moto Tantra and these are my friends Hazy & Lazy & Crazy! Come and join us for a Whiskey Sour or just a Beer") }
     end
 
     context 'with both an object and locals' do
@@ -83,16 +83,16 @@ describe Tilt::MustacheTemplate do
       subject { template.render(scope, locals) }
 
       it 'locals should have precedence' do
-        subject.should == 'Beer is great but Whisky is greater.'
+        expect(subject).to eq('Beer is great but Whisky is greater.')
       end
       context "with locals evaluating to false" do
         let(:locals) { { :beer => 'great', :whisky => nil } }
         it 'locals should still have precedence' do
-          subject.should == 'Beer is great but Whisky is .'
+          expect(subject).to eq('Beer is great but Whisky is .')
         end
       end
     end
-    
+
     context "data" do
       let(:template) do
         Tilt::MustacheTemplate.new {
@@ -107,32 +107,29 @@ describe Tilt::MustacheTemplate do
       end
       subject { template.render(scope, data) }
       it "should not be modified through rendering" do
-        subject.should == "The best beer is Gulp. The second best beer is German Schluck.  The worst Whisky is Rotten Brew. The best Whisky is Barley Pure. "
-        data.keys.map(&:to_s).sort.should == %W(beers whiskies)
+        expect(subject).to eq("The best beer is Gulp. The second best beer is German Schluck.  The worst Whisky is Rotten Brew. The best Whisky is Barley Pure. ")
+        expect(data.keys.map(&:to_s).sort).to eq(%W(beers whiskies))
       end
     end
-    
+
     context "when locals are changing for the same template" do
       let(:template) {
         Tilt::MustacheTemplate.new {
           'Beer is {{ beer }} but Whisky is {{ whisky }}.'
         }
       }
-      before(:all) do
-        @template = template
-      end
       context "first time rendering" do
         let(:first_locals) { { :beer => 'great', :whisky => 'greater' } }
-        subject { @template.render(Object.new, first_locals) }
+        subject { template.render(Object.new, first_locals) }
         it 'should render fine' do
-          subject.should == 'Beer is great but Whisky is greater.'
+          expect(subject).to eq('Beer is great but Whisky is greater.')
         end
       end
       context "second time rendering with changed locals" do
         let(:second_locals) { { :beer => 'nice', :whisky => 'the best' } }
-        subject { @template.render(Object.new, second_locals) }
+        subject { template.render(Object.new, second_locals) }
         it 'should render fine' do
-          subject.should == 'Beer is nice but Whisky is the best.'
+          expect(subject).to eq('Beer is nice but Whisky is the best.')
         end
       end
     end
@@ -141,7 +138,7 @@ describe Tilt::MustacheTemplate do
       let(:template) { Tilt::MustacheTemplate.new { |t| 'Hello {{ yield }}!'} }
       subject { template.render { 'World' } }
 
-      it { should == 'Hello World!' }
+      it { is_expected.to eq('Hello World!') }
     end
 
     context 'with a template that has yaml front matter' do
@@ -153,7 +150,7 @@ describe Tilt::MustacheTemplate do
 
       subject { template.render }
 
-      it { should == "Hello\nfrom yaml\n" }
+      it { is_expected.to eq("Hello\nfrom yaml\n") }
     end
   end
 end

metadata

@@ -1,96 +1,115 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: sinatra-mustache
-version: !ruby/object:Gem::Version 
-  version: 0.3.1
+version: !ruby/object:Gem::Version
+  version: 0.3.2
 platform: ruby
-authors: 
+authors:
 - Jason Campbell
 - Beat Richartz
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2014-01-03 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2014-07-27 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: sinatra
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ~>
-      - &id003 !ruby/object:Gem::Version 
-        version: "1.3"
-    - - ~>
-      - !ruby/object:Gem::Version 
-        version: "1.4"
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.3'
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.4'
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: mustache
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        version: "0.99"
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.3'
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.4'
+- !ruby/object:Gem::Dependency
+  name: mustache
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.99'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.99.6
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: tilt
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
-    requirements: 
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.99'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.99.6
+- !ruby/object:Gem::Dependency
+  name: tilt
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
     - - ">="
-      - *id003
-    - - <=
-      - !ruby/object:Gem::Version 
-        version: "2.0"
+      - !ruby/object:Gem::Version
+        version: '1.3'
+    - - "<="
+      - !ruby/object:Gem::Version
+        version: '2.0'
   type: :runtime
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: rspec
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        version: "2"
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '1.3'
+    - - "<="
+      - !ruby/object:Gem::Version
+        version: '2.0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2'
   type: :development
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: rack-test
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        version: "0"
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2'
+- !ruby/object:Gem::Dependency
+  name: rack-test
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
-  name: rubysl-logger
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
-    requirements: 
-    - &id008 
-      - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
-  type: :development
-  version_requirements: *id007
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Use Mustache in your Sinatra app without extra view classes
-email: 
+email:
 - attraccessor@gmail.com
 executables: []
-
-extensions: 
+extensions:
 - ext/mkrf_conf.rb
 extra_rdoc_files: []
-
-files: 
-- .gitignore
-- .rspec
-- .travis.yml
+files:
+- ".gitignore"
+- ".rspec"
+- ".travis.yml"
 - Changelog.md
 - Gemfile
 - License.txt
@@ -114,29 +133,30 @@ files:
 - spec/views/needs_partial.mustache
 - spec/views/yaml.mustache
 homepage: http://github.com/beatrichartz/sinatra-mustache
-licenses: 
+licenses:
 - MIT
 metadata: {}
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - *id008
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - *id008
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - ">="
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - ">="
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: sinatra-mustache
-rubygems_version: 2.2.0
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Use Mustache in your Sinatra app without extra view classes
-test_files: 
+test_files:
 - spec/fake_template_helper.rb
 - spec/mustache_spec.rb
 - spec/mustache_template_spec.rb
@@ -147,3 +167,4 @@ test_files:
 - spec/views/layout_too.mustache
 - spec/views/needs_partial.mustache
 - spec/views/yaml.mustache
+has_rdoc: