sinatra-mustache 0.0.4 → 0.0.5

data/.travis.yml

@@ -0,0 +1,15 @@
+language: ruby
+rvm:
+  - 1.8.7
+  - 1.9.2
+  - 1.9.3
+  - ree
+  - rbx-18mode
+  - rbx-19mode
+  - jruby
+  
+script: bundle exec rspec
+
+matrix:
+  allow_failures:
+    - rvm: jruby

data/Changelog.md

@@ -0,0 +1,5 @@
+0.0.5
+=====
+
+- Fixed rendering output being the same when templates are cached
+- Fixed locals being modified through rendering

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    sinatra-mustache (0.0.3)
+    sinatra-mustache (0.0.5)
       mustache (~> 0.99)
       sinatra (~> 1.3, ~> 1.2)
       tilt (~> 1.3, ~> 1.2)
@@ -12,19 +12,19 @@ GEM
     diff-lcs (1.1.3)
     mustache (0.99.4)
     rack (1.4.1)
-    rack-protection (1.2.0)
+    rack-protection (1.3.2)
       rack
-    rack-test (0.6.1)
+    rack-test (0.6.2)
       rack (>= 1.0)
-    rspec (2.8.0)
-      rspec-core (~> 2.8.0)
-      rspec-expectations (~> 2.8.0)
-      rspec-mocks (~> 2.8.0)
-    rspec-core (2.8.0)
-    rspec-expectations (2.8.0)
-      diff-lcs (~> 1.1.2)
-    rspec-mocks (2.8.0)
-    sinatra (1.3.2)
+    rspec (2.12.0)
+      rspec-core (~> 2.12.0)
+      rspec-expectations (~> 2.12.0)
+      rspec-mocks (~> 2.12.0)
+    rspec-core (2.12.2)
+    rspec-expectations (2.12.1)
+      diff-lcs (~> 1.1.3)
+    rspec-mocks (2.12.0)
+    sinatra (1.3.3)
       rack (~> 1.3, >= 1.3.6)
       rack-protection (~> 1.2)
       tilt (~> 1.3, >= 1.3.3)
@@ -34,6 +34,6 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  rack-test (~> 0.6)
-  rspec (~> 2.8)
+  rack-test (~> 0)
+  rspec (~> 2)
   sinatra-mustache!

data/README.md

@@ -1,4 +1,4 @@
-sinatra-mustache
+sinatra-mustache [![Build Status](https://travis-ci.org/beatrichartz/sinatra-mustache.png?branch=master)](https://travis-ci.org/beatrichartz/sinatra-mustache)
 ================
 
 To simplify setting up [Sinatra][1] to use [Mustache][2] for it's templates

data/lib/sinatra-mustache/version.rb

@@ -1,5 +1,5 @@
 module Sinatra
   module Mustache
-    VERSION = "0.0.4"
+    VERSION = "0.0.5"
   end
 end

data/lib/tilt/mustache_template.rb

@@ -4,6 +4,7 @@ require 'yaml'
 
 module Tilt
   class MustacheTemplate < Template
+    
     def initialize_engine
       return if defined? ::Mustache
       require_template_library 'mustache'
@@ -16,14 +17,16 @@ module Tilt
     end
 
     def evaluate(scope, locals, &block)
+      mustache_locals = locals.dup
+      
       if data =~ /^(\s*---(.+)---\s*)/m
         yaml = $2.strip
         template = data.sub($1, '')
 
         YAML.load_documents(yaml) do |front_matter|
           # allows partials to override locals defined higher up
-          front_matter.delete_if { |key,value| locals.has_key?(key)}
-          locals.merge!(front_matter)
+          front_matter.delete_if { |key,value| mustache_locals.has_key?(key)}
+          mustache_locals.merge!(front_matter)
         end
       else
         template = data
@@ -32,16 +35,17 @@ module Tilt
       scope.instance_variables.each do |instance_variable|
         symbol = instance_variable.to_s.gsub('@','').to_sym
 
-        if ! locals[symbol]
-          locals[symbol] = scope.instance_variable_get(instance_variable)
+        unless mustache_locals.member?(symbol)
+          mustache_locals[symbol] = scope.instance_variable_get(instance_variable)
         end
       end
 
-      locals[:yield] = block.nil? ? '' : yield
-      locals[:content] = locals[:yield]
+      mustache_locals[:yield] = block.nil? ? '' : yield
+      mustache_locals[:content] = mustache_locals[:yield]
 
-      @output ||= ::Mustache.render(template, locals)
+      @output = ::Mustache.render(template, mustache_locals)
     end
   end
+  
   register 'mustache', MustacheTemplate
 end

data/sinatra-mustache.gemspec

@@ -23,6 +23,6 @@ Gem::Specification.new do |s|
   s.add_dependency 'mustache', '~> 0.99'
   s.add_dependency 'tilt', '~> 1.2', '~> 1.3'
 
-  s.add_development_dependency 'rspec', '~> 2.8'
-  s.add_development_dependency 'rack-test', '~> 0.6'
+  s.add_development_dependency 'rspec', '~> 2'
+  s.add_development_dependency 'rack-test', '~> 0'
 end

data/spec/mustache_spec.rb

@@ -2,6 +2,26 @@ require 'spec_helper'
 
 describe 'sinatra-mustache', :type => :request do
   subject { response }
+  
+  context 'with an inline layout and template caching' do
+    before(:each) do
+      @app = mock_app {
+        disable :reload_templates
+        layout { 'Hello from {{ yield }}!' }
+        get('/foo') { mustache 'foo' }
+        get('/bar') { mustache 'bar' }
+      }
+    end
+
+    describe "two requests" do
+      it "does not cache wrong" do
+        get '/foo'
+        response.body.should == 'Hello from foo!'
+        get '/bar'
+        response.body.should == 'Hello from bar!'
+      end
+    end
+  end
 
   context 'inline mustache strings' do
     context 'without the :locals option' do

data/spec/mustache_template_spec.rb

@@ -56,6 +56,56 @@ describe Tilt::MustacheTemplate do
       it 'locals should have precedence' do
         subject.should == '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 .'
+        end
+      end
+    end
+    
+    context "data" do
+      let(:template) do
+        Tilt::MustacheTemplate.new {
+          '{{#beers }}{{ preference }} beer is {{ beer }}. {{/beers }} {{#whiskies }}{{ preference }} Whisky is {{ whisky }}. {{/whiskies }}'
+        }
+      end
+      let!(:data) { {:beers => [{:preference => "The best", :beer => "Gulp"}, {:preference => "The second best", :beer => "German Schluck"}],
+                    :whiskies => [{:preference => "The worst", :whisky => "Rotten Brew"}, {:preference => "The best", :whisky => "Barley Pure"}]} }
+      let(:scope) do
+        scope = Object.new
+        scope
+      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)
+      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) }
+        it 'should render fine' do
+          subject.should == '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) }
+        it 'should render fine' do
+          subject.should == 'Beer is nice but Whisky is the best.'
+        end
+      end
     end
 
     context 'passing a block' do

metadata

@@ -1,91 +1,115 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: sinatra-mustache
-version: !ruby/object:Gem::Version
-  version: 0.0.4
-  prerelease: 
+version: !ruby/object:Gem::Version 
+  prerelease: false
+  segments: 
+  - 0
+  - 0
+  - 5
+  version: 0.0.5
 platform: ruby
-authors:
+authors: 
 - Jason Campbell
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-02 00:00:00.000000000Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2012-12-18 00:00:00 +01:00
+default_executable: 
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: sinatra
-  requirement: &70361526468220 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.2'
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 2
+        version: "1.2"
     - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.3'
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 3
+        version: "1.3"
   type: :runtime
-  prerelease: false
-  version_requirements: *70361526468220
-- !ruby/object:Gem::Dependency
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
   name: mustache
-  requirement: &70361526467140 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: '0.99'
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 99
+        version: "0.99"
   type: :runtime
-  prerelease: false
-  version_requirements: *70361526467140
-- !ruby/object:Gem::Dependency
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
   name: tilt
-  requirement: &70361526466500 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.2'
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 2
+        version: "1.2"
     - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.3'
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 3
+        version: "1.3"
   type: :runtime
-  prerelease: false
-  version_requirements: *70361526466500
-- !ruby/object:Gem::Dependency
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
   name: rspec
-  requirement: &70361526465620 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: '2.8'
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 2
+        version: "2"
   type: :development
-  prerelease: false
-  version_requirements: *70361526465620
-- !ruby/object:Gem::Dependency
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
   name: rack-test
-  requirement: &70361526465020 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: '0.6'
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
   type: :development
-  prerelease: false
-  version_requirements: *70361526465020
+  version_requirements: *id005
 description: Use Mustache in your Sinatra app without the extra view classes
-email:
+email: 
 - jason@greatergood.cc
 executables: []
+
 extensions: []
+
 extra_rdoc_files: []
-files:
+
+files: 
 - .gitignore
+- .travis.yml
+- Changelog.md
 - Gemfile
 - Gemfile.lock
 - LISCENSE
 - README.md
 - Rakefile
-- TODO.md
 - lib/sinatra-mustache/version.rb
 - lib/sinatra/mustache.rb
 - lib/tilt/mustache_template.rb
@@ -99,31 +123,37 @@ files:
 - spec/views/layout_too.mustache
 - spec/views/needs_partial.mustache
 - spec/views/yaml.mustache
+has_rdoc: true
 homepage: http://github.com/jxson/sinatra-mustache
 licenses: []
+
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+required_ruby_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      segments: 
+      - 0
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      segments: 
+      - 0
+      version: "0"
 requirements: []
+
 rubyforge_project: sinatra-mustache
-rubygems_version: 1.8.6
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: Use Mustache in your Sinatra app without the extra view classes
-test_files:
+test_files: 
 - spec/mustache_spec.rb
 - spec/mustache_template_spec.rb
 - spec/request_helper.rb

data/TODO.md

@@ -1 +0,0 @@
-Soon: