tagz 9.7.0 → 9.9.0

data/lib/tagz.rb

@@ -7,7 +7,7 @@ unless defined? Tagz
     require 'cgi'
 
     def Tagz.version()
-      '9.7.0'
+      '9.9.0'
     end
 
     def Tagz.description
@@ -218,28 +218,18 @@ unless defined? Tagz
           \A compact  \Z 
         ]iomx
 
-        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
+        class HTMLSafe < ::String
+          def html_safe
+            self
           end
 
-          if args.empty? and block.nil?
-            Tagz.namespace(:HtmlSafe)
-          else
-            string = args.join
-            string += block.call.to_s if block
-            HtmlSafe.new(string)
+          def html_safe?
+            true
           end
         end
 
-        class Document < ::String
-          def Document.for other
+        class Document < HTMLSafe
+          def Document.for(other)
             Document === other ? other : Document.new(other.to_s)
           end
 
@@ -251,26 +241,21 @@ unless defined? Tagz
           alias_method 'write', 'concat'
           alias_method 'push', 'concat'
 
-          def << string 
-            case string
-              when Document
-                super string.to_s
-              else
-                if string.respond_to?(:html_safe)
-                  super string.to_s
-                else
-                  super Tagz.escape_content(string)
-                end
+          def << obj
+            if obj.respond_to?(:html_safe?) and obj.html_safe?
+              super obj.to_s
+            else
+              super Tagz.escape_content(obj)
             end
+
             self
           end
 
-          def concat(string)
-            self << string
+          def concat(obj)
+            self << obj
           end
 
           def escape(string)
-            return string if string.respond_to?(:html_safe)
             Tagz.escape(string)
           end
           alias_method 'h', 'escape'
@@ -299,14 +284,6 @@ unless defined? Tagz
           def to_str
             self
           end
-
-          def html_safe
-            self
-          end
-
-          def html_safe?
-            true
-          end
         end
         Tagz.singleton_class{ define_method(:document){ Tagz.namespace(:Document) } }
 
@@ -397,6 +374,29 @@ unless defined? Tagz
 
   # raw utils
   #
+    def Tagz.html_safe(*args, &block)
+      html_safe = namespace(:HTMLSafe)
+
+      if args.empty? and block.nil?
+        return html_safe
+      end
+
+      first = args.first
+
+      case
+        when first.is_a?(html_safe)
+          return first
+
+        when args.size == 1
+          string = first
+          html_safe.new(string)
+
+        else
+          string = [args, (block ? block.call : nil)].flatten.compact.join(' ')
+          html_safe.new(string)
+      end
+    end
+
     def Tagz.raw(*args, &block)
       Tagz.html_safe(*args, &block)
     end

data/tagz.gemspec

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tagz
 version: !ruby/object:Gem::Version
-  version: 9.7.0
+  version: 9.9.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-09 00:00:00.000000000 Z
+date: 2013-07-08 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