mustache 0.9.0 → 0.9.1

data/README.md

@@ -273,12 +273,19 @@ 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.
+<http://github.com/defunkt/mustache/blob/master/lib/mustache/sinatra.rb>
+for complete documentation.
 
 An example Sinatra application is also provided:
 <http://github.com/defunkt/mustache-sinatra-example>
 
+If you are upgrading to Sinatra 1.0 and Mustache 0.9.0+ from Mustache
+0.7.0 or lower, the settings have changed. But not that much.
+
+See [this diff](http://gist.github.com/345490) for what you need to
+do. Basically, things are named properly now and all should be
+contained in a hash set using `set :mustache, hash`.
+
 
 [Rack::Bug][4]
 --------------
@@ -305,6 +312,7 @@ is included under the contrib/ directory.
 
 See <http://gist.github.com/323622> for installation instructions.
 
+
 Emacs
 -----
 
@@ -323,6 +331,7 @@ TextMate
 
 See <http://gist.github.com/323624> for installation instructions.
 
+
 Command Line
 ------------
 
@@ -330,6 +339,7 @@ See `mustache(1)` man page or
 <http://defunkt.github.com/mustache/mustache.1.html>
 for command line docs.
 
+
 Installation
 ------------
 
@@ -341,12 +351,16 @@ Installation
 
     $ rip install git://github.com/defunkt/mustache.git
 
+
 Acknowledgements
 ----------------
 
 Thanks to [Tom Preston-Werner](http://github.com/mojombo) for showing
 me ctemplate and [Leah Culver](http://github.com/leah) for the name "Mustache."
 
+Special thanks to [Magnus Holm](http://judofyr.net/) for all his
+awesome work on Mustache's parser.
+
 
 Meta
 ----

data/lib/mustache.rb

@@ -92,6 +92,12 @@ class Mustache
     render(data, context)
   end
 
+  # Given a file name and an optional context, attempts to load and
+  # render the file as a template.
+  def render_file(name, context = {})
+    self.class.render_file(name, context)
+  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

@@ -14,8 +14,7 @@ class Mustache
   class Context
     # Expect to be passed an instance of `Mustache`.
     def initialize(mustache)
-      @mustache = mustache
-      @stack = [@mustache]
+      @stack = [mustache]
     end
 
     # A {{>partial}} tag translates into a call to the context's
@@ -26,10 +25,27 @@ class Mustache
     # to `partial`, we call it and use the result. Otherwise we render
     # and compile the partial as its own view and return the result.
     def partial(name)
-      if @mustache.respond_to? :partial
-        @mustache.partial(name)
+      # Look for any Mustaches 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
-        @mustache.class.render_file(name, self)
+        # Can't find any staches, abort and use whatever we can..
+        raise "No Mustache views in stack."
+      end
+    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
     end
 
@@ -79,6 +95,10 @@ class Mustache
     # set to true), will raise a ContextMiss exception on miss.
     def fetch(name, default = :__raise)
       @stack.each do |frame|
+        # Prevent infinite recursion.
+        next if frame == self
+
+        # Is this frame a hash?
         hash = frame.respond_to?(:has_key?)
 
         if hash && frame.has_key?(name)
@@ -90,7 +110,7 @@ class Mustache
         end
       end
 
-      if default == :__raise || @mustache.raise_on_context_miss?
+      if default == :__raise || mustache_in_stack.raise_on_context_miss?
         raise ContextMiss.new("Can't find #{name} in #{@stack.inspect}")
       else
         default

data/lib/mustache/version.rb

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

data/man/mustache.1

@@ -150,7 +150,7 @@ gem install mustache
 $ mustache data.yml template.mustache
 $ cat data.yml | mustache \- template.mustache
 $ mustache \-c template.mustache
-$ cat <<data | druby mustache \- template.mustache
+$ cat <<data | ruby mustache \- template.mustache
 \-\-\-
 name: Bob
 age: 30

data/man/mustache.1.html

@@ -173,7 +173,7 @@ identified by examining the tokens produced.</p></dd>
 <pre><code>$ mustache data.yml template.mustache
 $ cat data.yml | mustache - template.mustache
 $ mustache -c template.mustache
-$ cat &lt;&lt;data | druby mustache - template.mustache
+$ cat &lt;&lt;data | ruby mustache - template.mustache
 ---
 name: Bob
 age: 30

data/test/mustache_test.rb

@@ -363,4 +363,19 @@ start
 end
 expected
   end
+
+  def test_id_with_nested_context
+    html = %(<div>{{id}}</div>\n<div>{{# has_a? }}{{id}}{{/ has_a? }}</div>\n<div>{{# has_b? }}{{id}}{{/ has_b? }}</div>)
+
+    instance = Mustache.new
+    instance.template = html
+    instance[:id] = 3
+    instance[:has_a?] = true
+    instance[:has_b?] = true
+    assert_equal <<-rendered.strip, instance.render
+<div>3</div>
+<div>3</div>
+<div>3</div>
+rendered
+  end
 end

data/test/partial_test.rb

@@ -124,4 +124,36 @@ end_partial
 </html>
 end_partial
   end
+
+  def test_partials_use_proper_context
+    assert_equal "OuterThing OuterThing", OuterThing.render('{{name}} {{> p}}')
+
+    assert_equal "InnerThing InnerThing", InnerThing.render('{{name}} {{> p}}')
+
+    assert_equal "OuterThing InnerThing InnerThing",
+      OuterThing.render('{{name}} {{#inner}}{{name}} {{> p}}{{/inner}}')
+  end
+
+  def test_partials_render_returned_strings
+    assert_equal "ok", MiddleThing.render('{{> some_partial }}')
+  end
+end
+
+class InnerThing < Mustache
+  def partial(p) self.class end
+  def name;      self.class end
+end
+
+class OuterThing < Mustache
+  def inner
+    InnerThing.new
+  end
+
+  def partial(p) self.class end
+  def name;      self.class end
+end
+
+class MiddleThing < Mustache
+  def partial(name) "{{#{name}}}" end
+  def some_partial; "ok" end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: mustache
 version: !ruby/object:Gem::Version 
-  version: 0.9.0
+  version: 0.9.1
 platform: ruby
 authors: 
 - Chris Wanstrath
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-26 00:00:00 -07:00
+date: 2010-03-27 00:00:00 -07:00
 default_executable: 
 dependencies: []