markus 4.0.10 → 4.0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3aa1ee23e151e4b184b241a150ed7f3c1502414e
-  data.tar.gz: 7fe720eec420b2f1767bf02589730b511c04299b
+  metadata.gz: 61a7c81d7d3fa8cc762d85264060c00867f3ba14
+  data.tar.gz: b2aad643efe380b28666b614dc4eb25f0e8fe649
 SHA512:
-  metadata.gz: 88a1a1ac7b3649f158d00f9922af83401161e6b3c1a6312c4847ff636196d970d245b539b5264d21c91e4e98ac10e4612557fec7fa117ecf0f049a7b54af6cc4
-  data.tar.gz: 5784540a27ad2caffdfa296d2e6da97b0f4c476e0a25bc6283cf6d25757912f18c9b31b27403385cb14d1f9497b79e1c80d43f3faa04fbbf771750ca6120a74b
+  metadata.gz: 8a35d5910a5570c831f275e7e8d59ec42eded484b5efae6e8fe0ee160edf5fdf71b92e8c80a1d216b4f553d27f9e3b887dc812b71ad75e4bbc3384b851cd231d
+  data.tar.gz: 73b80f9b9be6f43e442aeda89cf06951b24af39d871212856638925492295ea6e4d0872efe546da90700e2f8282869b26aea2af35a09ebe46ec4acf6744ff6c5

data/lib/markus.rb

@@ -29,10 +29,10 @@ class MarkUS
 
   attr_reader :__markus_indent, :__markus_reload
   def __markus_indent=(value) #{{{
-    self.class.__markus_indent = value == true ? true : false 
+    self.class.__markus_indent = value == true ? true : false
   end #}}}
   def __markus_reload=(value) #{{{
-    self.class.__markus_reload = value == true ? true : false 
+    self.class.__markus_reload = value == true ? true : false
   end #}}}
 
   def json_!(name,params={}) #{{{
@@ -59,7 +59,7 @@ class MarkUS
     self.class.__markus_includes.each do |some|
       if some.__markus_do_reload
         self.class.__markus_templates.merge! some.__markus_templates
-      end  
+      end
     end
     @__markus_mode = type
 
@@ -68,7 +68,7 @@ class MarkUS
     self.class.__markus_indent ? @__markus_buffer.join("\n") : @__markus_buffer.join
   end
  #}}}
- 
+
   def element_!(name=nil, *args, &blk) #{{{
     __markus_method_missing name, *args, &blk
   end #}}}
@@ -81,7 +81,7 @@ class MarkUS
       __markus_method_missing $1, *args, &blk
     else
       super
-    end  
+    end
   end #}}}
   def __markus_method_missing(name,*args, &blk) #{{{ # :nodoc:
     if @__markus_mode == :json
@@ -99,18 +99,20 @@ class MarkUS
           attrs << " " + a.collect { |key,value|
             value.nil? ? nil : "#{key}=\"#{value.to_s.gsub(/"/,"&#34;")}\""
           }.compact.join(" ")
-        when String,Integer
+        when String
+          content = a.gsub(/\&(?!amp;|quot;|apos;|gt;|lt;)/,"&amp;").gsub(/\"/,"&quot;").gsub(/>/,"&gt;").gsub(/</,"&lt;").gsub(/'/,"&apos;")
+        when Integer
           content = a
-      end  
+      end
     end
     attrs = '' if attrs == ' '
     if block_given?
       @__markus_level += 1
       if self.class.__markus_indent
         @__markus_buffer << "#{"  " * @__markus_level}<#{tname}#{attrs}>"
-      else  
+      else
         @__markus_buffer << "<#{tname}#{attrs}>"
-      end  
+      end
       unless content.nil?
         if self.class.__markus_indent
           @__markus_buffer << "#{"  " * (@__markus_level+1)}#{content}"
@@ -124,7 +126,7 @@ class MarkUS
         @__markus_buffer << "#{"  " * @__markus_level}</#{tname}>"
       else
         @__markus_buffer << "</#{tname}>"
-      end  
+      end
       @__markus_level -= 1
     else
       if @__markus_mode == :xml && content.nil?
@@ -135,12 +137,12 @@ class MarkUS
         end
       else
         if self.class.__markus_indent
-          @__markus_buffer << "#{"  " * (@__markus_level+1)}<#{tname}#{attrs}>#{content}</#{tname}>" 
+          @__markus_buffer << "#{"  " * (@__markus_level+1)}<#{tname}#{attrs}>#{content}</#{tname}>"
         else
-          @__markus_buffer << "<#{tname}#{attrs}>#{content}</#{tname}>" 
+          @__markus_buffer << "<#{tname}#{attrs}>#{content}</#{tname}>"
         end
-      end  
-    end  
+      end
+    end
   end #}}}
   def __markus_json(tname,*args,&blk) #{{{ # :nodoc:
     attrs = nil
@@ -173,7 +175,7 @@ class MarkUS
           content = a
         else
           content = "\"#{a.to_s}\""
-      end  
+      end
     end
     if blk
       @__markus_level += 1
@@ -182,38 +184,38 @@ class MarkUS
         @__markus_parent = nil
         if self.class.__markus_indent
           @__markus_buffer << "#{"  " * @__markus_level}{"
-        else  
+        else
           @__markus_buffer << "{"
         end
         __markus_json tname, *args, &blk
         @__markus_buffer.last.chomp!(',')
         if self.class.__markus_indent
           @__markus_buffer << "#{"  " * @__markus_level}},"
-        else  
+        else
           @__markus_buffer << "},"
         end
-      else 
+      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  
+        else
           @__markus_buffer << "#{tname.nil? ? '' : "\"#{tname}\": "}#{type == :a ? '[' : '{'}"
         end
 
         c1 = @__markus_buffer.length
         res = blk.call
         c2 = @__markus_buffer.length
-        if c1 == c2 
+        if c1 == c2
           @__markus_buffer.last << "#{type == :a ? ']' : '}'},"
-        else  
+        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
+        end
       end
       @__markus_level -= 1
       @__markus_parent = mpsic
@@ -222,7 +224,7 @@ class MarkUS
         @__markus_level += 1
         if self.class.__markus_indent
           @__markus_buffer << "#{"  " * @__markus_level}{"
-        else  
+        else
           @__markus_buffer << "{"
         end
         if self.class.__markus_indent
@@ -232,18 +234,18 @@ class MarkUS
         end
         if self.class.__markus_indent
           @__markus_buffer << "#{"  " * @__markus_level}},"
-        else  
+        else
           @__markus_buffer << "},"
         end
         @__markus_level -= 1
-      else  
+      else
         if self.class.__markus_indent
-          @__markus_buffer << "#{"  " * (@__markus_level+1)}\"#{tname}\": #{attrs || content}," 
+          @__markus_buffer << "#{"  " * (@__markus_level+1)}\"#{tname}\": #{attrs || content},"
         else
-          @__markus_buffer << "\"#{tname}\": #{attrs || content}," 
+          @__markus_buffer << "\"#{tname}\": #{attrs || content},"
         end
-      end  
-    end  
+      end
+    end
   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.10"
+  s.version          = "4.0.11"
   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_ 62
+      query_ 63
     end  
   end
 end

data/test/change_include_common.mt_

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

metadata

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