tagz 9.5.0 → 9.6.0

data/lib/tagz.rb

@@ -4,8 +4,10 @@ unless defined? Tagz
 # core tagz functions
 #
   module Tagz
+    require 'cgi'
+
     def Tagz.version()
-      '9.5.0'
+      '9.6.0'
     end
 
     def Tagz.description
@@ -421,14 +423,12 @@ unless defined? Tagz
 
         NoEscapeKeyProc = lambda{|*values| values.join}
         Tagz.singleton_class{ define_method(:no_escape_key_proc){ Tagz.namespace(:NoEscapeKeyProc) } }
-        #EscapeKeyProc = lambda{|*values| Tagz.xchar.escape(values.join).sub(/\Adata_/imox, 'data-') }
-        EscapeKeyProc = lambda{|*values| values.join.sub(/\Adata_/imox, 'data-') }
+        EscapeKeyProc = lambda{|*values| Tagz.escapeAttribute(values).sub(/\Adata_/imox, 'data-') }
         Tagz.singleton_class{ define_method(:escape_key_proc){ Tagz.namespace(:EscapeKeyProc) } }
 
         NoEscapeValueProc = lambda{|*values| values.join}
         Tagz.singleton_class{ define_method(:no_escape_value_proc){ Tagz.namespace(:NoEscapeValueProc) } }
-        #EscapeValueProc = lambda{|*values| Tagz.xchar.escape(values.join)}
-        EscapeValueProc = lambda{|*values| values.join}
+        EscapeValueProc = lambda{|*values| Tagz.escapeAttribute(values)}
         Tagz.singleton_class{ define_method(:escape_value_proc){ Tagz.namespace(:EscapeValueProc) } }
 
         module Globally; include Tagz; end
@@ -447,6 +447,9 @@ unless defined? Tagz
     def Tagz.escape(*strings)
       Tagz.xchar.escape(strings.join)
     end
+    def Tagz.escapeAttribute(*strings)
+      CGI.escapeHTML(strings.join)
+    end
 
   # raw utils
   #

data/tagz.gemspec

@@ -3,7 +3,7 @@
 
 Gem::Specification::new do |spec|
   spec.name = "tagz"
-  spec.version = "9.5.0"
+  spec.version = "9.6.0"
   spec.platform = Gem::Platform::RUBY
   spec.summary = "tagz"
   spec.description = "\n        tagz.rb is generates html, xml, or any sgml variant like a small ninja\n        running across the backs of a herd of giraffes swatting of heads like\n        a mark-up weedwacker.  weighing in at less than 300 lines of code\n        tagz.rb adds an html/xml/sgml syntax to ruby that is both unobtrusive,\n        safe, and available globally to objects without the need for any\n        builder or superfluous objects.  tagz.rb is designed for applications\n        that generate html to be able to do so easily in any context without\n        heavyweight syntax or scoping issues, like a ninja sword through\n        butter.\n\n"

data/test/tagz_test.rb

@@ -475,11 +475,11 @@ class TagzTest < Test::Unit::TestCase
   end
 
   def test_390
-    expected = '<div class="bar&foo>">foo&amp;bar&gt;</div>'
+    expected = '<div class="bar&amp;foo&gt;">foo&amp;bar&gt;</div>'
     actual = tagz{ div_(:class => 'bar&foo>'){ 'foo&bar>' } }
     assert_equal expected, actual
 
-    expected = %|<div class="bar&foo>">#{ expected }</div>|
+    expected = %|<div class="bar&amp;foo&gt;">#{ expected }</div>|
     actual = tagz{ div_(:class => 'bar&foo>'){ actual } }
     assert_equal expected, actual
   end
@@ -561,7 +561,7 @@ class TagzTest < Test::Unit::TestCase
 
     actual = nil
     assert_nothing_raised{ actual=c.a}
-    expected = %(<div a>b="a>b">content</div>)
+    expected = %(<div a&gt;b="a&gt;b">content</div>)
     assert_equal expected, actual
 
     Tagz.escape_keys!(false) do
@@ -723,4 +723,11 @@ class TagzTest < Test::Unit::TestCase
     }
     assert_equal expected, actual
   end
+
+
+  def test_550
+    assert_nothing_raised{
+      Tagz{ div_(:title => "foo' bar\""){ "foobar" } }
+    }
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tagz
 version: !ruby/object:Gem::Version
-  version: 9.5.0
+  version: 9.6.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-22 00:00:00.000000000 Z
+date: 2012-11-22 00:00:00.000000000 Z
 dependencies: []
 description: ! "\n        tagz.rb is generates html, xml, or any sgml variant like
   a small ninja\n        running across the backs of a herd of giraffes swatting of
@@ -58,7 +58,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: codeforpeople
-rubygems_version: 1.8.11
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: tagz