activesupport 1.4.4 → 2.0.0

data/lib/active_support/vendor/{builder → builder-2.1.2/builder}/xchar.rb

@@ -10,7 +10,7 @@
 
 module Builder
   def self.check_for_name_collision(klass, method_name, defined_constant=nil)
-    if klass.instance_methods.include?(method_name)
+    if klass.instance_methods.include?(method_name.to_s)
       fail RuntimeError,
 	"Name Collision: Method '#{method_name}' is already defined in #{klass}"
     end
@@ -27,7 +27,7 @@ module Builder
 
   ####################################################################
   # XML Character converter, from Sam Ruby:
-  # (see http://intertwingly.net/stories/2005/09/28/xchar.rb). 
+  # (see http://intertwingly.net/stories/2005/09/28/xchar.rb).
   #
   module XChar # :nodoc:
 
@@ -73,8 +73,8 @@ module Builder
 
     # See http://www.w3.org/TR/REC-xml/#charsets for details.
     VALID = [
-      [0x9, 0xA, 0xD],
-      (0x20..0xD7FF), 
+      0x9, 0xA, 0xD,
+      (0x20..0xD7FF),
       (0xE000..0xFFFD),
       (0x10000..0x10FFFF)
     ]
@@ -86,14 +86,17 @@ end
 ######################################################################
 # Enhance the Fixnum class with a XML escaped character conversion.
 #
-class Fixnum #:nodoc:
+class Fixnum
   XChar = Builder::XChar if ! defined?(XChar)
 
   # XML escaped version of chr
   def xchr
     n = XChar::CP1252[self] || self
-    n = 42 unless XChar::VALID.find {|range| range.include? n}
-    XChar::PREDEFINED[n] or (n<128 ? n.chr : "&##{n};")
+    case n when *XChar::VALID
+      XChar::PREDEFINED[n] or (n<128 ? n.chr : "&##{n};")
+    else
+      '*'
+    end
   end
 end
 
@@ -102,7 +105,7 @@ end
 # Enhance the String class with a XML escaped character version of
 # to_s.
 #
-class String #:nodoc:
+class String
   # XML escaped version of to_s
   def to_xs
     unpack('U*').map {|n| n.xchr}.join # ASCII, UTF-8

data/lib/active_support/vendor/{builder → builder-2.1.2/builder}/xmlbase.rb

@@ -5,12 +5,11 @@ require 'builder/blankslate'
 module Builder
 
   # Generic error for builder
-  class IllegalBlockError < RuntimeError #:nodoc:
-  end
+  class IllegalBlockError < RuntimeError; end
 
   # XmlBase is a base class for building XML builders.  See
   # Builder::XmlMarkup and Builder::XmlEvents for examples.
-  class XmlBase < BlankSlate #:nodoc:
+  class XmlBase < BlankSlate
 
     # Create an XML markup builder.
     #
@@ -24,12 +23,12 @@ module Builder
       @indent = indent
       @level  = initial
     end
-    
+
     # Create a tag named +sym+.  Other than the first argument which
-    # is the tag name, the arguements are the same as the tags
+    # is the tag name, the arguments are the same as the tags
     # implemented via <tt>method_missing</tt>.
     def tag!(sym, *args, &block)
-      self.__send__(sym, *args, &block)
+      method_missing(sym.to_sym, *args, &block)
     end
 
     # Create XML markup based on the name of the method.  This method
@@ -40,51 +39,50 @@ module Builder
       attrs = nil
       sym = "#{sym}:#{args.shift}" if args.first.kind_of?(Symbol)
       args.each do |arg|
-	case arg
-	when Hash
-	  attrs ||= {}
-	  attrs.merge!(arg)
-	else
-	  text ||= ''
-	  text << arg.to_s
-	end
+        case arg
+        when Hash
+          attrs ||= {}
+          attrs.merge!(arg)
+        else
+          text ||= ''
+          text << arg.to_s
+        end
       end
       if block
-	unless text.nil?
-	  raise ArgumentError, "XmlMarkup cannot mix a text argument with a block"
-	end
-	_capture_outer_self(block) unless defined?(@self) && !@self.nil?
-	_indent
-	_start_tag(sym, attrs)
-	_newline
-	_nested_structures(block)
-	_indent
-	_end_tag(sym)
-	_newline
+        unless text.nil?
+          raise ArgumentError, "XmlMarkup cannot mix a text argument with a block"
+        end
+        _indent
+        _start_tag(sym, attrs)
+        _newline
+        _nested_structures(block)
+        _indent
+        _end_tag(sym)
+        _newline
       elsif text.nil?
-	_indent
-	_start_tag(sym, attrs, true)
-	_newline
+        _indent
+        _start_tag(sym, attrs, true)
+        _newline
       else
-	_indent
-	_start_tag(sym, attrs)
-	text! text
-	_end_tag(sym)
-	_newline
+        _indent
+        _start_tag(sym, attrs)
+        text! text
+        _end_tag(sym)
+        _newline
       end
       @target
     end
 
     # Append text to the output target.  Escape any markup.  May be
-    # used within the markup brakets as:
+    # used within the markup brackets as:
     #
     #   builder.p { |b| b.br; b.text! "HI" }   #=>  <p><br/>HI</p>
     def text!(text)
       _text(_escape(text))
     end
-    
+
     # Append text to the output target without escaping any markup.
-    # May be used within the markup brakets as:
+    # May be used within the markup brackets as:
     #
     #   builder.p { |x| x << "<br/>HI" }   #=>  <p><br/>HI</p>
     #
@@ -99,7 +97,7 @@ module Builder
     def <<(text)
       _text(text)
     end
-    
+
     # For some reason, nil? is sent to the XmlMarkup object.  If nil?
     # is not defined and method_missing is invoked, some strange kind
     # of recursion happens.  Since nil? won't ever be an XML tag, it
@@ -111,7 +109,7 @@ module Builder
     end
 
     private
-    
+
     require 'builder/xchar'
     def _escape(text)
       text.to_xs
@@ -121,20 +119,16 @@ module Builder
       _escape(text).gsub(%r{"}, '&quot;')  # " WART
     end
 
-    def _capture_outer_self(block)
-      @self = eval("self", block)
-    end
-    
     def _newline
       return if @indent == 0
       text! "\n"
     end
-    
+
     def _indent
       return if @indent == 0 || @level == 0
       text!(" " * (@level * @indent))
     end
-    
+
     def _nested_structures(block)
       @level += 1
       block.call(self)

data/lib/active_support/vendor/{builder → builder-2.1.2/builder}/xmlevents.rb

@@ -45,7 +45,7 @@ module Builder
   #     +text+ call, so the client cannot assume that a single
   #     callback contains all the text data.
   #
-  class XmlEvents < XmlMarkup #:nodoc:
+  class XmlEvents < XmlMarkup
     def text!(text)
       @target.text(text)
     end

data/lib/active_support/vendor/{builder → builder-2.1.2/builder}/xmlmarkup.rb

@@ -38,6 +38,7 @@ module Builder
   #       xm.title("History")        #     <title>History</title>
   #     }                            #   </head>
   #     xm.body {                    #   <body>
+  #       xm.comment! "HI"           #     <! -- HI -->
   #       xm.h1("Header")            #     <h1>Header</h1>
   #       xm.p("paragraph")          #     <p>paragraph</p>
   #     }                            #   </body>
@@ -46,7 +47,7 @@ module Builder
   # == Notes:
   #
   # * The order that attributes are inserted in markup tags is
-  #   undefined. 
+  #   undefined.
   #
   # * Sometimes you wish to insert text without enclosing tags.  Use
   #   the <tt>text!</tt> method to accomplish this.
@@ -77,7 +78,7 @@ module Builder
   #   <tt>tag!</tt> will also take text and attribute arguments (after
   #   the tag name) like normal markup methods.  (But see the next
   #   bullet item for a better way to handle XML namespaces).
-  #   
+  #
   # * Direct 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
@@ -92,7 +93,7 @@ module Builder
   # * XmlMarkup builds the markup in any object (called a _target_)
   #   that accepts the <tt><<</tt> method.  If no target is given,
   #   then XmlMarkup defaults to a string target.
-  # 
+  #
   #   Examples:
   #
   #     xm = Builder::XmlMarkup.new
@@ -109,16 +110,16 @@ module Builder
   #     xm = Builder::XmlMarkup.new
   #     x2 = Builder::XmlMarkup.new(:target=>xm)
   #     # Markup written to +x2+ will be send to +xm+.
-  #   
+  #
   # * Indentation is enabled by providing the number of spaces to
   #   indent for each level as a second argument to XmlBuilder.new.
   #   Initial indentation may be specified using a third parameter.
   #
   #   Example:
   #
-  #     xm = Builder.new(:ident=>2)
+  #     xm = Builder.new(:indent=>2)
   #     # xm will produce nicely formatted and indented XML.
-  #  
+  #
   #     xm = Builder.new(:indent=>2, :margin=>4)
   #     # xm will produce nicely formatted and indented XML with 2
   #     # spaces per indent and an over all indentation level of 4.
@@ -164,15 +165,15 @@ module Builder
     # :target=><em>target_object</em>::
     #    Object receiving the markup.  +out+ must respond to the
     #    <tt><<</tt> operator.  The default is a plain string target.
-    #    
+    #
     # :indent=><em>indentation</em>::
     #    Number of spaces used for indentation.  The default is no
     #    indentation and no line breaks.
-    #    
+    #
     # :margin=><em>initial_indentation_level</em>::
     #    Amount of initial indentation (specified in levels, not
     #    spaces).
-    #    
+    #
     # :escape_attrs=><b>OBSOLETE</em>::
     #    The :escape_attrs option is no longer supported by builder
     #    (and will be quietly ignored).  String attribute values are
@@ -180,14 +181,14 @@ module Builder
     #    values (perhaps you are using entities in the attribute
     #    values), then give the value as a Symbol.  This allows much
     #    finer control over escaping attribute values.
-    #    
+    #
     def initialize(options={})
       indent = options[:indent] || 0
       margin = options[:margin] || 0
       super(indent, margin)
       @target = options[:target] || ""
     end
-    
+
     # Return the target of the builder.
     def target!
       @target
@@ -208,18 +209,18 @@ module Builder
       _indent
       @target << "<!#{inst}"
       args.each do |arg|
-	case arg
-	when String
-	  @target << %{ "#{arg}"}
-	when Symbol
-	  @target << " #{arg}"
-	end
+        case arg
+        when String
+          @target << %{ "#{arg}"} # " WART
+        when Symbol
+          @target << " #{arg}"
+        end
       end
       if block_given?
-	@target << " ["
-	_newline
-	_nested_structures(block)
-	@target << "]"
+        @target << " ["
+        _newline
+        _nested_structures(block)
+        @target << "]"
       end
       @target << ">"
       _newline
@@ -237,15 +238,15 @@ module Builder
     def instruct!(directive_tag=:xml, attrs={})
       _ensure_no_block block_given?
       if directive_tag == :xml
-	a = { :version=>"1.0", :encoding=>"UTF-8" }
-	attrs = a.merge attrs
+        a = { :version=>"1.0", :encoding=>"UTF-8" }
+        attrs = a.merge attrs
       end
       _special(
-	"<?#{directive_tag}",
-	"?>",
-	nil,
-	attrs,
-	[:version, :encoding, :standalone])
+      "<?#{directive_tag}",
+      "?>",
+      nil,
+      attrs,
+      [:version, :encoding, :standalone])
     end
 
     # Insert a CDATA section into the XML markup.
@@ -259,7 +260,7 @@ module Builder
       _ensure_no_block block_given?
       _special("<![CDATA[", "]]>", text, nil)
     end
-    
+
     private
 
     # NOTE: All private methods of a builder object are prefixed when
@@ -269,8 +270,8 @@ module Builder
     def _text(text)
       @target << text
     end
-    
-    # Insert special instruction. 
+
+    # Insert special instruction.
     def _special(open, close, data=nil, attrs=nil, order=[])
       _indent
       @target << open
@@ -288,7 +289,7 @@ module Builder
       @target << "/" if end_too
       @target << ">"
     end
-    
+
     # Insert an ending tag.
     def _end_tag(sym)
       @target << "</#{sym}>"
@@ -298,27 +299,27 @@ module Builder
     def _insert_attributes(attrs, order=[])
       return if attrs.nil?
       order.each do |k|
-	v = attrs[k]
-	@target << %{ #{k}="#{_attr_value(v)}"} if v
+        v = attrs[k]
+        @target << %{ #{k}="#{_attr_value(v)}"} if v # " WART
       end
       attrs.each do |k, v|
-	@target << %{ #{k}="#{_attr_value(v)}"} unless order.member?(k)
+        @target << %{ #{k}="#{_attr_value(v)}"} unless order.member?(k) # " WART
       end
     end
 
     def _attr_value(value)
       case value
       when Symbol
-	value.to_s
+        value.to_s
       else
-	_escape_quote(value.to_s)
+        _escape_quote(value.to_s)
       end
     end
 
     def _ensure_no_block(got_block)
       if got_block
-	fail IllegalBlockError,
-	  "Blocks are not allowed on XML instructions"
+        fail IllegalBlockError,
+        "Blocks are not allowed on XML instructions"
       end
     end
 

data/lib/active_support/vendor/{xml_simple.rb → xml-simple-1.0.11/xmlsimple.rb}

@@ -11,11 +11,11 @@ require 'stringio'
 class XmlSimple
   include REXML
 
-  @@VERSION = '1.0.9'
+  @@VERSION = '1.0.11'
 
   # A simple cache for XML documents that were already transformed
   # by xml_in.
-  class Cache #:nodoc:
+  class Cache
     # Creates and initializes a new Cache object.
     def initialize
       @mem_share_cache = {}
@@ -129,7 +129,7 @@ class XmlSimple
     unless defaults.nil? || defaults.instance_of?(Hash)
       raise ArgumentError, "Options have to be a Hash."
     end
-    @default_options = normalize_option_names(defaults, KNOWN_OPTIONS['in'] & KNOWN_OPTIONS['out'])
+    @default_options = normalize_option_names(defaults, (KNOWN_OPTIONS['in'] + KNOWN_OPTIONS['out']).uniq)
     @options = Hash.new
     @_var_values = nil
   end

data/lib/active_support/version.rb

@@ -1,8 +1,8 @@
 module ActiveSupport
   module VERSION #:nodoc:
-    MAJOR = 1
-    MINOR = 4
-    TINY  = 4
+    MAJOR = 2
+    MINOR = 0
+    TINY  = 0
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end