stache 0.2.1 → 0.2.2

data/.travis.yml

@@ -0,0 +1,4 @@
+language: ruby
+rvm:
+  - 1.9.2
+  - 1.9.3

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+# 0.2.2
+
+* Saner, consistent handling of template extensions: partials and full templates both use configured value at `Stache.template_extension`. Thanks @ajacksified!
+
+# 0.2.1
+
+* Addresses #9: fix 'incompatible character encodings' error
+
 # 0.2.0
 
 * Patch to properly reraise NameError/LoadError that occurs upon loading a Stache::View

data/README.md

@@ -1,6 +1,6 @@
 # stache
 
-A Rails 3.x (yes, even Rails *3.1*) compatible Mustache Template Handler, with support for partials and a couple extra niceties to make sharing the raw templates with client-side javascript a little easier.
+A Rails 3.x compatible Mustache Template Handler, with support for partials and a couple extra niceties to make sharing the raw templates with client-side javascript a little easier.
 
 ## Usage
 
@@ -58,7 +58,7 @@ end
 
 ## Of Note
 
-This is early code, ripped out from an upcoming project. It probably has some rough edges.
+This is code that was ripped out of a research project. It probably has some rough edges.
 
 TODO:
 
@@ -80,6 +80,8 @@ So: thanks a ton to those guys.
 
 * [afeld](https://github.com/afeld) provided 1.8.7 compatibility fixes.
 * [subwindow](https://github.com/subwindow) provided some much needed love for Stache::View exception handling.
+* [solotimes](https://github.com/solotimes) provided better support for non-standard encodings.
+* [ajacksified](https://github.com/ajacksified) cleaned up template extension handling.
 
 ## Note on Patches/Pull Requests
 

data/lib/stache.rb

@@ -14,4 +14,4 @@ module Stache
 end
 
 ActionView::Template.register_template_handler(:mustache, Stache::Handler)
-ActionView::Base.send :include, Stache::AssetHelper
+ActionView::Base.send :include, Stache::AssetHelper

data/lib/stache/asset_helper.rb

@@ -21,10 +21,8 @@ module Stache
     
     def potential_paths(path, candidate_file_name)
       [
-        path.join("_#{candidate_file_name}.html.mustache"),
-        path.join("_#{candidate_file_name}.mustache"),
-        path.join("#{candidate_file_name}.html.mustache"),
-        path.join("#{candidate_file_name}.mustache")
+        path.join("_#{candidate_file_name}.#{Stache.template_extension}"),
+        path.join("#{candidate_file_name}.#{Stache.template_extension}")
       ]
     end
     
@@ -32,4 +30,4 @@ module Stache
       potential_paths(path, candidate_file_name).find { |file| File.file?(file.to_s) }
     end
   end
-end
+end

data/lib/stache/railtie.rb

@@ -5,7 +5,7 @@ module Stache
     end
 
     config.to_prepare do
-      ApplicationController.send(:append_view_path, 'app/templates')
+      ApplicationController.send(:append_view_path, Stache.template_base_path)
     end
   end
-end
+end

data/lib/stache/version.rb

@@ -1,3 +1,3 @@
 module Stache
-  VERSION = "0.2.1"
+  VERSION = "0.2.2"
 end

data/spec/stache/asset_helper_spec.rb

@@ -29,21 +29,37 @@ describe Stache::AssetHelper do
       helper.template_include_tag("whooo").should == "<script id=\"whooo_template\" type=\"text/html\">{{ awyeah }}</script>"
     end
     it "raises if it cannot find the template" do
-      -> { helper.template_include_tag("arrrgh") }.should raise_error(ActionView::MissingTemplate)
+      lambda { helper.template_include_tag("arrrgh") }.should raise_error(ActionView::MissingTemplate)
     end
   end
 
   describe "#locate_template_for" do
-    it "tries permutations of partial names and file extensions to find the requested file" do
+    it "tries permutations of partial names and default file extension to find the requested file" do
       File.should_receive(:file?).with("/tmp/whee/_whooo.html.mustache")
+      File.should_receive(:file?).with("/tmp/whee/whooo.html.mustache").and_return(true)
+
+      helper.locate_template_for(Pathname.new("/tmp/whee"), "whooo").should == Pathname.new("/tmp/whee/whooo.html.mustache")
+    end
+
+    it "tries permutations of partial names and configured file extension to find the requested file" do
+      Stache.configure do |config|
+        @current_extension = config.template_extension
+        config.template_extension = 'mustache'
+      end
+
       File.should_receive(:file?).with("/tmp/whee/_whooo.mustache")
-      File.should_receive(:file?).with("/tmp/whee/whooo.html.mustache")
       File.should_receive(:file?).with("/tmp/whee/whooo.mustache").and_return(true)
 
       helper.locate_template_for(Pathname.new("/tmp/whee"), "whooo").should == Pathname.new("/tmp/whee/whooo.mustache")
+
+      Stache.configure do |config|
+        config.template_extension = @current_extension
+      end
     end
+
+
     it "returns nil if it cannot find anything" do
       helper.locate_template_for(Pathname.new("/tmp/whee"), "whooo").should be_nil
     end
   end
-end
+end

data/stache.gemspec

@@ -5,7 +5,7 @@ Gem::Specification.new do |s|
   s.name = 'stache'
   s.version = Stache::VERSION
   s.platform = Gem::Platform::RUBY
-  s.date = '2011-08-12'
+  s.date = '2012-01-06'
   s.authors = ['Matt Wilson']
   s.email = 'mhw@hypomodern.com'
   s.homepage = 'http://github.com/agoragames/stache'
@@ -24,7 +24,7 @@ Gem::Specification.new do |s|
   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.require_paths = ['lib']
-  
+
   s.add_dependency 'mustache'
 
   s.add_development_dependency 'rails', '~>3.1.0'

metadata

@@ -2,7 +2,7 @@
 name: stache
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors: 
 - Matt Wilson
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-12 00:00:00 Z
+date: 2012-01-06 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: mustache
@@ -114,6 +114,7 @@ files:
 - .gitignore
 - .rspec
 - .rvmrc
+- .travis.yml
 - CHANGELOG.md
 - Gemfile
 - LICENSE