stache 0.2.2 → 0.9.0

data/spec/stache/handlebars/profile_autoload.rb

@@ -0,0 +1,6 @@
+# This file is intended to raise a NameError upon require
+module Profiles
+  class Index < Stache::Handlebars::View
+    include Foo
+  end
+end

data/spec/stache/handlebars/view_spec.rb

@@ -0,0 +1,11 @@
+require 'spec_helper'
+
+module Stache
+  module Handlebars
+    describe View do
+      it "is just a thin wrapper around Handlebars::Context" do
+        View.new.should be_a_kind_of(::Handlebars::Context)
+      end
+    end
+  end
+end

data/spec/stache/{handler_spec.rb → mustache/handler_spec.rb}

@@ -1,29 +1,29 @@
-require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+require 'spec_helper'
 
-describe Stache::Handler do
+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))
   # end
   before do
-    @template = ActionView::Template.new("{{body}}", "hello mustache", Stache::Handler, { :virtual_path => "hello_world"})
-    @handler = Stache::Handler.new
+    @template = ActionView::Template.new("{{body}}", "hello mustache", Stache::Mustache::Handler, { :virtual_path => "hello_world"})
+    @handler = Stache::Mustache::Handler.new
   end
 
   describe "#mustache_class_from_template" do
     it "returns the appropriate mustache class" do
-      class HelloWorld < Stache::View; end
+      class HelloWorld < Stache::Mustache::View; end
       @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::View; end; end
+      module Profiles; class Index < Stache::Mustache::View; end; end
       @handler.mustache_class_from_template(@template).should == Profiles::Index
       Object.send(:remove_const, :Profiles)
     end
-    it "retuns Stache::View if it can't find none" do
-      @handler.mustache_class_from_template(@template).should == Stache::View
+    it "retuns Stache::Mustache::View if it can't find none" 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")

data/spec/stache/{profile_autoload.rb → mustache/profile_autoload.rb}

@@ -1,6 +1,6 @@
 # This file is intended to raise a NameError upon require
 module Profiles
-  class Index < Stache::View
+  class Index < Stache::Mustache::View
     include Foo
   end
 end

data/spec/stache/mustache/view_spec.rb

@@ -0,0 +1,11 @@
+require 'spec_helper'
+
+module Stache
+  module Mustache
+    describe View do
+      it "is just a thin wrapper around Mustache" do
+        View.new.should be_a_kind_of(::Mustache)
+      end
+    end
+  end
+end

data/stache.gemspec

@@ -5,7 +5,6 @@ Gem::Specification.new do |s|
   s.name = 'stache'
   s.version = Stache::VERSION
   s.platform = Gem::Platform::RUBY
-  s.date = '2012-01-06'
   s.authors = ['Matt Wilson']
   s.email = 'mhw@hypomodern.com'
   s.homepage = 'http://github.com/agoragames/stache'
@@ -25,14 +24,13 @@ Gem::Specification.new do |s|
   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'
+  s.add_development_dependency 'mustache'
+  s.add_development_dependency 'handlebars'
+  s.add_development_dependency 'rails', '~>3.2.0'
   s.add_development_dependency 'rspec'
   s.add_development_dependency 'rspec-rails'
   s.add_development_dependency 'bundler'
   s.add_development_dependency 'bueller'
   s.add_development_dependency 'rake'
-  s.add_development_dependency 'rcov'
 end
 

metadata

@@ -2,7 +2,7 @@
 name: stache
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.2.2
+  version: 0.9.0
 platform: ruby
 authors: 
 - Matt Wilson
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-01-06 00:00:00 Z
+date: 2012-05-16 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: mustache
@@ -21,32 +21,32 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version 
         version: "0"
-  type: :runtime
+  type: :development
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: rails
+  name: handlebars
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
-        version: 3.1.0
+        version: "0"
   type: :development
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: rspec
+  name: rails
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        version: "0"
+        version: 3.2.0
   type: :development
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: rspec-rails
+  name: rspec
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
@@ -57,7 +57,7 @@ dependencies:
   type: :development
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  name: bundler
+  name: rspec-rails
   prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
@@ -68,7 +68,7 @@ dependencies:
   type: :development
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
-  name: bueller
+  name: bundler
   prerelease: false
   requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
@@ -79,7 +79,7 @@ dependencies:
   type: :development
   version_requirements: *id006
 - !ruby/object:Gem::Dependency 
-  name: rake
+  name: bueller
   prerelease: false
   requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
@@ -90,7 +90,7 @@ dependencies:
   type: :development
   version_requirements: *id007
 - !ruby/object:Gem::Dependency 
-  name: rcov
+  name: rake
   prerelease: false
   requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
@@ -123,19 +123,31 @@ files:
 - lib/stache.rb
 - lib/stache/asset_helper.rb
 - lib/stache/config.rb
-- lib/stache/handler.rb
+- lib/stache/handlebars.rb
+- lib/stache/handlebars/handler.rb
+- lib/stache/handlebars/view.rb
+- lib/stache/mustache.rb
+- lib/stache/mustache/handler.rb
+- lib/stache/mustache/view.rb
 - lib/stache/railtie.rb
 - lib/stache/util.rb
 - lib/stache/version.rb
-- lib/stache/view.rb
+- spec/controllers/handlebars_controller_spec.rb
 - spec/controllers/stache_controller_spec.rb
 - spec/dummy/Rakefile
+- spec/dummy/app/assets/stylesheets/test.css
 - spec/dummy/app/controllers/application_controller.rb
+- spec/dummy/app/controllers/handlebars_controller.rb
 - spec/dummy/app/controllers/stache_controller.rb
 - spec/dummy/app/helpers/application_helper.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
+- spec/dummy/app/views/handlebars/with_partials.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/index.html.mustache
+- spec/dummy/app/views/stache/with_asset_helpers.html.mustache
 - spec/dummy/app/views/stache/with_partials.html.mustache
 - spec/dummy/config.ru
 - spec/dummy/config/application.rb
@@ -153,6 +165,7 @@ files:
 - spec/dummy/config/initializers/stache.rb
 - spec/dummy/config/locales/en.yml
 - spec/dummy/config/routes.rb
+- spec/dummy/lib/with_asset_helpers.rb
 - spec/dummy/public/404.html
 - spec/dummy/public/422.html
 - spec/dummy/public/500.html
@@ -168,10 +181,13 @@ files:
 - spec/spec_helper.rb
 - spec/stache/asset_helper_spec.rb
 - spec/stache/config_spec.rb
-- spec/stache/handler_spec.rb
-- spec/stache/profile_autoload.rb
+- spec/stache/handlebars/handlebars_spec.rb
+- spec/stache/handlebars/profile_autoload.rb
+- spec/stache/handlebars/view_spec.rb
+- spec/stache/mustache/handler_spec.rb
+- spec/stache/mustache/profile_autoload.rb
+- spec/stache/mustache/view_spec.rb
 - spec/stache/util_spec.rb
-- spec/stache/view_spec.rb
 - spec/stache_spec.rb
 - stache.gemspec
 homepage: http://github.com/agoragames/stache
@@ -202,14 +218,22 @@ signing_key:
 specification_version: 3
 summary: Configurable Mustache Handler and Helpers for Rails
 test_files: 
+- spec/controllers/handlebars_controller_spec.rb
 - spec/controllers/stache_controller_spec.rb
 - spec/dummy/Rakefile
+- spec/dummy/app/assets/stylesheets/test.css
 - spec/dummy/app/controllers/application_controller.rb
+- spec/dummy/app/controllers/handlebars_controller.rb
 - spec/dummy/app/controllers/stache_controller.rb
 - spec/dummy/app/helpers/application_helper.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
+- spec/dummy/app/views/handlebars/with_partials.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/index.html.mustache
+- spec/dummy/app/views/stache/with_asset_helpers.html.mustache
 - spec/dummy/app/views/stache/with_partials.html.mustache
 - spec/dummy/config.ru
 - spec/dummy/config/application.rb
@@ -227,6 +251,7 @@ test_files:
 - spec/dummy/config/initializers/stache.rb
 - spec/dummy/config/locales/en.yml
 - spec/dummy/config/routes.rb
+- spec/dummy/lib/with_asset_helpers.rb
 - spec/dummy/public/404.html
 - spec/dummy/public/422.html
 - spec/dummy/public/500.html
@@ -242,8 +267,11 @@ test_files:
 - spec/spec_helper.rb
 - spec/stache/asset_helper_spec.rb
 - spec/stache/config_spec.rb
-- spec/stache/handler_spec.rb
-- spec/stache/profile_autoload.rb
+- spec/stache/handlebars/handlebars_spec.rb
+- spec/stache/handlebars/profile_autoload.rb
+- spec/stache/handlebars/view_spec.rb
+- spec/stache/mustache/handler_spec.rb
+- spec/stache/mustache/profile_autoload.rb
+- spec/stache/mustache/view_spec.rb
 - spec/stache/util_spec.rb
-- spec/stache/view_spec.rb
 - spec/stache_spec.rb

data/lib/stache/handler.rb

@@ -1,68 +0,0 @@
-require 'stache/view'
-
-module Stache
-  # From HAML, thanks a bunch, guys!
-  # In Rails 3.1+, template handlers don't inherit from anything. In <= 3.0, they do.
-  # To avoid messy logic figuring this out, we just inherit from whatever the ERB handler does.
-  class Handler < Stache::Util.av_template_class(:Handlers)::ERB.superclass
-    if Stache::Util.needs_compilable?
-      include Stache::Util.av_template_class(:Handlers)::Compilable
-    end
-
-    # Thanks to Mustache::Rails3 for getting us most of the way home here
-    def compile(template)
-      #
-      # get a custom Mustache, or the default Stache::View
-      mustache_class = mustache_class_from_template(template)
-
-      # 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
-        mustache.template = '#{template.source.gsub(/'/, "\\\\'")}'
-        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]
-
-        if controller.respond_to?(:protected_instance_variables)
-          variables -= controller.protected_instance_variables
-        end
-
-        variables.each do |name|
-          mustache.instance_variable_set(name, controller.instance_variable_get(name))
-        end
-
-        # Declaring an +attr_reader+ for each instance variable in the
-        # Stache::View subclass makes them available to your templates.
-        mustache.class.class_eval do
-          attr_reader *variables.map { |name| name.sub(/^@/, '').to_sym }
-        end
-
-        mustache.render.html_safe
-      MUSTACHE
-    end
-
-    # In Rails 3.1+, #call takes the place of #compile
-    def self.call(template)
-      new.compile(template)
-    end
-
-    # suss out a constant name for the given template
-    def mustache_class_from_template(template)
-      const_name = ActiveSupport::Inflector.camelize(template.virtual_path.to_s)
-      begin
-        const_name.constantize
-      rescue NameError, LoadError => e
-        # Only rescue NameError/LoadError concerning our mustache_class
-        if e.message.match(/#{const_name}$/)
-          Stache::View
-        else
-          raise e
-        end
-      end
-    end
-
-  end
-end

data/lib/stache/view.rb

@@ -1,38 +0,0 @@
-require 'mustache'
-
-module Stache
-  #
-  # A Convienent Base Class for the views. Subclass this for autoloading magic with your templates.
-  #
-  # e.g. if the handler is loading a template from templates/
-  class View < ::Mustache
-    attr_accessor :view, :template, :virtual_path
-
-    def method_missing(method, *args, &block)
-      view.send(method, *args, &block)
-    end
-
-    def respond_to?(method, include_private=false)
-      super(method, include_private) || view.respond_to?(method, include_private)
-    end
-    
-    # Redefine where Stache::View templates locate their partials:
-    #
-    # (1) in the same directory as the current template file.
-    # (2) in the shared templates path (can be configured via Config.shared_path=(value))
-    #
-    def partial(name)
-      partial_name = "_#{name}.#{Stache.template_extension}"
-      template_dir = self.virtual_path.split("/")[0..-2].join("/")
-      partial_path = File.expand_path(File.join(Stache.template_base_path, template_dir, partial_name))
-      # ::Rails.logger.info "Checking for #{partial_path} in template_dir: #{template_dir}"
-      unless File.file?(partial_path)
-        partial_path = "#{Stache.shared_path}/#{partial_name}"
-      end
-      
-      # ::Rails.logger.info "LOADING PARTIAL: #{partial_path}"
-      File.read(partial_path)
-    end
-    
-  end
-end

data/spec/stache/view_spec.rb

@@ -1,9 +0,0 @@
-require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
-
-module Stache
-  describe View do
-    it "is just a thin wrapper around Mustache" do
-      View.new.should be_a_kind_of(Mustache)
-    end
-  end
-end