sinatra-mustache 0.0.6 → 0.1.0

data/README.md

@@ -33,6 +33,49 @@ And then put your .mustache files in your app's views folder
 Instance variables and locals are available to the template as well as yaml
 front matter.
 
+Helpers
+======
+
+Use the helpers you defined in your app by passing their names to mustache_helper:
+
+    require 'sinatra/mustache'
+    
+    class App < Sinatra::Base
+      register Sinatra::MustacheHelper #makes mustache_helper available
+      
+      helpers do
+        def some_helper *args
+          args.join('/')
+        end
+      end
+      
+      mustache_helper :some_helper
+    end
+    
+Now you can use some_helper in your mustache template. There is also support for mustache's dot-notation:
+
+    " {{ some_helper.awesome.nice.spectacular }}" #=> "awesome/nice/spectacular"
+    
+Also, There is support for registering helper modules
+
+    module SomeHelpers
+      def hello what
+        "Hello #{what}"
+      end
+    end
+
+    class App < Sinatra::Base
+      register Sinatra::MustacheHelper
+      helpers SomeHelpers
+      mustache_helpers SomeHelpers
+    end
+    
+Now, this is possible:
+
+    " {{ hello.Mars }}" #=> "Hello Mars"
+    
+Passing arguments to helper methods via dot notation is limited to Strings only.
+
 Caveat
 ======
 

data/lib/proxies/currystache.rb

@@ -0,0 +1,32 @@
+module Proxies
+  class Currystache
+
+    attr_reader :proc, :args
+
+    def initialize my_proc
+      @proc     = my_proc
+      @args     = []
+    end
+  
+    def has_key? arg
+      true
+    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

data/lib/sinatra-mustache/version.rb

@@ -1,5 +1,5 @@
 module Sinatra
   module Mustache
-    VERSION = "0.0.6"
+    VERSION = "0.1.0"
   end
 end

data/lib/sinatra/helpers/mustache.rb

@@ -0,0 +1,25 @@
+module Sinatra
+  module MustacheHelper
+    METHODS = {}
+    
+    def mustache_helper *args      
+      args.each do |arg|
+        if arg.is_a? Symbol
+          add_to_mustache_helper_methods(arg, instance_method(arg).bind(self.new!))
+        elsif arg.is_a? Module
+          arg.instance_methods.each { |m| add_to_mustache_helper_methods(m, arg.instance_method(m).bind(self.new!)) }
+        else
+          raise ArgumentError.new("#{arg.class} can not be used with mustache_helper, please provide a symbol or a Module")
+        end
+      end
+    end
+    alias :mustache_helpers :mustache_helper
+    
+    def add_to_mustache_helper_methods name, meth
+      METHODS[name] = Proxies::Currystache.new(meth)
+    end
+    
+  end
+  
+  register MustacheHelper
+end

data/lib/sinatra/mustache.rb

@@ -1,3 +1,5 @@
+require 'proxies/currystache'
+require 'sinatra/helpers/mustache'
 require 'tilt/mustache_template'
 
 module Sinatra

data/lib/tilt/mustache_template.rb

@@ -16,7 +16,7 @@ module Tilt
       @output = nil
     end
 
-    def evaluate(scope, locals, &block)
+    def evaluate(scope, locals, &block)      
       mustache_locals = locals.dup
       
       if data =~ /^(\s*---(.+)---\s*)/m
@@ -39,10 +39,12 @@ module Tilt
           mustache_locals[symbol] = scope.instance_variable_get(instance_variable)
         end
       end
+            
+      mustache_locals = Sinatra::MustacheHelper::METHODS.dup.merge(mustache_locals)
 
-      mustache_locals[:yield] = block.nil? ? '' : yield
+      mustache_locals[:yield]   = block.nil? ? '' : yield
       mustache_locals[:content] = mustache_locals[:yield]
-
+      
       @output = ::Mustache.render(template, mustache_locals)
     end
   end

data/sinatra-mustache.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  s.add_dependency 'sinatra', '~> 1.2', '~> 1.3'
+  s.add_dependency 'sinatra', '~> 1'
   s.add_dependency 'mustache', '~> 0.99'
   s.add_dependency 'tilt', '~> 1.2', '~> 1.3'
 

data/spec/fake_template_helper.rb

@@ -0,0 +1,14 @@
+module FakeTemplateHelper
+  def name first_name, last_name
+    [first_name, last_name].join ' '
+  end
+  def friends *friends
+    friends.join ' & '
+  end
+  def sour_drink type
+    "#{type} Sour"
+  end
+  def random_drink
+    "Beer"
+  end
+end

data/spec/mustache_spec.rb

@@ -22,6 +22,57 @@ describe 'sinatra-mustache', :type => :request do
       end
     end
   end
+  
+  context "with defined mustache template helpers" do
+    before(:each) do
+      @app = mock_helper_app {
+        register Sinatra::MustacheHelper
+        layout { '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 }}' }
+        helpers do
+          def name first_name, last_name
+            [first_name, last_name].join ' '
+          end
+          def friends *friends
+            friends.join ' & '
+          end
+          def sour_drink type
+            "#{type} Sour"
+          end
+          def random_drink
+            "Beer"
+          end
+        end
+        mustache_helpers :name, :friends, :sour_drink, :random_drink
+        get('/foo') { mustache 'foo' }
+      }
+    end
+    after(:each) do
+      clean_helper_app
+    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"
+    end
+  end
+  
+  context "with a module of mustache template helpers" do
+    before(:each) do
+      @app = mock_helper_app {
+        register Sinatra::MustacheHelper
+        layout { '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 }}' }
+        helpers FakeTemplateHelper
+        mustache_helpers FakeTemplateHelper
+        get('/foo') { mustache 'foo' }
+      }
+    end
+    after(:each) do
+      clean_helper_app
+    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"
+    end
+  end
 
   context 'inline mustache strings' do
     context 'without the :locals option' do

data/spec/mustache_template_spec.rb

@@ -9,7 +9,7 @@ describe Tilt::MustacheTemplate do
   end
 
   describe '#render' do
-    let(:template) { Tilt::MustacheTemplate.new { |t| 'Hello {{ name }}!'} }
+    let(:template) { Tilt::MustacheTemplate.new { |t| 'Hello {{ someone }}!'} }
 
     context 'without locals or a scope' do
       subject { template.render }
@@ -18,7 +18,7 @@ describe Tilt::MustacheTemplate do
     end
 
     context 'with locals' do
-      subject { template.render(Object.new, :name => 'World') }
+      subject { template.render(Object.new, :someone => 'World') }
 
       it { should == 'Hello World!' }
     end
@@ -26,7 +26,7 @@ describe Tilt::MustacheTemplate do
     context 'with an objects scope' do
       let(:scope) do
         scope = Object.new
-        scope.instance_variable_set(:@name, 'World')
+        scope.instance_variable_set(:@someone, 'World')
         scope
       end
 
@@ -35,6 +35,35 @@ describe Tilt::MustacheTemplate do
       it { should == 'Hello World!' }
     end
 
+    context 'methods of the scope' do
+      let(:template) do
+        Tilt::MustacheTemplate.new do |t| 
+          '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
+          [first_name, last_name].join ' '
+        end
+        def scope.friends *friends
+          friends.join ' & '
+        end
+        def scope.sour_drink type
+          "#{type} Sour"
+        end
+        def scope.random_drink
+          "Beer"
+        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" }
+    end
+
     context 'with both an object and locals' do
       let(:template) do
         Tilt::MustacheTemplate.new {

data/spec/request_helper.rb

@@ -4,6 +4,22 @@ module RequestHelper
   def mock_app(base=Sinatra::Base, &block)
     @app = Sinatra.new(base, &block)
   end
+  
+  def mock_helper_app &block
+    @helper_app = Sinatra::Base
+    @helper_app.class_eval &block
+    @helper_app
+  end
+  
+  def clean_helper_app
+    Sinatra::Base.class_eval do
+      layout { "{{ yield }}" }
+      undef :name if instance_methods.include?(:name)
+      undef :friends if instance_methods.include?(:friends)
+      undef :sour_drink if instance_methods.include?(:sour_drink)
+      undef :random_drink if instance_methods.include?(:random_drink)
+    end
+  end
 
   def app
     Rack::Lint.new(@app)
@@ -11,6 +27,7 @@ module RequestHelper
 
   def mustache_app(&block)
     mock_app {
+      helpers Sinatra::MustacheHelper
       set :environment, :test
       set :views, File.dirname(__FILE__) + '/views'
       get '/', &block

data/spec/spec_helper.rb

@@ -4,6 +4,7 @@ require 'rack'
 require 'rack/test'
 
 require 'request_helper'
+require 'fake_template_helper'
 
 RSpec.configure do |config|
   config.include RequestHelper, :type => :request

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sinatra-mustache
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-22 00:00:00.000000000 Z
+date: 2013-03-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
@@ -19,10 +19,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.2'
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -30,10 +27,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.2'
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '1'
 - !ruby/object:Gem::Dependency
   name: mustache
   requirement: !ruby/object:Gem::Requirement
@@ -118,10 +112,13 @@ files:
 - LISCENSE
 - README.md
 - Rakefile
+- lib/proxies/currystache.rb
 - lib/sinatra-mustache/version.rb
+- lib/sinatra/helpers/mustache.rb
 - lib/sinatra/mustache.rb
 - lib/tilt/mustache_template.rb
 - sinatra-mustache.gemspec
+- spec/fake_template_helper.rb
 - spec/mustache_spec.rb
 - spec/mustache_template_spec.rb
 - spec/request_helper.rb
@@ -151,11 +148,12 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: sinatra-mustache
-rubygems_version: 1.8.24
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: Use Mustache in your Sinatra app without the extra view classes
 test_files:
+- spec/fake_template_helper.rb
 - spec/mustache_spec.rb
 - spec/mustache_template_spec.rb
 - spec/request_helper.rb