Changeset 6511

Timestamp:

04/09/07 15:33:38 (1 year ago)

Author:

xal

Message:

Removed ill faded xml_node class from codebase. Use XmlSimple instead

Files:

• trunk/actionpack/lib/action_controller/cgi_ext/cgi_methods.rb (modified) (2 diffs)
• trunk/actionpack/lib/action_controller/vendor/xml_node.rb (deleted)
• trunk/actionpack/test/controller/webservice_test.rb (modified) (4 diffs)

trunk/actionpack/lib/action_controller/cgi_ext/cgi_methods.rb

@@ -1 +1 @@
-require 'cgi'
-require 'action_controller/vendor/xml_node'
-require 'strscan'
-
@@ -50 +49 @@
-        when Proc
-          strategy.call(raw_post_data)
-
+, :xml_node
-          raw_post_data.blank? ? {} : Hash.from_xml(raw_post_data)
-        when :yaml
-          YAML.load(raw_post_data)
-        when :xml_node
-          node = XmlNode.from_xml(raw_post_data)
-          { node.node_name => node }
-      end
-    rescue Exception => e # YAML, XML or Ruby code block errors

trunk/actionpack/test/controller/webservice_test.rb

@@ -42 +42 @@
-    @controller = TestController.new
-    ActionController::Base.param_parsers.clear
-nod
+simpl
-  end
-  
@@ -55 +55 @@
-    assert_equal 'entry', @controller.response.body
-    assert @controller.params.has_key?(:entry)
-.summary.node_value
+['summary']
-    assert_equal 'true', @controller.params["entry"]['attributed']
-  end
@@ -64 +64 @@
-    assert_equal 'entry', @controller.response.body
-    assert @controller.params.has_key?(:entry)
-.summary.node_value
+['summary']
-    assert_equal 'true', @controller.params["entry"]['attributed']
-  end
@@ -184 +184 @@
-    
-end
-
-
-class XmlNodeTest < Test::Unit::TestCase
-  def test_all
-    xn = XmlNode.from_xml(%{<?xml version="1.0" encoding="UTF-8"?>
-      <response success='true'>
-      <page title='Ajax Summit' id='1133' email_address='ry87ib@backpackit.com'>
-        <description>With O'Reilly and Adaptive Path</description>
-        <notes>
-          <note title='Hotel' id='1020' created_at='2005-05-14 16:41:11'>
-            Staying at the Savoy
-          </note>
-        </notes>
-        <tags>
-          <tag name='Technology' id='4' />
-          <tag name='Travel' id='5' />
-        </tags>
-      </page>
-      </response>
-     }
-    )     
-    assert_equal 'UTF-8', xn.node.document.encoding
-    assert_equal '1.0', xn.node.document.version
-    assert_equal 'true', xn['success']
-    assert_equal 'response', xn.node_name
-    assert_equal 'Ajax Summit', xn.page['title']
-    assert_equal '1133', xn.page['id']
-    assert_equal "With O'Reilly and Adaptive Path", xn.page.description.node_value
-    assert_equal nil, xn.nonexistent
-    assert_equal "Staying at the Savoy", xn.page.notes.note.node_value.strip
-    assert_equal 'Technology', xn.page.tags.tag[0]['name']
-    assert_equal 'Travel', xn.page.tags.tag[1][:name]
-    matches = xn.xpath('//@id').map{ |id| id.to_i }
-    assert_equal [4, 5, 1020, 1133], matches.sort
-    matches = xn.xpath('//tag').map{ |tag| tag['name'] }
-    assert_equal ['Technology', 'Travel'], matches.sort
-    assert_equal "Ajax Summit", xn.page['title']
-    xn.page['title'] = 'Ajax Summit V2'
-    assert_equal "Ajax Summit V2", xn.page['title']
-    assert_equal "Staying at the Savoy", xn.page.notes.note.node_value.strip
-    xn.page.notes.note.node_value = "Staying at the Ritz"
-    assert_equal "Staying at the Ritz", xn.page.notes.note.node_value.strip
-    assert_equal '5', xn.page.tags.tag[1][:id]
-    xn.page.tags.tag[1]['id'] = '7'
-    assert_equal '7', xn.page.tags.tag[1]['id']
-  end
-  
-
-  def test_small_entry
-    node = XmlNode.from_xml('<entry>hi</entry>')
-    assert_equal 'hi', node.node_value
-  end
-
-end