tagz 9.9.0 → 9.9.1

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    Yzc5ZTc2NTRlNjhiNGFkOWZiMzMwM2Y4OWJhOWIyN2ZlMTY0MzkyNA==
+  data.tar.gz: !binary |-
+    NzI3NTM5ZWYzMjg2NjhiM2M1MjE4ODUxZmM3ZDQzNjNiMzgxYzc1Yg==
+!binary "U0hBNTEy":
+  metadata.gz: !binary |-
+    NGJlZWJkODY5ZTIzYjgwYmNhYTg0Nzg5NzgxMTUzMGU3YzA2YTcwNDBmNTUw
+    ZmVkNzAwYzE3NDk5MjBiZjk2MTY3ZWY3YjFjNjg1NTkxODMwNGYzZjM5ZmYy
+    MDk0NDc5NzA5OGRkMTM5YTFkMDg0Y2Q4YTdkYjE5ZDRiZmI4MjY=
+  data.tar.gz: !binary |-
+    ZjcyMWFmNDU2YzU1MTM1YzYwZDdlNWJmMGU3YzBkYTUzYjc1NTdkNWM0NjNj
+    YzJjMDJjNWVlMjM2YTdiMWFkOTM5ZjEzNWViNWY3ZGZhMjM1N2RjNDQ3ZWQw
+    Mzc5OGJhMDk2YmExNzJkZTliM2M3YmIwZjQ5NWQ1MTVlMzY5ZWU=

data/lib/tagz.rb

@@ -7,7 +7,7 @@ unless defined? Tagz
     require 'cgi'
 
     def Tagz.version()
-      '9.9.0'
+      '9.9.1'
     end
 
     def Tagz.description
@@ -35,10 +35,20 @@ unless defined? Tagz
 
         if block
           @tagz ||= (Tagz.document.for(document) || Tagz.document.new)
+
           begin
-            size = @tagz.size
-            value = instance_eval(&block)
-            @tagz << value unless(@tagz.size > size)
+            previous_size = @tagz.size
+
+            content = instance_eval(&block)
+
+            current_size = @tagz.size
+
+            content_was_added = current_size > previous_size
+
+            unless content_was_added
+              @tagz << content
+            end
+
             @tagz
           ensure
             @tagz = previous
@@ -362,14 +372,40 @@ unless defined? Tagz
 
   # escape utils
   #
+    def Tagz.escape_html_map
+      @escape_html_map ||= { '&' => '&amp;',  '>' => '&gt;',   '<' => '&lt;', '"' => '&quot;', "'" => '&#39;' }
+    end
+
+    def Tagz.escape_html_once_regexp
+      @escape_html_once_regexp ||= /["><']|&(?!([a-zA-Z]+|(#\d+));)/
+    end
+
+    def Tagz.escape_html(s)
+      s = s.to_s
+
+      if Tagz.html_safe?(s)
+        s
+      else
+        Tagz.html_safe(s.gsub(/[&"'><]/, Tagz.escape_html_map))
+      end
+    end
+
+    def Tagz.escape_html_once(s)
+      result = s.to_s.gsub(Tagz.html_escape_once_regexp){|_| Tagz.escape_html_map[_]}
+
+      Tagz.html_safe?(s) ? Tagz.html_safe(result) : result
+    end
+
     def Tagz.escapeHTML(*strings)
-      CGI.escapeHTML(strings.join)
+      Tagz.escape_html(strings.join)
     end
+
     def Tagz.escape(*strings)
-      CGI.escapeHTML(strings.join)
+      Tagz.escape_html(strings.join)
     end
+
     def Tagz.escapeAttribute(*strings)
-      CGI.escapeHTML(strings.join)
+      Tagz.escape_html(strings.join)
     end
 
   # raw utils
@@ -397,10 +433,18 @@ unless defined? Tagz
       end
     end
 
+    def Tagz.html_safe?(string)
+      string.html_safe? rescue false
+    end
+
     def Tagz.raw(*args, &block)
       Tagz.html_safe(*args, &block)
     end
 
+    def Tagz.h(string)
+      Tagz.escape_html(string)
+    end
+
   # generate code for escape configuration
   #
     %w( key value content ).each do |type|

data/tagz.gemspec

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

metadata

@@ -1,15 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tagz
 version: !ruby/object:Gem::Version
-  version: 9.9.0
-  prerelease: 
+  version: 9.9.1
 platform: ruby
 authors:
 - Ara T. Howard
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-08 00:00:00.000000000 Z
+date: 2013-07-26 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
@@ -40,26 +39,25 @@ files:
 - test/tagz_test.rb
 homepage: http://github.com/ahoward/tagz
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: codeforpeople
-rubygems_version: 1.8.23
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: tagz
 test_files: []