builder 3.1.4 → 3.2.4

data/test/test_eventbuilder.rb

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
 
 #--
 # Portions copyright 2004 by Jim Weirich (jim@weirichhouse.org).
@@ -10,12 +11,12 @@
 # above copyright notice is included.
 #++
 
-require 'test/unit'
-require 'test/preload'
+require 'helper'
+require 'preload'
 require 'builder'
 require 'builder/xmlevents'
 
-class TestEvents < Test::Unit::TestCase
+class TestEvents < Builder::Test
 
   class Target
     attr_reader :events

data/test/test_markupbuilder.rb

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
 
 #--
 # Portions copyright 2004 by Jim Weirich (jim@weirichhouse.org).
@@ -10,12 +11,12 @@
 # above copyright notice is included.
 #++
 
-require 'test/unit'
-require 'test/preload'
+require 'helper'
+require 'preload'
 require 'builder'
 require 'builder/xmlmarkup'
 
-class TestMarkup < Test::Unit::TestCase
+class TestMarkup < Builder::Test
   def setup
     @xml = Builder::XmlMarkup.new
   end
@@ -59,23 +60,38 @@ class TestMarkup < Test::Unit::TestCase
     assert_equal %{<ref id="12"/>}, @xml.target!
   end
 
-  def test_string_attributes_are_quoted_by_default
+  def test_single_quotes_for_attrs
+    @xml = Builder::XmlMarkup.new(:quote => :single)
+    @xml.ref(:id => 12)
+    assert_equal %{<ref id='12'/>}, @xml.target!
+  end
+
+  def test_mixed_quotes_for_attrs
+    @xml = Builder::XmlMarkup.new(:quote => :single)
+    x = Builder::XmlMarkup.new(:target=>@xml, :quote => :double)
+    @xml.ref(:id => 12) do
+      x.link(:id => 13)
+    end
+    assert_equal %{<ref id='12'><link id="13"/></ref>}, @xml.target!
+  end
+
+  def test_string_attributes_are_escaped_by_default
     @xml.ref(:id => "H&R")
     assert_equal %{<ref id="H&amp;R"/>}, @xml.target!
   end
 
-  def test_symbol_attributes_are_unquoted_by_default
+  def test_symbol_attributes_are_unescaped_by_default
     @xml.ref(:id => :"H&amp;R")
     assert_equal %{<ref id="H&amp;R"/>}, @xml.target!
   end
 
-  def test_attributes_quoted_can_be_turned_on
+  def test_attributes_escaping_can_be_turned_on
     @xml = Builder::XmlMarkup.new
     @xml.ref(:id => "<H&R \"block\">")
     assert_equal %{<ref id="&lt;H&amp;R &quot;block&quot;&gt;"/>}, @xml.target!
   end
 
-  def test_mixed_attribute_quoting_with_nested_builders
+  def test_mixed_attribute_escaping_with_nested_builders
     x = Builder::XmlMarkup.new(:target=>@xml)
     @xml.ref(:id=>:"H&amp;R") {
       x.element(:tag=>"Long&Short")
@@ -129,7 +145,7 @@ class TestMarkup < Test::Unit::TestCase
   end
 
   def test_reference_methods
-    @xml.title { |x| x.a { x.b(name) } }
+    @xml.title { |x| x.a { x.b(_name) } }
     assert_equal "<title><a><b>bob</b></a></title>", @xml.target!
   end
 
@@ -156,6 +172,24 @@ class TestMarkup < Test::Unit::TestCase
     assert_equal %{<div>&lt;hi&gt;<em>H&amp;R Block</em></div>}, @xml.target!
   end
 
+  def test_nil
+    b = Builder::XmlMarkup.new
+    b.tag! "foo", nil
+    assert_equal %{<foo/>}, b.target!
+  end
+
+  def test_nil_without_explicit_nil_handling
+    b = Builder::XmlMarkup.new(:explicit_nil_handling => false)
+    b.tag! "foo", nil
+    assert_equal %{<foo/>}, b.target!
+  end
+
+  def test_nil_with_explicit_nil_handling
+    b = Builder::XmlMarkup.new(:explicit_nil_handling => true)
+    b.tag! "foo", nil
+    assert_equal %{<foo nil="true"/>}, b.target!
+  end
+
   def test_non_escaping
     @xml.div("ns:xml"=>:"&xml;") { |x| x << "<h&i>"; x.em("H&R Block") }
     assert_equal %{<div ns:xml="&xml;"><h&i><em>H&amp;R Block</em></div>}, @xml.target!
@@ -172,12 +206,12 @@ class TestMarkup < Test::Unit::TestCase
     assert_equal "<div><span><a href=\"ref\">text</a></span></div>", @xml.target!
   end
 
-  def name
+  def _name
     "bob"
   end
 end
 
-class TestAttributeEscaping < Test::Unit::TestCase
+class TestAttributeEscaping < Builder::Test
 
   def setup
     @xml = Builder::XmlMarkup.new
@@ -215,7 +249,7 @@ class TestAttributeEscaping < Test::Unit::TestCase
 
 end
 
-class TestNameSpaces < Test::Unit::TestCase
+class TestNameSpaces < Builder::Test
   def setup
     @xml = Builder::XmlMarkup.new(:indent=>2)
   end
@@ -267,7 +301,7 @@ class TestNameSpaces < Test::Unit::TestCase
   end
 end
 
-class TestDeclarations < Test::Unit::TestCase
+class TestDeclarations < Builder::Test
   def setup
     @xml = Builder::XmlMarkup.new(:indent=>2)
   end
@@ -324,7 +358,7 @@ class TestDeclarations < Test::Unit::TestCase
 end
 
 
-class TestSpecialMarkup < Test::Unit::TestCase
+class TestSpecialMarkup < Builder::Test
   def setup
     @xml = Builder::XmlMarkup.new(:indent=>2)
   end
@@ -384,6 +418,11 @@ class TestSpecialMarkup < Test::Unit::TestCase
     assert_equal "<![CDATA[TEST]]>\n", @xml.target!
   end
 
+  def test_cdata_value
+    @xml.cdata_value!("content:encoded", "<p>TEST</p>")
+    assert_equal "<content:encoded><![CDATA[<p>TEST</p>]]></content:encoded>\n", @xml.target!
+  end
+
   def test_cdata_with_ampersand
     @xml.cdata!("TEST&CHECK")
     assert_equal "<![CDATA[TEST&CHECK]]>\n", @xml.target!
@@ -395,7 +434,7 @@ class TestSpecialMarkup < Test::Unit::TestCase
   end
 end
 
-class TestIndentedXmlMarkup < Test::Unit::TestCase
+class TestIndentedXmlMarkup < Builder::Test
   def setup
     @xml = Builder::XmlMarkup.new(:indent=>2)
   end
@@ -419,7 +458,7 @@ class TestIndentedXmlMarkup < Test::Unit::TestCase
     assert_equal "        <name>\n          <first>Jim</first>\n        </name>\n", @xml.target!
   end
 
-  class TestUtfMarkup < Test::Unit::TestCase
+  class TestUtfMarkup < Builder::Test
     if ! String.method_defined?(:encode)
       def setup
         @old_kcode = $KCODE
@@ -466,7 +505,7 @@ class TestIndentedXmlMarkup < Test::Unit::TestCase
         $KCODE = encoding
         string
       elsif encoding == 'UTF8'
-        string.force_encoding('UTF-8')
+        string.dup.force_encoding('UTF-8')
       else
         string
       end
@@ -507,7 +546,7 @@ class TestIndentedXmlMarkup < Test::Unit::TestCase
     end
   end
 
-  class TestXmlEvents < Test::Unit::TestCase
+  class TestXmlEvents < Builder::Test
     def setup
       @handler = EventHandler.new
       @xe = Builder::XmlEvents.new(:target=>@handler)
@@ -547,7 +586,7 @@ class TestIndentedXmlMarkup < Test::Unit::TestCase
     end
 
     def pop_text
-      result = ''
+      result = ''.dup
       while ! @handler.events.empty? && @handler.events[0][0] == :text
 	result << @handler.events[0][1]
 	@handler.events.shift

data/test/test_method_caching.rb

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
 
 #--
 # Portions copyright 2011 by Bart ten Brinke (info@retrosync.com).
@@ -9,11 +10,11 @@
 # above copyright notice is included.
 #++
 
-require 'test/unit'
-require 'test/preload'
+require 'helper'
+require 'preload'
 require 'builder'
 
-class TestMethodCaching < Test::Unit::TestCase
+class TestMethodCaching < Builder::Test
 
   # We can directly ask if xml object responds to the cache_me or
   # do_not_cache_me methods because xml is derived from BasicObject
@@ -54,7 +55,7 @@ class TestMethodCaching < Test::Unit::TestCase
     def xml.method_missing(*args)
       ::Kernel.fail StandardError, "SHOULD BE CALLED"
     end
-    assert_raise(StandardError, /SHOULD BE CALLED/) do
+    assert_raise(StandardError, "SHOULD BE CALLED") do
       xml.do_not_cache_me
     end
   end

data/test/test_namecollision.rb

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
 
 #--
 # Portions copyright 2004 by Jim Weirich (jim@weirichhouse.org).
@@ -10,10 +11,10 @@
 # above copyright notice is included.
 #++
 
-require 'test/unit'
+require 'helper'
 require 'builder/xchar'
 
-class TestNameCollisions < Test::Unit::TestCase
+class TestNameCollisions < Builder::Test
   module Collide
     def xchr
     end

data/test/test_xchar.rb

@@ -1,4 +1,6 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
+# encoding: us-ascii
 
 #--
 # Portions copyright 2004 by Jim Weirich (jim@weirichhouse.org).
@@ -12,7 +14,7 @@
 
 #!/usr/bin/env ruby
 
-require 'test/unit'
+require 'helper'
 require 'builder/xchar'
 
 if String.method_defined?(:encode)
@@ -21,9 +23,9 @@ if String.method_defined?(:encode)
 
     # shim method for testing purposes
     def to_xs(escape=true)
-      raise NameError.new('to_xs') unless caller[0].index(__FILE__)
+      # raise NameError.new('to_xs') unless caller[0].index(__FILE__)
 
-      result = Builder::XChar.encode(self)
+      result = Builder::XChar.encode(self.dup)
       if escape
         result.gsub(/[^\u0000-\u007F]/) {|c| "&##{c.ord};"}
       else
@@ -34,7 +36,7 @@ if String.method_defined?(:encode)
   end
 end
 
-class TestXmlEscaping < Test::Unit::TestCase
+class TestXmlEscaping < Builder::Test
   REPLACEMENT_CHAR = Builder::XChar::REPLACEMENT_CHAR.to_xs
 
   def test_ascii
@@ -67,11 +69,17 @@ 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
+    assert_equal binary("\xE2\x80\x99"), "\xE2\x80\x99".to_xs(false)  # right single quote
+    assert_equal binary("\xC2\xA9"),  "\xC2\xA9".to_xs(false)         # copy
+    assert_equal binary("\xC2\xA9&amp;\xC2\xA9"),
+      "\xC2\xA9&\xC2\xA9".to_xs(false)                                # copy with ampersand
+  end
+
+  private
+
+  def binary(string)
+    string.dup.force_encoding(Encoding::BINARY)
   end
 end

metadata

@@ -1,47 +1,57 @@
 --- !ruby/object:Gem::Specification
 name: builder
 version: !ruby/object:Gem::Version
-  version: 3.1.4
-  prerelease: 
+  version: 3.2.4
 platform: ruby
 authors:
 - Jim Weirich
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-16 00:00:00.000000000 Z
+date: 2019-12-10 00:00:00.000000000 Z
 dependencies: []
-description: ! 'Builder provides a number of builder objects that make creating structured
-  data
-
+description: |
+  Builder provides a number of builder objects that make creating structured data
   simple to do.  Currently the following builder objects are supported:
 
-
   * XML Markup
-
   * XML Events
-
-'
 email: jim.weirich@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files:
 - CHANGES
 - MIT-LICENSE
+- README.md
 - Rakefile
-- README.rdoc
+- builder.blurb
+- builder.gemspec
 - doc/releases/builder-1.2.4.rdoc
 - doc/releases/builder-2.0.0.rdoc
 - doc/releases/builder-2.1.1.rdoc
 files:
+- CHANGES
+- MIT-LICENSE
+- README.md
+- Rakefile
+- builder.blurb
+- builder.gemspec
+- doc/jamis.rb
+- doc/releases/builder-1.2.4.rdoc
+- doc/releases/builder-2.0.0.rdoc
+- doc/releases/builder-2.1.1.rdoc
 - lib/blankslate.rb
+- lib/builder.rb
 - lib/builder/blankslate.rb
 - lib/builder/version.rb
 - lib/builder/xchar.rb
 - lib/builder/xmlbase.rb
 - lib/builder/xmlevents.rb
 - lib/builder/xmlmarkup.rb
-- lib/builder.rb
+- rakelib/publish.rake
+- rakelib/tags.rake
+- rakelib/testing.rake
+- test/helper.rb
 - test/performance.rb
 - test/preload.rb
 - test/test_blankslate.rb
@@ -50,42 +60,33 @@ files:
 - test/test_method_caching.rb
 - test/test_namecollision.rb
 - test/test_xchar.rb
-- CHANGES
-- MIT-LICENSE
-- Rakefile
-- README.rdoc
-- doc/releases/builder-1.2.4.rdoc
-- doc/releases/builder-2.0.0.rdoc
-- doc/releases/builder-2.1.1.rdoc
 homepage: http://onestepback.org
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options:
-- --title
+- "--title"
 - Builder -- Easy XML Building
-- --main
+- "--main"
 - README.rdoc
-- --line-numbers
+- "--line-numbers"
 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: 
-rubygems_version: 1.8.24
+rubygems_version: 3.1.0.pre3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Builders for MarkUp.
 test_files:
 - test/test_blankslate.rb