builder 3.0.4 → 3.1.0

data/README

@@ -0,0 +1,230 @@
+# coding: UTF-8
+= Project: Builder
+
+== Goal
+
+Provide a simple way to create XML markup and data structures.
+
+== Classes
+
+Builder::XmlMarkup:: Generate XML markup notiation
+Builder::XmlEvents:: Generate XML events (i.e. SAX-like)
+
+<b>Notes</b>:: 
+
+* An <tt>Builder::XmlTree</tt> class to generate XML tree
+  (i.e. DOM-like) structures is also planned, but not yet implemented.
+  Also, the events builder is currently lagging the markup builder in
+  features.
+
+== Usage
+
+  require 'rubygems'	
+  require_gem 'builder', '~> 3.0'
+
+  builder = Builder::XmlMarkup.new
+  xml = builder.person { |b| b.name("Jim"); b.phone("555-1234") }
+  xml #=> <person><name>Jim</name><phone>555-1234</phone></person>
+
+or
+
+  require 'rubygems'	
+  require_gem 'builder'
+
+  builder = Builder::XmlMarkup.new(:target=>STDOUT, :indent=>2)
+  builder.person { |b| b.name("Jim"); b.phone("555-1234") }
+  #
+  # Prints:
+  # <person>
+  #   <name>Jim</name>
+  #   <phone>555-1234</phone>
+  # </person>
+
+== Compatibility
+
+=== Version 3.0.0 
+
+Version 3 adds Ruby 1.9.2 compatibility.
+
+=== Version 2.0.0 Compatibility Changes
+
+Version 2.0.0 introduces automatically escaped attribute values for
+the first time.  Versions prior to 2.0.0 did not insert escape
+characters into attribute values in the XML markup.  This allowed
+attribute values to explicitly reference entities, which was
+occasionally used by a small number of developers.  Since strings
+could always be explicitly escaped by hand, this was not a major
+restriction in functionality.
+
+However, it did suprise most users of builder.  Since the body text is
+normally escaped, everybody expected the attribute values to be
+escaped as well.  Escaped attribute values were the number one support
+request on the 1.x Builder series.
+
+Starting with Builder version 2.0.0, all attribute values expressed as
+strings will be processed and the appropriate characters will be
+escaped (e.g. "&" will be tranlated to "&amp;").  Attribute values
+that are expressed as Symbol values will not be processed for escaped
+characters and will be unchanged in output. (Yes, this probably counts
+as Symbol abuse, but the convention is convenient and flexible).
+
+Example:
+
+  xml = Builder::XmlMarkup.new
+  xml.sample(:escaped=>"This&That", :unescaped=>:"Here&amp;There")
+  xml.target!  =>
+    <sample escaped="This&amp;That" unescaped="Here&amp;There"/>
+
+=== Version 1.0.0 Compatibility Changes
+
+Version 1.0.0 introduces some changes that are not backwards
+compatible with earlier releases of builder.  The main areas of
+incompatibility are:
+
+* Keyword based arguments to +new+ (rather than positional based).  It
+  was found that a developer would often like to specify indentation
+  without providing an explicit target, or specify a target without
+  indentation.  Keyword based arguments handle this situation nicely.
+
+* Builder must now be an explicit target for markup tags.  Instead of
+  writing
+
+    xml_markup = Builder::XmlMarkup.new
+    xml_markup.div { strong("text") }
+
+  you need to write
+
+    xml_markup = Builder::XmlMarkup.new
+    xml_markup.div { xml_markup.strong("text") }
+
+* The builder object is passed as a parameter to all nested markup
+  blocks.  This allows you to create a short alias for the builder
+  object that can be used within the block.  For example, the previous
+  example can be written as:
+
+    xml_markup = Builder::XmlMarkup.new
+    xml_markup.div { |xml| xml.strong("text") }
+
+* If you have both a pre-1.0 and a post-1.0 gem of builder installed,
+  you can choose which version to use through the RubyGems
+  +require_gem+ facility.
+
+    require_gem 'builder', "~> 0.0"   # Gets the old version
+    require_gem 'builder', "~> 1.0"   # Gets the new version
+
+== Features
+
+* XML Comments are supported ...
+
+    xml_markup.comment! "This is a comment"
+      #=>  <!-- This is a comment -->
+
+* XML processing instructions are supported ...
+
+    xml_markup.instruct! :xml, :version=>"1.0", :encoding=>"UTF-8"
+      #=>  <?xml version="1.0" encoding="UTF-8"?>
+   
+  If the processing instruction is omitted, it defaults to "xml".
+  When the processing instruction is "xml", the defaults attributes
+  are:
+  
+  <b>version</b>:: 1.0
+  <b>encoding</b>:: "UTF-8"
+
+  (NOTE: if the encoding is set to "UTF-8" and $KCODE is set to
+  "UTF8", then Builder will emit UTF-8 encoded strings rather than
+  encoding non-ASCII characters as entities.)
+
+* XML entity declarations are now supported to a small degree.
+
+    xml_markup.declare! :DOCTYPE, :chapter, :SYSTEM, "../dtds/chapter.dtd"
+      #=>  <!DOCTYPE chapter SYSTEM "../dtds/chapter.dtd">
+
+  The parameters to a declare! method must be either symbols or
+  strings. Symbols are inserted without quotes, and strings are
+  inserted with double quotes.  Attribute-like arguments in hashes are
+  not allowed.
+
+  If you need to have an argument to declare! be inserted without
+  quotes, but the arguement does not conform to the typical Ruby
+  syntax for symbols, then use the :"string" form to specify a symbol.
+
+  For example:
+
+    xml_markup.declare! :ELEMENT, :chapter, :"(title,para+)"
+      #=>  <!ELEMENT chapter (title,para+)>
+
+  Nested entity declarations are allowed.  For example:
+
+    @xml_markup.declare! :DOCTYPE, :chapter do |x|
+      x.declare! :ELEMENT, :chapter, :"(title,para+)"
+      x.declare! :ELEMENT, :title, :"(#PCDATA)"
+      x.declare! :ELEMENT, :para, :"(#PCDATA)"
+    end
+
+    #=>
+
+    <!DOCTYPE chapter [
+      <!ELEMENT chapter (title,para+)>
+      <!ELEMENT title (#PCDATA)>
+      <!ELEMENT para (#PCDATA)>
+    ]>
+
+* Some support for XML namespaces is now available.  If the first
+  argument to a tag call is a symbol, it will be joined to the tag to
+  produce a namespace:tag combination.  It is easier to show this than
+  describe it.
+
+   xml.SOAP :Envelope do ... end
+
+  Just put a space before the colon in a namespace to produce the
+  right form for builder (e.g. "<tt>SOAP:Envelope</tt>" =>
+  "<tt>xml.SOAP :Envelope</tt>")
+
+* String attribute values are <em>now</em> escaped by default by
+  Builder (<b>NOTE:</b> this is _new_ behavior as of version 2.0).
+
+  However, occasionally you need to use entities in attribute values.
+  Using a symbols (rather than a string) for an attribute value will
+  cause Builder to not run its quoting/escaping algorithm on that
+  particular value.
+
+  (<b>Note:</b> The +escape_attrs+ option for builder is now
+  obsolete).
+
+  Example:
+
+    xml = Builder::XmlMarkup.new
+    xml.sample(:escaped=>"This&That", :unescaped=>:"Here&amp;There")
+    xml.target!  =>
+      <sample escaped="This&amp;That" unescaped="Here&amp;There"/>
+
+* UTF-8 Support
+
+  Builder correctly translates UTF-8 characters into valid XML.  (New
+  in version 2.0.0).  Thanks to Sam Ruby for the translation code.
+
+  Example:
+
+    xml = Builder::Markup.new
+    xml.sample("Iñtërnâtiônàl")
+    xml.target!  =>
+      "<sample>I&#241;t&#235;rn&#226;ti&#244;n&#224;l</sample>"
+
+  You can get UTF-8 encoded output by making sure that the XML
+  encoding is set to "UTF-8" and that the $KCODE variable is set to
+  "UTF8".
+
+    $KCODE = 'UTF8'
+    xml = Builder::Markup.new
+    xml.instruct!(:xml, :encoding => "UTF-8")
+    xml.sample("Iñtërnâtiônàl")
+    xml.target!  =>
+      "<sample>Iñtërnâtiônàl</sample>"
+
+== Contact
+
+Author::     Jim Weirich
+Email::      jim@weirichhouse.org
+Home Page::  http://onestepback.org
+License::    MIT Licence (http://www.opensource.org/licenses/mit-license.html)

data/README.rdoc

@@ -10,7 +10,7 @@ Provide a simple way to create XML markup and data structures.
 Builder::XmlMarkup:: Generate XML markup notiation
 Builder::XmlEvents:: Generate XML events (i.e. SAX-like)
 
-<b>Notes</b>::
+<b>Notes</b>:: 
 
 * An <tt>Builder::XmlTree</tt> class to generate XML tree
   (i.e. DOM-like) structures is also planned, but not yet implemented.
@@ -19,7 +19,7 @@ Builder::XmlEvents:: Generate XML events (i.e. SAX-like)
 
 == Usage
 
-  require 'rubygems'
+  require 'rubygems'	
   require_gem 'builder', '~> 2.0'
 
   builder = Builder::XmlMarkup.new
@@ -28,7 +28,7 @@ Builder::XmlEvents:: Generate XML events (i.e. SAX-like)
 
 or
 
-  require 'rubygems'
+  require 'rubygems'	
   require_gem 'builder'
 
   builder = Builder::XmlMarkup.new(:target=>STDOUT, :indent=>2)
@@ -119,11 +119,11 @@ incompatibility are:
 
     xml_markup.instruct! :xml, :version=>"1.0", :encoding=>"UTF-8"
       #=>  <?xml version="1.0" encoding="UTF-8"?>
-
+   
   If the processing instruction is omitted, it defaults to "xml".
   When the processing instruction is "xml", the defaults attributes
   are:
-
+  
   <b>version</b>:: 1.0
   <b>encoding</b>:: "UTF-8"
 
@@ -200,6 +200,13 @@ incompatibility are:
   Builder correctly translates UTF-8 characters into valid XML.  (New
   in version 2.0.0).  Thanks to Sam Ruby for the translation code.
 
+  Example:
+
+    xml = Builder::Markup.new
+    xml.sample("I$-1¶Æt(5k(Brn¶¨ti¶Én¶¦l")-A
+    xml.target!  =>
+      "<sample>I&#241;t&#235;rn&#226;ti&#244;n&#224;l</sample>"
+
   You can get UTF-8 encoded output by making sure that the XML
   encoding is set to "UTF-8" and that the $KCODE variable is set to
   "UTF8".
@@ -213,9 +220,10 @@ incompatibility are:
 
 == Links
 
-Documents           :: http://builder.rubyforge.org/
-Github Clone        :: git://github.com/jimweirich/builder.git
-Issue / Bug Reports :: https://github.com/jimweirich/builder/issues?state=open
+Documents::      http://builder.rubyforge.org/
+Github Clone::   git://github.com/jimweirich/builder.git
+Issue Tracking:: http://www.pivotaltracker.com/projects/29210
+Bug Reports::    http://onestepback.org/cgi-bin/bugs.cgi?project=builder
 
 == Contact
 

data/Rakefile

@@ -17,14 +17,13 @@ rescue Exception
   nil
 end
 
-require './lib/builder/version'
-
 # Determine the current version of the software
 
 CLOBBER.include('pkg')
 CLEAN.include('pkg/builder-*').include('pkg/blankslate-*').exclude('pkg/*.gem')
 
-PKG_VERSION = Builder::VERSION
+CURRENT_VERSION = '3.1.0'
+PKG_VERSION = ENV['REL'] ? ENV['REL'] : CURRENT_VERSION
 
 SRC_RB = FileList['lib/**/*.rb']
 
@@ -53,7 +52,7 @@ rd = RDoc::Task.new("rdoc") { |rdoc|
   rdoc.rdoc_dir = 'html'
   rdoc.title    = "Builder for Markup"
   rdoc.options << '--line-numbers' << '--inline-source' << '--main' << 'README.rdoc'
-  rdoc.rdoc_files.include('lib/**/*.rb', '[A-Z]*', 'doc/**/*.rdoc').exclude("TAGS")
+  rdoc.rdoc_files.include('lib/**/*.rb', '[A-Z]*', 'doc/**/*.rdoc')
   rdoc.template = 'doc/jamis.rb'
 }
 
@@ -66,9 +65,8 @@ PKG_FILES = FileList[
   'test/**/*.rb',
   'scripts/**/*.rb'
 ]
-PKG_FILES.exclude('test/test_cssbuilder.rb')
+PKG_FILES.exclude('test/testcssbuilder.rb')
 PKG_FILES.exclude('lib/builder/css.rb')
-PKG_FILES.exclude('TAGS')
 
 BLANKSLATE_FILES = FileList[
   'lib/blankslate.rb',
@@ -106,9 +104,8 @@ simple to do.  Currently the following builder objects are supported:
       '--line-numbers'
 
     s.author = "Jim Weirich"
-    s.email = "jim.weirich@gmail.com"
+    s.email = "jim@weirichhouse.org"
     s.homepage = "http://onestepback.org"
-    s.license = 'MIT'
   end
 
   blankslate_spec = Gem::Specification.new do |s|
@@ -137,30 +134,31 @@ classes that make heavy use of method_missing.
       '--line-numbers'
 
     s.author = "Jim Weirich"
-    s.email = "jim.weirich@gmail.com"
+    s.email = "jim@weirichhouse.org"
     s.homepage = "http://onestepback.org"
-    s.license = 'MIT'
   end
 
   namespace 'builder' do
     Gem::PackageTask.new(spec) do |t|
-      t.need_tar = false
+      t.need_tar = true
     end
   end
 
   namespace 'blankslate' do
     Gem::PackageTask.new(blankslate_spec) do |t|
-      t.need_tar = false
+      t.need_tar = true
     end
   end
 
-  task :package => [:remove_tags, 'builder:package', 'blankslate:package']
+  task :package => ['builder:package', 'blankslate:package']
 end
 
-task :remove_tags do
-  rm "TAGS" rescue nil
+desc "Look for Debugging print lines"
+task :dbg do
+  FileList['**/*.rb'].egrep /\bDBG|\bbreakpoint\b/
 end
 
+
 # RCov ---------------------------------------------------------------
 begin
   require 'rcov/rcovtask'
@@ -180,6 +178,114 @@ rescue LoadError
   # No rcov available
 end
 
+# Tags file ----------------------------------------------------------
+
+namespace "tags" do
+  desc "Create a TAGS file"
+  task :emacs => "TAGS"
+
+  TAGS = ENV['TAGS'] || 'ctags'
+
+  file "TAGS" => SRC_RB do
+    puts "Making TAGS"
+    sh "#{TAGS} -e #{SRC_RB}", :verbose => false
+  end
+end
+
+# --------------------------------------------------------------------
+# Creating a release
+
+def announce(msg='')
+  STDERR.puts msg
+end
+
+desc "Make a new release"
+task :release => [
+  :prerelease,
+  :clobber,
+  :test_all,
+  :update_version,
+  :package,
+  :tag] do
+
+  announce
+  announce "**************************************************************"
+  announce "* Release #{PKG_VERSION} Complete."
+  announce "* Packages ready to upload."
+  announce "**************************************************************"
+  announce
+end
+
+# Validate that everything is ready to go for a release.
+task :prerelease do
+  announce
+  announce "**************************************************************"
+  announce "* Making RubyGem Release #{PKG_VERSION}"
+  announce "* (current version #{CURRENT_VERSION})"
+  announce "**************************************************************"
+  announce
+
+  # Is a release number supplied?
+  unless ENV['REL']
+    fail "Usage: rake release REL=x.y.z [REUSE=tag_suffix]"
+  end
+
+  # Is the release different than the current release.
+  # (or is REUSE set?)
+  if PKG_VERSION == CURRENT_VERSION && ! ENV['REUSE']
+    fail "Current version is #{PKG_VERSION}, must specify REUSE=tag_suffix to reuse version"
+  end
+
+  # Are all source files checked in?
+  if ENV['RELTEST']
+    announce "Release Task Testing, skipping checked-in file test"
+  else
+    announce "Checking for unchecked-in files..."
+    data = `cvs -q update`
+    unless data =~ /^$/
+      fail "CVS update is not clean ... do you have unchecked-in files?"
+    end
+    announce "No outstanding checkins found ... OK"
+  end
+end
+
+task :update_version => [:prerelease] do
+  if PKG_VERSION == CURRENT_VERSION
+    announce "No version change ... skipping version update"
+  else
+    announce "Updating Builder version to #{PKG_VERSION}"
+    open("Rakefile") do |rakein|
+      open("Rakefile.new", "w") do |rakeout|
+	rakein.each do |line|
+	  if line =~ /^CURRENT_VERSION\s*=\s*/
+	    rakeout.puts "CURRENT_VERSION = '#{PKG_VERSION}'"
+	  else
+	    rakeout.puts line
+	  end
+	end
+      end
+    end
+    mv "Rakefile.new", "Rakefile"
+    if ENV['RELTEST']
+      announce "Release Task Testing, skipping commiting of new version"
+    else
+      sh "cvs commit -m \"Updated to version #{PKG_VERSION}\" Rakefile"
+    end
+  end
+end
+
+desc "Tag all the CVS files with the latest release number (REL=x.y.z)"
+task :tag => [:prerelease] do
+  reltag = "REL_#{PKG_VERSION.gsub(/\./, '_')}"
+  reltag << ENV['REUSE'].gsub(/\./, '_') if ENV['REUSE']
+  announce "Tagging CVS with [#{reltag}]"
+  if ENV['RELTEST']
+    announce "Release Task Testing, skipping CVS tagging"
+  else
+    sh %{cvs tag #{reltag}}
+  end
+end
+
 desc "Install the jamis RDoc template"
 task :install_jamis_template do
   require 'rbconfig'

data/TAGS

@@ -0,0 +1,102 @@
+
+(null),455
+class BlankSlateBlankSlate
17,621
+    def hide(name)hide
22,788
+    def find_hidden_method(name)find_hidden_method
31,1032
+    def reveal(name)reveal
38,1268
+module KernelKernel
55,1902
+    def method_added(name)method_added
61,2078
+class ObjectObject
73,2357
+    def method_added(name)method_added
79,2532
+    def find_hidden_method(name)find_hidden_method
86,2693
+class ModuleModule
99,3124
+  def append_features(mod)append_features
101,3197
+
+lib/builder/blankslate.rb,30
+module BuilderBuilder
16,533
+
+lib/builder/css.rb,1102
+module BuilderBuilder
23,757
+  class CSS < BlankSlateCSS
92,2139
+    def initialize(indent=2)initialize
101,2424
+    def +(part)+
108,2562
+    def >>(part)>>
113,2623
+    def >(part)>
118,2684
+    def |(part)|
123,2745
+    def target!target!
129,2845
+    def comment!(comment_text)comment!
134,2934
+    def id!(arg, &block)id!
138,3017
+    def class!(arg, &block)class!
145,3179
+    def store!(sym, &block)store!
152,3344
+    def group!(*args, &block)group!
156,3417
+    def method_missing(sym, *args, &block)method_missing
171,3730
+    def nil?nil?
190,4236
+    def _unify_block_unify_block
195,4282
+    def _join_with_op!(op)_join_with_op!
200,4363
+    def _text(text)_text
205,4484
+    def _css_block(block)_css_block
209,4534
+    def _end_block_end_block
216,4654
+    def _newline_newline
221,4716
+    def _indent_indent
225,4763
+    def _nested_structures(block)_nested_structures
229,4814
+    def _start_container(sym, atts = {}, with_bracket = true)_start_container
235,4937
+    def _end_container_end_container
242,5212
+    def _css_line(sym, *args)_css_line
246,5264
+
+lib/builder/xchar.rb,523
+module BuilderBuilder
11,321
+  def self.check_for_name_collision(klass, method_name, defined_constant=nil)check_for_name_collision
12,336
+module BuilderBuilder
26,826
+  module XChar # :nodoc:XChar
32,1025
+  module BuilderBuilder
97,3103
+    module XChar # :nodoc:XChar
98,3120
+      def XChar.unicode(string)unicode
125,4081
+      def XChar.encode(string)encode
151,4755
+  class FixnumFixnum
165,5150
+    def xchr(escape=true)xchr
171,5393
+  class StringString
187,5824
+    def to_xs(escape=true)to_xs
191,6017
+
+lib/builder/xmlbase.rb,748
+module BuilderBuilder
5,51
+  class IllegalBlockError < RuntimeError; endIllegalBlockError
8,97
+  class XmlBase < BlankSlateXmlBase
12,264
+    def initialize(indent=0, initial=0, encoding='utf-8')initialize
28,844
+    def tag!(sym, *args, &block)tag!
37,1172
+    def method_missing(sym, *args, &block)method_missing
84,2344
+    def text!(text)text!
93,2680
+    def <<(text)<<
110,3336
+    def nil?nil?
120,3763
+      def _escape(text)_escape
128,3879
+      def _escape(text)_escape
140,4227
+    def _escape_attribute(text)_escape_attribute
149,4425
+    def _newline_newline
154,4566
+    def _indent_indent
159,4638
+    def _nested_structures(block)_nested_structures
164,4745
+    def cache_method_call(sym)cache_method_call
177,5233
+
+lib/builder/xmlevents.rb,216
+module BuilderBuilder
14,315
+  class XmlEvents < XmlMarkupXmlEvents
48,1598
+    def text!(text)text!
49,1628
+    def _start_tag(sym, attrs, end_too=false)_start_tag
53,1682
+    def _end_tag(sym)_end_tag
58,1804
+
+lib/builder/xmlmarkup.rb,776
+module BuilderBuilder
16,425
+  class XmlMarkup < XmlBaseXmlMarkup
160,5942
+    def initialize(options={})initialize
186,7059
+    def target!target!
194,7284
+    def comment!(comment_text)comment!
198,7323
+    def declare!(inst, *args, &block)declare!
209,7629
+    def instruct!(directive_tag=:xml, attrs={})instruct!
242,8521
+    def cdata!(text)cdata!
264,9115
+    def _text(text)_text
275,9449
+    def _special(open, close, data=nil, attrs=nil, order=[])_special
280,9539
+    def _start_tag(sym, attrs, end_too=false)_start_tag
291,9873
+    def _end_tag(sym)_end_tag
299,10072
+    def _insert_attributes(attrs, order=[])_insert_attributes
304,10181
+    def _attr_value(value)_attr_value
315,10496
+    def _ensure_no_block(got_block)_ensure_no_block
324,10647
+
+pjw_94jc0000gn/T//tags.pR7PYt,0

data/lib/blankslate.rb

@@ -8,30 +8,6 @@
 # above copyright notice is included.
 #++
 
-class String
-  if instance_methods.first.is_a?(Symbol)
-    def _blankslate_as_name
-      to_sym
-    end
-  else
-    def _blankslate_as_name
-      self
-    end
-  end
-end
-
-class Symbol
-  if instance_methods.first.is_a?(Symbol)
-    def _blankslate_as_name
-      self
-    end
-  else
-    def _blankslate_as_name
-      to_s
-    end
-  end
-end
-
 ######################################################################
 # BlankSlate provides an abstract base class with no predefined
 # methods (except for <tt>\_\_send__</tt> and <tt>\_\_id__</tt>).
@@ -40,20 +16,16 @@ end
 #
 class BlankSlate
   class << self
-
+    
     # Hide the method named +name+ in the BlankSlate class.  Don't
     # hide +instance_eval+ or any method beginning with "__".
     def hide(name)
-      warn_level = $VERBOSE
-      $VERBOSE = nil
-      if instance_methods.include?(name._blankslate_as_name) &&
-          name !~ /^(__|instance_eval$)/
+      if instance_methods.include?(name.to_s) and
+        name !~ /^(__|instance_eval)/
         @hidden_methods ||= {}
         @hidden_methods[name.to_sym] = instance_method(name)
         undef_method name
       end
-    ensure
-      $VERBOSE = warn_level
     end
 
     def find_hidden_method(name)
@@ -69,7 +41,7 @@ class BlankSlate
       define_method(name, hidden_method)
     end
   end
-
+  
   instance_methods.each { |m| hide(m) }
 end
 
@@ -134,4 +106,4 @@ class Module
     end
     result
   end
-end
+end

data/lib/builder/xmlbase.rb

@@ -44,8 +44,6 @@ module Builder
         when ::Hash
           attrs ||= {}
           attrs.merge!(arg)
-        when nil
-          # do nothing
         else
           text ||= ''
           text << arg.to_s
@@ -130,9 +128,7 @@ module Builder
       def _escape(text)
         result = XChar.encode(text)
         begin
-          encoding = ::Encoding::find(@encoding)
-          raise Exception if encoding.dummy?
-          result.encode(encoding)
+          result.encode(@encoding)
         rescue
           # if the encoding can't be supported, use numeric character references
           result.
@@ -179,11 +175,11 @@ module Builder
     # method_missing is very slow, this speeds up document generation
     # significantly.
     def cache_method_call(sym)
-      class << self; self; end.class_eval do
-        define_method(sym) do |*args, &block|
-          tag!(sym, *args, &block)
+      instance_eval <<-NEW_METHOD
+        def #{sym.to_s}(*args, &block)
+          tag!(:#{sym.to_s}, *args, &block)
         end
-      end
+      NEW_METHOD
     end
   end
 

data/lib/builder/xmlmarkup.rb

@@ -263,7 +263,7 @@ module Builder
     #
     def cdata!(text)
       _ensure_no_block ::Kernel::block_given?
-      _special("<![CDATA[", "]]>", text.gsub(']]>', ']]]]><![CDATA[>'), nil)
+      _special("<![CDATA[", "]]>", text, nil)
     end
     
     private

data/test/test_blankslate.rb

@@ -12,7 +12,7 @@
 
 require 'test/unit'
 require 'test/preload'
-require 'blankslate'
+require 'builder/blankslate'
 require 'stringio'
 
 # Methods to be introduced into the Object class late.
@@ -81,11 +81,24 @@ end
 # Test case for blank slate.
 #
 class TestBlankSlate < Test::Unit::TestCase
+  if Object::const_defined?(:BasicObject)
+    def skipping?
+      true
+    end
+  else
+    def skipping?
+      false
+    end
+  end
+
   def setup
+    return if skipping?
+    @skip = Object::const_defined?(:BasicObject)
     @bs = BlankSlate.new
   end
 
   def test_undefined_methods_remain_undefined
+    return if skipping?
     assert_raise(NoMethodError) { @bs.no_such_method }
     assert_raise(NoMethodError) { @bs.nil? }
   end
@@ -94,6 +107,7 @@ class TestBlankSlate < Test::Unit::TestCase
   # NOTE: NameError is acceptable because the lack of a '.' means that
   # Ruby can't tell if it is a method or a local variable.
   def test_undefined_methods_remain_undefined_during_instance_eval
+    return if skipping?
     assert_raise(NoMethodError, NameError)  do
       @bs.instance_eval do nil? end
     end
@@ -103,12 +117,14 @@ class TestBlankSlate < Test::Unit::TestCase
   end
 
   def test_private_methods_are_undefined
+    return if skipping?
     assert_raise(NoMethodError) do
       @bs.puts "HI"
     end
   end
 
   def test_targetted_private_methods_are_undefined_during_instance_eval
+    return if skipping?
     assert_raise(NoMethodError, NameError) do
       @bs.instance_eval do self.puts "HI" end
     end
@@ -116,6 +132,7 @@ class TestBlankSlate < Test::Unit::TestCase
 
   def test_untargetted_private_methods_are_defined_during_instance_eval
     oldstdout = $stdout
+    return if skipping?
     $stdout = StringIO.new
     @bs.instance_eval do
       puts "HI"
@@ -125,47 +142,56 @@ class TestBlankSlate < Test::Unit::TestCase
   end
 
   def test_methods_added_late_to_kernel_remain_undefined
+    return if skipping?
     assert_equal 1234, nil.late_addition
     assert_raise(NoMethodError) { @bs.late_addition }
   end
 
   def test_methods_added_late_to_object_remain_undefined
+    return if skipping?
     assert_equal 4321, nil.another_late_addition
     assert_raise(NoMethodError) { @bs.another_late_addition }
   end
 
   def test_methods_added_late_to_global_remain_undefined
+    return if skipping?
     assert_equal 42, global_inclusion
     assert_raise(NoMethodError) { @bs.global_inclusion }
   end
 
   def test_preload_method_added
+    return if skipping?
     assert Kernel.k_added_names.include?(:late_addition)
     assert Object.o_added_names.include?(:another_late_addition)
   end
 
   def test_method_defined_late_multiple_times_remain_undefined
+    return if skipping?
     assert_equal 22, nil.double_late_addition
     assert_raise(NoMethodError) { @bs.double_late_addition }
   end
 
   def test_late_included_module_in_object_is_ok
+    return if skipping?
     assert_equal 33, 1.late_object
     assert_raise(NoMethodError) { @bs.late_object }
   end
 
   def test_late_included_module_in_kernel_is_ok
+    return if skipping?
     assert_raise(NoMethodError) { @bs.late_kernel }
   end
 
   def test_revealing_previously_hidden_methods_are_callable
+    return if skipping?
     with_to_s = Class.new(BlankSlate) do
       reveal :to_s
     end
-    assert_match(/^#<.*>$/, with_to_s.new.to_s)
+    assert_match /^#<.*>$/, with_to_s.new.to_s
   end
 
   def test_revealing_previously_hidden_methods_are_callable_with_block
+    return if skipping?
     Object.class_eval <<-EOS
       def given_block(&block)
         block
@@ -179,14 +205,16 @@ class TestBlankSlate < Test::Unit::TestCase
   end
 
   def test_revealing_a_hidden_method_twice_is_ok
+    return if skipping?
     with_to_s = Class.new(BlankSlate) do
       reveal :to_s
       reveal :to_s
     end
-    assert_match(/^#<.*>$/, with_to_s.new.to_s)
+    assert_match /^#<.*>$/, with_to_s.new.to_s
   end
 
   def test_revealing_unknown_hidden_method_is_an_error
+    return if skipping?
     assert_raises(RuntimeError) do
       Class.new(BlankSlate) do
         reveal :xyz
@@ -195,6 +223,7 @@ class TestBlankSlate < Test::Unit::TestCase
   end
 
   def test_global_includes_still_work
+    return if skipping?
     assert_nothing_raised do
       assert_equal 42, global_inclusion
       assert_equal 42, Object.new.global_inclusion
@@ -204,6 +233,7 @@ class TestBlankSlate < Test::Unit::TestCase
   end
 
   def test_reveal_should_not_bind_to_an_instance
+    return if skipping?
     with_object_id = Class.new(BlankSlate) do
       reveal(:object_id)
     end
@@ -215,3 +245,4 @@ class TestBlankSlate < Test::Unit::TestCase
        "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/test_markupbuilder.rb

@@ -34,21 +34,6 @@ class TestMarkup < Test::Unit::TestCase
     assert_equal "<value>hi</value>", @xml.target!
   end
 
-  def test_empty_value
-    @xml.value("")
-    assert_equal "<value></value>", @xml.target!
-  end
-
-  def test_nil_value
-    @xml.value(nil)
-    assert_equal "<value/>", @xml.target!
-  end
-
-  def test_no_value
-    @xml.value()
-    assert_equal "<value/>", @xml.target!
-  end
-
   def test_nested
     @xml.outer { |x| x.inner("x") }
     assert_equal "<outer><inner>x</inner></outer>", @xml.target!
@@ -142,8 +127,8 @@ class TestMarkup < Test::Unit::TestCase
     ex = assert_raise(ArgumentError) {
       @xml.h1("data1") { b }
     }
-    assert_match(/\btext\b/, ex.message)
-    assert_match(/\bblock\b/, ex.message)
+    assert_match /\btext\b/, ex.message
+    assert_match /\bblock\b/, ex.message
   end
 
   def test_capitalized_method
@@ -243,10 +228,10 @@ class TestNameSpaces < Test::Unit::TestCase
 	end
       end
     end
-    assert_match(/^<\?xml/, xml.target!)
-    assert_match(/\n<rdf:RDF/m, xml.target!)
-    assert_match(/xmlns:rdf="&rdf;"/m, xml.target!)
-    assert_match(/<owl:Restriction>/m, xml.target!)
+    assert_match /^<\?xml/, xml.target!
+    assert_match /\n<rdf:RDF/m, xml.target!
+    assert_match /xmlns:rdf="&rdf;"/m, xml.target!
+    assert_match /<owl:Restriction>/m, xml.target!
   end
 
   def test_ensure
@@ -357,17 +342,17 @@ class TestSpecialMarkup < Test::Unit::TestCase
 
   def test_xml_instruct
     @xml.instruct!
-    assert_match(/^<\?xml version="1.0" encoding="UTF-8"\?>$/, @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"\?>$/, @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!)
+    assert_match /^<\?xml version="1.0" encoding="UCS-2" standalone="yes"\?>$/, @xml.target!
   end
 
   def test_no_blocks
@@ -388,11 +373,6 @@ class TestSpecialMarkup < Test::Unit::TestCase
     @xml.cdata!("TEST&CHECK")
     assert_equal "<![CDATA[TEST&CHECK]]>\n", @xml.target!
   end
-
-  def test_cdata_with_included_close
-    @xml.cdata!("TEST]]>CHECK")
-    assert_equal "<![CDATA[TEST]]]]><![CDATA[>CHECK]]>\n", @xml.target!
-  end
 end
 
 class TestIndentedXmlMarkup < Test::Unit::TestCase
@@ -472,20 +452,14 @@ class TestIndentedXmlMarkup < Test::Unit::TestCase
       end
     end
 
-    def test_use_entities_if_kcode_is_utf_but_encoding_is_dummy_encoding
+    # PENDING: Until we figure out how to gsub on non-UTF-8 text.
+    def xtest_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_entities_if_kcode_is_utf_but_encoding_is_unsupported_encoding
-      xml = Builder::XmlMarkup.new
-      xml.instruct!(:xml, :encoding => 'UCS-2')
-      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'))

data/test/test_method_caching.rb

@@ -28,12 +28,6 @@ class TestMethodCaching < Test::Unit::TestCase
     Builder::XmlBase.cache_method_calls = true
   end
 
-  def test_caching_does_not_break_weird_symbols
-    xml = Builder::XmlMarkup.new
-    xml.__send__("work-order", 1)
-    assert_equal "<work-order>1</work-order>", xml.target!
-  end
-
   def test_method_call_caching
     xml = Builder::XmlMarkup.new
     xml.cache_me

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: builder
 version: !ruby/object:Gem::Version
-  version: 3.0.4
+  version: 3.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-16 00:00:00.000000000 Z
+date: 2012-09-06 00:00:00.000000000 Z
 dependencies: []
 description: ! 'Builder provides a number of builder objects that make creating structured
   data
@@ -22,21 +22,21 @@ description: ! 'Builder provides a number of builder objects that make creating
   * XML Events
 
 '
-email: jim.weirich@gmail.com
+email: jim@weirichhouse.org
 executables: []
 extensions: []
 extra_rdoc_files:
 - CHANGES
-- MIT-LICENSE
 - Rakefile
+- README
 - README.rdoc
+- TAGS
 - doc/releases/builder-1.2.4.rdoc
 - doc/releases/builder-2.0.0.rdoc
 - doc/releases/builder-2.1.1.rdoc
 files:
 - lib/blankslate.rb
 - lib/builder/blankslate.rb
-- lib/builder/version.rb
 - lib/builder/xchar.rb
 - lib/builder/xmlbase.rb
 - lib/builder/xmlevents.rb
@@ -45,21 +45,22 @@ files:
 - test/performance.rb
 - test/preload.rb
 - test/test_blankslate.rb
+- test/test_cssbuilder.rb
 - test/test_eventbuilder.rb
 - test/test_markupbuilder.rb
 - test/test_method_caching.rb
 - test/test_namecollision.rb
 - test/test_xchar.rb
 - CHANGES
-- MIT-LICENSE
 - Rakefile
+- README
 - README.rdoc
+- TAGS
 - 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
+licenses: []
 post_install_message: 
 rdoc_options:
 - --title
@@ -83,12 +84,13 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: Builders for MarkUp.
 test_files:
 - test/test_blankslate.rb
+- test/test_cssbuilder.rb
 - test/test_eventbuilder.rb
 - test/test_markupbuilder.rb
 - test/test_method_caching.rb

data/MIT-LICENSE

@@ -1,20 +0,0 @@
-Copyright (c) 2003-2012 Jim Weirich (jim.weirich@gmail.com)
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/lib/builder/version.rb

@@ -1,8 +0,0 @@
-module Builder
-  VERSION_NUMBERS = [
-    VERSION_MAJOR = 3,
-    VERSION_MINOR = 0,
-    VERSION_BUILD = 4,
-  ]
-  VERSION = VERSION_NUMBERS.join(".")
-end