markus 4.0.14 → 4.0.15

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (6) hide show
  1. checksums.yaml +4 -4
  2. data/lib/markus.rb +3 -1
  3. data/markus.gemspec +2 -1
  4. data/test/change.mt_ +1 -1
  5. data/test/change_include_common.mt_ +1 -1
  6. metadata +16 -2
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 0c4195f13580dbc60fd7da3af19ec43c6008425a
4
- data.tar.gz: 20baed2a2e1958a126d2370dc582460548d01d70
3
+ metadata.gz: 43483dab17abf88bbfea4c2bb2df649de3fb0bb2
4
+ data.tar.gz: b80d758fffbe7baa08ee39f8e2189155b2990bff
5
5
  SHA512:
6
- metadata.gz: e220d88ec4b45ff368df761194dfcc5c4d7d0d1472cae1e0ca7dbf051533c44e930f01a8d5e0d4e66b609d85c500162b93475f693fa234b64619f990d3d3cd29
7
- data.tar.gz: cecdf63a2a8e6416f25b0e7ef2ef9de9ab9786f939c62aba77f67b568f0c5e0736d20a9a3299f20628f9161dcfd37b0be88444b48067b9a1084f2af5a98920a7
6
+ metadata.gz: 100bdfbec50cf4e401a97cd7ba1722cdb842be3d08a712d0fd0987e254d6ff63e0c0c1c600796e6533bde336002ca963fd64c4bbd7d5d8a2d7894a288f9bc241
7
+ data.tar.gz: 357465f48812642cf15aa29daf82c2c96915e54ead942f109f825bd4a3d98069a6b3e30b0a0211b7247ea579fb575df96b6578ea4e0f46178047f02d9d4168e8
data/lib/markus.rb CHANGED
@@ -17,6 +17,8 @@
17
17
  # Markup UnderScore
18
18
  # ---- - -
19
19
 
20
+ require 'escape_utils'
21
+
20
22
  class MarkUS
21
23
  class << self
22
24
  attr_accessor :__markus_reload
@@ -118,7 +120,7 @@ class MarkUS
118
120
  value.nil? ? nil : "#{key}=\"#{value.to_s.gsub(/"/,"&#34;")}\""
119
121
  }.compact.join(" ")
120
122
  when String
121
- content = a.gsub(/\&(?!amp;|quot;|apos;|gt;|lt;)/,"&amp;").gsub(/\"/,"&quot;").gsub(/>/,"&gt;").gsub(/</,"&lt;").gsub(/'/,"&apos;")
123
+ content = EscapeUtils.escape_html(a)
122
124
  when Integer
123
125
  content = a
124
126
  end
data/markus.gemspec CHANGED
@@ -1,6 +1,6 @@
1
1
  Gem::Specification.new do |s|
2
2
  s.name = "markus"
3
- s.version = "4.0.14"
3
+ s.version = "4.0.15"
4
4
  s.platform = Gem::Platform::RUBY
5
5
  s.license = "LGPL-3"
6
6
  s.summary = "MarkUS - Markup UnderScore. Quick n' dirty templating in the spirit of markaby."
@@ -19,4 +19,5 @@ Gem::Specification.new do |s|
19
19
  s.homepage = 'https://github.com/etm/markus.rb'
20
20
 
21
21
  s.add_runtime_dependency 'minitest', '~> 5.8'
22
+ s.add_runtime_dependency 'escape_utils', '~> 1.2'
22
23
  end
data/test/change.mt_ CHANGED
@@ -3,7 +3,7 @@ class TestJsonChange < MarkUS
3
3
 
4
4
  template :main do
5
5
  element_! do
6
- query_ 73
6
+ query_ 75
7
7
  end
8
8
  end
9
9
  end
data/test/change_include_common.mt_ CHANGED
@@ -2,6 +2,6 @@ class ChangeIncludeCommon < MarkUS
2
2
  reload
3
3
 
4
4
  template :test do
5
- query_ 115
5
+ query_ 117
6
6
  end
7
7
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: markus
3
3
  version: !ruby/object:Gem::Version
4
- version: 4.0.14
4
+ version: 4.0.15
5
5
  platform: ruby
6
6
  authors:
7
7
  - Juergen eTM Mangler
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2016-02-15 00:00:00.000000000 Z
11
+ date: 2016-02-17 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: minitest
@@ -24,6 +24,20 @@ dependencies:
24
24
  - - "~>"
25
25
  - !ruby/object:Gem::Version
26
26
  version: '5.8'
27
+ - !ruby/object:Gem::Dependency
28
+ name: escape_utils
29
+ requirement: !ruby/object:Gem::Requirement
30
+ requirements:
31
+ - - "~>"
32
+ - !ruby/object:Gem::Version
33
+ version: '1.2'
34
+ type: :runtime
35
+ prerelease: false
36
+ version_requirements: !ruby/object:Gem::Requirement
37
+ requirements:
38
+ - - "~>"
39
+ - !ruby/object:Gem::Version
40
+ version: '1.2'
27
41
  description: MarkUS - Markup UnderScore. Quick n' dirty templating in the spirit of
28
42
  markaby.
29
43
  email: juergen.mangler@gmail.com