stache 1.0.0 → 1.0.1

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    YWI2NDQ1YWVhNGRmYjJkYzQ1MTc3NWZjYjM4YTBlZmZiNGFiNGE0YQ==
+  data.tar.gz: !binary |-
+    MmU3MThiN2I1MzY4Nzc0NjkzMDBmODZmZmFmYjAxMmVjMzM1MDgyOA==
+!binary "U0hBNTEy":
+  metadata.gz: !binary |-
+    NjQ0OThjOTI0ZGI3N2RhM2Y0YTJhOTEyOWRlMTY1MmY4N2MzNTcyOWE3YTU5
+    NzRmZmY1NzZkOGFkNDY2ZGY2YjU0YWQ2NGQ4ODJkMWU2NDAwZTc2YzVkYzRm
+    OTY1M2Y4YmI4MzU2MzZjMzg0MmMwNTk3ZTAzMGE3ODQ3OWEzZWQ=
+  data.tar.gz: !binary |-
+    NDdlYzQ1MzE5OWRlMTkwNGM2OGI3OGEzZTgwNTdjNzkxOTIyOWJhYzc4Y2Ew
+    ZTllMzIzY2FjY2M0NzEzOTcyYjQ0MjVhYTdiN2Q4YzkzMjYzM2Y2OGZlNjA4
+    ZDIyMzE0ZTFhNjMzYWI2YzU2YjFmZTVjOGQ2OGYzOWI2ZWVkYTc=

data/.ruby-gemset

@@ -0,0 +1 @@
+stache_gem

data/.ruby-version

@@ -0,0 +1 @@
+ruby-1.9.3-p392

data/Gemfile

@@ -1,4 +1,4 @@
-source "http://rubygems.org"
+source "https://rubygems.org"
 
 # Specify your gem's dependencies in stache.gemspec
 gemspec

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2011 Matt Wilson / Agora Games, LLC
+Copyright (c) 2011-2013 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

@@ -138,4 +138,4 @@ Thanks a ton to all of the contributors as well. This would never have grown bey
 
 ## Copyright
 
-Copyright (c) 2011 Matt Wilson / Agora Games. See LICENSE for details.
+Copyright (c) 2011-2013 Matt Wilson / Agora Games. See LICENSE for details.

data/lib/stache/mustache/handler.rb

@@ -16,21 +16,30 @@ module Stache
         # get a custom Mustache, or the default Stache::Mustache::View
         mustache_class = mustache_class_from_template(template)
 
+        # If the class is in the same directory as the template, the source of the template can be the
+        # source of the class, and so we need to read the template source from the file system.
+        # Matching against `module` may seem a bit hackish, but at worst it provides false positives
+        # only for templates containing the word `module`, and reads the template again from the file
+        # system.
+
+        template_is_class = template.source.match(/module/) ? true : false
+
         # 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 we are rendering an abstract Stache::View class, don't render any template.
-          if #{mustache_class} == Stache::Mustache::View
-            template_source = '#{template.source.gsub(/'/, "\\\\'")}'
+          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_name = "#{template.virtual_path.to_s}.#{template.formats.first.to_s}."+mustache.template_extension
-            template_source = File.read(File.join(::Stache.template_base_path, template_name))
+            template_source = '#{template.source.gsub(/'/, "\\\\'")}'
           end
 
           mustache.template = template_source
           mustache.virtual_path = '#{template.virtual_path.to_s}'
+          mustache[:yield] = content_for(:layout)
           mustache.context.update(local_assigns)
           variables = controller.instance_variable_names
           variables -= %w[@template]

data/lib/stache/version.rb

@@ -1,3 +1,3 @@
 module Stache
-  VERSION = "1.0.0"
+  VERSION = "1.0.1"
 end

data/spec/controllers/handlebars_controller_spec.rb

@@ -23,7 +23,7 @@ describe HandlebarsController do
       assert_response 200
 
       response.should render_template 'with_wrapper'
-      response.body.should =~ /Yes/
+      response.body.should =~ /answer: Yes/
     ensure
       Stache.wrapper_module_name = nil
     end

data/spec/controllers/stache_controller_spec.rb

@@ -59,4 +59,26 @@ describe StacheController do
     response.should render_template 'helper'               # view
     response.body.should == "/stache\n"
   end
+
+  it "does not require the format in the extension with view class" do
+    get :no_format_in_extension
+    assert_response 200
+
+    response.should render_template 'no_format_in_extension'
+    response.body.should == "No format"
+  end
+
+  it "does not require the format in the extension with view class and wrapper module" do
+    begin
+      Stache.wrapper_module_name = "Wrapper"
+
+      get :no_format_in_extension_with_wrapper
+      assert_response 200
+
+      response.should render_template 'no_format_in_extension_with_wrapper'
+      response.body.should == "No format"
+    ensure
+      Stache.wrapper_module_name = nil
+    end
+  end
 end

data/spec/dummy/app/controllers/stache_controller.rb

@@ -26,4 +26,12 @@ class StacheController < ApplicationController
     Stache::ViewContext.current = self.view_context
   end
 
+  def no_format_in_extension
+
+  end
+
+  def no_format_in_extension_with_wrapper
+
+  end
+
 end

data/spec/dummy/app/views/handlebars/with_wrapper.html.hbs

@@ -1,3 +1,3 @@
 Am I using a wrapper module?
 
-{{answer}}
+{{answer 'Yes'}}

data/spec/dummy/app/views/stache/no_format_in_extension.mustache

@@ -0,0 +1 @@
+No {{format}}

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

@@ -0,0 +1,7 @@
+module Stache
+  class NoFormatInExtension < Stache::Mustache::View
+    def format
+      "format"
+    end
+  end
+end

data/spec/dummy/app/views/stache/no_format_in_extension_with_wrapper.mustache

@@ -0,0 +1 @@
+No {{format}}

data/spec/dummy/config/routes.rb

@@ -11,6 +11,10 @@ Dummy::Application.routes.draw do
 
   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_with_wrapper', :to => 'stache#no_format_in_extension_with_wrapper'
+
   get 'handlebars', :to => 'handlebars#index', :as => 'handlebars'
 
   get 'handlebars/with_partials', :to => 'handlebars#with_partials'

data/spec/dummy/lib/wrapper/handlebars/with_wrapper.rb

@@ -1,8 +1,8 @@
 module Wrapper
   module Handlebars
     class WithWrapper < ::Stache::Handlebars::View
-      def answer
-        "Yes"
+      def answer correct_answer
+        "answer: #{correct_answer}"
       end
     end
   end

data/spec/dummy/lib/wrapper/stache/no_format_in_extension_with_wrapper.rb

@@ -0,0 +1,9 @@
+module Wrapper
+  module Stache
+    class NoFormatInExtensionWithWrapper < ::Stache::Mustache::View
+      def format
+        "format"
+      end
+    end
+  end
+end

data/stache.gemspec

@@ -25,7 +25,7 @@ Gem::Specification.new do |s|
   s.require_paths = ['lib']
 
   s.add_development_dependency 'mustache'
-  s.add_development_dependency 'handlebars'
+  s.add_development_dependency 'handlebars', '~>0.4.0'
   s.add_development_dependency 'rails', '~>3.2.0'
   s.add_development_dependency 'rspec'
   s.add_development_dependency 'rspec-rails'

metadata

@@ -1,20 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: stache
 version: !ruby/object:Gem::Version
-  version: 1.0.0
-  prerelease: 
+  version: 1.0.1
 platform: ruby
 authors:
 - Matt Wilson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-29 00:00:00.000000000 Z
+date: 2013-05-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mustache
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -22,7 +20,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -30,23 +27,20 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: handlebars
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.4.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.4.0
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -54,7 +48,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -62,7 +55,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -70,7 +62,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -78,7 +69,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -86,7 +76,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -94,7 +83,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -102,7 +90,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -110,7 +97,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -118,7 +104,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -134,7 +119,8 @@ files:
 - .document
 - .gitignore
 - .rspec
-- .rvmrc
+- .ruby-gemset
+- .ruby-version
 - .travis.yml
 - CHANGELOG.md
 - Gemfile
@@ -177,6 +163,9 @@ files:
 - spec/dummy/app/views/stache/index.html.mustache
 - spec/dummy/app/views/stache/index.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
+- spec/dummy/app/views/stache/no_format_in_extension_with_wrapper.mustache
 - spec/dummy/app/views/stache/with_asset_helpers.html.mustache
 - spec/dummy/app/views/stache/with_layout.html.mustache
 - spec/dummy/app/views/stache/with_layout.rb
@@ -201,6 +190,7 @@ files:
 - spec/dummy/config/routes.rb
 - spec/dummy/lib/with_asset_helpers.rb
 - spec/dummy/lib/wrapper/handlebars/with_wrapper.rb
+- spec/dummy/lib/wrapper/stache/no_format_in_extension_with_wrapper.rb
 - spec/dummy/lib/wrapper/stache/with_wrapper.rb
 - spec/dummy/public/404.html
 - spec/dummy/public/422.html
@@ -228,25 +218,24 @@ files:
 - stache.gemspec
 homepage: http://github.com/agoragames/stache
 licenses: []
+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: 1.3.7
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 2.0.3
 signing_key: 
 specification_version: 3
 summary: Configurable Mustache Handler and Helpers for Rails
@@ -272,6 +261,9 @@ test_files:
 - spec/dummy/app/views/stache/index.html.mustache
 - spec/dummy/app/views/stache/index.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
+- spec/dummy/app/views/stache/no_format_in_extension_with_wrapper.mustache
 - spec/dummy/app/views/stache/with_asset_helpers.html.mustache
 - spec/dummy/app/views/stache/with_layout.html.mustache
 - spec/dummy/app/views/stache/with_layout.rb
@@ -296,6 +288,7 @@ test_files:
 - spec/dummy/config/routes.rb
 - spec/dummy/lib/with_asset_helpers.rb
 - spec/dummy/lib/wrapper/handlebars/with_wrapper.rb
+- spec/dummy/lib/wrapper/stache/no_format_in_extension_with_wrapper.rb
 - spec/dummy/lib/wrapper/stache/with_wrapper.rb
 - spec/dummy/public/404.html
 - spec/dummy/public/422.html

data/.rvmrc

@@ -1 +0,0 @@
-rvm use --create 1.9.3@stache_gem