undees / rforce / changeset / b8e3c015bba2

Up to file-list lib/rforce/method_keys.rb:

@@ -3,6 +3,7 @@ module RForce
   # to supplement the traditional way of indexing: hash[key]
   module MethodKeys
     def method_missing(method, *args)
       raise NoMethodError unless respond_to?('[]')
       self[method]
     end
   end

Up to file-list lib/rforce/soap_pullable.rb:

@@ -19,7 +19,7 @@ module RForce
         return
       end
-      @stack.push({})
+      @stack.push(MethodHash.new)
     end
     def text(data)

Up to file-list lib/rforce/soap_response.rb:

@@ -15,21 +15,20 @@ module RForce
       define_method(unused) {}
     end
     def initialize(content)
       @content = content
     end
     # Parses an XML string into structured data.
-    def initialize(content)
+    def parse
       @current_value = nil
       @stack = []
       @parsed = {}
       @done = false
       @namespaces = []
       REXML::Document.parse_stream content, self
     end
     # Allows this object to act like a hash (and therefore
     # via MethodKeys from the include above).
     def [](symbol)
-      @parsed[symbol]
+      REXML::Document.parse_stream @content, self
       @parsed
     end
   end
 end

Up to file-list lib/rforce/soap_response_expat.rb:

@@ -7,13 +7,17 @@ module RForce
     include SoapPullable
     def initialize(content)
       @content = content
     end
     def parse
       @current_value = nil
       @stack = []
       @parsed = {}
       @done = false
       @namespaces = []
       XML::Parser.new.parse(content) do |type, name, data|
       XML::Parser.new.parse(@content) do |type, name, data|
         case type
         when XML::Parser::START_ELEM
           tag_start name, data
@@ -26,11 +30,7 @@ module RForce
         break if @done
       end
       self
     end
     def [](key)
-      @parsed[key.to_sym]
+      @parsed
     end
   end
 end

Up to file-list lib/rforce/soap_response_hpricot.rb:

@@ -3,24 +3,21 @@ require 'hpricot'
 module RForce
   class SoapResponseHpricot
     include MethodKeys
     # Parses an XML string into structured data.
     def initialize(content)
       document = Hpricot.XML(content)
       node = document%'soapenv:Body'
       @parsed = SoapResponseHpricot.parse node
     end
     # Allows this object to act like a hash (and therefore
     # via MethodKeys via the include above).
     def [](symbol)
       @parsed[symbol]
       @content = content
     end
     # Digests an XML DOM node into nested Ruby types.
-    def SoapResponseHpricot.parse(node)
+    def parse
       document = Hpricot.XML(@content)
       node = document % 'soapenv:Body'
       self.class.node_to_ruby node
     end
     private
     def self.node_to_ruby(node)
       # Convert text nodes into simple strings.
       children = node.children.reject do |c|
         c.is_a?(Hpricot::Text) && c.to_s.strip.empty?
@@ -50,20 +47,20 @@ module RForce
         case elements[name]
           # The most common case: unique child element tags.
-        when NilClass: elements[name] = parse(e)
+        when NilClass: elements[name] = node_to_ruby(e)
           # Non-unique child elements become arrays:
           # We've already created the array: just
           # add the element.
-        when Array: elements[name] << parse(e)
+        when Array: elements[name] << node_to_ruby(e)
           # We haven't created the array yet: do so,
           # then put the existing element in, followed
           # by the new one.
         else
           elements[name] = [elements[name]]
-          elements[name] << parse(e)
+          elements[name] << node_to_ruby(e)
         end
       end
@@ -71,4 +68,3 @@ module RForce
     end
   end
 end

Up to file-list spec/rforce_spec.rb:

@@ -52,7 +52,7 @@ describe SoapResponse do
     @rexml_recs, @expat_recs, @hpricot_recs =
         [SoapResponse, SoapResponseExpat, SoapResponseHpricot].map do |klass|
-      results = klass.new(@contents)
+      results = klass.new(@contents).parse
       results[:queryResponse][:result][:records]
     end
   end

Up to file-list tasks/timing.rake:

@@ -9,7 +9,7 @@ task :timing do
    RForce::SoapResponseExpat,
    RForce::SoapResponseHpricot].each do |klass|
     started_at = Time.now
-    results = klass.new(contents)
+    klass.new(contents).parse
     elapsed = Time.now - started_at
     puts "#{klass}: #{elapsed}"
   end

commit 26:	b8e3c015bba2
parent 25:	022791b4ec0f
branch:	trunk

undees / rforce (http://rforce.rubyforge.org)