sinatra-mustache 0.0.1 → 0.0.2

data/Gemfile.lock

@@ -9,21 +9,31 @@ PATH
 GEM
   remote: http://rubygems.org/
   specs:
+    diff-lcs (1.1.2)
     mustache (0.11.2)
     rack (1.2.1)
+    rack-test (0.5.6)
+      rack (>= 1.0)
+    rspec (2.2.0)
+      rspec-core (~> 2.2)
+      rspec-expectations (~> 2.2)
+      rspec-mocks (~> 2.2)
+    rspec-core (2.2.1)
+    rspec-expectations (2.2.0)
+      diff-lcs (~> 1.1.2)
+    rspec-mocks (2.2.0)
     sinatra (1.1.0)
       rack (~> 1.1)
       tilt (~> 1.1)
     tilt (1.1)
-    unicorn (1.0.0)
-      rack
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   mustache (~> 0.11.2)
+  rack-test (~> 0.5.6)
+  rspec (~> 2.2.0)
   sinatra (~> 1.1.0)
   sinatra-mustache!
   tilt (= 1.1)
-  unicorn

data/TODO.md

@@ -1,3 +1 @@
 Soon:
-
-* Tests

data/lib/sinatra-mustache/version.rb

@@ -1,5 +1,5 @@
 module Sinatra
   module Mustache
-    VERSION = "0.0.1"
+    VERSION = "0.0.2"
   end
 end

data/lib/tilt/mustache_template.rb

@@ -10,7 +10,7 @@ module Tilt
     end
 
     def prepare
-      ::Mustache.template_path = file.gsub(File.basename(file), '')
+      ::Mustache.template_path = file.gsub(File.basename(file), '') if file
       @engine = ::Mustache.new
       @output = nil
     end
@@ -30,7 +30,11 @@ module Tilt
       end
 
       scope.instance_variables.each do |instance_variable|
-        locals[instance_variable.to_s.gsub('@','').to_sym] = scope.instance_variable_get(instance_variable)
+        symbol = instance_variable.to_s.gsub('@','').to_sym
+
+        if ! locals[symbol]
+          locals[symbol] = scope.instance_variable_get(instance_variable)
+        end
       end
 
       locals[:yield] = block.nil? ? '' : yield

data/sinatra-mustache.gemspec

@@ -22,4 +22,7 @@ Gem::Specification.new do |s|
   s.add_dependency 'sinatra', '~> 1.1.0'
   s.add_dependency 'mustache', '~> 0.11.2'
   s.add_dependency 'tilt', '1.1'
+
+  s.add_development_dependency 'rspec', '~> 2.2.0'
+  s.add_development_dependency 'rack-test', '~> 0.5.6'
 end

data/spec/mustache_spec.rb

@@ -0,0 +1,70 @@
+require 'spec_helper'
+
+describe 'sinatra-mustache', :type => :request do
+  subject { response }
+
+  context 'inline mustache strings' do
+    context 'without the :locals option' do
+      before(:each) { mustache_app { mustache('Hello') } }
+
+      it { should be_ok }
+      its(:body) { should == 'Hello' }
+    end
+
+    context 'with :locals option' do
+      before(:each) do
+        locals = { :subject => 'World' }
+        mustache_app { mustache('Hello {{ subject }}!', :locals => locals) }
+      end
+
+      it { should be_ok }
+      its(:body) { should == 'Hello World!' }
+    end
+
+    context 'with an inline layout' do
+      before(:each) do
+        mock_app {
+          layout { 'This is a {{ yield }}!' }
+          get('/') { mustache 'layout' }
+        }
+
+        get '/'
+      end
+
+      it { should be_ok }
+      its(:body) { should == 'This is a layout!' }
+    end
+
+    context 'with a file layout' do
+      before(:each) do
+        mustache_app { mustache('Hello World!', :layout => :layout_too) }
+      end
+
+      it { should be_ok }
+      its(:body) { should == "From a layout!\nHello World!\n" }
+    end
+  end
+
+  context 'rendering .mustache files in the views path' do
+    context 'without a layout' do
+      before(:each) { mustache_app { mustache :hello } }
+
+      it { should be_ok }
+      its(:body) { should == "Hello \n" }
+    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" }
+    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" }
+    end
+  end
+end

data/spec/mustache_template_spec.rb

@@ -0,0 +1,80 @@
+require 'spec_helper'
+
+describe Tilt::MustacheTemplate do
+  describe 'registered for mustache files' do
+    subject { Tilt::MustacheTemplate }
+
+    it { should == Tilt['test.mustache'] }
+    it { should == Tilt['test.html.mustache'] }
+  end
+
+  describe '#render' do
+    let(:template) { Tilt::MustacheTemplate.new { |t| 'Hello {{ name }}!'} }
+
+    context 'without locals or a scope' do
+      subject { template.render }
+
+      it { should == 'Hello !' }
+    end
+
+    context 'with locals' do
+      subject { template.render(Object.new, :name => 'World') }
+
+      it { should == 'Hello World!' }
+    end
+
+    context 'with an objects scope' do
+      let(:scope) do
+        scope = Object.new
+        scope.instance_variable_set(:@name, 'World')
+        scope
+      end
+
+      subject { template.render(scope) }
+
+      it { should == 'Hello World!' }
+    end
+
+    context 'with both an object and locals' do
+      let(:template) do
+        Tilt::MustacheTemplate.new {
+          'Beer is {{ beer }} but Whisky is {{ whisky }}.'
+        }
+      end
+
+      let(:scope) do
+        scope = Object.new
+        scope.instance_variable_set(:@beer, 'wet')
+        scope.instance_variable_set(:@whisky, 'wetter')
+        scope
+      end
+
+      let(:locals) { { :beer => 'great', :whisky => 'greater' } }
+
+      subject { template.render(scope, locals) }
+
+      it 'locals should have precedence' do
+        subject.should == 'Beer is great but Whisky is greater.'
+      end
+    end
+
+    context 'passing a block' do
+      let(:template) { Tilt::MustacheTemplate.new { |t| 'Hello {{ yield }}!'} }
+      subject { template.render { 'World' } }
+
+      it { should == 'Hello World!' }
+    end
+
+    context 'with a template that has yaml front matter' do
+      let(:template) do
+        Tilt::MustacheTemplate.new do
+          File.read(File.dirname(__FILE__) + '/views/yaml.mustache')
+        end
+      end
+
+      subject { template.render }
+
+      it { should == "Hello\nfrom yaml\n" }
+    end
+  end
+end

data/spec/request_helper.rb

@@ -0,0 +1,23 @@
+module RequestHelper
+  include Rack::Test::Methods
+
+  def mock_app(base=Sinatra::Base, &block)
+    @app = Sinatra.new(base, &block)
+  end
+
+  def app
+    Rack::Lint.new(@app)
+  end
+
+  def mustache_app(&block)
+    mock_app {
+      set :environment, :test
+      set :views, File.dirname(__FILE__) + '/views'
+      get '/', &block
+    }
+
+    get '/'
+  end
+
+  alias_method :response, :last_response
+end

data/spec/spec_helper.rb

@@ -0,0 +1,10 @@
+require 'sinatra'
+require 'sinatra/mustache'
+require 'rack'
+require 'rack/test'
+
+require 'request_helper'
+
+RSpec.configure do |config|
+  config.include RequestHelper, :type => :request
+end

data/spec/views/box.mustache

@@ -0,0 +1 @@
+from a partial

data/spec/views/hello.mustache

@@ -0,0 +1 @@
+Hello {{ subject }}

data/spec/views/layout_too.mustache

@@ -0,0 +1,2 @@
+From a layout!
+{{ yield }}

data/spec/views/needs_partial.mustache

@@ -0,0 +1,2 @@
+Hello
+{{> box }}

data/spec/views/yaml.mustache

@@ -0,0 +1,6 @@
+---
+message: from yaml
+---
+
+Hello
+{{ message }}

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: sinatra-mustache
 version: !ruby/object:Gem::Version 
-  hash: 29
   prerelease: false
   segments: 
   - 0
   - 0
-  - 1
-  version: 0.0.1
+  - 2
+  version: 0.0.2
 platform: ruby
 authors: 
 - Jason Campbell
@@ -15,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-01 00:00:00 -08:00
+date: 2010-12-04 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -26,7 +25,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 19
         segments: 
         - 1
         - 1
@@ -42,7 +40,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 55
         segments: 
         - 0
         - 11
@@ -58,13 +55,42 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 13
         segments: 
         - 1
         - 1
         version: "1.1"
   type: :runtime
   version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: rspec
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 2
+        - 2
+        - 0
+        version: 2.2.0
+  type: :development
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: rack-test
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 5
+        - 6
+        version: 0.5.6
+  type: :development
+  version_requirements: *id005
 description: Use Mustache in your Sinatra app without the extra view classes
 email: 
 - jason@greatergood.cc
@@ -86,6 +112,15 @@ files:
 - lib/sinatra/mustache.rb
 - lib/tilt/mustache_template.rb
 - sinatra-mustache.gemspec
+- spec/mustache_spec.rb
+- spec/mustache_template_spec.rb
+- spec/request_helper.rb
+- spec/spec_helper.rb
+- spec/views/box.mustache
+- spec/views/hello.mustache
+- 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: []
@@ -100,7 +135,6 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
@@ -109,7 +143,6 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
@@ -120,5 +153,13 @@ rubygems_version: 1.3.7
 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
+- spec/spec_helper.rb
+- spec/views/box.mustache
+- spec/views/hello.mustache
+- spec/views/layout_too.mustache
+- spec/views/needs_partial.mustache
+- spec/views/yaml.mustache