Changeset 3812

Timestamp:

03/08/06 02:56:25 (3 years ago)

Author:

david

Message:

Added Hash#to_xml and Array#to_xml that makes it much easier to produce XML from basic structures [DHH] Moved Jim Weirich's wonderful Builder from Action Pack to Active Support (it's simply too useful to be stuck in AP) [DHH]

Files:

• trunk/activesupport/CHANGELOG (modified) (1 diff)
• trunk/activesupport/lib/active_support.rb (modified) (1 diff)
• trunk/activesupport/lib/active_support/core_ext/array/conversions.rb (modified) (2 diffs)
• trunk/activesupport/lib/active_support/core_ext/hash.rb (modified) (2 diffs)
• trunk/activesupport/lib/active_support/core_ext/hash/conversions.rb (added)
• trunk/activesupport/lib/active_support/core_ext/string/inflections.rb (modified) (1 diff)
• trunk/activesupport/lib/active_support/inflector.rb (modified) (1 diff)
• trunk/activesupport/Rakefile (modified) (1 diff)
• trunk/activesupport/test/core_ext/array_ext_test.rb (modified) (1 diff)
• trunk/activesupport/test/core_ext/hash_ext_test.rb (modified) (2 diffs)
• trunk/activesupport/test/inflector_test.rb (modified) (2 diffs)
• trunk/activesupport/vendor (moved) (moved from trunk/actionpack/lib/action_view/vendor)

trunk/activesupport/CHANGELOG

@@ -1 +1 @@
-*SVN*
+
+* Added Hash#to_xml and Array#to_xml that makes it much easier to produce XML from basic structures [DHH]. Examples:
+
+    { :name => "David", :street_name => "Paulina", :age => 26, :moved_on => Date.new(2005, 11, 15) }.to_xml
+    
+  ...returns:
+
+      <person>
+        <street-name type="string">Paulina</street>
+        <name type="string">David</name>
+        <age type="integer">26</age>
+        <moved-on type="date">2005-11-15</moved-on>
+      </person>
+
+* Moved Jim Weirich's wonderful Builder from Action Pack to Active Support (it's simply too useful to be stuck in AP) [DHH]
-
-* Fixed that Array#to_sentence will return "" on an empty array instead of ", and" #3842, #4031 [rubyonrails@beautifulpixel.com]

trunk/activesupport/lib/active_support.rb

@@ -23 +23 @@
-
-$:.unshift(File.dirname(__FILE__))
+$:.unshift(File.dirname(__FILE__) + "/../vendor")
+
+require 'builder'
-
-require 'active_support/inflector'

trunk/activesupport/lib/active_support/core_ext/array/conversions.rb

@@ -2 +2 @@
-  module CoreExtensions #:nodoc:
-    module Array #:nodoc:
-      # Enables to conversion of Arrays to human readable lists. ['one', 'two', 'three'] => "one, two, and three"
-      module Conversions
-        # Converts the array to comma-seperated sentence where the last element is joined by the connector word. Options:
@@ -28 +27 @@
-        end
-        
+        def to_xml(options = {})
+          raise "Not all elements respond to to_xml" unless all? { |e| e.respond_to? :to_xml }
+          options[:root] ||= all? { |e| e.is_a? first.class } ? first.class.to_s.underscore.pluralize : "records"
+          xml = options[:builder] || Builder::XmlMarkup.new
+          xml.__send__(options[:root]) { each { |e| e.to_xml(:builder => xml) } }
+        end
-      end
-    end

trunk/activesupport/lib/active_support/core_ext/hash.rb

@@ -2 +2 @@
-require File.dirname(__FILE__) + '/hash/indifferent_access'
-require File.dirname(__FILE__) + '/hash/reverse_merge'
+require File.dirname(__FILE__) + '/hash/conversions'
-
-class Hash #:nodoc:
@@ -7 +8 @@
-  include ActiveSupport::CoreExtensions::Hash::IndifferentAccess
-  include ActiveSupport::CoreExtensions::Hash::ReverseMerge
+  include ActiveSupport::CoreExtensions::Hash::Conversions
-end

trunk/activesupport/lib/active_support/core_ext/string/inflections.rb

@@ -25 +25 @@
-        def underscore
-          Inflector.underscore(self)
+        end
+
+        def dasherize
+          Inflector.dasherize(self)
-        end
-

trunk/activesupport/lib/active_support/inflector.rb

@@ -121 +121 @@
-    camel_cased_word.to_s.gsub(/::/, '/').gsub(/([A-Z]+)([A-Z][a-z])/,'\1_\2').gsub(/([a-z\d])([A-Z])/,'\1_\2').downcase
-  end
+  
+  def dasherize(underscored_word)
+    underscored_word.gsub(/_/, '-')
+  end
-
-  def humanize(lower_case_and_underscored_word)

trunk/activesupport/Rakefile

@@ -19 +19 @@
-  t.pattern = 'test/**/*_test.rb'
-  t.verbose = true
-tru
+fals
-}
-

trunk/activesupport/test/core_ext/array_ext_test.rb

@@ -68 +68 @@
-    assert_equal [%w(a b c), %w(d e f), ['g', false, false]], groups
-  end
+end
-
+class ArraToXmlTests < Test::Unit::TestCase
+  def test_to_xml
+    a = [ { :name => "David", :street_address => "Paulina" }, { :name => "Jason", :street_address => "Evergreen" } ]
+    assert_equal(
+      "<hashes><hash><street-address type=\"string\">Paulina</street-address><name type=\"string\">David</name></hash><hash><street-address type=\"string\">Evergreen</street-address><name type=\"string\">Jason</name></hash></hashes>",
+      a.to_xml
+    )
+  end
-end

trunk/activesupport/test/core_ext/hash_ext_test.rb

@@ -1 +1 @@
-require 'test/unit'
-/core_ext/hash
+
-
-class HashExtTest < Test::Unit::TestCase
@@ -166 +166 @@
-  end
-end
+
+class HashToXmlTest < Test::Unit::TestCase
+  def test_one_level
+    h = { :name => "David", :street => "Paulina" }
+    assert_equal %(<person><street type="string">Paulina</street><name type="string">David</name></person>), h.to_xml(:root => :person)
+  end
+
+  def test_one_level_with_types
+    h = { :name => "David", :street => "Paulina", :age => 26, :moved_on => Date.new(2005, 11, 15) }
+    assert_equal(
+      "<person><street type=\"string\">Paulina</street><name type=\"string\">David</name><age type=\"integer\">26</age><moved-on type=\"date\">2005-11-15</moved-on></person>", 
+      h.to_xml(:root => :person)
+    )
+  end
+
+  def test_one_level_with_nils
+    h = { :name => "David", :street => "Paulina", :age => nil }
+    assert_equal(
+      "<person><street type=\"string\">Paulina</street><name type=\"string\">David</name><age></age></person>", 
+      h.to_xml(:root => :person)
+    )
+  end
+
+  def test_two_levels
+    h = { :name => "David", :address => { :street => "Paulina" } }
+    assert_equal %(<person><address><street type="string">Paulina</street></address><name type="string">David</name></person>), h.to_xml(:root => :person)
+  end
+end

trunk/activesupport/test/inflector_test.rb

@@ -188 +188 @@
-    "1001" => "1001st"
-  }
+  
+  UnderscoresToDashes = {
+    "street"                => "street",
+    "street_address"        => "street-address",
+    "person_street_address" => "person-street-address"
+  }
-
-  def test_pluralize_plurals
@@ -291 +297 @@
-    end
-  end
+
+  def test_dasherize
+    UnderscoresToDashes.each do |underscored, dasherized|
+      assert_equal(dasherized, Inflector.dasherize(underscored))
+    end
+  end
-end