sinatra-mustache 0.1.0 → 0.2.0

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    NWE3OGU0YjQxMTFmMGVmMGMzMWNhMzE1MzFiODJjMjEzYWM2MGVkOQ==
+  data.tar.gz: !binary |-
+    MmQzZjQ1ODFiZTFmOTc5ZjhiZjgyNmMxYzllZWM5NWU1OWQ4MTA3NQ==
+SHA512:
+  metadata.gz: !binary |-
+    YjIzZTNjOTE3ZTcwYTJhYmEwYjYzMGU1YjBkZDgxMGFkN2ZiNWMwNjExYTZm
+    YjYwZjMzZDA3MTUzNGIwYTQ4MjIyNjEzN2IxZTI1OTA0MzFmMTI2ZDU0N2Zi
+    ZGJhNWM1MGMzNDdjNjU2MTYxNDk0NTQ5ZDY0NGNmNGUxMzNhOGM=
+  data.tar.gz: !binary |-
+    NzlhMGE5ZTc1ZDgyMzJlZGRlMjhiYjNmZTcxY2FiNTJhYTAzNWQ0MWU5OGNl
+    NTM0NDZhYzU3NzBjYTk5M2ExYmY2ZjA2MDg3ZDQxNDI1OTMyOTg4MzBjYzZi
+    NmZkY2M5M2M1YzgyNWRhMTkxZWI1MmM3MDZmZjI0MmNlMWU5YzE=

data/.rspec

@@ -0,0 +1 @@
+--color

data/.travis.yml

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

data/Changelog.md

@@ -1,3 +1,9 @@
+0.2.0
+=====
+
+- removed support for 1.8.7
+- refactoring of mustache template class
+
 0.0.5
 =====
 

data/{LISCENSE → License.txt}

@@ -1,6 +1,6 @@
 The MIT License
 
-Copyright (c) 2010 Jason Campbell
+Copyright (c) 2010 Jason Campbell, Beat Richartz
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/README.md

@@ -1,24 +1,20 @@
-sinatra-mustache [![Build Status](https://travis-ci.org/beatrichartz/sinatra-mustache.png?branch=master)](https://travis-ci.org/beatrichartz/sinatra-mustache) [![Code Climate](https://codeclimate.com/badge.png)](https://codeclimate.com/github/beatrichartz/sinatra-mustache)
+sinatra-mustache [![Build Status](https://travis-ci.org/beatrichartz/sinatra-mustache.png?branch=master)](https://travis-ci.org/beatrichartz/sinatra-mustache) [![Code Climate](https://codeclimate.com/github/beatrichartz/sinatra-mustache.png)](https://codeclimate.com/github/beatrichartz/sinatra-mustache) [![Dependency Status](https://gemnasium.com/beatrichartz/sinatra-mustache.png)](https://gemnasium.com/beatrichartz/sinatra-mustache)
 ================
 
-To simplify setting up [Sinatra][1] to use [Mustache][2] for it's templates
+To simplify setting up [Sinatra][1] to use [Mustache][2] for it's templates. Supports MRI 1.9, 2.0 as well as Rubinius and JRuby in 1.9 and 2.0 mode.
 
-[Sinatra][1] is a pretty amazing little web framework, if you don't know much
+[Sinatra][1] is a amazing little web framework, if you don't know much
 about it you should take some time to [get to know it][4].
 
-[Mustache][2] is also another favorite of mine; a really great and simple
-templating system. I have been slowly converting all my old views in various
-projects over to it.
+[Mustache][2] is a really great and simple templating system.
 
-Why?
-====
+Without extra view classes
+----
 
-There is already an [official][3] way to get Mustache to work with Sinatra, which
-involves some work and requires separate view classes to accompany your
-mustache templates. While I see the power in that it seems a bit complex..
+There is already an [official][3] way to get Mustache to work with Sinatra, which involves some work and requires separate view classes to accompany your mustache templates. There's power in that for sure, but for some implementations it is a bit complex.
 
 Usage
-=====
+----
 
 Try this on:
 
@@ -28,13 +24,12 @@ Try this on:
       set :views, 'templates' # totally optional
     end
 
-And then put your .mustache files in your app's views folder
+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.
+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:
 
@@ -77,12 +72,29 @@ Now, this is possible:
 Passing arguments to helper methods via dot notation is limited to Strings only.
 
 Caveat
-======
+----
 
-If you need the extra support of the ruby views used in the official Mustache
-for Sinatra example this gem probably isn't for you.
+If you need the extra support of the ruby views used in the official Mustache for Sinatra example this gem probably isn't for you.
 
 [1]: http://www.sinatrarb.com/
 [2]: http://mustache.github.com/
 [3]: https://github.com/defunkt/mustache-sinatra-example
 [4]: http://sinatra-book.gittr.com/
+
+Contributing to sinatra-mustache
+----
+
+* Check out the latest master to make sure the feature hasn't been implemented or the bug hasn't been fixed yet.
+* Check out the issue tracker to make sure someone already hasn't requested it and/or contributed it.
+* Fork the project.
+* Start a feature/bugfix branch.
+* Commit and push until you are happy with your contribution.
+* Make sure to add tests for it. This is important so I don't break it in a future version unintentionally.
+* Make sure to add documentation for it. This is important so everyone else can see what your code can do.
+* Please try not to mess with the Rakefile, version, or history. If you want to have your own version, or is otherwise necessary, that is fine, but please isolate to its own commit so I can cherry-pick around it.
+
+Copyright
+----
+
+Copyright (c) 2013 Beat Richartz. See LICENSE.txt for
+further details.

data/lib/sinatra-mustache/version.rb

@@ -1,5 +1,5 @@
 module Sinatra
   module Mustache
-    VERSION = "0.1.0"
+    VERSION = "0.2.0".freeze
   end
 end

data/lib/sinatra/helpers/mustache.rb

@@ -2,12 +2,12 @@ module Sinatra
   module MustacheHelper
     METHODS = {}
     
-    def mustache_helper *args      
+    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!))
+          add_to_mustache_helper_methods(arg)
         elsif arg.is_a? Module
-          arg.instance_methods.each { |m| add_to_mustache_helper_methods(m, arg.instance_method(m).bind(self.new!)) }
+          add_to_mustache_helper_methods(*arg.instance_methods, arg)
         else
           raise ArgumentError.new("#{arg.class} can not be used with mustache_helper, please provide a symbol or a Module")
         end
@@ -15,8 +15,17 @@ module Sinatra
     end
     alias :mustache_helpers :mustache_helper
     
-    def add_to_mustache_helper_methods name, meth
-      METHODS[name] = Proxies::Currystache.new(meth)
+    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
+      scope.instance_method(meth).bind(self.new!)
     end
     
   end

data/lib/tilt/mustache_template.rb

@@ -11,41 +11,48 @@ module Tilt
     end
 
     def prepare
-      ::Mustache.template_path = file.gsub(File.basename(file), '') if file
+      ::Mustache.template_path = file.sub File.basename(file), '' if file
       @engine = ::Mustache.new
       @output = nil
     end
 
-    def evaluate(scope, locals, &block)      
+    def evaluate scope, locals, &block
       mustache_locals = locals.dup
       
-      if data =~ /^(\s*---(.+)---\s*)/m
-        yaml = $2.strip
-        template = data.sub($1, '')
+      template = assign_template_and_front_matter! mustache_locals, data
+      assign_instance_variables! mustache_locals, scope
+      assign_helper_methods! mustache_locals
 
-        YAML.load_documents(yaml) do |front_matter|
-          # allows partials to override locals defined higher up
-          front_matter.delete_if { |key,value| mustache_locals.has_key?(key)}
-          mustache_locals.merge!(front_matter)
+      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], '')
+        YAML.load_documents(yaml[2].strip) do |front_matter|
+          mustache_locals.merge! front_matter.delete_if{|k,v| mustache_locals.member?(k) }
         end
       else
         template = data
       end
-
-      scope.instance_variables.each do |instance_variable|
-        symbol = instance_variable.to_s.gsub('@','').to_sym
-
-        unless mustache_locals.member?(symbol)
-          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[:content] = mustache_locals[:yield]
       
-      @output = ::Mustache.render(template, mustache_locals)
+      template
     end
   end
   

data/sinatra-mustache.gemspec

@@ -9,14 +9,14 @@ Gem::Specification.new do |s|
   s.authors     = ['Jason Campbell', 'Beat Richartz']
   s.email       = ['attraccessor@gmail.com']
   s.homepage    = 'http://github.com/beatrichartz/sinatra-mustache'
-  s.summary     = %q{Use Mustache in your Sinatra app without the extra view classes}
-  s.description = %q{Use Mustache in your Sinatra app without the extra view classes}
+  s.summary     = %q{Use Mustache in your Sinatra app without extra view classes}
+  s.description = %q{Use Mustache in your Sinatra app without extra view classes}
 
   s.rubyforge_project = "sinatra-mustache"
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
-  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
+  s.licenses      = ["MIT"]
   s.require_paths = ["lib"]
 
   s.add_dependency 'sinatra', '~> 1'

data/spec/mustache_template_spec.rb

@@ -37,7 +37,7 @@ describe Tilt::MustacheTemplate do
 
     context 'methods of the scope' do
       let(:template) do
-        Tilt::MustacheTemplate.new do |t| 
+        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

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sinatra-mustache
 version: !ruby/object:Gem::Version
-  version: 0.1.0
-  prerelease: 
+  version: 0.2.0
 platform: ruby
 authors:
 - Jason Campbell
@@ -10,12 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-27 00:00:00.000000000 Z
+date: 2013-11-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -23,7 +21,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -31,7 +28,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: mustache
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -39,7 +35,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -47,7 +42,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: tilt
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -58,7 +52,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -69,7 +62,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -77,7 +69,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -85,7 +76,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rack-test
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -93,12 +83,11 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '0'
-description: Use Mustache in your Sinatra app without the extra view classes
+description: Use Mustache in your Sinatra app without extra view classes
 email:
 - attraccessor@gmail.com
 executables: []
@@ -106,10 +95,11 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .rspec
 - .travis.yml
 - Changelog.md
 - Gemfile
-- LISCENSE
+- License.txt
 - README.md
 - Rakefile
 - lib/proxies/currystache.rb
@@ -129,29 +119,29 @@ 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:
 - 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'
 requirements: []
 rubyforge_project: sinatra-mustache
-rubygems_version: 1.8.25
+rubygems_version: 2.1.11
 signing_key: 
-specification_version: 3
-summary: Use Mustache in your Sinatra app without the extra view classes
+specification_version: 4
+summary: Use Mustache in your Sinatra app without extra view classes
 test_files:
 - spec/fake_template_helper.rb
 - spec/mustache_spec.rb