markus 4.0.5 → 4.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5b9f7311225a8dfb0eef7755ecb5e2f85592320d
-  data.tar.gz: fd5a692cefe8acc1fa1ec8ba2e62241966d52d92
+  metadata.gz: 5d48cbb12a240bc989879271a8497265c3223cec
+  data.tar.gz: 352bcd5138109702e4a7868823fa61c8306b1892
 SHA512:
-  metadata.gz: 64d0b9064af360ae718ac2dc237232735a46c237f153eb2fc9ee65e57a8f69228964833a843dd1ca76bdc56c3b6a11b659e612133e3aae0316c829a092cae256
-  data.tar.gz: 9b406d8de67b3533b0f25ee34255f64577b785fae3365aac179ae3c72d7af0254bbdbdb362382426bec196f3d98647c64217a7b0ae0aa44947ca61770145033b
+  metadata.gz: 72a6ea71891f5a72908cfbaab751ca7d27352565ea0c684d0d662128052bd5a187faae2a67b1e4cfb64830152b9368939bed9ee3b27387ed331bccd5a88fa6aa
+  data.tar.gz: f59e224c2bdac2839a5229e605b42816ed7eeb03701194cb5dfc240599f2a4cd070f75831a5d839dd0862b5c77a4ac4da2634ee1637f40430679937bf7b61827

data/README.md

@@ -10,7 +10,7 @@ This code is distributed without any warranty. See the file
 
 ## Introduction
 
-All template libraries suck. But sometimes they are useful, for 
+All template libraries suck. But sometimes they are useful, for
 quick n' dirty building of documents. This template library will of course suck
 as well. It is inspired by _why's markaby. It supports JSON and XML.
 
@@ -18,38 +18,44 @@ as well. It is inspired by _why's markaby. It supports JSON and XML.
 
 Its fairly simple:
 
-1. Create classes that inherit from MarkUS, and add templates with a name to them (see below). 
-2. In the templates use arbitrary code, mixed with functions that have an _ at the end. 
+1. Create classes that inherit from MarkUS, and add templates with a name to them (see below).
+2. In the templates use arbitrary code, mixed with functions that have an _ at the end.
 3. Everything with an _ at the end is added to the result buffer
   - If the first parameter is a String or Integer it will be used as content of the element
   - If any parameter is a Hash it will be used as attributes in XML, or you-know-what in JSON
   - If any parameter is an Array it will be used as you-know-what in JSON
   - If it has a block, a nested data structure is implied (see template examples below)
-  - JSON only: by default a Hash is assumed, if you pass a paramter ```array```, e.g. ```value_ do |array| ... end```, the result is ```"value": [ ... ]```
-  - ```#template_!``` is a special method to include other templates
-  - ```#element_!``` allows you to include stuff in your result that is not a valid ruby function name (e.g. with a dot in the name - see below)
-4. Get the result by instantiating the class and calling one of ```#json_!```, ```#xml_!```, ```#html_!```
-  - ```#xml_!``` and ```#html_!``` differ in the way elements with no content are printed. XML uses short-handed tags, HTML doesn't.
+  - JSON only: by default a Hash is assumed, if you pass a paramter `array`, e.g. `value_ do |array| ... end`, the result is `"value": [ ... ]`
+  - `#template_!` is a special method to include other templates
+  - `#element_!` allows you to include stuff in your result that is not a valid ruby function name (e.g. with a dot in the name - see below)
+4. Get the result by instantiating the class and calling one of `#json_!`, `#xml_!`, `#html_!`
+  - `#xml_!` and `#html_!` differ in the way elements with no content are printed. XML uses short-handed tags, HTML doesn't.
+
+`#json_!`, `#xml_!` and `#html_!` need the name of the template as
+the first parameter, optional you can pass a hash. All pairs in the hash are
+available as instance variables. Of course you can also handle it yourself through a
+constructor in the template class.
 
 ## Usage - Example
 
 template1.rb:
-```
+```ruby
 class Common < MarkUS
   template :test1 do
-    query_ [2, 3, "world"]
+    query1_ [2, 3, @w]
   end
   template :test2 do
-    query_ :a => 2, :b => "hello"
+    query2_ :a => 2, :b => @h
   end
 end
 ```
 
 template2.rb:
-```
+```ruby
 require File.expand_path(File.dirname(__FILE__) + '/template1')
+
 class Something < MarkUS
-  templates Common                                                                                                                                                                                                                                                   
+  templates Common
 
   indent
 
@@ -61,17 +67,21 @@ end
 ```
 
 main.rb:
-```
+```ruby
+  require 'markus'
   require File.expand_path(File.dirname(__FILE__) + '/template2')
   s = Something.new
-  result = s.json_! :main
+  result = s.json_! :main, :h => 'hello', :w => 'world'
+  puts result
 ```
 
-If you add ```reload``` to any of the template classes, they will be reloaded if they change (if templates are use in a long-running service).
+If you add `reload` to any of the template classes, they will be reloaded if they change (if templates are use in a long-running service).
+
+
 
 ## HTML Example Template
 
-```
+```ruby
 html_ do
   body_ :class => 'test' do
     a_ 'Ruby', :href => 'https://ruby-lang.org'
@@ -84,7 +94,7 @@ end
 
 ## JSON Example Template
 
-```
+```ruby
 query_ do
   filtered_ do
     filter_ do
@@ -118,7 +128,7 @@ knows.
 
 View the example in the ./examples subdirectory. View the tests in the ./test subdirectory. From there you should be able to figure it out yourself. Tip: neat combinations with heredocs are possible, e.g. to create script tags in html.
 
-```
+```ruby
   script_ <<~end
     var foo = "bar";
   end

data/lib/markus.rb

@@ -64,7 +64,7 @@ class MarkUS
     @__markus_mode = type
 
     template_!(name)
-    @__markus_buffer.last.chop! if @__markus_mode == :json
+    @__markus_buffer.last.chomp!(',') if @__markus_mode == :json
     self.class.__markus_indent ? @__markus_buffer.join("\n") : @__markus_buffer.join
   end
  #}}}
@@ -156,7 +156,7 @@ class MarkUS
                 value.nil? ? nil : "\"#{value.to_s.gsub(/"/,'\\\"')}\""
             end
           }.compact.join(", ").strip + " ]"
-          attrs = nil if attrs == "[  ]"
+          attrs = '[]' if attrs == "[  ]"
         when Hash
           attrs = "{ " + a.collect { |key,value|
             case value
@@ -166,7 +166,7 @@ class MarkUS
                 value.nil? ? nil : "\"#{key}\": \"#{value.to_s.gsub(/"/,'\\\"')}\""
             end
           }.compact.join(", ").strip + " }"
-          attrs = nil if attrs == "{  }"
+          attrs = '{}' if attrs == "{  }"
         when String
           content = "\"#{a.gsub(/"/,'\\\"')}\""
         when Integer, Float
@@ -186,7 +186,7 @@ class MarkUS
           @__markus_buffer << "{"
         end
         __markus_json tname, *args, &blk
-        @__markus_buffer.last.chop!
+        @__markus_buffer.last.chomp!(',')
         if self.class.__markus_indent
           @__markus_buffer << "#{"  " * @__markus_level}},"
         else  
@@ -199,13 +199,20 @@ class MarkUS
         else  
           @__markus_buffer << "#{tname.nil? ? '' : "\"#{tname}\": "}#{type == :a ? '[' : '{'}"
         end
+
+        c1 = @__markus_buffer.length
         res = blk.call
-        @__markus_buffer << res + ',' if type == :a && res.is_a?(String)
-        @__markus_buffer.last.chop!
-        if self.class.__markus_indent
-          @__markus_buffer << "#{"  " * @__markus_level}#{type == :a ? ']' : '}'},"
-        else
-          @__markus_buffer << "#{type == :a ? ']' : '}'},"
+        c2 = @__markus_buffer.length
+        if c1 == c2 
+          @__markus_buffer.last << "#{type == :a ? ']' : '}'},"
+        else  
+          @__markus_buffer << res + ',' if type == :a && res.is_a?(String)
+          @__markus_buffer.last.chomp!(',')
+          if self.class.__markus_indent
+            @__markus_buffer << "#{"  " * @__markus_level}#{type == :a ? ']' : '}'},"
+          else
+            @__markus_buffer << "#{type == :a ? ']' : '}'},"
+          end  
         end  
       end
       @__markus_level -= 1

data/markus.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name             = "markus"
-  s.version          = "4.0.5"
+  s.version          = "4.0.6"
   s.platform         = Gem::Platform::RUBY
   s.license          = "LGPL-3"
   s.summary          = "MarkUS - Markup UnderScore. Quick n' dirty templating in the spirit of markaby."

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: markus
 version: !ruby/object:Gem::Version
-  version: 4.0.5
+  version: 4.0.6
 platform: ruby
 authors:
 - Juergen eTM Mangler
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-09 00:00:00.000000000 Z
+date: 2016-01-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest