tagz 8.2.0 → 9.0.0

data/lib/tagz.rb

@@ -4,7 +4,7 @@ unless defined? Tagz
 #
   module Tagz
     def Tagz.version()
-      '8.2.0'
+      '9.0.0'
     end
 
     def Tagz.description
@@ -55,8 +55,8 @@ unless defined? Tagz
         unless options.empty?
           attributes = ' ' << 
             options.map do |key, value|
-              key = Tagz.escape_attribute(key)
-              value = Tagz.escape_attribute(value)
+              key = Tagz.escape_key(key)
+              value = Tagz.escape_value(value)
               if value =~ %r/"/
                 raise ArgumentError, value if value =~ %r/'/
                 value = "'#{ value }'"
@@ -125,7 +125,7 @@ unless defined? Tagz
               nil
           end
 
-        if(strategy.nil? or (tagz.nil? and not Tagz.globally===self))
+        if(strategy.nil? or (tagz.nil? and Tagz.privately===self))
           begin
             super
           ensure
@@ -190,7 +190,20 @@ unless defined? Tagz
         }
 
         module HtmlSafe
-          attr_accessor :html_safe
+          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.empty? and block.nil?
+            Tagz.namespace(:HtmlSafe)
+          else
+            string = args.join
+            string += block.call.to_s if block
+            string.extend(HtmlSafe)
+            string
+          end
         end
 
         class Document < ::String
@@ -223,7 +236,6 @@ unless defined? Tagz
           def concat(string)
             self << string
           end
-          #alias_method 'concat', '<<'
 
           def escape(string)
             return string if string.respond_to?(:html_safe)
@@ -271,8 +283,8 @@ unless defined? Tagz
             unless options.empty?
               ' ' << 
                 options.map do |key, value|
-                  key = Tagz.escape_attribute(key)
-                  value = Tagz.escape_attribute(value)
+                  key = Tagz.escape_key(key)
+                  value = Tagz.escape_value(value)
                   if value =~ %r/"/
                     raise ArgumentError, value if value =~ %r/'/
                     value = "'#{ value }'"
@@ -376,11 +388,20 @@ unless defined? Tagz
         end
         Tagz.singleton_class{ define_method(:xchar){ Tagz.namespace(:XChar) } }
 
-        NoEscapeProc = lambda{|*values| values.join}
-        Tagz.singleton_class{ define_method(:no_escape_proc){ Tagz.namespace(:NoEscapeProc) } }
+        NoEscapeContentProc = lambda{|*contents| contents.join}
+        Tagz.singleton_class{ define_method(:no_escape_content_proc){ Tagz.namespace(:NoEscapeContentProc) } }
+        EscapeContentProc = lambda{|*contents| Tagz.xchar.escape(contents.join)}
+        Tagz.singleton_class{ define_method(:escape_content_proc){ Tagz.namespace(:EscapeContentProc) } }
 
-        EscapeProc = lambda{|*values| Tagz.xchar.escape(values.join)}
-        Tagz.singleton_class{ define_method(:escape_proc){ Tagz.namespace(:EscapeProc) } }
+        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).gsub(/_/, '-')}
+        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)}
+        Tagz.singleton_class{ define_method(:escape_value_proc){ Tagz.namespace(:EscapeValueProc) } }
 
         module Globally; include Tagz; end
         Tagz.singleton_class{ define_method(:globally){ Tagz.namespace(:Globally) } }
@@ -399,54 +420,60 @@ unless defined? Tagz
       Tagz.xchar.escape(strings.join)
     end
 
-  # support for configuring attribute escaping
+  # raw utils
   #
-    def Tagz.escape_attribute!(*args, &block)
-      previous = @escape_attribute if defined?(@escape_attribute)
-      unless args.empty? and block.nil?
-        value = block ? block : args.shift
-        value = Tagz.escape_proc if value==true
-        value = Tagz.no_escape_proc if(value==false or value==nil)
-        @escape_attribute = value.to_proc
-        return previous
-      end
-      @escape_attribute
-    end
-    def Tagz.escape_attributes!(*args, &block)
-      Tagz.escape_attribute!(*args, &block)
-    end
-    def Tagz.escape_attribute(value)
-      @escape_attribute.call(value.to_s)
+    def Tagz.raw(*args, &block)
+      Tagz.html_safe(*args, &block)
     end
 
-  # support for configuring content escaping
+  # generate code for escape configuration
   #
-    def Tagz.escape_content!(*args, &block)
-      previous = @escape_content if defined?(@escape_content)
-      unless args.empty? and block.nil?
-        value = block ? block : args.shift
-        value = Tagz.escape_proc if value==true
-        value = Tagz.no_escape_proc if(value==false or value==nil)
-        @escape_content = value.to_proc
-        return previous
-      end
-      @escape_content
-    end
-    def Tagz.escape_contents!(*args, &block)
-      Tagz.escape_content!(*args, &block)
-    end
-    def Tagz.escape_content(value)
-      @escape_content.call(value.to_s)
+    %w( key value content ).each do |type|
+
+      module_eval <<-__, __FILE__, __LINE__
+        def Tagz.escape_#{ type }!(*args, &block)
+          previous = @escape_#{ type } if defined?(@escape_#{ type })
+          unless args.empty?
+            value = args.shift
+            value = Tagz.escape_#{ type }_proc if value==true
+            value = Tagz.no_escape_#{ type }_proc if(value==false or value==nil)
+            @escape_#{ type } = value.to_proc
+            if block
+              begin
+                return block.call()
+              ensure
+                @escape_#{ type } = previous
+              end
+            else
+              return previous
+            end
+          end
+          @escape_#{ type }
+        end
+
+        def Tagz.escape_#{ type }s!(*args, &block)
+          Tagz.escape_#{ type }!(*args, &block)
+        end
+
+        def Tagz.escape_#{ type }(value)
+          @escape_#{ type }.call(value.to_s)
+        end
+      __
+
     end
 
   # configure tagz escaping
   #
     def Tagz.escape!(options = {})
-      options = {:attributes => options, :content => options} unless options.is_a?(Hash)
-      escape_attributes = options[:attributes]||options['attributes']
-      escape_content = options[:content]||options['content']
-      Tagz.escape_attributes!(!!escape_attributes)
-      Tagz.escape_content!(!!escape_content)
+      options = {:keys => options, :values => options, :content => options} unless options.is_a?(Hash)
+
+      escape_keys = options[:keys]||options['keys']||options[:key]||options['key']
+      escape_values = options[:values]||options['values']||options[:value]||options['value']
+      escape_contents = options[:contents]||options['contents']||options[:content]||options['content']
+
+      Tagz.escape_keys!(!!escape_keys)
+      Tagz.escape_values!(!!escape_values)
+      Tagz.escape_contents!(!!escape_contents)
     end
     def Tagz.i_know_what_the_hell_i_am_doing!
       escape!(false)
@@ -456,13 +483,15 @@ unless defined? Tagz
     end
     def Tagz.xml_mode!
       Tagz.escape!(
-        :attributes => true,
-        :content => true
+        :keys => true,
+        :values => true,
+        :contents => true
       )
     end
     def Tagz.html_mode!
       Tagz.escape!(
-        :attributes => true,
+        :keys => true,
+        :values => false,
         :content => false
       )
     end
@@ -476,5 +505,5 @@ unless defined? Tagz
     (argv.empty? and block.nil?) ? ::Tagz : Tagz.tagz(*argv, &block)
   end
 
-  Tagz.xml_mode!
+  Tagz.escape!(true)
 end

data/tagz.gemspec

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

@@ -10,8 +10,6 @@ $:.unshift '.'
 
 require 'tagz'
 
-Tagz.html_mode!
-
 class TagzTest < Test::Unit::TestCase
   include Tagz
 
@@ -476,7 +474,7 @@ class TagzTest < Test::Unit::TestCase
   end
 
   def test_390
-    expected = '<div class="bar&amp;foo&gt;">foo&bar></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
 
@@ -486,7 +484,7 @@ class TagzTest < Test::Unit::TestCase
   end
 
   def test_400
-    expected = '<div><span>foo&bar</span></div>'
+    expected = '<div><span>foo&amp;bar</span></div>'
     actual = tagz{ div_{ span_{ 'foo&bar' } } }
     assert_equal expected, actual
   end
@@ -525,7 +523,7 @@ class TagzTest < Test::Unit::TestCase
 
   def test_440
     c = Class.new{
-      include Tagz
+      include Tagz.privately
       def foobar() tagz{ div_{ 'foobar' } } end
       def barfoo() div_{ 'barfoo' } end
     }.new
@@ -565,33 +563,24 @@ class TagzTest < Test::Unit::TestCase
     expected = %(<div a&gt;b="a&gt;b">content</div>)
     assert_equal expected, actual
 
-    original = Tagz.escape_attribute! false
-    assert original
-    actual = nil
-    assert_nothing_raised{ actual=c.a}
-    expected = %(<div a>b="a>b">content</div>)
-    assert_equal expected, actual
-
-    Tagz.escape_attribute! original
-    actual = nil
-    assert_nothing_raised{ actual=c.a}
-    expected = %(<div a&gt;b="a&gt;b">content</div>)
-    assert_equal expected, actual
-
-    upcased = Tagz.escape_attribute! lambda{|value| original.call(value).upcase} 
-    assert upcased
-    actual = nil
-    assert_nothing_raised{ actual=c.a}
-    expected = %(<div A&GT;B="A&GT;B">content</div>)
-    assert_equal expected, actual
+    Tagz.escape_keys!(false) do
+      Tagz.escape_values!(false) do
+        actual = nil
+        assert_nothing_raised{ actual=c.a}
+        expected = %(<div a>b="a>b">content</div>)
+        assert_equal expected, actual
+      end
+    end
 
-    Tagz.escape_attributes! lambda{|value| upcased.call(value).downcase} 
-    actual = nil
-    assert_nothing_raised{ actual=c.a}
-    expected = %(<div a&gt;b="a&gt;b">content</div>)
-    assert_equal expected, actual
-  ensure
-    Tagz.escape_attributes!(original)
+    upcased = lambda{|value| value.to_s.upcase}
+    Tagz.escape_key!(upcased) do
+      Tagz.escape_value!(upcased) do
+        actual = nil
+        assert_nothing_raised{ actual=c.a}
+        expected = %(<div A>B="A>B">content</div>)
+        assert_equal expected, actual
+      end
+    end
   end
 
   def test_470
@@ -604,7 +593,7 @@ class TagzTest < Test::Unit::TestCase
 
     actual = nil
     assert_nothing_raised{ actual=c.a}
-    expected = %(<div>a>b</div>)
+    expected = %(<div>a&gt;b</div>)
     assert_equal expected, actual
 
     original = Tagz.escape_content!(true)
@@ -618,13 +607,13 @@ class TagzTest < Test::Unit::TestCase
     assert upcased
     actual = nil
     assert_nothing_raised{ actual=c.a}
-    expected = %(<div>A>B</div>)
+    expected = %(<div>A&GT;B</div>)
     assert_equal expected, actual
 
     Tagz.escape_content!(original)
     actual = nil
     assert_nothing_raised{ actual=c.a}
-    expected = %(<div>a>b</div>)
+    expected = %(<div>a&gt;b</div>)
     assert_equal expected, actual
   ensure
     Tagz.escape_content!(original)

metadata

@@ -4,10 +4,10 @@ version: !ruby/object:Gem::Version
   hash: 87
   prerelease: 
   segments: 
-  - 8
-  - 2
+  - 9
   - 0
-  version: 8.2.0
+  - 0
+  version: 9.0.0
 platform: ruby
 authors: 
 - Ara T. Howard
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-18 00:00:00 -07:00
+date: 2011-03-01 00:00:00 -07:00
 default_executable: 
 dependencies: []