builder 1.2.2 → 1.2.3

data/CHANGES

@@ -1,5 +1,10 @@
 = Change Log
 
+== Version 1.2.3
+
+The attributes in the <?xml ... ?> instruction will be ordered:
+version, encoding, standalone.
+
 == Version 1.2.2
 
 Another fix for BlankSlate.  The Kernal/Object traps added in 1.2.1

data/Rakefile

@@ -17,7 +17,7 @@ rescue Exception
   nil
 end
 
-PKG_VERSION = "1.2.2"
+PKG_VERSION = "1.2.3"
 
 SRC_RB = FileList['lib/**/*.rb']
 
@@ -63,7 +63,13 @@ else
     s.name = 'builder'
     s.version = PKG_VERSION
     s.summary = "Builders for MarkUp."
-    s.description = %{Simple builder classes for creating markup.}
+    s.description = <<EOS
+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	
+EOS
 
     s.files = PKG_FILES.to_a
 

data/lib/builder/xmlmarkup.rb

@@ -221,7 +221,7 @@ module Builder
     # For example:
     #
     #    xml.instruct!
-    #        #=> <?xml encoding="UTF-8" version="1.0"?>
+    #        #=> <?xml version="1.0" encoding="UTF-8"?>
     #    xml.instruct! :aaa, :bbb=>"ccc"
     #        #=> <?aaa bbb="ccc"?>
     #
@@ -231,7 +231,12 @@ module Builder
 	a = { :version=>"1.0", :encoding=>"UTF-8" }
 	attrs = a.merge attrs
       end
-      _special("<?#{directive_tag}", "?>", nil, attrs)
+      _special(
+	"<?#{directive_tag}",
+	"?>",
+	nil,
+	attrs,
+	[:version, :encoding, :standalone])
     end
 
     private
@@ -245,11 +250,11 @@ module Builder
     end
     
     # Insert special instruction. 
-    def _special(open, close, data=nil, attrs=nil)
+    def _special(open, close, data=nil, attrs=nil, order=[])
       _indent
       @target << open
       @target << data if data
-      _insert_attributes(attrs) if attrs
+      _insert_attributes(attrs, order) if attrs
       @target << close
       _newline
     end
@@ -269,10 +274,14 @@ module Builder
     end
 
     # Insert the attributes (given in the hash).
-    def _insert_attributes(attrs)
+    def _insert_attributes(attrs, order=[])
       return if attrs.nil?
+      order.each do |k|
+	v = attrs[k]
+	@target << %{ #{k}="#{v}"} if v
+      end
       attrs.each do |k, v|
-	@target << %{ #{k}="#{v}"}
+	@target << %{ #{k}="#{v}"} unless order.member?(k)
       end
     end
 

data/test/testmarkupbuilder.rb

@@ -231,7 +231,7 @@ class TestSpecialMarkup < Test::Unit::TestCase
 
   def test_indented_instruct
     @xml.p { @xml.instruct! :xml }
-    assert_match %r{<p>\n  <\?xml( version="1.0"| encoding="UTF-8"){2}\?>\n</p>\n},
+    assert_match %r{<p>\n  <\?xml version="1.0" encoding="UTF-8"\?>\n</p>\n},
       @xml.target!
   end
 
@@ -242,12 +242,17 @@ class TestSpecialMarkup < Test::Unit::TestCase
 
   def test_xml_instruct
     @xml.instruct!
-    assert_match /^<\?xml( version="1.0"| encoding="UTF-8"){2}\?>$/, @xml.target!
+    assert_match /^<\?xml version="1.0" encoding="UTF-8"\?>$/, @xml.target!
   end
 
   def test_xml_instruct_with_overrides
     @xml.instruct! :xml, :encoding=>"UCS-2"
-    assert_match /^<\?xml( version="1.0"| encoding="UCS-2"){2}\?>$/, @xml.target!
+    assert_match /^<\?xml version="1.0" encoding="UCS-2"\?>$/, @xml.target!
+  end
+
+  def test_xml_instruct_with_standalong
+    @xml.instruct! :xml, :encoding=>"UCS-2", :standalone=>"yes"
+    assert_match /^<\?xml version="1.0" encoding="UCS-2" standalone="yes"\?>$/, @xml.target!
   end
 
   def test_no_blocks

metadata

@@ -1,18 +1,19 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.8.1
+rubygems_version: 0.8.3
 specification_version: 1
 name: builder
 version: !ruby/object:Gem::Version 
-  version: 1.2.2
-date: 2004-11-23
+  version: 1.2.3
+date: 2005-01-08
 summary: Builders for MarkUp.
 require_paths: 
   - lib
-author: Jim Weirich
 email: jim@weirichhouse.org
 homepage: http://onestepback.org
 rubyforge_project: 
-description: Simple builder classes for creating markup.
+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"
 autorequire: builder
 default_executable: 
 bindir: bin
@@ -25,22 +26,24 @@ required_ruby_version: !ruby/object:Gem::Version::Requirement
         version: 0.0.0
   version: 
 platform: ruby
+authors: 
+  - Jim Weirich
 files: 
   - lib/builder.rb
-  - lib/builder/blankslate.rb
+  - lib/builder/xmlmarkup.rb
   - lib/builder/xmlbase.rb
+  - lib/builder/blankslate.rb
   - lib/builder/xmlevents.rb
-  - lib/builder/xmlmarkup.rb
-  - test/preload.rb
-  - test/testblankslate.rb
   - test/testmarkupbuilder.rb
+  - test/testblankslate.rb
+  - test/preload.rb
   - scripts/publish.rb
-  - CHANGES
   - README
   - Rakefile
+  - CHANGES
 test_files: 
-  - test/testblankslate.rb
   - test/testmarkupbuilder.rb
+  - test/testblankslate.rb
 rdoc_options: 
   - "--title"
   - "Builder -- Easy XML Building"
@@ -48,9 +51,9 @@ rdoc_options:
   - README
   - "--line-numbers"
 extra_rdoc_files: 
-  - CHANGES
   - README
   - Rakefile
+  - CHANGES
 executables: []
 extensions: []
 requirements: []