markus 4.0.14 → 4.0.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0c4195f13580dbc60fd7da3af19ec43c6008425a
-  data.tar.gz: 20baed2a2e1958a126d2370dc582460548d01d70
+  metadata.gz: 43483dab17abf88bbfea4c2bb2df649de3fb0bb2
+  data.tar.gz: b80d758fffbe7baa08ee39f8e2189155b2990bff
 SHA512:
-  metadata.gz: e220d88ec4b45ff368df761194dfcc5c4d7d0d1472cae1e0ca7dbf051533c44e930f01a8d5e0d4e66b609d85c500162b93475f693fa234b64619f990d3d3cd29
-  data.tar.gz: cecdf63a2a8e6416f25b0e7ef2ef9de9ab9786f939c62aba77f67b568f0c5e0736d20a9a3299f20628f9161dcfd37b0be88444b48067b9a1084f2af5a98920a7
+  metadata.gz: 100bdfbec50cf4e401a97cd7ba1722cdb842be3d08a712d0fd0987e254d6ff63e0c0c1c600796e6533bde336002ca963fd64c4bbd7d5d8a2d7894a288f9bc241
+  data.tar.gz: 357465f48812642cf15aa29daf82c2c96915e54ead942f109f825bd4a3d98069a6b3e30b0a0211b7247ea579fb575df96b6578ea4e0f46178047f02d9d4168e8

data/lib/markus.rb

@@ -17,6 +17,8 @@
 # Markup UnderScore
 # ----   -    -
 
+require 'escape_utils'
+
 class MarkUS
   class << self
     attr_accessor :__markus_reload
@@ -118,7 +120,7 @@ class MarkUS
             value.nil? ? nil : "#{key}=\"#{value.to_s.gsub(/"/,"&#34;")}\""
           }.compact.join(" ")
         when String
-          content = a.gsub(/\&(?!amp;|quot;|apos;|gt;|lt;)/,"&amp;").gsub(/\"/,"&quot;").gsub(/>/,"&gt;").gsub(/</,"&lt;").gsub(/'/,"&apos;")
+          content = EscapeUtils.escape_html(a)
         when Integer
           content = a
       end

data/markus.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name             = "markus"
-  s.version          = "4.0.14"
+  s.version          = "4.0.15"
   s.platform         = Gem::Platform::RUBY
   s.license          = "LGPL-3"
   s.summary          = "MarkUS - Markup UnderScore. Quick n' dirty templating in the spirit of markaby."
@@ -19,4 +19,5 @@ Gem::Specification.new do |s|
   s.homepage         = 'https://github.com/etm/markus.rb'
 
   s.add_runtime_dependency 'minitest',  '~> 5.8'
+  s.add_runtime_dependency 'escape_utils',  '~> 1.2'
 end

data/test/change.mt_

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

data/test/change_include_common.mt_

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: markus
 version: !ruby/object:Gem::Version
-  version: 4.0.14
+  version: 4.0.15
 platform: ruby
 authors:
 - Juergen eTM Mangler
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-15 00:00:00.000000000 Z
+date: 2016-02-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -24,6 +24,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '5.8'
+- !ruby/object:Gem::Dependency
+  name: escape_utils
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.2'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.2'
 description: MarkUS - Markup UnderScore. Quick n' dirty templating in the spirit of
   markaby.
 email: juergen.mangler@gmail.com