tagz 9.6.0 → 9.6.1

data/lib/tagz.rb

@@ -7,7 +7,7 @@ unless defined? Tagz
     require 'cgi'
 
     def Tagz.version()
-      '9.6.0'
+      '9.6.1'
     end
 
     def Tagz.description
@@ -207,6 +207,7 @@ unless defined? Tagz
           \A selected \Z |
           \A disabled \Z |
           \A readonly \Z |
+          \A autofocus \Z |
           \A multiple \Z |
           \A ismap    \Z |
           \A defer    \Z |
@@ -217,20 +218,23 @@ unless defined? Tagz
           \A compact  \Z 
         ]iomx
 
-        module HtmlSafe
+        class HtmlSafe < ::String
           def html_safe() @html_safe ||= true end
           def html_safe?() html_safe end
           def html_safe=(value) @html_safe = !!value end
         end
 
         def Tagz.html_safe(*args, &block)
+          if args.size == 1 and args.first.respond_to?(:html_safe?)
+            return args.first
+          end
+
           if args.empty? and block.nil?
             Tagz.namespace(:HtmlSafe)
           else
             string = args.join
             string += block.call.to_s if block
-            string.extend(HtmlSafe)
-            string
+            HtmlSafe.new(string)
           end
         end
 

data/tagz.gemspec

@@ -3,7 +3,7 @@
 
 Gem::Specification::new do |spec|
   spec.name = "tagz"
-  spec.version = "9.6.0"
+  spec.version = "9.6.1"
   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

@@ -730,4 +730,20 @@ class TagzTest < Test::Unit::TestCase
       Tagz{ div_(:title => "foo' bar\""){ "foobar" } }
     }
   end
+
+  def test_600
+    value = '&lt;&gt;'
+    html_safe = Tagz.html_safe(value)
+    assert_equal(value, html_safe)
+    assert_equal(false, value.respond_to?(:html_safe?))
+    assert_equal(false, value.respond_to?(:html_safe))
+    assert_equal(true, html_safe.respond_to?(:html_safe?))
+    assert_equal(true, html_safe.respond_to?(:html_safe))
+  end
+
+  def test_610
+    value = Tagz.html_safe.new('foobar')
+    html_safe = Tagz.html_safe(value)
+    assert_equal value.object_id, html_safe.object_id
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tagz
 version: !ruby/object:Gem::Version
-  version: 9.6.0
+  version: 9.6.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-22 00:00:00.000000000 Z
+date: 2013-01-13 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