mote 1.1.4 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0bf64ea0a8637abd44b6e4ffe5c8307849171e7d
-  data.tar.gz: df273253e96dca30b70aa34b0f5b02fe6be78a2b
+  metadata.gz: 530e8a86da4e1fcb06a1bebd2e953a4a6b5be56c
+  data.tar.gz: 18eed6501b852ae5bb4540980a5bfa6e8cc527f4
 SHA512:
-  metadata.gz: 28f751114df86a5345052b7fec958e3c08fcdeedd9bfb71a7278e2bc0eba77ca3c8aa3a2ca97ce946b80ce09442bed017c9f642cd9e42d22c9ba4d6e7d6a7ec5
-  data.tar.gz: d2d889b1f9d050089adb4c126e63ccaa1497ad9cf62b5e33dbdce893c091b7fc9ed4159f0a93ebfa0b3f42585039fc93caa93656bc6899a552fbe4f011b36135
+  metadata.gz: 9d9ebffd32633732750fe63bb190f7e2c81bf7438c8a7bf8bb975b21012b130bf40a20f027ae69c980aced146296b065912948deb563ccf2d14ea991f0fbc407
+  data.tar.gz: 63cae29cdfeae148549e82a531fef12bbc72b07c58562058046b5201e5a74af6c7b310001d19f1d525bd6c54428614792f998acc844cc1538867484ef51999a0

data/lib/mote.rb

@@ -18,40 +18,44 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 class Mote
-  VERSION = "1.1.4"
+  VERSION = "1.2.0"
 
-  PATTERN = /^[^\S\n]*(%)[^\S\n]*(.*?)(?:\n|\Z)|(<\?)\s+(.*?)\s+\?>|(\{\{)(.*?)\}\}/m
+  # The regex have 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.parse(template, context = self, vars = [], name = "template")
     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[%p]\n" % [var, var]
+      code << "%s = params[%p];" % [var, var]
     end
 
     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"
+    code << "__o; end"
 
-    compile(context, parts)
-  end
-
-  def self.compile(context, parts)
-    context.instance_eval(parts)
+    context.instance_eval(code, name, -1)
   end
 
   module Helpers
     def mote(file, params = {}, context = self)
-      mote_cache[file] ||= Mote.parse(File.read(file), context, params.keys)
+      template = File.read(file)
+
+      mote_cache[file] ||= Mote.parse(template, context, params.keys, file)
       mote_cache[file][params]
     end
 

data/test/mote_test.rb

@@ -139,6 +139,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.4
+  version: 1.2.0
 platform: ruby
 authors:
 - Michel Martens
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-15 00:00:00.000000000 Z
+date: 2017-02-23 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,13 +32,13 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- LICENSE
 - AUTHORS
+- LICENSE
 - README.md
+- bin/mote
 - lib/mote.rb
 - mote.gemspec
 - test/mote_test.rb
-- bin/mote
 homepage: http://github.com/soveran/mote
 licenses: []
 metadata: {}
@@ -48,17 +48,17 @@ 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.14
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Minimum Operational Template.