mustache 0.5.0 → 0.5.1

data/CONTRIBUTORS

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

data/HISTORY.md

@@ -1,3 +1,9 @@
+## 0.5.1 (2009-12-15)
+
+* Added "mail merge" functionality to `mustache` script.
+* Support for multi-line tags (useful for comments)
+* Sinatra Bugfix: Use Sinatra app's view path, not Sinatra base class'.
+
 ## 0.5.0 (2009-11-23)
 
 * Partial classes are no longer supported. Use modules!

data/README.md

@@ -452,13 +452,31 @@ frontmatter. An example looks like this:
       Hi {{name}}!
     {{/names}}
 
-    $ cat complete.mustache | mustache
+    $ mustache < complete.mustache
+    Hi chris!
+    Hi mark!
+    Hi scott!
+
+You can include multiple documents in your YAML frontmatter if you
+like. Then the template is evaluated once for each of them.
+
+    $ cat multiple.mustache
+    ---
+    name: chris
+    ---
+    name: mark
+    ---
+    name: scott
+    ---
+    Hi {{name}!
+    
+    $ mustache < multiple.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:
+though. `cat` makes this easy:
 
     $ cat data.yml
     ---

data/bin/mustache

@@ -6,8 +6,12 @@ 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)
+    yaml = $2.strip
+    template = doc.sub($1, '')
+    
+    YAML.each_document(yaml) do |data|
+      puts Mustache.render(template, data)
+    end
   else
     puts doc
   end
@@ -30,5 +34,16 @@ The data.yml file should start with --- on a single line and end with
     ---
 
 The converted document will be printed on STDOUT.
+
+You can include multiple documents in your YAML frontmatter if you
+like. Then the template is evaluated once for each of them.
+
+    ---
+    name: chris
+    ---
+    name: mark
+    ---
+    name: scott
+    ---
 usage
 end

data/contrib/tpl-mode.el

@@ -74,7 +74,7 @@
   "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-tpl-token "[a-zA-Z_][a-zA-Z0-9_:=\?!-]*?")
 (defconst tpl-mode-section (concat "\\({{[#/]\s*"
                                    tpl-mode-tpl-token
                                    "\s*}}\\)"))
@@ -86,7 +86,7 @@
                                          "\s*\\)}}"))
 ;; TODO(tonyg) Figure out a way to support multiline comments.
 (defconst tpl-mode-comment "\\({{!.*?}}\\)")
-(defconst tpl-mode-include (concat "\\({{>\s*"
+(defconst tpl-mode-include (concat "\\({{[><]\s*"
                                    tpl-mode-tpl-token
                                    "\s*}}\\)"))
 (defconst tpl-mode-variable (concat "\\({{\s*"
@@ -240,7 +240,7 @@
    (list tpl-mode-comment
          '(1 font-lock-comment-face))
    (list tpl-mode-include
-         '(1 font-lock-builtin-face))
+         '(1 font-lock-function-name-face))
    (list tpl-mode-builtins
          '(1 font-lock-variable-name-face))
    (list tpl-mode-variable

data/examples/complex_view.rb

@@ -17,7 +17,7 @@ class ComplexView < Mustache
   end
 
   def link
-    not context[:current]
+    not self[:current]
   end
 
   def list

data/lib/mustache/context.rb

@@ -4,7 +4,7 @@ class Mustache
   # set to true.
   #
   # For example, if your View class does not respond to `music` but
-  # your template contains a `{{template}}` tag this exception will be raised.
+  # your template contains a `{{music}}` tag this exception will be raised.
   #
   # By default it is not raised. See Mustache.raise_on_context_miss.
   class ContextMiss < RuntimeError;  end

data/lib/mustache/sinatra.rb

@@ -92,7 +92,7 @@ class Mustache
 
     def self.registered(app)
       app.helpers Mustache::Sinatra::Helpers
-      app.set :mustaches, ::Sinatra::Base.views
+      app.set :mustaches, app.views
       app.set :namespace, app
     end
   end

data/lib/mustache/template.rb

@@ -106,7 +106,7 @@ class Mustache
     # 4. Partial tags - {{> partial_name }}
     def compile_tags(src)
       res = ""
-      while src =~ /#{otag}(#|=|!|<|>|\{)?(.+?)\1?#{ctag}+/
+      while src =~ /#{otag}(#|=|!|<|>|\{)?(.+?)\1?#{ctag}+/m
         res << str($`)
         case $1
         when '#'

data/lib/mustache/version.rb

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

data/test/mustache_test.rb

@@ -125,6 +125,12 @@ end_section
     assert_equal "<h1>A Comedy of Errors</h1>\n", Comments.render
   end
 
+  def test_multi_linecomments
+    view = Comments.new
+    view.template = "<h1>{{title}}{{! just something interesting... \n#or not... }}</h1>\n"
+    assert_equal "<h1>A Comedy of Errors</h1>\n", view.render
+  end
+
   def test_escaped
     assert_equal '<h1>Bear &gt; Shark</h1>', Escaped.render
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: mustache
 version: !ruby/object:Gem::Version 
-  version: 0.5.0
+  version: 0.5.1
 platform: ruby
 authors: 
 - Chris Wanstrath
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-23 00:00:00 -08:00
+date: 2009-12-15 00:00:00 -08:00
 default_executable: mustache
 dependencies: []