stache 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 351c235cf203b65a8eacf4a9fcb01b9236eb54e1
-  data.tar.gz: 6540207101f87ff30024205a56c8b308e690280e
+  metadata.gz: 35a70dffe63e8b3339b268a7e7e8f392b7b23fcb
+  data.tar.gz: e096b6bcf5d4aab498db1fb9032d9a34f07bf169
 SHA512:
-  metadata.gz: 689692a05dcf7dc95b82adac7cfb37cd1b0d91f618277584115baffa5a543bc7f0af4e456e172826b5c5dae398b1c06e25822876c14de7a77835fad706e8af2f
-  data.tar.gz: cfd7331c2b602ac2a777ab3c98f22df598f280a5a25a5b8e7eaef54557b06d7297b07be29134db2a81ba2643125e74cfc31b492a6b37363207f886b443f1e345
+  metadata.gz: ce5651630bf430ecef53aa54a69c4d6a8687fd8d7166e385bc1e52c4a3547ace23b998e0dd633a70295ac193897ce4f506ce9f18c2447b4144e1b5b56d70e739
+  data.tar.gz: 1a262d6abdb6429f377aa95ef034d17b7d4f52e21aef22fb4651887d937bd61155ac4dda506d7f6c43dd5ca914ec7ced0908330df00b9a5f74f2d47c3ab91ca2

data/.travis.yml

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

data/README.md

@@ -12,7 +12,7 @@ I'm investigating whether or not this is something that can be/needs to be porte
 
 If you want Rails 4, you'll have to use 1.0.3.
 
-## Usage
+## Installation
 
     gem "mustache" # or "handlebars"
     gem "stache"
@@ -51,7 +51,15 @@ 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.
+## Helper methods
+
+There is currently just one helper method; `template_include_tag`. If you pass it the name of a partial it will write out the contents of the partial in a `script` tag, so that you can access it from within your JavaScript.
+
+```erb
+<%= template_include_tag 'profiles/profile' %>
+```
+
+Specify the template to include with a path *relative to your template base path* (i.e. `profiles/profile` rather than just `profile`).
 
 ## A View Class of your Very Own
 
@@ -151,6 +159,49 @@ View:
    end
 ```
 
+## Stache + ActionMailer
+
+Stache should work just fine with `ActionMailer`, with one minor configuration:
+
+Assuming you have a view directory like this:
+
+```
+views/
+  user_mailer/
+    confirm_sign_up.html.mustache
+    confirm_sign_up.rb
+    confirm_sign_up.text.mustache
+```
+
+You'd define your `UserMailer` like so:
+
+```ruby
+class UserMailer < ActionMailer::Base
+  default from: 'notifications@example.com'
+
+  def confirm_sign_up
+    mail(to: 'user@example.com', subject: 'Welcome to StacheMail') do |format|
+      format.text
+      format.html
+    end
+  end
+end
+```
+
+**N.B.** the `do |format|` block is very important: `ActionMailer` will render the code in the `.rb` file as a multipart text/html component, which is probably not what you want unless you really want to show off your View class to all your recipients :).
+
+The `confirm_sign_up.rb` file contains an utterly normal `::Stache::Mustache::View` subclass, e.g. Note that it is nested inside the `UserMailer` class.
+
+```ruby
+class UserMailer
+  class ConfirmSignUp < ::Stache::Mustache::View
+    def full_name
+      ["Bob", "Jones"].join(' ')
+    end
+  end
+end
+```
+
 ## Of Note
 
 This is code that was ripped out of a research project. It probably has some rough edges.

data/lib/stache/mustache/faster_context.rb

@@ -15,7 +15,6 @@ module Stache
         # Call the Mustache's `partial` method and render the result.
         mustache.render(part, self)
       end
-
     end
   end
 end

data/lib/stache/mustache/handler.rb

@@ -35,7 +35,7 @@ module Stache
 
           mustache.virtual_path = '#{virtual_path}'
           mustache[:yield] = content_for(:layout)
-          mustache.context.update(local_assigns)
+          mustache.context.push(local_assigns)
           variables = controller.instance_variables
           variables.delete(:@template)
           variables -= controller.class.protected_instance_variables.to_a
@@ -93,13 +93,14 @@ module Stache
           return Stache::Mustache::View
         end
 
-        const_name = ActiveSupport::Inflector.camelize(template.virtual_path.to_s)
+        const_name = ActiveSupport::Inflector.camelize(ActiveSupport::Inflector.underscore(template.virtual_path.to_s))
         const_name = "#{Stache.wrapper_module_name}::#{const_name}" if Stache.wrapper_module_name
         begin
           const_name.constantize
         rescue NameError, LoadError => e
           # Only rescue NameError/LoadError concerning our mustache_class
-          if e.message.match(/#{const_name}$/)
+          e_const_name = e.message.match(/ ([^ ]*)$/)[1]
+          if const_name.match(/#{e_const_name}(::|$)/)
             Stache::Mustache::View
           else
             raise e

data/lib/stache/version.rb

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

data/spec/dummy/app/mailers/user_mailer.rb

@@ -0,0 +1,10 @@
+class UserMailer < ActionMailer::Base
+  default from: 'notifications@example.com'
+
+  def confirm_sign_up
+    mail(to: 'user@example.com', subject: 'Welcome to StacheMail') do |format|
+      format.text
+      format.html
+    end
+  end
+end

data/spec/dummy/app/views/user_mailer/confirm_sign_up.html.mustache

@@ -0,0 +1 @@
+<h1>Welcome, {{full_name}}!</h1>

data/spec/dummy/app/views/user_mailer/confirm_sign_up.rb

@@ -0,0 +1,7 @@
+class UserMailer
+  class ConfirmSignUp < ::Stache::Mustache::View
+    def full_name
+      ["Bob", "Jones"].join(' ')
+    end
+  end
+end

data/spec/dummy/app/views/user_mailer/confirm_sign_up.text.mustache

@@ -0,0 +1 @@
+Welcome, {{full_name}}!

data/spec/mailers/user_mailer_spec.rb

@@ -0,0 +1,15 @@
+require 'spec_helper'
+
+describe UserMailer do
+  describe 'confirm_sign_up' do
+    let(:mail) { UserMailer.confirm_sign_up() }
+
+    it 'renders the subject' do
+      expect(mail.subject).to eql('Welcome to StacheMail')
+    end
+
+    it 'renders the mustache template correctly' do
+      expect(mail.body.encoded).to match('Welcome, Bob Jones!')
+    end
+  end
+end

data/spec/stache/mustache/handler_spec.rb

@@ -16,6 +16,12 @@ describe Stache::Mustache::Handler do
       @handler.mustache_class_from_template(@template).should == HelloWorld
       Object.send(:remove_const, :HelloWorld)
     end
+    it "handles templates with dashes in the filename" do
+      class HelloWorld < Stache::Mustache::View; end
+      @template.stub(:virtual_path).and_return 'hello-world'
+      @handler.mustache_class_from_template(@template).should == HelloWorld
+      Object.send(:remove_const, :HelloWorld)
+    end
     it "is clever about folders and such" do
       @template.stub(:virtual_path).and_return("profiles/index")
       module Profiles; class Index < Stache::Mustache::View; end; end
@@ -25,6 +31,10 @@ describe Stache::Mustache::Handler do
     it "retuns Stache::Mustache::View if it can't find none" do
       @handler.mustache_class_from_template(@template).should == Stache::Mustache::View
     end
+    it "handles nested paths" do
+      @template.stub(:virtual_path).and_return("profiles/sub/index")
+      @handler.mustache_class_from_template(@template).should == Stache::Mustache::View
+    end
     it "reraises error if loaded mustache_class raises a NameError" do
       @template.stub(:virtual_path).and_return("profiles/index")
       module Profiles; end

data/stache.gemspec

@@ -26,11 +26,12 @@ Gem::Specification.new do |s|
   s.require_paths = ['lib']
 
   s.add_development_dependency 'mustache'
-  s.add_development_dependency 'handlebars', '~>0.4.0'
+  s.add_development_dependency 'handlebars', '~>0.6.0'
   s.add_development_dependency 'rails', '~>4.0.0'
   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'
+  s.add_development_dependency 'test-unit'
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: stache
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Matt Wilson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-05 00:00:00.000000000 Z
+date: 2015-03-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mustache
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: 0.6.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: 0.6.0
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
@@ -108,6 +108,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: test-unit
+  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 and Rails 4.x compatible Mustache/Handlebars template handler
 email: mhw@hypomodern.com
 executables: []
@@ -152,6 +166,7 @@ files:
 - spec/dummy/app/controllers/handlebars_controller.rb
 - spec/dummy/app/controllers/stache_controller.rb
 - spec/dummy/app/helpers/application_helper.rb
+- spec/dummy/app/mailers/user_mailer.rb
 - spec/dummy/app/views/handlebars/_eaten_by_a.html.hbs
 - spec/dummy/app/views/handlebars/index.html.hbs
 - spec/dummy/app/views/handlebars/with_helpers.html.hbs
@@ -178,6 +193,9 @@ files:
 - spec/dummy/app/views/stache/with_partials.html.mustache
 - spec/dummy/app/views/stache/with_partials.rb
 - spec/dummy/app/views/stache/with_wrapper.html.mustache
+- spec/dummy/app/views/user_mailer/confirm_sign_up.html.mustache
+- spec/dummy/app/views/user_mailer/confirm_sign_up.rb
+- spec/dummy/app/views/user_mailer/confirm_sign_up.text.mustache
 - spec/dummy/config.ru
 - spec/dummy/config/application.rb
 - spec/dummy/config/boot.rb
@@ -210,6 +228,7 @@ files:
 - spec/dummy/public/javascripts/rails.js
 - spec/dummy/public/stylesheets/.gitkeep
 - spec/dummy/script/rails
+- spec/mailers/user_mailer_spec.rb
 - spec/spec_helper.rb
 - spec/stache/asset_helper_spec.rb
 - spec/stache/config_spec.rb
@@ -258,6 +277,7 @@ test_files:
 - spec/dummy/app/controllers/handlebars_controller.rb
 - spec/dummy/app/controllers/stache_controller.rb
 - spec/dummy/app/helpers/application_helper.rb
+- spec/dummy/app/mailers/user_mailer.rb
 - spec/dummy/app/views/handlebars/_eaten_by_a.html.hbs
 - spec/dummy/app/views/handlebars/index.html.hbs
 - spec/dummy/app/views/handlebars/with_helpers.html.hbs
@@ -284,6 +304,9 @@ test_files:
 - spec/dummy/app/views/stache/with_partials.html.mustache
 - spec/dummy/app/views/stache/with_partials.rb
 - spec/dummy/app/views/stache/with_wrapper.html.mustache
+- spec/dummy/app/views/user_mailer/confirm_sign_up.html.mustache
+- spec/dummy/app/views/user_mailer/confirm_sign_up.rb
+- spec/dummy/app/views/user_mailer/confirm_sign_up.text.mustache
 - spec/dummy/config.ru
 - spec/dummy/config/application.rb
 - spec/dummy/config/boot.rb
@@ -316,6 +339,7 @@ test_files:
 - spec/dummy/public/javascripts/rails.js
 - spec/dummy/public/stylesheets/.gitkeep
 - spec/dummy/script/rails
+- spec/mailers/user_mailer_spec.rb
 - spec/spec_helper.rb
 - spec/stache/asset_helper_spec.rb
 - spec/stache/config_spec.rb