builder 2.1.2 → 3.0.0

data/test/preload.rb

@@ -1,5 +1,15 @@
 #!/usr/bin/env ruby
 
+#--
+# Portions copyright 2004 by Jim Weirich (jim@weirichhouse.org).
+# Portions copyright 2005 by Sam Ruby (rubys@intertwingly.net).
+# All rights reserved.
+
+# Permission is granted for use, copying, modification, distribution,
+# and distribution of modified versions of this work as long as the
+# above copyright notice is included.
+#++
+
 # We are defining method_added in Kernel and Object so that when
 # BlankSlate overrides them later, we can verify that it correctly
 # calls the older hooks.

data/test/{testblankslate.rb → test_blankslate.rb}

@@ -1,5 +1,15 @@
 #!/usr/bin/env ruby
 
+#--
+# Portions copyright 2004 by Jim Weirich (jim@weirichhouse.org).
+# Portions copyright 2005 by Sam Ruby (rubys@intertwingly.net).
+# All rights reserved.
+
+# Permission is granted for use, copying, modification, distribution,
+# and distribution of modified versions of this work as long as the
+# above copyright notice is included.
+#++
+
 require 'test/unit'
 require 'test/preload'
 require 'builder/blankslate'
@@ -71,6 +81,13 @@ end
 # Test case for blank slate.
 #
 class TestBlankSlate < Test::Unit::TestCase
+  if Object::const_defined?(:BasicObject)
+    def self.suite
+      # skip tests if :BasicObject is present
+      Test::Unit::TestSuite.new(name)
+    end
+  end
+
   def setup
     @bs = BlankSlate.new
   end
@@ -155,6 +172,19 @@ class TestBlankSlate < Test::Unit::TestCase
     assert_match /^#<.*>$/, with_to_s.new.to_s
   end
 
+  def test_revealing_previously_hidden_methods_are_callable_with_block
+    Object.class_eval <<-EOS
+      def given_block(&block)
+        block
+      end   
+    EOS
+  
+    with_given_block = Class.new(BlankSlate) do
+      reveal :given_block
+    end
+    assert_not_nil with_given_block.new.given_block {}
+  end
+
   def test_revealing_a_hidden_method_twice_is_ok
     with_to_s = Class.new(BlankSlate) do
       reveal :to_s
@@ -179,5 +209,17 @@ class TestBlankSlate < Test::Unit::TestCase
       assert_equal 43, direct_global
     end
   end
+
+  def test_reveal_should_not_bind_to_an_instance
+    with_object_id = Class.new(BlankSlate) do
+      reveal(:object_id)
+    end
+
+    obj1 = with_object_id.new
+    obj2 = with_object_id.new
+
+    assert obj1.object_id != obj2.object_id, 
+       "Revealed methods should not be bound to a particular instance"
+  end
 end
 

data/test/test_cssbuilder.rb

@@ -0,0 +1,125 @@
+#!/usr/bin/env ruby
+
+#--
+# Portions copyright 2004 by Jim Weirich (jim@weirichhouse.org).
+# Portions copyright 2005 by Sam Ruby (rubys@intertwingly.net).
+# All rights reserved.
+
+# Permission is granted for use, copying, modification, distribution,
+# and distribution of modified versions of this work as long as the
+# above copyright notice is included.
+#++
+
+require 'test/unit'
+require 'test/preload'
+require 'builder'
+require 'builder/css'
+
+class TestCSS < Test::Unit::TestCase
+  def setup
+    @css = Builder::CSS.new
+  end
+
+  def test_create
+    assert_not_nil @css
+  end
+
+  def test_no_block
+    @css.body
+    assert_equal 'body', @css.target!
+  end
+
+  def test_block
+    @css.body {
+      color 'green'
+    }
+    assert_equal "body {\n  color: green;\n}\n\n", @css.target!
+  end
+    
+  def test_id
+    @css.id!('nav') { color 'green' }
+    assert_equal "#nav {\n  color: green;\n}\n\n", @css.target!
+  end
+
+  def test_class
+    @css.class!('nav') { color 'green' }
+    assert_equal ".nav {\n  color: green;\n}\n\n", @css.target!
+  end
+
+  def test_elem_with_id
+    @css.div(:id => 'nav') { color 'green' }
+    assert_equal "div#nav {\n  color: green;\n}\n\n", @css.target!
+  end
+
+  def test_elem_with_class
+    @css.div(:class => 'nav') { color 'green' }
+    assert_equal "div.nav {\n  color: green;\n}\n\n", @css.target!
+  end
+
+  def test_comment
+    @css.comment!('foo')
+    assert_equal "/* foo */\n", @css.target!
+  end
+
+  def test_selector
+    @css.a(:hover) { color 'green' }
+    assert_equal "a:hover {\n  color: green;\n}\n\n", @css.target!
+  end
+
+  def test_plus
+    @css.h1 + @css.span
+    assert_equal "h1 + span", @css.target!
+  end
+
+  def test_plus_with_block
+    @css.h1 + @css.span { color 'green' }
+    assert_equal "h1 + span {\n  color: green;\n}\n\n", @css.target!
+  end
+
+  def test_contextual
+    @css.h1 >> @css.span
+    assert_equal "h1  span", @css.target!
+  end
+
+  def test_contextual_with_block
+    @css.h1 >> @css.span { color 'green' }
+    assert_equal "h1  span {\n  color: green;\n}\n\n", @css.target!
+  end
+
+  def test_child
+    @css.h1 > @css.span
+    assert_equal "h1 > span", @css.target!
+  end
+
+  def test_child_with_block
+    @css.h1 > @css.span { color 'green' }
+    assert_equal "h1 > span {\n  color: green;\n}\n\n", @css.target!
+  end
+
+  def test_multiple_op
+    @css.h1 + @css.span + @css.span
+    assert_equal "h1 + span + span", @css.target!
+  end
+
+  def test_all
+    @css.h1 | @css.h2 { color 'green' }
+    assert_equal "h1 , h2 {\n  color: green;\n}\n\n", @css.target!
+  end
+
+  def test_all_with_atts
+    @css.h1(:class => 'foo') | @css.h2(:class => 'bar') { color 'green' }
+    assert_equal "h1.foo , h2.bar {\n  color: green;\n}\n\n", @css.target!
+  end
+
+  def test_multiple_basic
+    @css.body { color 'green' }
+    @css.h1   { color 'green' }
+    assert_equal "body {\n  color: green;\n}\n\nh1 {\n  color: green;\n}\n\n", @css.target!
+  end
+
+  def test_multiple_ops
+    @css.body { color 'green' }
+    @css.body > @css.h1 { color 'green' }
+    assert_equal "body {\n  color: green;\n}\n\nbody > h1 {\n  color: green;\n}\n\n", @css.target!
+  end
+end

data/test/{testeventbuilder.rb → test_eventbuilder.rb}

@@ -1,3 +1,20 @@
+#!/usr/bin/env ruby
+
+#--
+# Portions copyright 2004 by Jim Weirich (jim@weirichhouse.org).
+# Portions copyright 2005 by Sam Ruby (rubys@intertwingly.net).
+# All rights reserved.
+
+# Permission is granted for use, copying, modification, distribution,
+# and distribution of modified versions of this work as long as the
+# above copyright notice is included.
+#++
+
+require 'test/unit'
+require 'test/preload'
+require 'builder'
+require 'builder/xmlevents'
+
 class TestEvents < Test::Unit::TestCase
 
   class Target

data/test/{testmarkupbuilder.rb → test_markupbuilder.rb}

@@ -118,7 +118,7 @@ class TestMarkup < Test::Unit::TestCase
   end
   
   def test_ambiguous_markup
-    ex = assert_raises(ArgumentError) {
+    ex = assert_raise(ArgumentError) {
       @xml.h1("data1") { b }
     }
     assert_match /\btext\b/, ex.message
@@ -228,6 +228,22 @@ class TestNameSpaces < Test::Unit::TestCase
     assert_match /<owl:Restriction>/m, xml.target!
   end
   
+  def test_ensure
+    xml = Builder::XmlMarkup.new
+    xml.html do
+      xml.body do
+       begin
+         xml.p do
+           raise Exception.new('boom')
+         end
+       rescue Exception => e
+         xml.pre e
+       end
+      end
+    end
+    assert_match %r{<p>},  xml.target!
+    assert_match %r{</p>}, xml.target!
+  end
 end
 
 class TestDeclarations < Test::Unit::TestCase
@@ -334,10 +350,10 @@ class TestSpecialMarkup < Test::Unit::TestCase
   end
 
   def test_no_blocks
-    assert_raises(Builder::IllegalBlockError) do
+    assert_raise(Builder::IllegalBlockError) do
       @xml.instruct! { |x| x.hi }
     end
-    assert_raises(Builder::IllegalBlockError) do
+    assert_raise(Builder::IllegalBlockError) do
       @xml.comment!(:element) { |x| x.hi }
     end
   end
@@ -377,6 +393,87 @@ class TestIndentedXmlMarkup < Test::Unit::TestCase
     assert_equal "        <name>\n          <first>Jim</first>\n        </name>\n", @xml.target!
   end
 
+  class TestUtfMarkup < Test::Unit::TestCase
+    if ! String.method_defined?(:encode)
+      def setup
+        @old_kcode = $KCODE
+      end
+
+      def teardown
+        $KCODE = @old_kcode
+      end
+
+      def test_use_entities_if_no_encoding_is_given_and_kcode_is_none
+        $KCODE = 'NONE'
+        xml = Builder::XmlMarkup.new
+        xml.p("\xE2\x80\x99")
+        assert_match(%r(<p>&#8217;</p>), xml.target!) #
+      end
+
+      def test_use_entities_if_encoding_is_utf_but_kcode_is_not
+        $KCODE = 'NONE'
+        xml = Builder::XmlMarkup.new
+        xml.instruct!(:xml, :encoding => 'UTF-8')
+        xml.p("\xE2\x80\x99")
+        assert_match(%r(<p>&#8217;</p>), xml.target!) #
+      end
+    else
+      # change in behavior.  As there is no $KCODE anymore, the default
+      # moves from "does not understand utf-8" to "supports utf-8".
+
+      def test_use_entities_if_no_encoding_is_given_and_kcode_is_none
+        xml = Builder::XmlMarkup.new
+        xml.p("\xE2\x80\x99")
+        assert_match("<p>\u2019</p>", xml.target!) #
+      end
+
+      def test_use_entities_if_encoding_is_utf_but_kcode_is_not
+        xml = Builder::XmlMarkup.new
+        xml.instruct!(:xml, :encoding => 'UTF-8')
+        xml.p("\xE2\x80\x99")
+        assert_match("<p>\u2019</p>", xml.target!) #
+      end
+    end
+
+    def encode string, encoding
+      if !String.method_defined?(:encode)
+        $KCODE = encoding
+        string
+      elsif encoding == 'UTF8'
+        string.force_encoding('UTF-8')
+      else
+        string
+      end
+    end
+
+    def test_use_entities_if_kcode_is_utf_but_encoding_is_something_else
+      xml = Builder::XmlMarkup.new
+      xml.instruct!(:xml, :encoding => 'UTF-16')
+      xml.p(encode("\xE2\x80\x99", 'UTF8'))
+      assert_match(%r(<p>&#8217;</p>), xml.target!) #
+    end
+
+    def test_use_utf8_if_encoding_defaults_and_kcode_is_utf8
+      xml = Builder::XmlMarkup.new
+      xml.p(encode("\xE2\x80\x99",'UTF8'))
+      assert_equal encode("<p>\xE2\x80\x99</p>",'UTF8'), xml.target!
+    end
+
+    def test_use_utf8_if_both_encoding_and_kcode_are_utf8
+      xml = Builder::XmlMarkup.new
+      xml.instruct!(:xml, :encoding => 'UTF-8')
+      xml.p(encode("\xE2\x80\x99",'UTF8'))
+      assert_match encode("<p>\xE2\x80\x99</p>",'UTF8'), xml.target!
+    end
+
+    def test_use_utf8_if_both_encoding_and_kcode_are_utf8_with_lowercase
+      xml = Builder::XmlMarkup.new
+      xml.instruct!(:xml, :encoding => 'utf-8')
+      xml.p(encode("\xE2\x80\x99",'UTF8'))
+      assert_match encode("<p>\xE2\x80\x99</p>",'UTF8'), xml.target!
+    end
+  end
+
   class TestXmlEvents < Test::Unit::TestCase
     def setup
       @handler = EventHandler.new

data/test/test_namecollision.rb

@@ -0,0 +1,39 @@
+#!/usr/bin/env ruby
+
+#--
+# Portions copyright 2004 by Jim Weirich (jim@weirichhouse.org).
+# Portions copyright 2005 by Sam Ruby (rubys@intertwingly.net).
+# All rights reserved.
+
+# Permission is granted for use, copying, modification, distribution,
+# and distribution of modified versions of this work as long as the
+# above copyright notice is included.
+#++
+
+require 'test/unit'
+require 'builder/xchar'
+
+class TestNameCollisions < Test::Unit::TestCase
+  module Collide
+    def xchr
+    end
+  end
+
+  def test_no_collision
+    assert_nothing_raised do
+      Builder.check_for_name_collision(Collide, :not_defined)
+    end
+  end
+
+  def test_collision
+    assert_raise RuntimeError do
+      Builder.check_for_name_collision(Collide, "xchr")
+    end
+  end
+
+  def test_collision_with_symbol
+    assert_raise RuntimeError do
+      Builder.check_for_name_collision(Collide, :xchr)
+    end
+  end
+end

data/test/test_xchar.rb

@@ -1,9 +1,42 @@
 #!/usr/bin/env ruby
 
+#--
+# Portions copyright 2004 by Jim Weirich (jim@weirichhouse.org).
+# Portions copyright 2005 by Sam Ruby (rubys@intertwingly.net).
+# All rights reserved.
+
+# Permission is granted for use, copying, modification, distribution,
+# and distribution of modified versions of this work as long as the
+# above copyright notice is included.
+#++
+
+#!/usr/bin/env ruby
+
 require 'test/unit'
 require 'builder/xchar'
 
+if String.method_defined?(:encode)
+  class String
+    ENCODING_BINARY = Encoding.find('BINARY')
+
+    # shim method for testing purposes
+    def to_xs(escape=true)
+      raise NameError.new('to_xs') unless caller[0].index(__FILE__)
+
+      result = Builder::XChar.encode(self)
+      if escape
+        result.gsub(/[^\u0000-\u007F]/) {|c| "&##{c.ord};"}
+      else
+        # really only useful for testing purposes
+        result.force_encoding(ENCODING_BINARY)
+      end
+    end
+  end
+end
+
 class TestXmlEscaping < Test::Unit::TestCase
+  REPLACEMENT_CHAR = Builder::XChar::REPLACEMENT_CHAR.to_xs
+
   def test_ascii
     assert_equal 'abc', 'abc'.to_xs
   end
@@ -15,9 +48,9 @@ class TestXmlEscaping < Test::Unit::TestCase
   end
 
   def test_invalid
-    assert_equal '*', "\x00".to_xs               # null
-    assert_equal '*', "\x0C".to_xs               # form feed
-    assert_equal '*', "\xEF\xBF\xBF".to_xs       # U+FFFF
+    assert_equal REPLACEMENT_CHAR, "\x00".to_xs               # null
+    assert_equal REPLACEMENT_CHAR, "\x0C".to_xs               # form feed
+    assert_equal REPLACEMENT_CHAR, "\xEF\xBF\xBF".to_xs       # U+FFFF
   end
 
   def test_iso_8859_1
@@ -34,4 +67,11 @@ class TestXmlEscaping < Test::Unit::TestCase
     assert_equal '&#8217;', "\xE2\x80\x99".to_xs # right single quote
     assert_equal '&#169;',  "\xC2\xA9".to_xs     # copy
   end
+ 
+  def test_utf8_verbatim
+    assert_equal "\xE2\x80\x99", "\xE2\x80\x99".to_xs(false)  # right single quote
+    assert_equal "\xC2\xA9",  "\xC2\xA9".to_xs(false)         # copy
+    assert_equal "\xC2\xA9&amp;\xC2\xA9",
+      "\xC2\xA9&\xC2\xA9".to_xs(false)                        # copy with ampersand
+  end
 end