stache 1.0.3 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4c4d478dbffc3306efd783fe17d868a8879c0b24
-  data.tar.gz: ddba634b4929cc0ac1c83ef8f888b13cee625f10
+  metadata.gz: 351c235cf203b65a8eacf4a9fcb01b9236eb54e1
+  data.tar.gz: 6540207101f87ff30024205a56c8b308e690280e
 SHA512:
-  metadata.gz: f1b49b3ddf56014e1bae27183c5b7b393415d4d27e39884a2701bf505f88b1134fdbd31cd9ed0fe1aecb6920e1ccc9cb327a898082d88d904f1afef33daa0089
-  data.tar.gz: 0747cd7f832dfdaaca2adeeae2fb3316cf52f9bc582a375139523ea2ea2e64982bba6153a340b99011d7fda39a1285a5957ec65940bb75d50e7b8ee5cbdfb745
+  metadata.gz: 689692a05dcf7dc95b82adac7cfb37cd1b0d91f618277584115baffa5a543bc7f0af4e456e172826b5c5dae398b1c06e25822876c14de7a77835fad706e8af2f
+  data.tar.gz: cfd7331c2b602ac2a777ab3c98f22df598f280a5a25a5b8e7eaef54557b06d7297b07be29134db2a81ba2643125e74cfc31b492a6b37363207f886b443f1e345

data/.gitignore

@@ -13,6 +13,7 @@ doc
 .yardoc
 
 spec/dummy/log/
+spec/dummy/tmp/
 
 # Have editor/IDE/OS specific files you need to ignore? Consider using a global gitignore: 
 #

data/.rspec

@@ -1,2 +1,2 @@
 --color
---format nested
+--format documentation

data/.ruby-version

@@ -1 +1 @@
-ruby-2.0.0
+ruby-2.1.1

data/.travis.yml

@@ -1,4 +1,5 @@
 language: ruby
 rvm:
   - 1.9.3
-  - 2.0.0
+  - 2.0.0
+  - 2.1.1

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # CHANGELOG
 
+## 1.1.0 (2014-09-05)
+
+* Overhaul of Stache::Mustache rendering by [@MarkusHarmsen](https://github.com/MarkusHarmsen) brings caching, and with it, 200-300% rendering performance enhancements. Thanks!
+
 ## 1.0.3 (2014-01-14)
 
 * Access RSpec-assigned instance variables in view classes (Thanks [@kianw](https://github.com/kianw))

data/README.md

@@ -1,18 +1,16 @@
 # stache
 
-A Rails 3.x compatible Mustache/Handlebars Template Handler, with support for partials and a couple extra niceties to make sharing the raw templates with client-side javascript a little easier. It's a one-stop shop for your facial-hair-inspired templates.
+A Rails 3.x and Rails 4.x compatible Mustache/Handlebars template handler, with support for partials and a couple extra niceties to make sharing the raw templates with client-side javascript a little easier. It's a one-stop shop for your facial-hair-inspired templates.
 
 [![Build Status](https://secure.travis-ci.org/agoragames/stache.png)](http://travis-ci.org/agoragames/stache)
 
-## 1.0.0
+## Mustache template caching is in 1.1+
 
-Major overhaul to the mustache side of things. Backwards compatibility *should* be intact. If not, file a bug and it will get taken care of.
+I'm investigating whether or not this is something that can be/needs to be ported to handlebars.
 
-Handlebars can also handle application layouts, and you can use subclasses of Stache::Handlebars::View to define view-specific helpers now.
+## Rails 4 Support is in 1.0.3+
 
-## Notice Of Breaking Changes
-
-Stache 0.9.x adds handlebars support. In the process, the public API has changed *ever-so-slightly*. Specifically, you'll need to require the mustache or handlebars gems on your own, **and** you'll need to tell Stache which one (or both!) you want to use. Add `config.use :mustache` to your initializer.
+If you want Rails 4, you'll have to use 1.0.3.
 
 ## Usage
 
@@ -23,21 +21,34 @@ Install the gem. If you want to override any of the configuration options (see `
 
 ```ruby
 Stache.configure do |c|
-  c.template_base_path = "..."  # this is probably the one you'll want to change
-                                # it defaults to app/templates
+  # This is probably the one you'll want to change
+  # it defaults to app/templates
+  c.template_base_path = "..."
 
-  c.wrapper_module_name = "..." # this lets you indicate the name of a module that
-                                # namespaces all your view classes, useful, if you
-                                # have a naming conflict, such as with a mailer
+  # This lets you indicate the name of a module that
+  # namespaces all your view classes, useful, if you
+  # have a naming conflict, such as with a mailer
+  c.wrapper_module_name = "..."
 
   # N.B. YOU MUST TELL STACHE WHICH TO USE:
   c.use :mustache
   # and / or
   c.use :handlebars
+
+  # Set it to true if template path should be included in
+  # script's id tag as a underscored prefix. It can be
+  # overwritten by an id param in `#template_include_tag`.
+  c.include_path_in_id = false
+
+  # Caching (new in 1.1.0, Mustache-only for now)
+  # Any ActiveSupport::Cache should work fine.
+  # If you enable this in development, you will lose automagical template reloading!
+  c.template_cache = ActiveSupport::Cache::MemoryStore.new if Rails.env.production?
 end
 
 # or if the block style ain't yer thang, just:
 Stache.template_base_path = File.join(Rails.root, "app", "şablon")
+Stache.template_cache = ActiveSupport::Cache::MemoryStore.new if Rails.env.production?
 ```
 
 There is as of right now one provided helper, `template_include_tag`. Give it the name of a partial and it will write it raw to a script block.
@@ -94,8 +105,8 @@ You can subclass `Stache::Handlebars::View` in the same way as mustache above, b
 
 ## View Specs
 
-Yes, you can write view specs using RSpec for your Stache templates! You can use RSpec's `assign` method to 
-assign values to view instance variables, which will then be be available to the Stache view, either as 
+Yes, you can write view specs using RSpec for your Stache templates! You can use RSpec's `assign` method to
+assign values to view instance variables, which will then be be available to the Stache view, either as
 instance variables, or via an accessor. Any instance variables defined in the RSpec example will also be
 similarly available, so
 
@@ -144,12 +155,6 @@ View:
 
 This is code that was ripped out of a research project. It probably has some rough edges.
 
-TODO:
-
-* more and better integration tests
-* automated tests across different rails versions
-* other helpers, etc, as desired
-
 ## Thanks to
 
 This project builds on work done by the following people and projects:
@@ -172,8 +177,10 @@ So: thanks a ton to those guys.
 * [zombor](https://github.com/zombor) contributed an overhaul to the Mustache renderer that puts Mustache classes themselves in control of the render chain, not Rails.
 * [kategengler](https://github.com/kategengler) contributed a patch to allow folks to specify a namespace for their view objects.
 * [joker1007](https://github.com/joker1007) contributed a patch making the autoload paths setup more broadly compatible.
+* [kianw](https://github.com/kianw) contributed a patch making RSpec a little easier to use.
+* [MarkusHarmsen](https://github.com/MarkusHarmsen) added Mustache caching, leading to HUGE performance increases. Thanks!
 
-Thanks a ton to all of the contributors as well. This would never have grown beyond a mediocre tool that rendered partials without their help!
+Thanks a ton to all of the contributors, equally. This would never have grown beyond a mediocre tool that rendered partials without their help!
 
 ## Note on Patches/Pull Requests
 

data/Rakefile

@@ -8,7 +8,7 @@ RSpec::Core::RakeTask.new(:spec) do |spec|
   # spec.ruby_opts = ['-w']
 end
 
-task :default => :spec
+task default: :spec
 
 require 'rdoc/task'
 RDoc::Task.new do |rdoc|

data/lib/stache/asset_helper.rb

@@ -14,10 +14,8 @@ module Stache
         end
 
         template = template_finder.call(true) rescue template_finder.call(false)
-        template_id = source.split("/").last
-
-        options = options.reverse_merge(:type => "text/html", :id => "#{template_id.dasherize.underscore}_template")
-        content_tag(:script, template.source.html_safe, options)
+        template_id = (Stache.include_path_in_id) ? source.gsub("/", '_') : source.to_s.split("/").last
+        content_tag(:script, template.source.html_safe, options.reverse_merge(type: 'text/html', id: template_id.dasherize.underscore))
 
       end.join("\n").html_safe
     end

data/lib/stache/config.rb

@@ -11,7 +11,7 @@ module Stache
   #   use :mustache # or :handlebars
   # end
   module Config
-    attr_accessor :template_base_path, :shared_path, :wrapper_module_name
+    attr_accessor :template_base_path, :shared_path, :wrapper_module_name, :include_path_in_id, :template_cache
 
     def configure
       yield self
@@ -33,6 +33,22 @@ module Stache
       @wrapper_module_name ||= nil
     end
 
+    def include_path_in_id
+      @include_path_in_id ||= false
+    end
+
+    def include_path_in_id= boolean
+      @include_path_in_id = boolean
+    end
+
+    def template_cache
+      @template_cache ||= ActiveSupport::Cache::NullStore.new
+    end
+
+    def template_cache= cache
+      @template_cache = cache
+    end
+
     def use template_engine
       require "stache/#{template_engine}"
     end

data/lib/stache/handlebars/handler.rb

@@ -34,11 +34,11 @@ module Stache
             content_for(:layout)
           end
 
-          template = handlebars.compile('#{template.source.gsub(/'/, "\\\\'")}');
+          template = handlebars.compile('#{template.source.gsub(/'/, "\\\\'")}')
           vars = {}
           partial_renderer = PartialRenderer.new(lookup_context)
           vars.merge!(@_assigns)
-          vars.merge!(partial_renderer.instance_variable_get('@locals') || {})
+          vars.merge!(local_assigns || {})
           options = partial_renderer.instance_variable_get('@options')
           vars.merge!(options[:context] || {}) if options
 
@@ -46,7 +46,7 @@ module Stache
             search_path = '#{template.virtual_path}'.split("/")[0..-2]
             file = (search_path + [name]).join("/")
             finder = lambda do |partial|
-              self.lookup_context.find(file, [], partial, [], {:formats => [:html]})
+              self.lookup_context.find(file, [], partial, [], {formats: [:html]})
             end
             template = finder.call(false) rescue finder.call(true)
 

data/lib/stache/mustache.rb

@@ -1,5 +1,7 @@
 require "stache/mustache/handler"
 require "stache/mustache/layout"
+require "stache/mustache/cached_template"
+require "stache/mustache/faster_context"
 
 module Stache
   module Mustache; end

data/lib/stache/mustache/cached_template.rb

@@ -0,0 +1,41 @@
+module Stache
+  module Mustache
+    #
+    # Extend the Mustache::Template class to support dumping/loading.
+    # This is not possible by the original class since it uses a singleton class.
+    #
+    class CachedTemplate < ::Mustache::Template
+
+      #
+      # Init with uncompiled "source" and "compiled_source" if given.
+      #
+      def initialize(source, compiled_source = nil)
+        super(source)
+        @compiled_source = compiled_source
+      end
+
+      #
+      # Compiles the source, but uses the already compiled version if
+      # present.
+      #
+      def compile(src = @source)
+        @compiled_source || (@compiled_source = super(src))
+      end
+
+      #
+      # Store the template by returning the compiled_source
+      #
+      def _dump(level)
+        compile
+      end
+
+      #
+      # Restore object by simply setting the compiled_source
+      #
+      def self._load(compiled_source)
+        new(nil, compiled_source)
+      end
+
+    end
+  end
+end

data/lib/stache/mustache/faster_context.rb

@@ -0,0 +1,21 @@
+module Stache
+  module Mustache
+    class FasterContext < ::Mustache::Context
+
+      def partial(name, indentation = nil)
+        # Look for the first Mustache in the stack.
+        mustache = mustache_in_stack
+
+        # Do NOT indent the partial template by the given indentation.
+        part = mustache.partial(name)
+
+        # If we already have a template, to not convert it into a string
+        part = part.to_s unless part.is_a?(::Mustache::Template)
+
+        # Call the Mustache's `partial` method and render the result.
+        mustache.render(part, self)
+      end
+
+    end
+  end
+end

data/lib/stache/mustache/handler.rb

@@ -23,30 +23,22 @@ module Stache
         # system.
 
         template_is_class = template.source.match(/module/) ? true : false
+        virtual_path      = template.virtual_path.to_s
+
+        # Caching key
+        template_id = "#{template.identifier.to_s}#{template.updated_at.to_i}"
 
         # Return a string that will be eval'd in the context of the ActionView, ugly, but it works.
         <<-MUSTACHE
           mustache = ::#{mustache_class}.new
           mustache.view = self
 
-          if #{template_is_class}
-            template_name = "#{template.virtual_path.to_s}"
-            file = Dir.glob(File.join(::Stache.template_base_path, template_name + "\.*" + mustache.template_extension)).first
-            template_source = File.read(file)
-          else
-            template_source = '#{template.source.gsub(/'/, "\\\\'")}'
-          end
-
-          mustache.template = template_source
-          mustache.virtual_path = '#{template.virtual_path.to_s}'
+          mustache.virtual_path = '#{virtual_path}'
           mustache[:yield] = content_for(:layout)
           mustache.context.update(local_assigns)
-          variables = controller.instance_variable_names
-          variables -= %w[@template]
-
-          if controller.respond_to?(:protected_instance_variables)
-            variables -= controller.protected_instance_variables
-          end
+          variables = controller.instance_variables
+          variables.delete(:@template)
+          variables -= controller.class.protected_instance_variables.to_a
 
           variables.each do |name|
             mustache.instance_variable_set(name, controller.instance_variable_get(name))
@@ -59,11 +51,31 @@ module Stache
 
           # Declaring an +attr_reader+ for each instance variable in the
           # Stache::Mustache::View subclass makes them available to your templates.
-          mustache.class.class_eval do
-            attr_reader *variables.map { |name| name.sub(/^@/, '').to_sym }
+          mustache.singleton_class.class_eval do
+            attr_reader *variables.map { |name| name.to_s.sub(/^@/, '').to_sym }
+          end
+
+          # Try to get template from cache, otherwise use template source
+          template_cached   = ::Stache.template_cache.read(:'#{template_id}', :namespace => :templates, :raw => true)
+          mustache.template = template_cached || Stache::Mustache::CachedTemplate.new(
+            if #{template_is_class}
+              template_name = "#{virtual_path}"
+              file = Dir.glob(File.join(::Stache.template_base_path, template_name + "\.*" + mustache.template_extension)).first
+              File.read(file)
+            else
+              '#{template.source.gsub(/'/, "\\\\'")}'
+            end
+          )
+
+          # Render - this will also compile the template
+          compiled = mustache.render.html_safe
+
+          # Store the now compiled template
+          unless template_cached
+            ::Stache.template_cache.write(:'#{template_id}', mustache.template, :namespace => :templates, :raw => true)
           end
 
-          mustache.render.html_safe
+          compiled
         MUSTACHE
       end
 

data/lib/stache/mustache/layout.rb

@@ -24,7 +24,7 @@ module Stache
         # stick that rendered template as :yield into the layout template
         # (which will be combined with the current context)
         if (!ctx.is_a?(::Mustache::Context))
-          rendered_template = super(layout_template, :yield => rendered_template)
+          rendered_template = super(layout_template, yield: rendered_template)
         end
 
         rendered_template

data/lib/stache/mustache/view.rb

@@ -5,7 +5,12 @@ module Stache
     #
     # A Convienent Base Class for the views. Subclass this for autoloading magic with your templates.
     class View < ::Mustache
-      attr_accessor :view, :template, :virtual_path
+      attr_accessor :view, :virtual_path
+
+      def context
+        # Use the faster context instead of the original mustache one
+        @context ||= FasterContext.new(self)
+      end
 
       def method_missing(method, *args, &block)
         view.send(method, *args, &block)
@@ -15,21 +20,36 @@ module Stache
         super(method, include_private) || view.respond_to?(method, include_private)
       end
 
+      def virtual_path=(path)
+        @virtual_path = path
+        #
+        # Since the addition to the lookup_context only depends on the virtual_path,
+        # do it here instead of inside the partial.
+        #
+        current_dir   = Stache.template_base_path.join(path.split("/")[0..-2].join("/"))
+        lookup_context.view_paths << current_dir unless lookup_context.view_paths.include?(current_dir)
+      end
+
       # Redefine where Stache::View templates locate their partials
       def partial(name)
-        current_dir = Stache.template_base_path.join( self.virtual_path.split("/")[0..-2].join("/") )
-        lookup_context.view_paths += [current_dir]
-
-        template_finder = lambda do |partial|
-          if ActionPack::VERSION::MAJOR == 3 && ActionPack::VERSION::MINOR < 2
-            lookup_context.find(name, [], partial)
-          else # Rails 3.2 and higher
-            lookup_context.find(name, [], partial, [], { formats: [:html], handlers: [:mustache] })
-          end
+        cache_key = :"#{virtual_path}/#{name}"
+
+        # Try to resolve template from cache
+        template_cached = ::Stache.template_cache.read(cache_key, :namespace => :partials, :raw => true)
+        curr_template   = template_cached || Stache::Mustache::CachedTemplate.new(
+          begin # Try to resolve the partial template
+            template_finder(name, true)
+          rescue ActionView::MissingTemplate
+            template_finder(name, false)
+          end.source
+        )
+
+        # Store the template
+        unless template_cached
+          ::Stache.template_cache.write(cache_key, curr_template, :namespace => :partials, :raw => true)
         end
 
-        template = template_finder.call(true) rescue template_finder.call(false)
-        template.source
+        curr_template
       end
 
       def helpers
@@ -43,6 +63,16 @@ module Stache
         end
         alias :h :helpers
       end
+
+    protected
+      def template_finder(name, partial)
+        if ActionPack::VERSION::MAJOR == 3 && ActionPack::VERSION::MINOR < 2
+          lookup_context.find(name, [], partial)
+        else # Rails 3.2 and higher
+          lookup_context.find(name, [], partial, [], { formats: [:html], handlers: [:mustache] })
+        end
+      end
+
     end
   end
 end

data/lib/stache/railtie.rb

@@ -1,6 +1,6 @@
 module Stache
   class Railtie < ::Rails::Railtie
-    initializer 'stache.autoload', :before => :set_autoload_paths do |app|
+    initializer 'stache.autoload', before: :set_autoload_paths do |app|
       app.config.autoload_paths << (Rails.root + 'app/views').to_s
     end
 

data/lib/stache/version.rb

@@ -1,3 +1,3 @@
 module Stache
-  VERSION = "1.0.3"
+  VERSION = "1.1.0"
 end

data/spec/controllers/stache_controller_spec.rb

@@ -52,7 +52,7 @@ describe StacheController do
     response.body.should == "Wrap\nThis is wrapped in a layout\n\nEndWrap\n"
   end
 
-  it "can get render a mustache with rails helpers", :type => :stache do
+  it "can get render a mustache with rails helpers", type: :stache do
     get :helper
     assert_response 200
 
@@ -81,4 +81,43 @@ describe StacheController do
       Stache.wrapper_module_name = nil
     end
   end
+
+  describe "cache usage" do
+    before do
+      Stache.template_cache = ActiveSupport::Cache::MemoryStore.new
+    end
+
+    it "fills the cache" do
+      get :index
+      get :index  # Render a second time
+      Stache.template_cache.instance_variable_get(:@data).size.should eq(1) # But should only contain one element
+    end
+
+    it "fills the cache" do
+      get :with_partials
+      get :with_partials  # Render a second time
+      Stache.template_cache.instance_variable_get(:@data).size.should eq(2) # But should only contain two elements (one for template, one for the partial)
+    end
+
+    it "uses the cache" do
+      get :with_partials
+
+      # Setup fake template
+      template = Stache::Mustache::CachedTemplate.new("foo")
+      template.compile
+
+      # Get first entry and manipulate it to be the fake template
+      key = Stache.template_cache.instance_variable_get(:@data).keys.last
+      Stache.template_cache.write(key, template, :raw => true)
+
+      # Now check response if it is the fake template
+      get :with_partials
+      assert_response 200
+      response.body.should == "foo"
+    end
+
+    after do
+      Stache.template_cache = ActiveSupport::Cache::NullStore.new
+    end
+  end
 end

data/spec/dummy/config/initializers/secret_token.rb

@@ -5,3 +5,4 @@
 # Make sure the secret is at least 30 characters and all random,
 # no regular words or you'll be exposed to dictionary attacks.
 Dummy::Application.config.secret_token = '63d476c32606ceb52290e05ef316ea4d0fa558de3bc1ea83b4182a7c030a28b2f8b0111b7b3e3cf6bbdf43c03c7dd7f7fad555cfe11c56c2d23276e16873eaa0'
+Dummy::Application.config.secret_key_base = '63d476c32606ceb52290e05ef316ea4d0fa558de3bc1ea83b4182a7c030a28b2f8b0111b7b3e3cf6bbdf43c03c7dd7f7fad555cfe11c56c2d23276e16873eaa0'

data/spec/dummy/config/initializers/session_store.rb

@@ -1,6 +1,6 @@
 # Be sure to restart your server when you modify this file.
 
-Dummy::Application.config.session_store :cookie_store, :key => '_dummy_session'
+Dummy::Application.config.session_store :cookie_store, key: '_dummy_session'
 
 # Use the database for sessions instead of the cookie-based default,
 # which shouldn't be used to store highly confidential information

data/spec/dummy/config/routes.rb

@@ -1,27 +1,27 @@
 Dummy::Application.routes.draw do
-  get 'stache', :to => 'stache#index', :as => 'stache'
+  get 'stache', to: 'stache#index', as: 'stache'
 
-  get 'stache/with_layout', :to => 'stache#with_layout'
+  get 'stache/with_layout', to: 'stache#with_layout'
 
-  get 'stache/helper', :to => 'stache#helper'
+  get 'stache/helper', to: 'stache#helper'
 
-  get 'stache/with_partials', :to => 'stache#with_partials'
+  get 'stache/with_partials', to: 'stache#with_partials'
 
-  get 'stache/with_asset_helpers', :to => 'stache#with_asset_helpers'
+  get 'stache/with_asset_helpers', to: 'stache#with_asset_helpers'
 
-  get 'stache/with_wrapper', :to => 'stache#with_wrapper'
+  get 'stache/with_wrapper', to: 'stache#with_wrapper'
 
-  get 'stache/no_format_in_extension', :to => 'stache#no_format_in_extension'
+  get 'stache/no_format_in_extension', to: 'stache#no_format_in_extension'
 
-  get 'stache/no_format_in_extension_with_wrapper', :to => 'stache#no_format_in_extension_with_wrapper'
+  get 'stache/no_format_in_extension_with_wrapper', to: 'stache#no_format_in_extension_with_wrapper'
 
-  get 'handlebars', :to => 'handlebars#index', :as => 'handlebars'
+  get 'handlebars', to: 'handlebars#index', as: 'handlebars'
 
-  get 'handlebars/with_partials', :to => 'handlebars#with_partials'
+  get 'handlebars/with_partials', to: 'handlebars#with_partials'
 
-  get 'handlebars/with_helpers', :to => 'handlebars#with_helpers'
+  get 'handlebars/with_helpers', to: 'handlebars#with_helpers'
 
-  get 'handlebars/with_missing_data', :to => 'handlebars#with_missing_data'
+  get 'handlebars/with_missing_data', to: 'handlebars#with_missing_data'
 
-  get 'handlebars/with_wrapper', :to => 'handlebars#with_wrapper'
+  get 'handlebars/with_wrapper', to: 'handlebars#with_wrapper'
 end

data/spec/spec_helper.rb

@@ -29,5 +29,5 @@ require 'rspec/rails'
 Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each {|f| require f}
 
 RSpec.configure do |config|
-
+  config.infer_spec_type_from_file_location!
 end

data/spec/stache/asset_helper_spec.rb

@@ -39,28 +39,78 @@ describe Stache::AssetHelper do
     it "renders a script tag with the template contents" do
       helper.lookup_context.should_receive(:find).with('widgets/oh_herro', [], true, [], anything).and_return(TemplateStub.new("{{ awyeah }}"))
 
-      helper.template_include_tag("widgets/oh_herro").should == "<script id=\"oh_herro_template\" type=\"text/html\">{{ awyeah }}</script>"
+      helper.template_include_tag("widgets/oh_herro").should == "<script id=\"oh_herro\" type=\"text/html\">{{ awyeah }}</script>"
+    end
+    it "renders a script tag with the template contents for the passed in symbol" do
+      helper.lookup_context.should_receive(:find).with(:oh_herro, [], true, [], anything).and_return(TemplateStub.new("{{ awyeah }}"))
+
+      helper.template_include_tag(:oh_herro).should == "<script id=\"oh_herro\" type=\"text/html\">{{ awyeah }}</script>"
+    end
+    it "renders a script tag with the template contents for the passed in symbols" do
+      helper.lookup_context.should_receive(:find).with(:oh_herro, [], true, [], anything).and_return(TemplateStub.new("{{ awyeah }}"))
+      helper.lookup_context.should_receive(:find).with(:oh_hai, [], true, [], anything).and_return(TemplateStub.new("{{ awyes }}"))
+
+      helper.template_include_tag(:oh_herro, :oh_hai).should == "<script id=\"oh_herro\" type=\"text/html\">{{ awyeah }}</script>\n<script id=\"oh_hai\" type=\"text/html\">{{ awyes }}</script>"
     end
     it "renders a script tag with the template contents and given id" do
       helper.lookup_context.should_receive(:find).with('widgets/oh_herro', [], true, [], anything).and_return(TemplateStub.new("{{ awyeah }}"))
 
-      helper.template_include_tag("widgets/oh_herro", :id => 'oh_herro_tmpl').should == "<script id=\"oh_herro_tmpl\" type=\"text/html\">{{ awyeah }}</script>"
+      helper.template_include_tag("widgets/oh_herro", id: 'oh_herro_tmpl').should == "<script id=\"oh_herro_tmpl\" type=\"text/html\">{{ awyeah }}</script>"
     end
     it "renders a script tag with the template contents and given options" do
       helper.lookup_context.should_receive(:find).with('widgets/oh_herro', [], true, [], anything).and_return(TemplateStub.new("{{ awyeah }}"))
 
-      helper.template_include_tag("widgets/oh_herro", :data => {:engine => 'mustache'}).
-        should == "<script data-engine=\"mustache\" id=\"oh_herro_template\" type=\"text/html\">{{ awyeah }}</script>"
+      helper.template_include_tag("widgets/oh_herro", data: {engine: 'mustache'}).
+        should == "<script data-engine=\"mustache\" id=\"oh_herro\" type=\"text/html\">{{ awyeah }}</script>"
     end
     it "will find first by partial and later by non-partial" do
       helper.lookup_context.should_receive(:find).with('widgets/oh_herro', anything, true, anything, anything).and_raise(StandardError.new("noooooo"))
       helper.lookup_context.should_receive(:find).with('widgets/oh_herro', anything, false, anything, anything).and_return(TemplateStub.new("{{ awyeah }}"))
 
-      helper.template_include_tag("widgets/oh_herro").should == "<script id=\"oh_herro_template\" type=\"text/html\">{{ awyeah }}</script>"
+      helper.template_include_tag("widgets/oh_herro").should == "<script id=\"oh_herro\" type=\"text/html\">{{ awyeah }}</script>"
     end
     it "raises if it cannot find the template" do
       lambda { helper.template_include_tag("arrrgh") }.should raise_error(ActionView::MissingTemplate)
     end
+
+    context "when config.include_path_in_id is set to true" do
+      before do
+        Stache.include_path_in_id = true
+
+        helper.lookup_context.should_receive(:find)
+          .with(nested_path, [], true, [], anything)
+          .and_return(TemplateStub.new("{{ awyeah }}"))
+      end
+
+      after do
+        Stache.include_path_in_id = false
+      end
+
+      let(:nested_path) { 'nested/path/to/oh_herro' }
+
+      it "renders a script tag id with template path included (underscored)" do
+        helper.template_include_tag(nested_path)
+          .should == "<script id=\"nested_path_to_oh_herro\" type=\"text/html\">{{ awyeah }}</script>"
+      end
+
+      context "when template_base_path is set" do
+        before do
+          Stache.template_base_path = 'widgets/'
+        end
+
+        it "renders a script tag id without a template path included" do
+          helper.template_include_tag(nested_path)
+            .should == "<script id=\"nested_path_to_oh_herro\" type=\"text/html\">{{ awyeah }}</script>"
+        end
+      end
+
+      context "when id option is set" do
+        it "renders a script tag with given id and without a full path" do
+          helper.template_include_tag(nested_path, id: 'oh_herro_tmpl')
+            .should == "<script id=\"oh_herro_tmpl\" type=\"text/html\">{{ awyeah }}</script>"
+        end
+      end
+    end
   end
 
 

data/spec/stache/config_spec.rb

@@ -28,6 +28,15 @@ describe "Stache::Config" do
     it "sets a default value for wrapper_module_name" do
       Stache.send(:wrapper_module_name).should be_nil
     end
+
+    it "sets up an attribute named include_path_in_id" do
+      attr = :include_path_in_id
+      should_set_up_attr_accessor_for(attr)
+    end
+
+    it "sets a default value for include_path_in_id" do
+      Stache.send(:include_path_in_id).should be false
+    end
   end
 
   describe ".configure" do

data/spec/stache/handlebars/handlebars_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 describe Stache::Handlebars::Handler do
   before do
-    @template = ActionView::Template.new("{{body}}", "hello handlebars", Stache::Handlebars::Handler, { :virtual_path => "hello_world"})
+    @template = ActionView::Template.new("{{body}}", "hello handlebars", Stache::Handlebars::Handler, { virtual_path: "hello_world"})
     @handler = Stache::Handlebars::Handler.new
   end
 

data/spec/stache/mustache/cached_template_spec.rb

@@ -0,0 +1,27 @@
+require 'spec_helper'
+
+describe Stache::Mustache::CachedTemplate do
+  before do
+    @source   = "{{hello}} mustache"
+    @template = Stache::Mustache::CachedTemplate.new(@source)
+  end
+
+  it "can be dumped when compiled" do
+    @template.compile
+    dump = Marshal.dump(@template)
+    dump.should =~ /ctx\[:hello\]/
+    dump.should =~ /mustache/
+  end
+
+  it "can be loaded from valid dump" do
+    @template.compile
+    obj = Marshal.load(Marshal.dump(@template))
+    obj.compile.should eq(@template.compile)
+  end
+
+  it "should ignore source if already compiled" do
+    res   = @template.compile
+    res2 =  @template.compile("{{foo}} bar")
+    res.should eq(res2)
+  end
+end

data/spec/stache/mustache/handler_spec.rb

@@ -3,10 +3,10 @@ require 'spec_helper'
 describe Stache::Mustache::Handler do
   # ERBHandler = ActionView::Template::Handlers::ERB.new
   # def new_template(body = "<%= hello %>", details = {})
-  #   ActionView::Template.new(body, "hello template", ERBHandler, {:virtual_path => "hello"}.merge!(details))
+  #   ActionView::Template.new(body, "hello template", ERBHandler, {virtual_path: "hello"}.merge!(details))
   # end
   before do
-    @template = ActionView::Template.new("{{body}}", "hello mustache", Stache::Mustache::Handler, { :virtual_path => "hello_world"})
+    @template = ActionView::Template.new("{{body}}", "hello mustache", Stache::Mustache::Handler, { virtual_path: "hello_world"})
     @handler = Stache::Mustache::Handler.new
   end
 

data/spec/stache/util_spec.rb

@@ -10,8 +10,8 @@ describe Stache::Util do
       Stache::Util.av_template_class("Foo").should == ActionView::TemplateFoo
     end
   end
-  
+
   describe ".needs_compilable?" do
-    pending "need to figure out some way to test this across different rails versions..."
+    skip "need to figure out some way to test this across different rails versions..."
   end
 end

data/stache.gemspec

@@ -8,8 +8,8 @@ Gem::Specification.new do |s|
   s.authors = ['Matt Wilson']
   s.email = 'mhw@hypomodern.com'
   s.homepage = 'http://github.com/agoragames/stache'
-  s.summary = %Q{Configurable Mustache Handler and Helpers for Rails}
-  s.description = %Q{A rails 3.x compatible template handler, configurable.}
+  s.summary = %Q{A Rails 3.x and Rails 4.x compatible Mustache/Handlebars template handler}
+  s.description = %Q{A Rails 3.x and Rails 4.x compatible Mustache/Handlebars template handler}
   s.license = 'MIT'
   s.extra_rdoc_files = [
     'LICENSE',
@@ -28,8 +28,8 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'mustache'
   s.add_development_dependency 'handlebars', '~>0.4.0'
   s.add_development_dependency 'rails', '~>4.0.0'
-  s.add_development_dependency 'rspec'
-  s.add_development_dependency 'rspec-rails'
+  s.add_development_dependency 'rspec', '~>2.99.0'
+  s.add_development_dependency 'rspec-rails', '~>2.99.0'
   s.add_development_dependency 'bundler'
   s.add_development_dependency 'rake'
 end

metadata

@@ -1,114 +1,114 @@
 --- !ruby/object:Gem::Specification
 name: stache
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.1.0
 platform: ruby
 authors:
 - Matt Wilson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-14 00:00:00.000000000 Z
+date: 2014-09-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mustache
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: handlebars
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.4.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.4.0
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 4.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 4.0.0
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.99.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.99.0
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.99.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.99.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: A rails 3.x compatible template handler, configurable.
+description: A Rails 3.x and Rails 4.x compatible Mustache/Handlebars template handler
 email: mhw@hypomodern.com
 executables: []
 extensions: []
@@ -116,12 +116,12 @@ extra_rdoc_files:
 - LICENSE
 - README.md
 files:
-- .document
-- .gitignore
-- .rspec
-- .ruby-gemset
-- .ruby-version
-- .travis.yml
+- ".document"
+- ".gitignore"
+- ".rspec"
+- ".ruby-gemset"
+- ".ruby-version"
+- ".travis.yml"
 - CHANGELOG.md
 - Gemfile
 - LICENSE
@@ -134,6 +134,8 @@ files:
 - lib/stache/handlebars/handler.rb
 - lib/stache/handlebars/view.rb
 - lib/stache/mustache.rb
+- lib/stache/mustache/cached_template.rb
+- lib/stache/mustache/faster_context.rb
 - lib/stache/mustache/handler.rb
 - lib/stache/mustache/layout.rb
 - lib/stache/mustache/view.rb
@@ -214,6 +216,7 @@ files:
 - spec/stache/handlebars/handlebars_spec.rb
 - spec/stache/handlebars/profile_autoload.rb
 - spec/stache/handlebars/view_spec.rb
+- spec/stache/mustache/cached_template_spec.rb
 - spec/stache/mustache/handler_spec.rb
 - spec/stache/mustache/profile_autoload.rb
 - spec/stache/mustache/view_spec.rb
@@ -232,20 +235,20 @@ require_paths:
 - lib
 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: 1.3.7
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.0
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 3
-summary: Configurable Mustache Handler and Helpers for Rails
+summary: A Rails 3.x and Rails 4.x compatible Mustache/Handlebars template handler
 test_files:
 - spec/controllers/handlebars_controller_spec.rb
 - spec/controllers/stache_controller_spec.rb
@@ -319,6 +322,7 @@ test_files:
 - spec/stache/handlebars/handlebars_spec.rb
 - spec/stache/handlebars/profile_autoload.rb
 - spec/stache/handlebars/view_spec.rb
+- spec/stache/mustache/cached_template_spec.rb
 - spec/stache/mustache/handler_spec.rb
 - spec/stache/mustache/profile_autoload.rb
 - spec/stache/mustache/view_spec.rb