mustache 0.4.0 → 0.5.0

data/CONTRIBUTORS

@@ -3,3 +3,4 @@
 * Magnus Holm
 * Nicolas Sanguinetti
 * Jan-Erik Rediger
+* Aaron Patterson

data/HISTORY.md

@@ -1,3 +1,21 @@
+## 0.5.0 (2009-11-23)
+
+* Partial classes are no longer supported. Use modules!
+* Added `mustache` script for rendering templates on the command line.
+* ctemplate compat: Partials are indicated by >, not <
+* Bugfix: Context miss should return nil, not empty string. Fixes 1.9.x
+
+## 0.4.2 (2009-10-28)
+
+* Bugfix: Ignore bad constant names when autoloading
+
+## 0.4.1 (2009-10-27)
+
+* Partials now respect the `view_namespace` setting.
+* Added tpl-mode.el to contrib/ for us Emacs users.
+* Rack::Bug bugfix: ensure benchmark is required before using it
+* Rack::Bug: truncate too-large variables (click expands them)
+
 ## 0.4.0 (2009-10-27)
 
 * Stopped raising context miss exceptions by default

data/README.md

@@ -176,13 +176,32 @@ Will render as follows:
 
 ### Partials
 
-Partials begin with a less than sign, like `{{< box}}`.
+Partials begin with a greater than sign, like `{{> box}}`.
 
-If a partial's view is loaded, we use that to render the HTML. If
-nothing is loaded we render the template directly using our current context.
+It is useful to think of partials as a "template expansion" - that is,
+the actual partial tag will be replaced with the content of the
+partial. Therefor partials share the current context.
 
-In this way partials can reference variables or sections the calling
-view defines.
+For example, this template and partial:
+
+    base.mustache
+    Names:
+    {{# names }}
+      {{> user }}
+    {{/ names }}
+
+    user.mustache:
+    <strong>{{ name }}</strong>
+
+Can be thought of as a single, expanded template:
+
+    Names:
+    {{# names }}
+      <strong>{{ name }}</strong>
+    {{/ names }}
+
+Have partial-specific code you want to share between view classes?
+Consider using a module and including it.
 
 
 ### Set Delimiter
@@ -376,7 +395,7 @@ An example Sinatra application is also provided:
 
 
 [Rack::Bug][4]
----------
+--------------
 
 Mustache also ships with a `Rack::Bug` panel. In your `config.ru` add
 the following code:
@@ -399,6 +418,64 @@ Thanks to [Juvenn Woo](http://github.com/juvenn) for mustache.vim. It
 is included under the contrib/ directory.
 
 
+Emacs
+-----
+
+tpl-mode.el is included under the contrib/ directory for any Emacs users.
+Based on Google's tpl-mode for ctemplates, it adds support for Mustache's
+more lenient tag values and includes a few commands for your editing pleasure.
+
+
+TextMate
+--------
+
+Check out Tekkub's
+[Mustache.tmbundle](http://github.com/tekkub/Mustache.tmbundle).
+
+
+Command Line
+------------
+
+Mustache includes a `mustache` script for rendering templates on the
+command line. This can be useful when designing HTML that will
+eventually be included in a website: instead of having to format the
+HTML as Mustache later, you can do it now!
+
+The script expects a Mustache template on STDIN with YAML
+frontmatter. An example looks like this:
+
+    $ cat complete.mustache
+    ---
+    names: [ {name: chris}, {name: mark}, {name: scott} ]
+    ---
+    {{#names}}
+      Hi {{name}}!
+    {{/names}}
+
+    $ cat complete.mustache | mustache
+    Hi chris!
+    Hi mark!
+    Hi scott!
+
+It's probably more useful to keep the YAML and HTML in separate files,
+though. Luckily `cat` works great for this, too:
+
+    $ cat data.yml
+    ---
+    names: [ {name: chris}, {name: mark}, {name: scott} ]
+    ---
+
+    $ cat template.mustache
+    {{#names}}
+      Hi {{name}}!
+    {{/names}}
+
+    $ cat data.yml template.mustache | mustache
+    Hi chris!
+    Hi mark!
+    Hi scott!
+
+
 Installation
 ------------
 

data/Rakefile

@@ -15,7 +15,7 @@ task :gem => [ :gemspec, :build ]
 desc "Launch Kicker (like autotest)"
 task :kicker do
   puts "Kicking... (ctrl+c to cancel)"
-  exec "kicker -e rake test lib"
+  exec "kicker -e rake test lib examples"
 end
 
 begin
@@ -46,6 +46,7 @@ desc "Push a new version to Gemcutter"
 task :publish => [ :test, :gemspec, :build ] do
   system "git tag v#{Mustache::Version}"
   system "git push origin v#{Mustache::Version}"
+  system "git push origin master"
   system "gem push pkg/mustache-#{Mustache::Version}.gem"
   system "git clean -fd"
   exec "rake pages"

data/bin/mustache

@@ -0,0 +1,34 @@
+#!/usr/bin/env ruby
+
+require 'mustache'
+require 'yaml'
+
+if STDIN.stat.size > 0
+  doc = STDIN.read
+  if doc =~ /^(\s*---(.*)---\s*)/m
+    data = YAML.load($2.strip)
+    puts Mustache.render(doc.sub($1, ''), data)
+  else
+    puts doc
+  end
+else
+  puts <<-usage
+Usage: cat data.yml template.mustache | mustache
+
+Expects a single Mustache template on STDIN complete with YAML
+frontmatter.
+
+Runs template.mustache through Mustache, using the data in data.yml to
+replace sections and variables. Useful when developing templates
+before hooking them into your website or whatnot.
+
+The data.yml file should start with --- on a single line and end with
+--- on a single line, e.g.
+
+    ---
+    names: [ {name: chris}, {name: mark}, {name: scott} ]
+    ---
+
+The converted document will be printed on STDOUT.
+usage
+end

data/contrib/tpl-mode.el

@@ -0,0 +1,274 @@
+;;; tpl-mode.el -- a major mode for editing Google CTemplate files.
+;;; By Tony Gentilcore, July 2006
+;;;
+;;; Very minor, backwards compatible changes added for Mustache compatibility
+;;; by Chris Wanstrath, October 2009
+;;;
+;;; TO USE:
+;;; 1) Copy this file somewhere you in emacs load-path.  To see what
+;;;    your load-path is, run inside emacs: C-h v load-path<RET>
+;;; 2) Add the following two lines to your .emacs file:
+;;;    (setq auto-mode-alist (cons '("\\.tpl$" . tpl-mode) auto-mode-alist))
+;;;    (autoload 'tpl-mode "tpl-mode" "Major mode for editing CTemplate files." t)
+;;; 3) Optionally (but recommended), add this third line as well:
+;;;    (add-hook 'tpl-mode-hook '(lambda () (font-lock-mode 1)))
+;;; ---
+;;;
+;;; While the CTemplate language can be used for any types of text,
+;;; this mode is intended for using CTemplate to write HTML.
+;;;
+;;; The indentation still has minor bugs due to the fact that
+;;; templates do not require valid HTML.
+;;;
+;;; It would be nice to be able to highlight attributes of HTML tags,
+;;; however this is difficult due to the presence of CTemplate symbols
+;;; embedded within attributes.
+
+(eval-when-compile
+  (require 'font-lock))
+
+(defgroup tpl-mode nil
+  "Major mode for editing Google CTemplate and Mustache files"
+  :group 'languages)
+
+(defvar tpl-mode-version "1.1"
+  "Version of `tpl-mode.el'.")
+
+(defvar tpl-mode-abbrev-table nil
+  "Abbrev table for use in tpl-mode buffers.")
+
+(define-abbrev-table 'tpl-mode-abbrev-table ())
+
+(defcustom tpl-mode-hook nil
+  "*Hook that runs upon entering tpl-mode."
+  :type 'hook)
+
+(defvar tpl-mode-map nil
+  "Keymap for tpl-mode major mode")
+
+(if tpl-mode-map
+    nil
+  (setq tpl-mode-map (make-sparse-keymap)))
+
+(define-key tpl-mode-map "\t" 'tpl-indent-command)
+(define-key tpl-mode-map "\C-m" 'reindent-then-newline-and-indent)
+(define-key tpl-mode-map "\C-ct" 'tpl-insert-tag)
+(define-key tpl-mode-map "\C-cv" 'tpl-insert-variable)
+(define-key tpl-mode-map "\C-cs" 'tpl-insert-section)
+
+
+(defvar tpl-mode-syntax-table nil
+  "Syntax table in use in tpl-mode buffers.")
+
+;; Syntax table.
+(if tpl-mode-syntax-table
+    nil
+  (setq tpl-mode-syntax-table (make-syntax-table text-mode-syntax-table))
+  (modify-syntax-entry ?<  "(>  " tpl-mode-syntax-table)
+  (modify-syntax-entry ?>  ")<  " tpl-mode-syntax-table)
+  (modify-syntax-entry ?\" ".   " tpl-mode-syntax-table)
+  (modify-syntax-entry ?\\ ".   " tpl-mode-syntax-table)
+  (modify-syntax-entry ?'  "w   " tpl-mode-syntax-table))
+
+(defvar tpl-basic-offset 2
+  "The basic indentation offset.")
+
+;; Constant regular expressions to identify template elements.
+(defconst tpl-mode-tpl-token "[a-zA-Z][a-zA-Z0-9_:=\?!-]*?")
+(defconst tpl-mode-section (concat "\\({{[#/]\s*"
+                                   tpl-mode-tpl-token
+                                   "\s*}}\\)"))
+(defconst tpl-mode-open-section (concat "\\({{#\s*"
+                                        tpl-mode-tpl-token
+                                        "\s*}}\\)"))
+(defconst tpl-mode-close-section (concat "{{/\\(\s*"
+                                         tpl-mode-tpl-token
+                                         "\s*\\)}}"))
+;; TODO(tonyg) Figure out a way to support multiline comments.
+(defconst tpl-mode-comment "\\({{!.*?}}\\)")
+(defconst tpl-mode-include (concat "\\({{>\s*"
+                                   tpl-mode-tpl-token
+                                   "\s*}}\\)"))
+(defconst tpl-mode-variable (concat "\\({{\s*"
+                                    tpl-mode-tpl-token
+                                    "\s*}}\\)"))
+(defconst tpl-mode-builtins
+  (concat
+   "\\({{\\<\s*"
+   (regexp-opt
+    '("BI_NEWLINE" "BI_SPACE")
+    t)
+   "\s*\\>}}\\)"))
+(defconst tpl-mode-close-section-at-start (concat "^[ \t]*?"
+                                                  tpl-mode-close-section))
+
+;; Constant regular expressions to identify html tags.
+;; Taken from HTML 4.01 / XHTML 1.0 Reference found at:
+;; http://www.w3schools.com/tags/default.asp.
+(defconst tpl-mode-html-constant "\\(&#?[a-z0-9]\\{2,5\\};\\)")
+(defconst tpl-mode-pair-tag
+  (concat
+   "\\<"
+   (regexp-opt
+    '("a" "abbr" "acronym" "address" "applet" "area" "b" "bdo"
+      "big" "blockquote" "body" "button" "caption" "center" "cite"
+      "code" "col" "colgroup" "dd" "del" "dfn" "dif" "div" "dl"
+      "dt" "em" "fieldset" "font" "form" "frame" "frameset" "h1"
+      "h2" "h3" "h4" "h5" "h6" "head" "html" "i" "iframe" "ins"
+      "kbd" "label" "legend" "li" "link" "map" "menu" "noframes"
+      "noscript" "object" "ol" "optgroup" "option" "p" "pre" "q"
+      "s" "samp" "script" "select" "small" "span" "strike"
+      "strong" "style" "sub" "sup" "table" "tbody" "td" "textarea"
+      "tfoot" "th" "thead" "title" "tr" "tt" "u" "ul" "var")
+    t)
+   "\\>"))
+(defconst tpl-mode-standalone-tag
+  (concat
+   "\\<"
+   (regexp-opt
+    '("base" "br" "hr" "img" "input" "meta" "param")
+    t)
+   "\\>"))
+(defconst tpl-mode-open-tag (concat "<\\("
+                                    tpl-mode-pair-tag
+                                    "\\)"))
+(defconst tpl-mode-close-tag (concat "</\\("
+                                     tpl-mode-pair-tag
+                                     "\\)>"))
+(defconst tpl-mode-close-tag-at-start (concat "^[ \t]*?"
+                                              tpl-mode-close-tag))
+
+(defconst tpl-mode-blank-line "^[ \t]*?$")
+(defconst tpl-mode-dangling-open (concat "\\("
+                                         tpl-mode-open-section
+                                         "\\)\\|\\("
+                                         tpl-mode-open-tag
+                                         "\\)[^/]*$"))
+
+(defun tpl-indent-command ()
+  "Command for indenting text. Just calls tpl-indent."
+  (interactive)
+  (tpl-indent))
+
+(defun tpl-insert-tag (tag)
+  "Inserts an HTML tag."
+  (interactive "sTag: ")
+  (tpl-indent)
+  (insert (concat "<" tag ">"))
+  (insert "\n\n")
+  (insert (concat "</" tag ">"))
+  (tpl-indent)
+  (forward-line -1)
+  (tpl-indent))
+
+(defun tpl-insert-variable (variable)
+  "Inserts a tpl variable."
+  (interactive "sVariable: ")
+  (insert (concat "{{" variable "}}")))
+
+(defun tpl-insert-section (section)
+  "Inserts a tpl section."
+  (interactive "sSection: ")
+  (tpl-indent)
+  (insert (concat "{{#" section "}}\n"))
+  (insert "\n")
+  (insert (concat "{{/" section "}}"))
+  (tpl-indent)
+  (forward-line -1)
+  (tpl-indent))
+
+;; Function to control indenting.
+(defun tpl-indent ()
+  "Indent current line"
+  ;; Set the point to beginning of line.
+  (beginning-of-line)
+  ;; If we are at the beginning of the file, indent to 0.
+  (if (bobp)
+      (indent-line-to 0)
+    (let ((tag-stack 1) (close-tag "") (cur-indent 0) (old-pnt (point-marker))
+          (close-at-start) (open-token) (dangling-open))
+      (progn
+        ;; Determine if this is a template line or an html line.
+        (if (looking-at "^[ \t]*?{{")
+            (setq close-at-start tpl-mode-close-section-at-start
+                  open-token "{{#")
+          (setq close-at-start tpl-mode-close-tag-at-start
+                open-token "<"))
+        ;; If there is a closing tag at the start of the line, search back
+        ;; for its opener and indent to that level.
+        (if (looking-at close-at-start)
+            (progn
+              (save-excursion
+                (setq close-tag (match-string 1))
+                ;; Keep searching for a match for the close tag until
+                ;; the tag-stack is 0.
+                (while (and (not (bobp))
+                            (> tag-stack 0)
+                            (re-search-backward (concat open-token
+                                                        "\\(/?\\)"
+                                                        close-tag) nil t))
+                  (if (string-equal (match-string 1) "/")
+                      ;; We found another close tag, so increment tag-stack.
+                      (setq tag-stack (+ tag-stack 1))
+                    ;; We found an open tag, so decrement tag-stack.
+                    (setq tag-stack (- tag-stack 1)))
+                  (setq cur-indent (current-indentation))))
+              (if (> tag-stack 0)
+                  (save-excursion
+                    (forward-line -1)
+                    (setq cur-indent (current-indentation)))))
+          ;; This was not a closing tag, so we check if the previous line
+          ;; was an opening tag.
+          (save-excursion
+            ;; Keep moving back until we find a line that is not blank
+            (while (progn
+                     (forward-line -1)
+                     (and (not (bobp)) (looking-at tpl-mode-blank-line))))
+            (setq cur-indent (current-indentation))
+            (if (re-search-forward tpl-mode-dangling-open old-pnt t)
+                (setq cur-indent (+ cur-indent tpl-basic-offset)))))
+        ;; Finally, we execute the actual indentation.
+        (if (> cur-indent 0)
+            (indent-line-to cur-indent)
+          (indent-line-to 0))))))
+
+;; controls highlighting
+(defconst tpl-mode-font-lock-keywords
+  (list
+   (list tpl-mode-section
+         '(1 font-lock-keyword-face))
+   (list tpl-mode-comment
+         '(1 font-lock-comment-face))
+   (list tpl-mode-include
+         '(1 font-lock-builtin-face))
+   (list tpl-mode-builtins
+         '(1 font-lock-variable-name-face))
+   (list tpl-mode-variable
+         '(1 font-lock-reference-face))
+   (list (concat "</?\\(" tpl-mode-pair-tag "\\)")
+         '(1 font-lock-function-name-face))
+   (list (concat "<\\(" tpl-mode-standalone-tag "\\)")
+         '(1 font-lock-function-name-face))
+   (list tpl-mode-html-constant
+         '(1 font-lock-variable-name-face))))
+
+(put 'tpl-mode 'font-lock-defaults '(tpl-font-lock-keywords nil t))
+
+(defun tpl-mode ()
+  "Major mode for editing Google CTemplate file."
+  (interactive)
+  (kill-all-local-variables)
+  (use-local-map tpl-mode-map)
+  (setq major-mode 'tpl-mode)
+  (setq mode-name "tpl-mode")
+  (setq local-abbrev-table tpl-mode-abbrev-table)
+  (setq indent-tabs-mode nil)
+  (set-syntax-table tpl-mode-syntax-table)
+  ;; show trailing whitespace, but only when the user can fix it
+  (setq show-trailing-whitespace (not buffer-read-only))
+  (make-local-variable 'indent-line-function)
+  (setq indent-line-function 'tpl-indent)
+  (setq font-lock-defaults '(tpl-mode-font-lock-keywords))
+  (run-hooks 'tpl-mode-hook))
+
+(provide 'tpl-mode)

data/examples/namespaced.rb

@@ -9,8 +9,16 @@ module TestViews
       "Dragon < Tiger"
     end
   end
-end
 
+  class NamespacedWithPartial < Mustache
+    self.path = File.dirname(__FILE__)
+    self.template = "My opinion: {{>inner_partial}}"
+
+    def title
+      "Victory"
+    end
+  end
+end
 
 if $0 == __FILE__
   puts TestViews::Namespaced.to_html

data/examples/partial_with_module.mustache

@@ -0,0 +1,3 @@
+<h1>{{greeting}}</h1>
+{{>simple}}
+<h3>{{farewell}}</h3>

data/examples/partial_with_module.rb

@@ -0,0 +1,37 @@
+$LOAD_PATH.unshift File.dirname(__FILE__) + '/../lib'
+require 'mustache'
+
+module SimpleView
+  def name
+    "Bob"
+  end
+
+  def value
+    100_000
+  end
+
+  def taxed_value
+    value - (value * 0.4)
+  end
+
+  def in_ca
+    false
+  end
+end
+
+class PartialWithModule < Mustache
+  include SimpleView
+  self.path = File.dirname(__FILE__)
+
+  def greeting
+    "Welcome"
+  end
+
+  def farewell
+    "Fair enough, right?"
+  end
+end
+
+if $0 == __FILE__
+  puts PartialWithModule.to_html
+end

data/examples/template_partial.mustache

@@ -1,2 +1,2 @@
 <h1>{{title}}</h1>
-{{<inner_partial}}
+{{>inner_partial}}

data/examples/template_partial.txt

@@ -1,4 +1,4 @@
 {{title}}
 {{title_bars}}
 
-{{<inner_partial}}
+{{>inner_partial}}

data/lib/mustache/context.rb

@@ -27,7 +27,7 @@ class Mustache
       elsif @mustache.raise_on_context_miss?
         raise ContextMiss.new("Can't find #{name} in #{@mustache.inspect}")
       else
-        ''
+        nil
       end
     end
   end

data/lib/mustache/template.rb

@@ -103,10 +103,10 @@ class Mustache
     # 1. Escaped variable tags - {{var}}
     # 2. Unescaped variable tags - {{{var}}}
     # 3. Comment variable tags - {{! comment}
-    # 4. Partial tags - {{< partial_name }}
+    # 4. Partial tags - {{> partial_name }}
     def compile_tags(src)
       res = ""
-      while src =~ /#{otag}(#|=|!|<|\{)?(.+?)\1?#{ctag}+/
+      while src =~ /#{otag}(#|=|!|<|>|\{)?(.+?)\1?#{ctag}+/
         res << str($`)
         case $1
         when '#'
@@ -117,7 +117,7 @@ class Mustache
           # ignore comments
         when '='
           self.otag, self.ctag = $2.strip.split(' ', 2)
-        when '<'
+        when '>', '<'
           res << compile_partial($2.strip)
         when '{'
           res << utag($2.strip)
@@ -131,13 +131,8 @@ class Mustache
 
     # Partials are basically a way to render views from inside other views.
     def compile_partial(name)
-      klass = Mustache.classify(name)
-      if Object.const_defined?(klass)
-        ev("#{klass}.render")
-      else
-        src = File.read("#{@template_path}/#{name}.#{@template_extension}")
-        compile(src)[1..-2]
-      end
+      src = File.read("#{@template_path}/#{name}.#{@template_extension}")
+      compile(src)[1..-2]
     end
 
     # Generate a temporary id, used when compiling code.

data/lib/mustache/version.rb

@@ -1,3 +1,3 @@
 class Mustache
-  Version = '0.4.0'
+  Version = '0.5.0'
 end

data/lib/mustache.rb

@@ -192,6 +192,8 @@ class Mustache
     else
       Mustache
     end
+  rescue NameError
+    Mustache
   end
 
   # Should an exception be raised when we cannot find a corresponding method

data/lib/rack/bug/panels/mustache_panel/mustache_extension.rb

@@ -1,4 +1,6 @@
 if defined? Mustache
+  require 'benchmark'
+
   Mustache.class_eval do
     alias_method :real_render, :render
 

data/lib/rack/bug/panels/mustache_panel/view.mustache

@@ -1,3 +1,17 @@
+<script type="text/javascript">
+$(function() {
+  $('#mustache_variables .variable').each(function() {
+    var el = $(this)
+    if (el.text().length > 500) {
+      var txt = el.text()
+      el.click(function() {
+        $(this).text(txt)
+      }).text( el.text().slice(0, 500) + '...' )
+    }
+  })
+});
+</script>
+
 <h3>Render Times</h3>
 
 <table>
@@ -16,7 +30,7 @@
 
 <h3>Variables</h3>
 
-<table>
+<table id="mustache_variables">
   <tr>
     <th>Name</th>
     <th>Value</th>
@@ -25,7 +39,7 @@
   {{# variables }}
     <tr>
       <td>{{ key }}</td>
-      <td>{{ value }}</td>
+      <td class="variable">{{ value }}</td>
     </tr>
   {{/ variables }}
 </table>

data/test/autoloading_test.rb

@@ -1,4 +1,5 @@
-require 'test/unit'
+$LOAD_PATH.unshift File.dirname(__FILE__)
+require 'helper'
 
 module TestViews; end
 
@@ -35,4 +36,17 @@ class AutoloadingTest < Test::Unit::TestCase
 <h1>Dragon &lt; Tiger</h1>
 end_render
   end
+
+  def test_namespaced_partial_autoload
+    Mustache.view_namespace = TestViews
+    klass = Mustache.view_class(:namespaced_with_partial)
+    assert_equal TestViews::NamespacedWithPartial, klass
+    assert_equal <<-end_render.strip, klass.render
+My opinion: Again, Victory!
+end_render
+  end
+
+  def test_bad_constant_name
+    assert_equal Mustache, Mustache.view_class(404)
+  end
 end

data/test/helper.rb

@@ -0,0 +1,13 @@
+require 'test/unit'
+
+$LOAD_PATH.unshift File.dirname(__FILE__) + '/../examples'
+require 'simple'
+require 'complex_view'
+require 'partial_with_module'
+require 'template_partial'
+require 'escaped'
+require 'unescaped'
+require 'comments'
+require 'passenger'
+require 'delimiters'
+require 'double_section'

data/test/mustache_test.rb

@@ -1,16 +1,5 @@
-require 'test/unit'
-
-$LOAD_PATH.unshift File.dirname(__FILE__) + '/../examples'
-require 'simple'
-require 'complex_view'
-require 'view_partial'
-require 'template_partial'
-require 'escaped'
-require 'unescaped'
-require 'comments'
-require 'passenger'
-require 'delimiters'
-require 'double_section'
+$LOAD_PATH.unshift File.dirname(__FILE__)
+require 'helper'
 
 class MustacheTest < Test::Unit::TestCase
   def test_passenger
@@ -113,46 +102,15 @@ end_simple
     assert_equal 'Hi mom!', view.render
   end
 
-  def test_view_partial
-    assert_equal <<-end_partial.strip, ViewPartial.render
-<h1>Welcome</h1>
-Hello Chris
-You have just won $10000!
-Well, $6000.0, after taxes.
-
-<h3>Fair enough, right?</h3>
-end_partial
-  end
-
-  def test_template_partial
-    assert_equal <<-end_partial.strip, TemplatePartial.render
-<h1>Welcome</h1>
-Again, Welcome!
-end_partial
-  end
-
-  def test_template_partial_with_custom_extension
-    partial = Class.new(TemplatePartial)
-    partial.template_extension = 'txt'
-    partial.template_path = File.dirname(__FILE__) + '/../examples'
-
-    assert_equal <<-end_partial.strip, partial.render.strip
-Welcome
--------
-
-## Again, Welcome! ##
-end_partial
-  end
-
   def test_delimiters
-    assert_equal <<-end_partial, Delimiters.render
+    assert_equal <<-end_template, Delimiters.render
 
 * It worked the first time.
 
 * And it worked the second time.
 
 * Then, surprisingly, it worked the third time.
-end_partial
+end_template
   end
 
   def test_double_section

data/test/partial_test.rb

@@ -0,0 +1,80 @@
+$LOAD_PATH.unshift File.dirname(__FILE__)
+require 'helper'
+
+class PartialTest < Test::Unit::TestCase
+  def test_view_partial
+    assert_equal <<-end_partial.strip, PartialWithModule.render
+<h1>Welcome</h1>
+Hello Bob
+You have just won $100000!
+
+<h3>Fair enough, right?</h3>
+end_partial
+  end
+
+  def test_view_partial_inherits_context
+    klass = Class.new(TemplatePartial)
+    klass.template_path = File.dirname(__FILE__) + '/../examples'
+    view = klass.new
+    view[:titles] = [{:title => :One}, {:title => :Two}]
+    view.template = <<-end_template
+<h1>Context Test</h1>
+<ul>
+{{#titles}}
+<li>{{>inner_partial}}</li>
+{{/titles}}
+</ul>
+end_template
+    assert_equal <<-end_partial, view.render
+<h1>Context Test</h1>
+<ul>
+<li>Again, One!</li>
+<li>Again, Two!</li>
+</ul>
+end_partial
+  end
+
+  def test_view_partial_inherits_context_of_class_methods
+    klass = Class.new(TemplatePartial)
+    klass.template_path = File.dirname(__FILE__) + '/../examples'
+    klass.send(:define_method, :titles) do
+      [{:title => :One}, {:title => :Two}]
+    end
+    view = klass.new
+    view.template = <<-end_template
+<h1>Context Test</h1>
+<ul>
+{{#titles}}
+<li>{{>inner_partial}}</li>
+{{/titles}}
+</ul>
+end_template
+    assert_equal <<-end_partial, view.render
+<h1>Context Test</h1>
+<ul>
+<li>Again, One!</li>
+<li>Again, Two!</li>
+</ul>
+end_partial
+  end
+
+  def test_template_partial
+    assert_equal <<-end_partial.strip, TemplatePartial.render
+<h1>Welcome</h1>
+Again, Welcome!
+end_partial
+  end
+
+  def test_template_partial_with_custom_extension
+    partial = Class.new(TemplatePartial)
+    partial.template_extension = 'txt'
+    partial.template_path = File.dirname(__FILE__) + '/../examples'
+
+    assert_equal <<-end_partial.strip, partial.render.strip
+Welcome
+-------
+
+## Again, Welcome! ##
+end_partial
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: mustache
 version: !ruby/object:Gem::Version 
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors: 
 - Chris Wanstrath
@@ -9,14 +9,14 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-27 00:00:00 -07:00
-default_executable: 
+date: 2009-11-23 00:00:00 -08:00
+default_executable: mustache
 dependencies: []
 
 description: Mustache is a framework-agnostic way to render logic-free views.
 email: chris@ozmm.org
-executables: []
-
+executables: 
+- mustache
 extensions: []
 
 extra_rdoc_files: 
@@ -35,7 +35,9 @@ files:
 - benchmarks/helper.rb
 - benchmarks/simple.erb
 - benchmarks/speed.rb
+- bin/mustache
 - contrib/mustache.vim
+- contrib/tpl-mode.el
 - examples/comments.mustache
 - examples/comments.rb
 - examples/complex_view.mustache
@@ -50,6 +52,8 @@ files:
 - examples/inner_partial.txt
 - examples/namespaced.mustache
 - examples/namespaced.rb
+- examples/partial_with_module.mustache
+- examples/partial_with_module.rb
 - examples/passenger.conf
 - examples/passenger.rb
 - examples/simple.mustache
@@ -59,8 +63,6 @@ files:
 - examples/template_partial.txt
 - examples/unescaped.mustache
 - examples/unescaped.rb
-- examples/view_partial.mustache
-- examples/view_partial.rb
 - lib/mustache.rb
 - lib/mustache/context.rb
 - lib/mustache/sinatra.rb
@@ -70,7 +72,9 @@ files:
 - lib/rack/bug/panels/mustache_panel/mustache_extension.rb
 - lib/rack/bug/panels/mustache_panel/view.mustache
 - test/autoloading_test.rb
+- test/helper.rb
 - test/mustache_test.rb
+- test/partial_test.rb
 has_rdoc: true
 homepage: http://github.com/defunkt/mustache
 licenses: []
@@ -101,15 +105,17 @@ specification_version: 3
 summary: Mustache is a framework-agnostic way to render logic-free views.
 test_files: 
 - test/autoloading_test.rb
+- test/helper.rb
 - test/mustache_test.rb
+- test/partial_test.rb
 - examples/comments.rb
 - examples/complex_view.rb
 - examples/delimiters.rb
 - examples/double_section.rb
 - examples/escaped.rb
 - examples/namespaced.rb
+- examples/partial_with_module.rb
 - examples/passenger.rb
 - examples/simple.rb
 - examples/template_partial.rb
 - examples/unescaped.rb
-- examples/view_partial.rb

data/examples/view_partial.mustache

@@ -1,3 +0,0 @@
-<h1>{{greeting}}</h1>
-{{<simple}}
-<h3>{{farewell}}</h3>

data/examples/view_partial.rb

@@ -1,18 +0,0 @@
-$LOAD_PATH.unshift File.dirname(__FILE__) + '/../lib'
-require 'mustache'
-
-class ViewPartial < Mustache
-  self.path = File.dirname(__FILE__)
-
-  def greeting
-    "Welcome"
-  end
-
-  def farewell
-    "Fair enough, right?"
-  end
-end
-
-if $0 == __FILE__
-  puts ViewPartial.to_html
-end