mote 1.1.2 → 1.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 26b0b54d5537850b18d7faa452776b6d079ac0da
-  data.tar.gz: 8da3ff5b57972c1b4189561b660bb01e49457784
+  metadata.gz: 97237b0155b66dfbd3b2d984f21d3785895f8bab
+  data.tar.gz: 51b922147551b06f5b3135e5f51e144c789f111f
 SHA512:
-  metadata.gz: b1110be61eedc588a5e1f3682c1dd6cf75c86655508d9adba51137e1936e86b69422a8a3f493546fdc19fb38ce22584dcd3be8b2d633e62dab6c6151681ad773
-  data.tar.gz: 03be6b8178add22491fefeb362b40c737f05d3248187eddd60e864180e40d92084f40cd3ce90330152c25feedadab8b6f8c435a6ea3a5d5c0c547871f9d683a1
+  metadata.gz: 6a034be6380e394e4732d001a2edeb32a70eb445048eac0509ce8505ab847adb4b6518256ea90cf31253f85cf8884ba6f50131d2ddc149b7a67e12902cce9901
+  data.tar.gz: 0b2ca78c4758fdac89db5fbe499e3627388c5d71b4cf6ea5d3ee5950f0742a053c493c52e280c3c2bc8c4c60a03e256f016cd731842e6370352e05c816214626

data/README.md

@@ -77,7 +77,7 @@ free to include it in your code. To do it, just type:
 include Mote::Helpers
 ```
 
-## mote
+### Using the mote helper
 
 The `mote` helper receives a file name and a hash and returns the rendered
 version of its content. The compiled template is cached for subsequent calls.
@@ -86,9 +86,54 @@ version of its content. The compiled template is cached for subsequent calls.
 assert_equal "***\n", mote("test/basic.mote", n: 3)
 ```
 
+### Template caching
+
+When the `mote` helper is first called with a template name, the
+file is read and parsed, and a proc is created and stored in the
+current thread. The parameters passed are defined as local
+variables in the template. If you want to provide more parameters
+once the template was cached, you won't be able to access the
+values as local variables, but you can always access the `params`
+hash.
+
+For example:
+
+```ruby
+# First call
+mote("foo.mote", a: 1, b: 2)
+```
+
+## Command line tool
+
+Mote ships with a command line tool to render mote templates. The
+result is redirected to standard output.
+
+```
+mote FILE [param1 value1 ... paramN valueN]
+```
+
+The extra parameters supplied will be passed to the template.
+Note that all the parameter values will be treated as strings.
+
+### Example usage
+
+If your template is called foo.mote, you can render it with the
+following command:
+
+	mote foo.mote
+
+To write the result to a new file, just redirect the output:
+
+	mote foo.mote > foo.html
+
+If the template uses a local variable `bar`, you can pass a
+value from the command line:
+
+	mote foo.mote bar 42
+
 ## Installation
 
-As usual, you can install it using rubygems.
+You can install it using rubygems.
 
 ```
 $ gem install mote

data/lib/mote.rb

@@ -18,9 +18,9 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 class Mote
-  VERSION = "1.1.2"
+  VERSION = "1.1.3"
 
-  PATTERN = /^(\n+)|^\s*(%)\s*(.*?)\n|(<\?)\s+(.*?)\s+\?>|(\{\{)(.*?)\}\}/m
+  PATTERN = /^(\n)|^\s*(%)\s*(.*?)(?:\n|\Z)|(<\?)\s+(.*?)\s+\?>|(\{\{)(.*?)\}\}/m
 
   def self.parse(template, context = self, vars = [])
     terms = template.split(PATTERN)
@@ -50,9 +50,9 @@ class Mote
   end
 
   module Helpers
-    def mote(filename, params = {}, context = self)
-      mote_cache[filename] ||= Mote.parse(File.read(filename), context, params.keys)
-      mote_cache[filename][params]
+    def mote(file, params = {}, context = self)
+      mote_cache[file] ||= Mote.parse(File.read(file), context, params.keys)
+      mote_cache[file][params]
     end
 
     def mote_cache

data/test/mote_test.rb

@@ -16,6 +16,11 @@ scope do
     assert_equal "\n\n\n", example.call
   end
 
+  test "control flow without final newline" do
+    example = Mote.parse("\n% if true\n\n\n% else\n\n% end")
+    assert_equal "\n\n\n", example.call
+  end
+
   test "assignment" do
     example = Mote.parse("{{ \"***\" }}")
     assert_equal "***", example.call

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mote
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.1.3
 platform: ruby
 authors:
 - Michel Martens
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-15 00:00:00.000000000 Z
+date: 2014-10-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cutest
@@ -35,7 +35,6 @@ files:
 - LICENSE
 - AUTHORS
 - README.md
-- Rakefile
 - lib/mote.rb
 - mote.gemspec
 - test/mote_test.rb
@@ -59,7 +58,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
 summary: Minimum Operational Template.

data/Rakefile

@@ -1,6 +0,0 @@
-task :test do
-  require "cutest"
-  Cutest.run(Dir["test/*.rb"])
-end
-
-task :default => :test