stache 0.9.1 → 1.0.0.rc

data/.rvmrc

@@ -1 +1 @@
-rvm use --create 1.9.2-p180@stache_gem
+rvm use --create 1.9.3@stache_gem

data/README.md

@@ -4,6 +4,12 @@ A Rails 3.x compatible Mustache/Handlebars Template Handler, with support for pa
 
 [![Build Status](https://secure.travis-ci.org/agoragames/stache.png)](http://travis-ci.org/agoragames/stache)
 
+## 1.0.0.rc
+
+Major overhaul to the mustache side of things. Backwards compatibility *should* be intact. If not, file a bug and it will get taken care of.
+
+Handlebars can also handle application layouts, and you can use subclasses of Stache::Handlebars::View to define view-specific helpers now.
+
 ## Notice Of Breaking Changes
 
 Stache 0.9.x adds handlebars support. In the process, the public API has changed *ever-so-slightly*. Specifically, you'll need to require the mustache or handlebars gems on your own, **and** you'll need to tell Stache which one (or both!) you want to use. Add `config.use :mustache` to your initializer.

data/Rakefile

@@ -1,34 +1,14 @@
-require 'rubygems'
-
-begin
-  require 'bundler'
-rescue LoadError
-  $stderr.puts "You must install bundler - run `gem install bundler`"
-end
-
-begin
-  Bundler.setup
-rescue Bundler::BundlerError => e
-  $stderr.puts e.message
-  $stderr.puts "Run `bundle install` to install missing gems"
-  exit e.status_code
-end
+require 'bundler/gem_tasks'
 require 'rake'
-
-require 'bueller'
-Bueller::Tasks.new
-
 require 'rspec/core/rake_task'
-RSpec::Core::RakeTask.new(:examples) do |examples|
-  examples.rspec_opts = '-Ispec'
-end
 
-RSpec::Core::RakeTask.new(:rcov) do |spec|
-  spec.rspec_opts = '-Ispec'
-  spec.rcov = true
+RSpec::Core::RakeTask.new(:spec) do |spec|
+  spec.pattern = 'spec/**/*_spec.rb'
+  spec.rspec_opts = ['--backtrace']
+  # spec.ruby_opts = ['-w']
 end
 
-task :default => :examples
+task :default => :spec
 
 require 'rake/rdoctask'
 Rake::RDocTask.new do |rdoc|

data/lib/stache.rb

@@ -2,6 +2,8 @@ require "stache/version"
 require "stache/config"
 require "stache/util"
 require "stache/asset_helper"
+require "stache/view_context"
+require "stache/system"
 
 if defined? ::Rails::Railtie and ::Rails::VERSION::MAJOR >= 3
   require 'stache/railtie'

data/lib/stache/handlebars/handler.rb

@@ -12,21 +12,28 @@ module Stache
 
       def compile(template)
         handlebars_class = handlebars_class_from_template(template)
-
         <<-RUBY_CODE
           handlebars = ::#{handlebars_class}.new
+          handlebars.view = self
 
           handlebars.register_helper('helperMissing') do |name, *args|
             meth, *params, options = args
-            if params.size == 0
-              ""
+
+            if handlebars.respond_to?(meth)
+              handlebars.send(meth, *params)
             elsif self.respond_to?(meth)
               self.send(meth, *params)
+            elsif params.size == 0
+              ""
             else
               raise "Could not find property '\#\{meth\}'"
             end
           end
 
+          handlebars.register_helper('yield') do |name, *args|
+            content_for(:layout)
+          end
+
           template = handlebars.compile('#{template.source.gsub(/'/, "\\\\'")}');
           vars = {}
           partial_renderer = @view_renderer.send(:_partial_renderer)

data/lib/stache/handlebars/view.rb

@@ -5,9 +5,11 @@ module Stache
     #
     # A Convienent Base Class for the views. Subclass this for autoloading magic with your templates.
     class View < ::Handlebars::Context
+      attr_accessor :view
 
-      # crickets. So, this isn't as useful right now since you have to call #register_helper
-      # and #partial_missing on the instance, but I'm sure we'll find a use for it :).
+      def method_missing(method, *args, &block)
+        view.send(method, *args, &block)
+      end
 
     end
   end

data/lib/stache/mustache.rb

@@ -1,7 +1,9 @@
 require "stache/mustache/handler"
+require "stache/mustache/layout"
 
 module Stache
   module Mustache; end
 end
 
-ActionView::Template.register_template_handler :mustache, Stache::Mustache::Handler
+ActionView::Template.register_template_handler :rb, Stache::Mustache::Handler
+ActionView::Template.register_template_handler :mustache, Stache::Mustache::Handler

data/lib/stache/mustache/handler.rb

@@ -20,9 +20,17 @@ module Stache
         <<-MUSTACHE
           mustache = ::#{mustache_class}.new
           mustache.view = self
-          mustache.template = '#{template.source.gsub(/'/, "\\\\'")}'
+
+          # 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(/'/, "\\\\'")}'
+          else
+            template_name = mustache.template_name+".#{template.formats.first.to_s}."+mustache.template_extension
+            template_source = File.read(File.join(::Stache.template_base_path, template_name))
+          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]
@@ -52,6 +60,13 @@ module Stache
 
       # suss out a constant name for the given template
       def mustache_class_from_template(template)
+        # If we don't have a source template to render, return an abstract view class.
+        # This is normally used with rspec-rails. You probably never want to normally
+        # render a bare Stache::View
+        if template.source.empty?
+          return Stache::Mustache::View
+        end
+
         const_name = ActiveSupport::Inflector.camelize(template.virtual_path.to_s)
         begin
           const_name.constantize
@@ -67,4 +82,4 @@ module Stache
 
     end
   end
-end
+end

data/lib/stache/mustache/layout.rb

@@ -0,0 +1,34 @@
+module Stache
+  module Mustache
+    # This class is for providing layouts in a better way.
+    # Your page class should extend this class.
+    class Layout < ::Stache::Mustache::View
+      attr_writer :layout
+
+      def layout
+        @layout ||= :layout
+      end
+
+      # template here would be the pages' template, not the layout.
+      def render(data = template, ctx = {})
+        # Store the current template, we'll need to stuff it inside the layout
+        page_template = data
+
+        # Grab the layout template, to render it at the end
+        layout_template = partial(layout)
+
+        # Render the page_template using this class's context
+        # (which will be combined with the layout context)
+        rendered_template = super(page_template, ctx)
+
+        # stick that rendered template as :yield into the layout template
+        # (which will be combined with the current context)
+        if (!ctx.is_a?(::Mustache::Context))
+          rendered_template = super(layout_template, :yield => rendered_template)
+        end
+
+        rendered_template
+      end
+    end
+  end
+end

data/lib/stache/mustache/view.rb

@@ -32,6 +32,17 @@ module Stache
         template.source
       end
 
+      def helpers
+        self.class.helpers
+      end
+      alias :h :helpers
+
+      class << self
+        def helpers
+          Stache::ViewContext.current
+        end
+        alias :h :helpers
+      end
     end
   end
-end
+end

data/lib/stache/railtie.rb

@@ -7,5 +7,11 @@ module Stache
     config.to_prepare do
       ApplicationController.send(:append_view_path, Stache.template_base_path)
     end
+
+    initializer 'stache.extend_action_controller_base' do
+      ActiveSupport.on_load(:action_controller) do
+        Stache::System.setup
+      end
+    end
   end
 end

data/lib/stache/system.rb

@@ -0,0 +1,7 @@
+module Stache
+  class System
+    def self.setup
+      ActionController::Base.send(:include, Stache::ViewContextFilter)
+    end
+  end
+end

data/lib/stache/version.rb

@@ -1,3 +1,3 @@
 module Stache
-  VERSION = "0.9.1"
+  VERSION = "1.0.0.rc"
 end

data/lib/stache/view_context.rb

@@ -0,0 +1,21 @@
+module Stache
+  module ViewContext
+    def self.current
+      Thread.current[:current_view_context]
+    end
+
+    def self.current=(input)
+      Thread.current[:current_view_context] = input
+    end
+  end
+
+  module ViewContextFilter
+    def set_current_view_context
+      Stache::ViewContext.current = self.view_context
+    end
+
+    def self.included(source)
+      source.send(:before_filter, :set_current_view_context) if source.respond_to?(:before_filter)
+    end
+  end
+end

data/spec/controllers/stache_controller_spec.rb

@@ -4,7 +4,7 @@ describe StacheController do
   render_views
 
   before do
-    Stache.template_base_path = ::Rails.root.join('app', 'views')
+    #Stache.template_base_path = ::Rails.root.join('app', 'views')
   end
 
   it "can get to index and render a Mustache" do
@@ -31,5 +31,18 @@ describe StacheController do
     response.body.should =~ /link href="\/assets\/test\.css"/
   end
 
+  it "uses a layout" do
+    get :with_layout
+    assert_response 200
+
+    response.body.should == "Wrap\nThis is wrapped in a layout\n\nEndWrap\n"
+  end
 
+  it "can get render a mustache with rails helpers", :type => :stache do
+    get :helper
+    assert_response 200
+
+    response.should render_template 'helper'               # view
+    response.body.should == "/stache\n"
+  end
 end

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

@@ -1,8 +1,7 @@
 class StacheController < ApplicationController
+  layout false
 
   def index
-    @user = params[:user] || "Matt"
-    # index.html.mustache
   end
 
   def with_partials
@@ -15,4 +14,12 @@ class StacheController < ApplicationController
     # with_asset_helpers.html.mustache
   end
 
-end
+  def with_layout
+
+  end
+
+  def helper
+    Stache::ViewContext.current = self.view_context
+  end
+
+end

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

@@ -0,0 +1 @@
+{{url}}

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

@@ -0,0 +1,7 @@
+module Stache
+  class Helper < Stache::Mustache::View
+    def url
+      h.stache_path
+    end
+  end
+end

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

@@ -0,0 +1,7 @@
+module Stache
+  class Index < Stache::Mustache::View
+    def user
+      'Matt'
+    end
+  end
+end

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

@@ -0,0 +1,3 @@
+Wrap
+{{yield}}
+EndWrap

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

@@ -0,0 +1 @@
+This is wrapped in a layout

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

@@ -0,0 +1,5 @@
+module Stache
+  class WithLayout < Stache::Mustache::Layout
+
+  end
+end

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

@@ -0,0 +1,5 @@
+module Stache
+  class WithPartials < Stache::Mustache::View
+
+  end
+end

data/spec/dummy/config/environment.rb

@@ -1,5 +1,7 @@
 # Load the rails application
 require File.expand_path('../application', __FILE__)
 
+Dummy::Application.config.autoload_paths << Rails.root + 'app/views'
+
 # Initialize the rails application
 Dummy::Application.initialize!

data/spec/dummy/config/routes.rb

@@ -1,6 +1,10 @@
 Dummy::Application.routes.draw do
   get 'stache', :to => 'stache#index', :as => 'stache'
 
+  get 'stache/with_layout', :to => 'stache#with_layout'
+
+  get 'stache/helper', :to => 'stache#helper'
+
   get 'stache/with_partials', :to => 'stache#with_partials'
 
   get 'stache/with_asset_helpers', :to => 'stache#with_asset_helpers'

data/stache.gemspec

@@ -30,7 +30,6 @@ Gem::Specification.new do |s|
   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'
 end
 

metadata

@@ -1,115 +1,136 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: stache
-version: !ruby/object:Gem::Version 
-  prerelease: 
-  version: 0.9.1
+version: !ruby/object:Gem::Version
+  version: 1.0.0.rc
+  prerelease: 6
 platform: ruby
-authors: 
+authors:
 - Matt Wilson
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-05-17 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-11-09 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: mustache
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: handlebars
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: handlebars
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: rails
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rails
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
         version: 3.2.0
   type: :development
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: rspec
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 3.2.0
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: rspec-rails
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec-rails
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: bundler
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
-  name: bueller
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
-  type: :development
-  version_requirements: *id007
-- !ruby/object:Gem::Dependency 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: rake
-  prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id008
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: A rails 3.x compatible template handler, configurable.
 email: mhw@hypomodern.com
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - LICENSE
 - README.md
-files: 
+files:
 - .document
 - .gitignore
 - .rspec
@@ -128,10 +149,13 @@ files:
 - lib/stache/handlebars/view.rb
 - lib/stache/mustache.rb
 - lib/stache/mustache/handler.rb
+- lib/stache/mustache/layout.rb
 - lib/stache/mustache/view.rb
 - lib/stache/railtie.rb
+- lib/stache/system.rb
 - lib/stache/util.rb
 - lib/stache/version.rb
+- lib/stache/view_context.rb
 - spec/controllers/handlebars_controller_spec.rb
 - spec/controllers/stache_controller_spec.rb
 - spec/dummy/Rakefile
@@ -147,9 +171,16 @@ files:
 - 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/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/layout.html.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
 - spec/dummy/app/views/stache/with_partials.html.mustache
+- spec/dummy/app/views/stache/with_partials.rb
 - spec/dummy/config.ru
 - spec/dummy/config/application.rb
 - spec/dummy/config/boot.rb
@@ -193,32 +224,32 @@ files:
 - stache.gemspec
 homepage: http://github.com/agoragames/stache
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
+      - 0
+      hash: 2542393094037451014
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
       version: 1.3.7
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Configurable Mustache Handler and Helpers for Rails
-test_files: 
+test_files:
 - spec/controllers/handlebars_controller_spec.rb
 - spec/controllers/stache_controller_spec.rb
 - spec/dummy/Rakefile
@@ -234,9 +265,16 @@ test_files:
 - 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/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/layout.html.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
 - spec/dummy/app/views/stache/with_partials.html.mustache
+- spec/dummy/app/views/stache/with_partials.rb
 - spec/dummy/config.ru
 - spec/dummy/config/application.rb
 - spec/dummy/config/boot.rb