mote 0.2.2 → 0.2.3

data/README.md

@@ -13,18 +13,21 @@ Usage
 
 Usage is very similar to that of ERB:
 
-    template = Mote.parse("This is a template")
-    template.call #=> "This is a template"
+```ruby
+template = Mote.parse("This is a template")
+template.call #=> "This is a template"
+```
 
 Silly example, you may say, and I would agree. What follows is a short list of
 the different use cases you may face:
 
-
-    % if user == "Bruno"
-      {{user}} rhymes with Piano
-    % elsif user == "Brutus"
-      {{user}} rhymes with Opus
-    % end
+```
+% if user == "Bruno"
+  {{user}} rhymes with Piano
+% elsif user == "Brutus"
+  {{user}} rhymes with Opus
+% end
+```
 
 ## Control flow
 
@@ -38,40 +41,53 @@ Whatever it is between `{{` and `}}` gets printed in the template.
 
 There's nothing special about comments, it's just a `#` inside your Ruby code:
 
-    % # This is a comment.
+```
+% # This is a comment.
+```
 
 
 ## Block evaluation
 
 As with control instructions, it happens naturally:
 
-    % 3.times do |i|
-      {{i}}
-    % end
+```
+% 3.times do |i|
+  {{i}}
+% end
+```
 
 ## Parameters
 
 The values passed to the template are available as local variables:
 
-    example = Mote.parse("Hello {{name}}")
-    assert_equal "Hello world", example.call(name: "world")
-    assert_equal "Hello Bruno", example.call(name: "Bruno")
+```ruby
+example = Mote.parse("Hello {{name}}")
+assert_equal "Hello world", example.call(name: "world")
+assert_equal "Hello Bruno", example.call(name: "Bruno")
+```
 
 # Helpers
 
 There's a helper available in the `Mote::Helpers` module, and you are
 free to include it in your code. To do it, just type:
 
-    include Mote::Helpers
+```ruby
+include Mote::Helpers
+```
 
 ## mote
 
 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.
 
-    assert_equal "***\n", mote("test/basic.mote", n: 3)
+```ruby
+assert_equal "***\n", mote("test/basic.mote", n: 3)
+```
+
+## Installation
 
-Installation
-------------
+As usual, you can install it using rubygems.
 
-    $ gem install mote
+```
+$ gem install mote
+```

data/lib/mote.rb

@@ -18,10 +18,12 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 class Mote
-  VERSION = "0.2.2"
+  VERSION = "0.2.3"
+
+  PATTERN = /^\s*(%)(.*?)$|(<\?)\s+(.*?)\s+\?>|(\{\{)(.*?)\}\}/m
 
   def self.parse(template, context = self, vars = [])
-    terms = template.split(/^\s*(%)(.*?)$|(\{\{)(.*?)\}\}/)
+    terms = template.split(PATTERN)
 
     parts = "Proc.new do |params, __o|\n params ||= {}; __o ||= ''\n"
 
@@ -31,6 +33,7 @@ class Mote
 
     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"

data/test/mote_test.rb

@@ -82,6 +82,29 @@ scope 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
+    ?>
+    {{ res }}
+    EOT
+
+    example = Mote.parse(template)
+    assert_equal "\n1. 1\n2. 4\n3. 9\n\n", example.call
+  end
+
+  test "preserve XML directives" do
+    template = (<<-EOT).gsub(/^    /, "")
+    <?xml "hello" ?>
+    EOT
+
+    example = Mote.parse(template)
+    assert_equal "<?xml \"hello\" ?>\n", example.call
+  end
 end
 
 include Mote::Helpers

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mote
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-23 00:00:00.000000000 Z
+date: 2012-04-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cutest
-  requirement: &2156055280 !ruby/object:Gem::Requirement
+  requirement: &2152129460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,7 +21,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2156055280
+  version_requirements: *2152129460
 description: Mote is a very simple and fast template engine.
 email:
 - michel@soveran.com
@@ -59,7 +59,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: Minimum Operational Template.