mustache 0.9.1 → 0.9.2

data/lib/mustache.rb

@@ -88,8 +88,7 @@ class Mustache
   # Given a file name and an optional context, attempts to load and
   # render the file as a template.
   def self.render_file(name, context = {})
-    data = File.read("#{template_path}/#{name}.#{template_extension}")
-    render(data, context)
+    render(partial(name), context)
   end
 
   # Given a file name and an optional context, attempts to load and
@@ -98,6 +97,22 @@ class Mustache
     self.class.render_file(name, context)
   end
 
+  # Given a name, attempts to read a file and return the contents as a
+  # string. The file is not rendered, so it might contain
+  # {{mustaches}}.
+  #
+  # Call `render` if you need to process it.
+  def self.partial(name)
+    File.read("#{template_path}/#{name}.#{template_extension}")
+  end
+
+  # Override this in your subclass if you want to do fun things like
+  # reading templates from a database. It will be rendered by the
+  # context, so all you need to do is return a string.
+  def partial(name)
+    self.class.partial(name)
+  end
+
   # The template path informs your Mustache subclass where to look for its
   # corresponding template. By default it's the current directory (".")
   def self.template_path

data/lib/mustache/context.rb

@@ -22,31 +22,19 @@ class Mustache
     #
     # If the Mustache view handling the rendering (e.g. the view
     # representing your profile page or some other template) responds
-    # to `partial`, we call it and use the result. Otherwise we render
-    # and compile the partial as its own view and return the result.
+    # to `partial`, we call it and render the result.
     def partial(name)
-      # Look for any Mustaches in the stack.
+      # Look for the first Mustache in the stack.
       mustache = mustache_in_stack
 
-      if mustache.respond_to? :partial
-        # We found a mustache and it responds to `partial`, send it.
-        mustache.render(mustache.partial(name), self)
-
-      elsif mustache
-        # We found a mustache without `partial`, use it to render.
-        mustache.render_file(name, self)
-      else
-        # Can't find any staches, abort and use whatever we can..
-        raise "No Mustache views in stack."
-      end
+      # Call its `partial` method and render the result.
+      mustache.render(mustache.partial(name), self)
     end
 
     # Find the first Mustache in the stack. If we're being rendered
     # inside a Mustache object as a context, we'll use that one.
     def mustache_in_stack
-      @stack.detect do |frame|
-        frame.is_a?(Mustache)
-      end
+      @stack.detect { |frame| frame.is_a?(Mustache) }
     end
 
     # Adds a new object to the context's internal stack.

data/lib/mustache/parser.rb

@@ -48,7 +48,7 @@ EOF
     SKIP_WHITESPACE = [ '#', '/' ]
 
     # The content allowed in a tag name.
-    ALLOWED_CONTENT = /(\w|[?!-])*/
+    ALLOWED_CONTENT = /(\w|[?!\/-])*/
 
     # These types of tags allow any content,
     # the rest only allow ALLOWED_CONTENT.

data/lib/mustache/sinatra.rb

@@ -56,11 +56,17 @@ class Mustache
         # compiling templates on each page load.
         klass = mustache_class(template, options)
 
-        # If they aren't explicitly diabling layouts, try to find
+        # If they aren't explicitly disabling layouts, try to find
         # one.
         if options[:layout] != false
+          # Let the user pass in a layout name.
+          layout_name = options[:layout]
+
+          # If all they said was `true` (or nothing), default to :layout.
+          layout_name = :layout if layout_name == true || !layout_name
+
           # If they passed a layout name use that.
-          layout = mustache_class(options[:layout] || :layout, options)
+          layout = mustache_class(layout_name, options)
 
           # If it's just an anonymous subclass then don't bother, otherwise
           # give us a layout instance.

data/lib/mustache/version.rb

@@ -1,3 +1,3 @@
 class Mustache
-  Version = '0.9.1'
+  Version = '0.9.2'
 end

data/test/fixtures/utf8.mustache

@@ -0,0 +1,3 @@
+<h1>中文 {{test}}</h1>
+
+{{> utf8_partial}}

data/test/fixtures/utf8_partial.mustache

@@ -0,0 +1 @@
+<h2>中文又来啦</h2>

data/test/mustache_test.rb

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 $LOAD_PATH.unshift File.dirname(__FILE__)
 require 'helper'
 
@@ -376,6 +377,20 @@ expected
 <div>3</div>
 <div>3</div>
 <div>3</div>
+rendered
+  end
+
+  def test_utf8
+    klass = Class.new(Mustache)
+    klass.template_name = 'utf8'
+    klass.template_path = 'test/fixtures'
+    view = klass.new
+    view[:test] = "中文"
+
+    assert_equal <<-rendered, view.render
+<h1>中文 中文</h1>
+
+<h2>中文又来啦</h2>
 rendered
   end
 end

data/test/partial_test.rb

@@ -12,6 +12,15 @@ You have just won $100000!
 end_partial
   end
 
+  def test_partial_with_slashes
+    klass = Class.new(Mustache)
+    klass.template = '{{> test/fixtures/inner_partial}}'
+    view = klass.new
+    view[:title] = 'success'
+
+    assert_equal "Again, success!", view.render
+  end
+
   def test_view_partial_inherits_context
     klass = Class.new(TemplatePartial)
     klass.template_path = File.dirname(__FILE__) + '/fixtures'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: mustache
 version: !ruby/object:Gem::Version 
-  version: 0.9.1
+  version: 0.9.2
 platform: ruby
 authors: 
 - Chris Wanstrath
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-27 00:00:00 -07:00
+date: 2010-03-29 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
@@ -87,6 +87,8 @@ files:
 - test/fixtures/template_partial.txt
 - test/fixtures/unescaped.mustache
 - test/fixtures/unescaped.rb
+- test/fixtures/utf8.mustache
+- test/fixtures/utf8_partial.mustache
 - test/helper.rb
 - test/mustache_test.rb
 - test/parser_test.rb