From 53dda29f8b34073a4b135ee224c1d09c1f10de02 Mon Sep 17 00:00:00 2001
From: Brian Lopez <seniorlopez@gmail.com>
Date: Sun, 17 May 2009 10:37:30 -0500
Subject: Add support for parsing XML and JSON from an IO as well as a string
 [#2659 state:resolved]

Signed-off-by: Joshua Peek <josh@joshpeek.com>
---
 activesupport/test/xml_mini/nokogiri_engine_test.rb | 13 +++++++++++++
 activesupport/test/xml_mini/rexml_engine_test.rb    | 14 ++++++++++++++
 2 files changed, 27 insertions(+)

(limited to 'activesupport/test')

diff --git a/activesupport/test/xml_mini/nokogiri_engine_test.rb b/activesupport/test/xml_mini/nokogiri_engine_test.rb
index 886a9d1aba..7c3a591e63 100644
--- a/activesupport/test/xml_mini/nokogiri_engine_test.rb
+++ b/activesupport/test/xml_mini/nokogiri_engine_test.rb
@@ -148,6 +148,19 @@ class NokogiriEngineTest < Test::Unit::TestCase
     eoxml
   end
 
+  def test_parse_from_io
+    io = StringIO.new(<<-eoxml)
+    <root>
+      good
+      <products>
+        hello everyone
+      </products>
+      morning
+    </root>
+    eoxml
+    XmlMini.parse(io)
+  end
+
   private
   def assert_equal_rexml(xml)
     hash = XmlMini.with_backend('REXML') { XmlMini.parse(xml) }
diff --git a/activesupport/test/xml_mini/rexml_engine_test.rb b/activesupport/test/xml_mini/rexml_engine_test.rb
index a412d8ca05..57bb35254a 100644
--- a/activesupport/test/xml_mini/rexml_engine_test.rb
+++ b/activesupport/test/xml_mini/rexml_engine_test.rb
@@ -12,4 +12,18 @@ class REXMLEngineTest < Test::Unit::TestCase
     XmlMini.backend = 'REXML'
     assert_equal XmlMini_REXML, XmlMini.backend
   end
+
+  def test_parse_from_io
+    XmlMini.backend = 'REXML'
+    io = StringIO.new(<<-eoxml)
+    <root>
+      good
+      <products>
+        hello everyone
+      </products>
+      morning
+    </root>
+    eoxml
+    XmlMini.parse(io)
+  end
 end
-- 
cgit v1.2.3


From e89241c92fbcf68b59d9efb50c21c5040e9f3156 Mon Sep 17 00:00:00 2001
From: rick <technoweenie@gmail.com>
Date: Sun, 17 May 2009 19:16:11 -0700
Subject: load the JSON Backend lazily.  If the JSON gem is already loaded, use
 the JSONGem backend by default.

---
 activesupport/test/json/decoding_test.rb | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'activesupport/test')

diff --git a/activesupport/test/json/decoding_test.rb b/activesupport/test/json/decoding_test.rb
index 7e1bfcca84..09fd0d09ba 100644
--- a/activesupport/test/json/decoding_test.rb
+++ b/activesupport/test/json/decoding_test.rb
@@ -36,6 +36,9 @@ class TestJSONDecoding < ActiveSupport::TestCase
     %q({"b":["\u003ci\u003e","\u003cb\u003e","\u003cu\u003e"]}) => {'b' => ["<i>","<b>","<u>"]}
   }
 
+  # load the default JSON backend
+  ActiveSupport::JSON.backend
+
   backends = %w(Yaml)
   begin
     gem 'json', '>= 1.1'
-- 
cgit v1.2.3