mote 1.1.2 → 1.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 26b0b54d5537850b18d7faa452776b6d079ac0da
-  data.tar.gz: 8da3ff5b57972c1b4189561b660bb01e49457784
+SHA256:
+  metadata.gz: 505a571d37072d62d6a1de88ef80388861411beb832dee8a959a0aaf44250b3c
+  data.tar.gz: e71a2d24a0f66ad9d12e006114b0c3ab8c2e2d0f08c945e76042aa6bd1ab3505
 SHA512:
-  metadata.gz: b1110be61eedc588a5e1f3682c1dd6cf75c86655508d9adba51137e1936e86b69422a8a3f493546fdc19fb38ce22584dcd3be8b2d633e62dab6c6151681ad773
-  data.tar.gz: 03be6b8178add22491fefeb362b40c737f05d3248187eddd60e864180e40d92084f40cd3ce90330152c25feedadab8b6f8c435a6ea3a5d5c0c547871f9d683a1
+  metadata.gz: 41df91b9f277c509c6b5d438ac7039f07e5265889e58e8235d8d630bd4db7c263e2a9406776b691b86e0310736da1c3b91cff1d84d0b3cad86723844748d81b7
+  data.tar.gz: 1587c00e41e9bfeaf5a180b8297e3fb1f84e097c0c2d432fa2b2f86e7e7b4da921ab3919ced687d954733bcfaad5a6c028ea12000f52453ef9db0d4f8e721f89

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2011, 2012 Michel Martens
+Copyright (c) 2011 Michel Martens
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/README.md

@@ -22,16 +22,26 @@ Silly example, you may say, and I would agree. What follows is a short list of
 the different use cases you may face:
 
 ```
+% # This is a comment
 % if user == "Bruno"
   {{user}} rhymes with Piano
 % elsif user == "Brutus"
   {{user}} rhymes with Opus
 % end
+
+<?
+  # Multiline code evaluation
+  lucky = [1, 3, 7, 9, 13, 15]
+  prime = [2, 3, 5, 7, 11, 13]
+?>
+
+{{ lucky & prime }}
 ```
 
 ## Control flow
 
-Lines that start with `%` are evaluated as Ruby code.
+Lines that start with `%` are evaluated as Ruby code. Anything between
+`<?` and `?>`, including new lines, is also evaluated as Ruby code.
 
 ## Assignment
 
@@ -45,7 +55,6 @@ There's nothing special about comments, it's just a `#` inside your Ruby code:
 % # This is a comment.
 ```
 
-
 ## Block evaluation
 
 As with control instructions, it happens naturally:
@@ -77,7 +86,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 +95,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

@@ -1,4 +1,4 @@
-# Copyright (c) 2011, 2012 Michel Martens
+# Copyright (c) 2011 Michel Martens
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
@@ -18,41 +18,47 @@
 # 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.3.1"
 
-  PATTERN = /^(\n+)|^\s*(%)\s*(.*?)\n|(<\?)\s+(.*?)\s+\?>|(\{\{)(.*?)\}\}/m
+  # The regex has three alternative blocks that capture the embedded
+  # Ruby code. The rest is left as is.
+  PATTERN = /
+    ^[^\S\n]*(%)[^\S\n]*(.*?)(?:\n|\Z) | # Ruby evaluated lines
+    (<\?)\s+(.*?)\s+\?>                | # Multiline Ruby blocks
+    (\{\{)(.*?)\}\}                      # Ruby evaluated to strings
+  /mx
 
-  def self.parse(template, context = self, vars = [])
+  def self.src(template, vars = [])
     terms = template.split(PATTERN)
 
-    parts = "Proc.new do |params, __o|\n params ||= {}; __o ||= ''\n"
+    code = "Proc.new do |params, __o| params ||= {}; __o ||= '';"
 
     vars.each do |var|
-      parts << "%s = params[%s]\n" % [var, var.inspect]
+      code << "%s = params[%p];" % [var, var]
     end
 
-    while term = terms.shift
+    while (term = terms.shift)
       case term
-      when "<?" then parts << "#{terms.shift}\n"
-      when "%"  then parts << "#{terms.shift}\n"
-      when "{{" then parts << "__o << (#{terms.shift}).to_s\n"
-      else           parts << "__o << #{term.dump}\n"
+      when "<?" then code << "#{terms.shift}\n"
+      when "%"  then code << "#{terms.shift}\n"
+      when "{{" then code << "__o << (#{terms.shift}).to_s\n"
+      else           code << "__o << #{term.dump}\n"
       end
     end
 
-    parts << "__o; end"
-
-    compile(context, parts)
+    code << "__o; end"
   end
 
-  def self.compile(context, parts)
-    context.instance_eval(parts)
+  def self.parse(_template, _context = self, _vars = [], _name = "template")
+    _context.instance_eval(src(_template, _vars), _name, -1)
   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)
+      template = File.read(file)
+
+      mote_cache[file] ||= Mote.parse(template, context, params.keys, file)
+      mote_cache[file][params]
     end
 
     def mote_cache

data/mote.gemspec

@@ -12,7 +12,6 @@ Gem::Specification.new do |s|
     "LICENSE",
     "AUTHORS",
     "README.md",
-    "Rakefile",
     "lib/**/*.rb",
     "*.gemspec",
     "test/**/*.rb"

data/test/mote_test.rb

@@ -16,8 +16,13 @@ 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("{{ \"***\" }}")
+    example = Mote.parse("{{ '***' }}")
     assert_equal "***", example.call
   end
 
@@ -70,7 +75,7 @@ scope do
 
   test "multiline" do
     example = Mote.parse("The\nMan\nAnd\n{{\"The\"}}\nSea")
-    assert_equal "The\nMan\nAnd\nThe\nSea", example[:n => 3]
+    assert_equal "The\nMan\nAnd\nThe\nSea", example.call
   end
 
   test "quotes" do
@@ -82,8 +87,16 @@ scope do
     context = Object.new
     def context.user; "Bruno"; end
 
-    example = Mote.parse("{{ context.user }}", context, [:context])
-    assert_equal "Bruno", example.call(context: context)
+    example = Mote.parse("{{ user }}", context)
+    assert_equal "Bruno", example.call
+  end
+  
+  test "context with name" do
+    context = Object.new
+    def context.name; "Sebas"; end
+    
+    example = Mote.parse("{{ self.name }}", context)
+    assert_equal "Sebas", example.call
   end
 
   test "locals" do
@@ -96,23 +109,19 @@ scope do
     assert_equal "", example.call(user: nil)
   end
 
-  test "curly bug" do
-    example = Mote.parse("{{ [1, 2, 3].map { |i| i * i }.join(',') }}")
-    assert_equal "1,4,9", example.call
-  end
-
   test "multi-line XML-style directives" do
     template = (<<-EOT).gsub(/^    /, "")
-    <? res = ""
-       [1, 2, 3].each_with_index do |item, idx|
-         res << "%d. %d\n" % [idx + 1, item * item]
-       end
+    <?
+      # Multiline code evaluation
+      lucky = [1, 3, 7, 9, 13, 15]
+      prime = [2, 3, 5, 7, 11, 13]
     ?>
-    {{ res }}
+
+    {{ lucky & prime }}
     EOT
 
     example = Mote.parse(template)
-    assert_equal "\n1. 1\n2. 4\n3. 9\n\n", example.call
+    assert_equal "\n\n[3, 7, 13]\n", example.call
   end
 
   test "preserve XML directives" do
@@ -138,6 +147,16 @@ scope do
     mote_cache.clear
   end
 
+  test "syntax errors" do
+    begin
+      mote("test/error.mote")
+    rescue SyntaxError => error
+    end
+
+    assert_equal SyntaxError, error.class
+    assert error.message["test/error.mote:4: syntax error"]
+  end
+
   test "helpers" do
     assert_equal "  *\n  *\n  *\n", mote("test/basic.mote", :n => 3)
   end

metadata

@@ -1,27 +1,27 @@
 --- !ruby/object:Gem::Specification
 name: mote
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.3.1
 platform: ruby
 authors:
 - Michel Martens
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-15 00:00:00.000000000 Z
+date: 2021-04-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cutest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Mote is a very simple and fast template engine.
@@ -32,14 +32,13 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- LICENSE
 - AUTHORS
+- LICENSE
 - README.md
-- Rakefile
+- bin/mote
 - lib/mote.rb
 - mote.gemspec
 - test/mote_test.rb
-- bin/mote
 homepage: http://github.com/soveran/mote
 licenses: []
 metadata: {}
@@ -49,17 +48,16 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 3.0.3
 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