markus 4.0.15 → 4.0.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 43483dab17abf88bbfea4c2bb2df649de3fb0bb2
-  data.tar.gz: b80d758fffbe7baa08ee39f8e2189155b2990bff
+  metadata.gz: 7f0ffc073e5244986b80b5ea4387179a4f6c45a7
+  data.tar.gz: dea294a898cd66808c01d51aaa2117ce8ba7469f
 SHA512:
-  metadata.gz: 100bdfbec50cf4e401a97cd7ba1722cdb842be3d08a712d0fd0987e254d6ff63e0c0c1c600796e6533bde336002ca963fd64c4bbd7d5d8a2d7894a288f9bc241
-  data.tar.gz: 357465f48812642cf15aa29daf82c2c96915e54ead942f109f825bd4a3d98069a6b3e30b0a0211b7247ea579fb575df96b6578ea4e0f46178047f02d9d4168e8
+  metadata.gz: c34f01d5632b892fd3bd60ab731249d23126f8596c316c1b99d0940e111e856b4ed395cb93fe709b0fa7008bd371762046bbf537fa22ed1e9596a563dc607b03
+  data.tar.gz: a9c0e966baaf7954e11f1bdfd4d9de6849db78beb5ed9cc6d7ebb32de8c44638ad1ce1151299e3aa5d2ebac2f71627b01855cbf1970db3473d6ac9488de33b1a

data/README.md

@@ -2,17 +2,23 @@
 
 Copyright (C) 2004-2016 Jürgen "eTM" Mangler <juergen.mangler@gmail.com>
 
-MarkUS is freely distributable according to the terms of the
-GNU Lesser General Public License 3.0 (see the file 'COPYING').
+MarkUS is freely distributable according to the terms of the GNU Lesser General
+Public License 3.0 (see the file 'COPYING').
 
-This code is distributed without any warranty. See the file
-'COPYING' for details.
+This code is distributed without any warranty. See the file 'COPYING' for
+details.
 
 ## Introduction
 
-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.
+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. 
+
+## Possible Applications
+
+It can be used for better handling of big elasticsearch querys (json), for
+creating html documents, or for stuff that ought to return json, xml, or
+switchable json<=>xml.
 
 ## Usage - Jump Start
 
@@ -75,9 +81,8 @@ main.rb:
   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
 
@@ -116,21 +121,24 @@ end
 ```
 
 Why the f**k would i use a template library for JSON when i can just create a
-big hash or array and create a json out of it? If you ever find yourself feeling bad or
-lost with your big hashes, try this out. Maybe you like it, maybe not. Who
-knows.
+big hash or array and create a json out of it? If you ever find yourself
+feeling bad or lost with your big hashes, try this out. Maybe you like it,
+maybe not. Who knows.
 
 ## Installation
 
 * You need a least ruby 1.9.2
+* gem install markus.rb
 
 ## Further Reading
 
-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.
+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

@@ -96,6 +96,10 @@ class MarkUS
     instance_exec *args, &self.class.__markus_templates[name]
   end #}}}
 
+  def __markus_indent(lvl=0) #{{{
+    self.class.__markus_indent ? "#{"  " * (@__markus_level + lvl)}" : ""
+  end #}}}
+
   def method_missing(name,*args, &blk) #{{{ # :nodoc:
     if name.to_s =~ /(.*)(__)$/ || name.to_s =~ /(.*)(_)$/
       __markus_method_missing $1, *args, &blk
@@ -104,10 +108,11 @@ class MarkUS
     end
   end #}}}
   def __markus_method_missing(name,*args, &blk) #{{{ # :nodoc:
-    if @__markus_mode == :json
-      __markus_json name, *args, &blk
-    else
-      __markus_xml name, *args, &blk
+    case @__markus_mode
+      when :json
+        __markus_json name, *args, &blk
+      else
+        __markus_xml name, *args, &blk
     end
   end #}}}
   def __markus_xml(tname,*args) #{{{ # :nodoc:
@@ -119,54 +124,31 @@ class MarkUS
           attrs << " " + a.collect { |key,value|
             value.nil? ? nil : "#{key}=\"#{value.to_s.gsub(/"/,"&#34;")}\""
           }.compact.join(" ")
+          attrs = '' if attrs == ' '
         when String
           content = EscapeUtils.escape_html(a)
         when Integer
           content = a
       end
     end
-    attrs = '' if attrs == ' '
+    @__markus_level += 1
     if block_given?
-      @__markus_level += 1
-      if self.class.__markus_indent
-        @__markus_buffer << "#{"  " * @__markus_level}<#{tname}#{attrs}>"
-      else
-        @__markus_buffer << "<#{tname}#{attrs}>"
-      end
-      unless content.nil?
-        if self.class.__markus_indent
-          @__markus_buffer << "#{"  " * (@__markus_level+1)}#{content}"
-        else
-          @__markus_buffer << "#{content}"
-        end
-      end
+      @__markus_buffer << __markus_indent + "<#{tname}#{attrs}>"
+      @__markus_buffer << __markus_indent(1) + "#{content}" unless content.nil?
       res = yield
       @__markus_buffer << res if String === res
-      if self.class.__markus_indent
-        @__markus_buffer << "#{"  " * @__markus_level}</#{tname}>"
-      else
-        @__markus_buffer << "</#{tname}>"
-      end
-      @__markus_level -= 1
+      @__markus_buffer << __markus_indent + "</#{tname}>"
     else
       if @__markus_mode == :xml && content.nil?
-        if self.class.__markus_indent
-          @__markus_buffer << "#{"  " * (@__markus_level+1)}<#{tname}#{attrs}/>"
-        else
-          @__markus_buffer << "<#{tname}#{attrs}/>"
-        end
+        @__markus_buffer << __markus_indent + "<#{tname}#{attrs}/>"
       else
-        if self.class.__markus_indent
-          @__markus_buffer << "#{"  " * (@__markus_level+1)}<#{tname}#{attrs}>#{content}</#{tname}>"
-        else
-          @__markus_buffer << "<#{tname}#{attrs}>#{content}</#{tname}>"
-        end
+        @__markus_buffer << __markus_indent + "<#{tname}#{attrs}>#{content}</#{tname}>"
       end
     end
+    @__markus_level -= 1
   end #}}}
   def __markus_json(tname,*args,&blk) #{{{ # :nodoc:
-    attrs = nil
-    content = "null"
+    attrs = content = nil
     args.each do |a|
       case a
         when Array
@@ -197,75 +179,55 @@ class MarkUS
           content = "\"#{a.to_s}\""
       end
     end
-    if blk
-      @__markus_level += 1
-      mpsic = @__markus_parent
-      if mpsic == :a && !tname.nil?
-        @__markus_parent = nil
-        if self.class.__markus_indent
-          @__markus_buffer << "#{"  " * @__markus_level}{"
-        else
-          @__markus_buffer << "{"
-        end
-        __markus_json tname, *args, &blk
-        @__markus_buffer.last.chomp!(',')
-        if self.class.__markus_indent
-          @__markus_buffer << "#{"  " * @__markus_level}},"
-        else
-          @__markus_buffer << "},"
-        end
-      else
-        @__markus_parent = type = blk.parameters.length == 1 && blk.parameters[0][1] == :array ? :a : :h
-        if self.class.__markus_indent
-          @__markus_buffer << "#{"  " * @__markus_level}#{tname.nil? ? '' : "\"#{tname}\": "}#{type == :a ? '[' : '{'}"
-        else
-          @__markus_buffer << "#{tname.nil? ? '' : "\"#{tname}\": "}#{type == :a ? '[' : '{'}"
-        end
 
-        c1 = @__markus_buffer.length
-        res = blk.call
-        c2 = @__markus_buffer.length
-        if c1 == c2
-          @__markus_buffer.last << "#{type == :a ? ']' : '}'},"
-        else
-          @__markus_buffer << res + ',' if type == :a && res.is_a?(String)
+    @__markus_level += 1
+    mpsic = @__markus_parent
+
+    if mpsic == :a
+      @__markus_buffer << __markus_indent + "{"
+    end  
+
+    if [content, attrs, blk].compact.length > 1
+      @__markus_parent = nil
+
+      @__markus_buffer << __markus_indent + "\"#{tname}\": {"
+      __markus_json "attributes", attrs if attrs
+      __markus_json "value", content if content
+      __markus_json "content", &blk if blk
+      @__markus_buffer.last.chomp!(',')
+      @__markus_buffer << __markus_indent + "},"
+    else
+      if blk
+        if mpsic == :a && !tname.nil?
+          @__markus_parent = nil
+          __markus_json tname, *args, &blk
           @__markus_buffer.last.chomp!(',')
-          if self.class.__markus_indent
-            @__markus_buffer << "#{"  " * @__markus_level}#{type == :a ? ']' : '}'},"
+        else
+          @__markus_parent = type = blk.parameters.length == 1 && blk.parameters[0][1] == :array ? :a : :h
+          @__markus_buffer << __markus_indent + "#{tname.nil? ? '' : "\"#{tname}\": "}#{type == :a ? '[' : '{'}"
+
+          c1 = @__markus_buffer.length
+          res = blk.call
+          c2 = @__markus_buffer.length
+          if c1 == c2
+            @__markus_buffer.last << "#{type == :a ? ']' : '}'},"
           else
-            @__markus_buffer << "#{type == :a ? ']' : '}'},"
+            @__markus_buffer << res + ',' if type == :a && res.is_a?(String)
+            @__markus_buffer.last.chomp!(',')
+            @__markus_buffer << __markus_indent + "#{type == :a ? ']' : '}'},"
           end
         end
-      end
-      @__markus_level -= 1
-      @__markus_parent = mpsic
-    else
-      if @__markus_parent == :a
-        @__markus_level += 1
-        if self.class.__markus_indent
-          @__markus_buffer << "#{"  " * @__markus_level}{"
-        else
-          @__markus_buffer << "{"
-        end
-        if self.class.__markus_indent
-          @__markus_buffer << "#{"  " * (@__markus_level+1)}\"#{tname}\": #{attrs || content}"
-        else
-          @__markus_buffer << "\"#{tname}\": #{attrs || content}"
-        end
-        if self.class.__markus_indent
-          @__markus_buffer << "#{"  " * @__markus_level}},"
-        else
-          @__markus_buffer << "},"
-        end
-        @__markus_level -= 1
-      else
-        if self.class.__markus_indent
-          @__markus_buffer << "#{"  " * (@__markus_level+1)}\"#{tname}\": #{attrs || content},"
-        else
-          @__markus_buffer << "\"#{tname}\": #{attrs || content},"
-        end
-      end
+      else  
+        @__markus_buffer << __markus_indent + "\"#{tname}\": #{attrs || content},"
+      end  
+    end
+
+    if mpsic == :a
+      @__markus_buffer << __markus_indent + "},"
     end
+
+    @__markus_level -= 1
+    @__markus_parent = mpsic
   end #}}}
 
   def self::inherited(subclass) #{{{ # :nodoc:

data/markus.gemspec

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

data/test/change.mt_

@@ -3,7 +3,7 @@ class TestJsonChange < MarkUS
 
   template :main do
     element_! do
-      query_ 75
+      query_ 76
     end  
   end
 end

data/test/change_include_common.mt_

@@ -2,6 +2,6 @@ class ChangeIncludeCommon < MarkUS
   reload
 
   template :test do
-    query_ 117
+    query_ 118
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: markus
 version: !ruby/object:Gem::Version
-  version: 4.0.15
+  version: 4.0.16
 platform: ruby
 authors:
 - Juergen eTM Mangler
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-17 00:00:00.000000000 Z
+date: 2016-03-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest