stache 1.0.2 → 1.0.3

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    NzZkZjUyYzllZWRhODJkYzc4YTViMGFhYzlkOTgyMTU2MmVkZjgwOQ==
-  data.tar.gz: !binary |-
-    M2M5MGM0ZDU5Zjk3YWVmMWFiZWI1ZDM3MTUxMzMzMTY1NDM3ODZiOA==
-!binary "U0hBNTEy":
-  metadata.gz: !binary |-
-    YzJmYjgyYmQ2MzBkOTZiOWIxNzI4NmRkZWUxY2Q0OTNjNzk4MWIwMDQ5Mzg2
-    ZTQ4Y2IxMjkyYjRmNWFkODhkMjU0Yzk2ZDE1MDAyNTQwM2Q3YTcxNWVmZmE4
-    MzkwMmI2MGUwNjUzMDlhMDc2ZTc1YzhmYjkzYTEzZGI2Y2Y1ZmE=
-  data.tar.gz: !binary |-
-    MDEyNTAyMDg4OTcwYmFjMWNmNjUzMWVhODdkMzQ1NWE2NTNlZDM0YzUwMjll
-    NDZhZTBiNzc2MzNlNWE0YTAwMmUwNjk0MzhhMTY5YWNmYTdkZTNjYzg3YjFl
-    NjE0OTkxZjgwNTY3OGJiNjM5ZjAwYTQ5OTU2ZTJjZTdkOGU1MzA=
+SHA1:
+  metadata.gz: 4c4d478dbffc3306efd783fe17d868a8879c0b24
+  data.tar.gz: ddba634b4929cc0ac1c83ef8f888b13cee625f10
+SHA512:
+  metadata.gz: f1b49b3ddf56014e1bae27183c5b7b393415d4d27e39884a2701bf505f88b1134fdbd31cd9ed0fe1aecb6920e1ccc9cb327a898082d88d904f1afef33daa0089
+  data.tar.gz: 0747cd7f832dfdaaca2adeeae2fb3316cf52f9bc582a375139523ea2ea2e64982bba6153a340b99011d7fda39a1285a5957ec65940bb75d50e7b8ee5cbdfb745

data/.ruby-version

@@ -1 +1 @@
-ruby-1.9.3-p392
+ruby-2.0.0

data/.travis.yml

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

data/CHANGELOG.md

@@ -1,12 +1,20 @@
-# 1.0.1
+# CHANGELOG
+
+## 1.0.3 (2014-01-14)
+
+* Access RSpec-assigned instance variables in view classes (Thanks [@kianw](https://github.com/kianw))
+* Rails4 compatibility at long last!
+* Ruby2 required for development, as it is preferred by rails4.
+
+## 1.0.2 (2013-05-10)
 
 * Change autoload paths to an array of Strings instead of Pathnames, for greater compatibility.
 
-# 1.0.1
+## 1.0.1 (2013-05-07)
 
 * Fix a regression in mustache layout handling.
 
-# 1.0.0
+## 1.0.0 (2012-11-29)
 
 * Overhauled Mustache template engine. If you wish to have Mustache drive your entire template stack, you can invert control to it.
 * Fixed a bunch of problems with Handlebars access to the view namespace for helpers, etc.
@@ -16,11 +24,11 @@ Backwards compatibility should be fine; any regressions are bugs and should be r
 
 Huge thanks to all contributors!
 
-# 0.9.1
+## 0.9.1
 
 * soften our hardcore stance on missing properties.
 
-# 0.9.0
+## 0.9.0
 
 /!\ /!\ Breaking Changes.
 
@@ -30,14 +38,14 @@ Huge thanks to all contributors!
 
 There's some code duplication that should be crushed out before 1.0.
 
-# 0.2.2
+## 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
+## 0.2.1
 
 * Addresses #9: fix 'incompatible character encodings' error
 
-# 0.2.0
+## 0.2.0
 
 * Patch to properly reraise NameError/LoadError that occurs upon loading a Stache::View

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2011-2013 Matt Wilson / Agora Games, LLC
+Copyright (c) 2011-2014 Matt Wilson / Agora Games, LLC
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.md

@@ -92,6 +92,54 @@ I'm a handlebars template. Look at me call a helper: {{{image_path my_image}}}
 
 You can subclass `Stache::Handlebars::View` in the same way as mustache above, but there isn't as much point in doing so.
 
+## 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 
+instance variables, or via an accessor. Any instance variables defined in the RSpec example will also be
+similarly available, so
+
+```ruby
+    it "should display my instance variable" do
+      assign(:resource, "Foo")
+      render
+      ...
+    end
+```
+and
+
+```ruby
+    it "should display my instance variable" do
+      @resource = "Foo"
+      render
+      ...
+    end
+```
+both make `@resource` available to the Stache view.
+
+## Non-Mustache Partials
+
+Yes, you can include non-Mustache partials (and templates) in your Stache templates. However, the
+`{{>partial_name_here}}` syntax in the template won't find a non-Mustache template. You can define
+a method in the view and reference it in the template. The view method should use `@view.render` to
+render the non-Mustache partial and return its content. Example:
+
+Mustache template:
+
+```
+    {{{my_haml_sidebar}}}
+```
+
+View:
+
+```ruby
+   class MyPage < ::Stache::Mustache::View
+     def my_haml_sidebar
+       @view.render partial: 'somewhere/some_haml_partial_name'
+     end
+   end
+```
+
 ## Of Note
 
 This is code that was ripped out of a research project. It probably has some rough edges.
@@ -139,4 +187,4 @@ Thanks a ton to all of the contributors as well. This would never have grown bey
 
 ## Copyright
 
-Copyright (c) 2011-2013 Matt Wilson / Agora Games. See LICENSE for details.
+Copyright (c) 2011-2014 Matt Wilson / Agora Games. See LICENSE for details.

data/lib/stache/handlebars/handler.rb

@@ -36,7 +36,7 @@ module Stache
 
           template = handlebars.compile('#{template.source.gsub(/'/, "\\\\'")}');
           vars = {}
-          partial_renderer = @view_renderer.send(:_partial_renderer)
+          partial_renderer = PartialRenderer.new(lookup_context)
           vars.merge!(@_assigns)
           vars.merge!(partial_renderer.instance_variable_get('@locals') || {})
           options = partial_renderer.instance_variable_get('@options')

data/lib/stache/mustache/handler.rb

@@ -52,6 +52,11 @@ module Stache
             mustache.instance_variable_set(name, controller.instance_variable_get(name))
           end
 
+          # Add view instance variables also so RSpec view spec assigns will work
+          (instance_variable_names - variables).each do |name|
+            mustache.instance_variable_set(name, instance_variable_get(name))
+          end
+
           # 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

data/lib/stache/version.rb

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

data/spec/controllers/handlebars_controller_spec.rb

@@ -41,7 +41,7 @@ describe HandlebarsController do
     get :with_helpers
     assert_response 200
 
-    response.body.should =~ /Here's an image_path=\/assets\/image\.png/
+    response.body.should =~ /Here's an image_path=\/images\/image\.png/
     response.body.should =~ /Here's a capitalized string: Lowercase/
   end
 

data/spec/controllers/stache_controller_spec.rb

@@ -41,7 +41,7 @@ describe StacheController do
     get :with_asset_helpers
     assert_response 200
 
-    response.body.should =~ /Here's an image_path=\/assets\/image\.png/
+    response.body.should =~ /Here's an image_path=\/images\/image\.png/
     response.body.should =~ /link href="\/assets\/test\.css"/
   end
 

data/spec/dummy/app/views/stache/accessor.html.mustache

@@ -0,0 +1 @@
+Hello, {{user}}!

data/spec/dummy/app/views/stache/accessor.rb

@@ -0,0 +1,5 @@
+module Stache
+  class Accessor < Stache::Mustache::View
+    attr_accessor :user
+  end
+end

data/spec/dummy/app/views/stache/ivar.html.mustache

@@ -0,0 +1 @@
+Hello, {{user}}!

data/spec/dummy/app/views/stache/ivar.rb

@@ -0,0 +1,7 @@
+module Stache
+  class Ivar < Stache::Mustache::View
+    def user
+      @user_name
+    end
+  end
+end

data/spec/dummy/config/environments/development.rb

@@ -6,8 +6,8 @@ Dummy::Application.configure do
   # since you don't have to restart the webserver when you make code changes.
   config.cache_classes = false
 
-  # Log error messages when you accidentally call methods on nil.
-  config.whiny_nils = true
+  # eager load
+  config.eager_load = false
 
   # Show full error reports and disable caching
   config.consider_all_requests_local       = true

data/spec/dummy/config/environments/production.rb

@@ -5,6 +5,9 @@ Dummy::Application.configure do
   # Code is not reloaded between requests
   config.cache_classes = true
 
+  # eager load
+  config.eager_load = true
+
   # Full error reports are disabled and caching is turned on
   config.consider_all_requests_local       = false
   config.action_controller.perform_caching = true

data/spec/dummy/config/environments/test.rb

@@ -7,8 +7,8 @@ Dummy::Application.configure do
   # and recreated between test runs.  Don't rely on the data there!
   config.cache_classes = true
 
-  # Log error messages when you accidentally call methods on nil.
-  config.whiny_nils = true
+  # eager load
+  config.eager_load = false
 
   # Show full error reports and disable caching
   config.consider_all_requests_local       = true

data/spec/stache/handlebars/handlebars_spec.rb

@@ -13,7 +13,7 @@ describe Stache::Handlebars::Handler do
       Object.send(:remove_const, :HelloWorld)
     end
     it "is clever about folders and such" do
-      @template.stub!(:virtual_path).and_return("profiles/index")
+      @template.stub(:virtual_path).and_return("profiles/index")
       module Profiles; class Index < Stache::Handlebars::View; end; end
       @handler.handlebars_class_from_template(@template).should == Profiles::Index
       Object.send(:remove_const, :Profiles)
@@ -22,7 +22,7 @@ describe Stache::Handlebars::Handler do
       @handler.handlebars_class_from_template(@template).should == Stache::Handlebars::View
     end
     it "reraises error if loaded handlebars_class raises a NameError" do
-      @template.stub!(:virtual_path).and_return("profiles/index")
+      @template.stub(:virtual_path).and_return("profiles/index")
       module Profiles; end
       # Emulate autoload behavior so the error gets raised upon const_get
       Profiles.autoload :Index, File.join(File.dirname(__FILE__), "profile_autoload.rb")
@@ -46,7 +46,7 @@ describe Stache::Handlebars::Handler do
       Object.send(:remove_const, :Wrapper)
     end
     it "is clever about folders and such" do
-      @template.stub!(:virtual_path).and_return("profiles/index")
+      @template.stub(:virtual_path).and_return("profiles/index")
       module Wrapper; module Profiles; class Index < ::Stache::Handlebars::View; end; end; end
       @handler.handlebars_class_from_template(@template).should == Wrapper::Profiles::Index
       Object.send(:remove_const, :Wrapper)

data/spec/stache/mustache/handler_spec.rb

@@ -17,7 +17,7 @@ describe Stache::Mustache::Handler do
       Object.send(:remove_const, :HelloWorld)
     end
     it "is clever about folders and such" do
-      @template.stub!(:virtual_path).and_return("profiles/index")
+      @template.stub(:virtual_path).and_return("profiles/index")
       module Profiles; class Index < Stache::Mustache::View; end; end
       @handler.mustache_class_from_template(@template).should == Profiles::Index
       Object.send(:remove_const, :Profiles)
@@ -26,7 +26,7 @@ describe Stache::Mustache::Handler do
       @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")
+      @template.stub(:virtual_path).and_return("profiles/index")
       module Profiles; end
       # Emulate autoload behavior so the error gets raised upon const_get
       Profiles.autoload :Index, File.join(File.dirname(__FILE__), "profile_autoload.rb")
@@ -50,7 +50,7 @@ describe Stache::Mustache::Handler do
       Object.send(:remove_const, :Wrapper)
     end
     it "is clever about folders and such" do
-      @template.stub!(:virtual_path).and_return("profiles/index")
+      @template.stub(:virtual_path).and_return("profiles/index")
       module Wrapper; module Profiles; class Index < ::Stache::Mustache::View; end; end; end
       @handler.mustache_class_from_template(@template).should == Wrapper::Profiles::Index
       Object.send(:remove_const, :Wrapper)

data/spec/views/accessor_spec.rb

@@ -0,0 +1,9 @@
+require 'spec_helper'
+
+describe 'stache/accessor' do
+  it "should pass an instance variable through via an accessor" do
+    assign(:user, "Magnus")
+    render
+    rendered.should include "Magnus"
+  end
+end

data/spec/views/ivar_spec.rb

@@ -0,0 +1,15 @@
+require 'spec_helper'
+
+describe 'stache/ivar' do
+  it "should access an instance variable defined with RSpec #assign in a view method" do
+    assign(:user_name, "Thomas")
+    render
+    rendered.should include "Thomas"
+  end
+
+  it "should access an instance variable defined directly in RSpec in a view method" do
+    @user_name = "Stefan"
+    render
+    rendered.should include "Stefan"
+  end
+end

data/stache.gemspec

@@ -10,6 +10,7 @@ Gem::Specification.new do |s|
   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.license = 'MIT'
   s.extra_rdoc_files = [
     'LICENSE',
     'README.md',
@@ -26,7 +27,7 @@ Gem::Specification.new do |s|
 
   s.add_development_dependency 'mustache'
   s.add_development_dependency 'handlebars', '~>0.4.0'
-  s.add_development_dependency 'rails', '~>3.2.0'
+  s.add_development_dependency 'rails', '~>4.0.0'
   s.add_development_dependency 'rspec'
   s.add_development_dependency 'rspec-rails'
   s.add_development_dependency 'bundler'

metadata

@@ -1,27 +1,27 @@
 --- !ruby/object:Gem::Specification
 name: stache
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
 platform: ruby
 authors:
 - Matt Wilson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-10 00:00:00.000000000 Z
+date: 2014-01-14 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
@@ -44,68 +44,68 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 3.2.0
+        version: 4.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 3.2.0
+        version: 4.0.0
 - !ruby/object:Gem::Dependency
   name: rspec
   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: rspec-rails
   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: 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.
@@ -158,10 +158,14 @@ files:
 - spec/dummy/app/views/handlebars/with_wrapper.html.hbs
 - spec/dummy/app/views/layouts/application.html.erb
 - spec/dummy/app/views/stache/_eaten_by_a.html.mustache
+- spec/dummy/app/views/stache/accessor.html.mustache
+- spec/dummy/app/views/stache/accessor.rb
 - spec/dummy/app/views/stache/helper.html.mustache
 - spec/dummy/app/views/stache/helper.rb
 - spec/dummy/app/views/stache/index.html.mustache
 - spec/dummy/app/views/stache/index.rb
+- spec/dummy/app/views/stache/ivar.html.mustache
+- spec/dummy/app/views/stache/ivar.rb
 - spec/dummy/app/views/stache/layout.html.mustache
 - spec/dummy/app/views/stache/no_format_in_extension.mustache
 - spec/dummy/app/views/stache/no_format_in_extension.rb
@@ -215,9 +219,12 @@ files:
 - spec/stache/mustache/view_spec.rb
 - spec/stache/util_spec.rb
 - spec/stache_spec.rb
+- spec/views/accessor_spec.rb
+- spec/views/ivar_spec.rb
 - stache.gemspec
 homepage: http://github.com/agoragames/stache
-licenses: []
+licenses:
+- MIT
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -225,17 +232,17 @@ 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.0.3
+rubygems_version: 2.2.0
 signing_key: 
 specification_version: 3
 summary: Configurable Mustache Handler and Helpers for Rails
@@ -256,10 +263,14 @@ test_files:
 - spec/dummy/app/views/handlebars/with_wrapper.html.hbs
 - spec/dummy/app/views/layouts/application.html.erb
 - spec/dummy/app/views/stache/_eaten_by_a.html.mustache
+- spec/dummy/app/views/stache/accessor.html.mustache
+- spec/dummy/app/views/stache/accessor.rb
 - spec/dummy/app/views/stache/helper.html.mustache
 - spec/dummy/app/views/stache/helper.rb
 - spec/dummy/app/views/stache/index.html.mustache
 - spec/dummy/app/views/stache/index.rb
+- spec/dummy/app/views/stache/ivar.html.mustache
+- spec/dummy/app/views/stache/ivar.rb
 - spec/dummy/app/views/stache/layout.html.mustache
 - spec/dummy/app/views/stache/no_format_in_extension.mustache
 - spec/dummy/app/views/stache/no_format_in_extension.rb
@@ -313,3 +324,5 @@ test_files:
 - spec/stache/mustache/view_spec.rb
 - spec/stache/util_spec.rb
 - spec/stache_spec.rb
+- spec/views/accessor_spec.rb
+- spec/views/ivar_spec.rb