mustache 0.1.3 → 0.1.4

data/README.md

@@ -304,6 +304,15 @@ Now:
 Convoluted but you get the idea.
 
 
+Sinatra
+-------
+
+Mustache ships with Sinatra integration. Please see
+`lib/mustache/sinatra.rb` or
+<http://defunkt.github.com/mustache/classes/Mustache/Sinatra.html> for
+complete documentation.
+
+
 Installation
 ------------
 

data/Rakefile

@@ -34,5 +34,6 @@ end
 
 desc "Push a new version to Gemcutter"
 task :publish => [ :gemspec, :build ] do
-  exec "gem push pkg/mustache-#{Mustache::Version}.gem" 
+  system "gem push pkg/mustache-#{Mustache::Version}.gem" 
+  exec "git clean -fd"
 end

data/lib/mustache/sinatra.rb

@@ -6,7 +6,9 @@ class Mustache
   #
   #   require 'mustache/sinatra'
   #
-  #   class App < Sinatra::Base
+  #   class Hurl < Sinatra::Base
+  #     register Mustache::Sinatra
+  #
   #     # Should be the path to your .mustache template files.
   #     set :views, "path/to/mustache/templates"
   #
@@ -14,19 +16,21 @@ class Mustache
   #     # Only needed if different from the `views` setting
   #     set :mustaches, "path/to/mustache/views"
   #
-  #     # This tells Mustache where to look for the Views modules,
+  #     # This tells Mustache where to look for the Views module,
   #     # under which your View classes should live. By default it's
-  #     # Object. That is, for an :index view Mustache will expect
-  #     # Views::Index. In this example, we're telling Mustache to look
-  #     # for index at App::Views::Index.
-  #     set :namespace, App
+  #     # the class of your app - in this case `Hurl`. That is, for an :index
+  #     # view Mustache will expect Hurl::Views::Index by default.
+  #
+  #     # If our Sinatra::Base subclass was instead Hurl::App,
+  #     # we'd want to do `set :namespace, Hurl::App`
+  #     set :namespace, Hurl
   #
   #     get '/stats' do
   #       mustache :stats
   #     end
   #   end
   #
-  # As noted above, Mustache will look for `App::Views::Index` when
+  # As noted above, Mustache will look for `Hurl::Views::Index` when
   # `mustache :index` is called.
   #
   # If no `Views::Stats` class exists Mustache will render the template
@@ -36,61 +40,67 @@ class Mustache
   # <%= yield %> you instead {{{yield}}} - the body of the subview is
   # set to the `yield` variable and made available to you.
   module Sinatra
-    # Call this in your Sinatra routes.
-    def mustache(template, options={}, locals={})
-      render :mustache, template, options, locals
-    end
+    module Helpers
+      # Call this in your Sinatra routes.
+      def mustache(template, options={}, locals={})
+        render :mustache, template, options, locals
+      end
 
-    # This is called by Sinatra's `render` with the proper paths
-    # and, potentially, a block containing a sub-view
-    def render_mustache(template, data, options, locals, &block)
-      name = Mustache.classify(template.to_s)
+      # This is called by Sinatra's `render` with the proper paths
+      # and, potentially, a block containing a sub-view
+      def render_mustache(template, data, opts, locals, &block)
+        name = Mustache.classify(template.to_s)
 
-      # This is a horrible hack but we need it to know under which namespace
-      # Views is located. If you have Haystack::Views, namespace should be
-      # set to Haystack.
-      namespace = self.class.namespace
+        # This is a horrible hack but we need it to know under which namespace
+        # Views is located. If you have Hurl::App::Views, namespace should be
+        # set to Hurl:App.
+        namespace = options.namespace
 
-      if namespace.const_defined?(:Views) && namespace::Views.const_defined?(name)
-        # First try to find the existing view,
-        # e.g. Haystack::Views::Index
-        klass = namespace::Views.const_get(name)
+        if namespace.const_defined?(:Views) && namespace::Views.const_defined?(name)
+          # First try to find the existing view,
+          # e.g. Hurl::Views::Index
+          klass = namespace::Views.const_get(name)
 
-      elsif File.exists?(file = "#{self.class.mustaches}/#{template}.rb")
-        # Couldn't find it - try to require the file if it exists, then
-        # load in the view.
-        require "#{file}".chomp('.rb')
-        klass = namespace::Views.const_get(name)
+        elsif File.exists?(file = "#{options.mustaches}/#{template}.rb")
+          # Couldn't find it - try to require the file if it exists, then
+          # load in the view.
+          require "#{file}".chomp('.rb')
+          klass = namespace::Views.const_get(name)
 
-      else
-        # Still nothing. Use the stache.
-        klass = Mustache
+        else
+          # Still nothing. Use the stache.
+          klass = Mustache
 
-      end
+        end
 
-      # Create a new instance for playing with
-      instance = klass.new
+        # Create a new instance for playing with
+        instance = klass.new
 
-      # Copy instance variables set in Sinatra to the view
-      instance_variables.each do |name|
-        instance.instance_variable_set(name, instance_variable_get(name))
-      end
+        # Copy instance variables set in Sinatra to the view
+        instance_variables.each do |name|
+          instance.instance_variable_set(name, instance_variable_get(name))
+        end
 
-      # Locals get added to the view's context
-      locals.each do |local, value|
-        instance[local] = value
-      end
+        # Locals get added to the view's context
+        locals.each do |local, value|
+          instance[local] = value
+        end
+
+        # If we're paseed a block it's a subview. Sticking it in yield
+        # lets us use {{yield}} in layout.html to render the actual page.
+        instance[:yield] = block.call if block
 
-      # If we're paseed a block it's a subview. Sticking it in yield
-      # lets us use {{yield}} in layout.html to render the actual page.
-      instance[:yield] = block.call if block
+        instance.template = data
+        instance.to_html
+      end
+    end
 
-      instance.template = data
-      instance.to_html
+    def self.registered(app)
+      app.helpers Mustache::Sinatra::Helpers
+      app.set :mustaches, ::Sinatra::Base.views
+      app.set :namespace, app
     end
   end
 end
 
-Sinatra::Base.helpers Mustache::Sinatra
-Sinatra::Base.set :mustaches, Sinatra::Base.views
-Sinatra::Base.set :namespace, Object
+Sinatra.register Mustache::Sinatra

data/lib/mustache/version.rb

@@ -1,3 +1,3 @@
 class Mustache
-  Version = '0.1.3'
+  Version = '0.1.4'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: mustache
 version: !ruby/object:Gem::Version 
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors: 
 - Chris Wanstrath