rforce 0.5.1 → 0.6

data/Manifest.txt

@@ -9,6 +9,7 @@ lib/rforce/soap_pullable.rb
 lib/rforce/soap_response.rb
 lib/rforce/soap_response_expat.rb
 lib/rforce/soap_response_hpricot.rb
+lib/rforce/soap_response_nokogiri.rb
 lib/rforce/soap_response_rexml.rb
 lib/rforce/version.rb
 spec/rforce_spec.rb

data/Rakefile

@@ -3,15 +3,23 @@
 $:.unshift './lib'
 
 require 'rubygems'
+gem 'hoe', '>= 2.1.0'
 require 'hoe'
-require 'rforce/version'
-
-Hoe.new('rforce', RForce::VERSION) do |p|
-  p.developer         'Ian Dees', 'undees@gmail.com'
-  p.extra_deps      = [['builder', '~> 2.0'], ['oauth', '~> 0.4']]
-  p.extra_dev_deps  = [['rspec', '~> 1.3']]
-  p.remote_rdoc_dir = ''
-  p.rspec_options   = ['-rubygems', '--options', 'spec/spec.opts']
+
+Hoe.plugin :gemspec
+
+Hoe.spec 'rforce' do
+  developer('Ian Dees', 'undees@gmail.com')
+  
+  self.extra_deps << ['builder', '~> 2.0']
+  self.extra_deps << ['oauth', '~> 0.4']
+
+  self.extra_dev_deps << ['rspec', '~> 1.3']
+
+  self.rdoc_locations = ['undees@rforce.rubyforge.org:/var/www/gforge-projects/rforce']
+  self.remote_rdoc_dir = ''
+
+  self.rspec_options = ['-rubygems', '--options', 'spec/spec.opts']
 end
 
 Dir['tasks/**/*.rake'].each { |rake| load rake }

data/lib/rforce/soap_response.rb

@@ -1,3 +1,4 @@
+begin; require 'rforce/soap_response_nokogiri'; rescue LoadError; end
 begin; require 'rforce/soap_response_hpricot'; rescue LoadError; end
 begin; require 'rforce/soap_response_expat';   rescue LoadError; end
 require 'rforce/soap_response_rexml'
@@ -6,7 +7,8 @@ require 'rforce/soap_response_rexml'
 module RForce
   # Use the fastest XML parser available.
   SoapResponse =
-    (RForce::const_get(:SoapResponseExpat) rescue nil)   ||
-    (RForce::const_get(:SoapResponseHpricot) rescue nil) ||
+    (RForce::const_get(:SoapResponseExpat) rescue nil)    ||
+    (RForce::const_get(:SoapResponseNokogiri) rescue nil) ||
+    (RForce::const_get(:SoapResponseHpricot) rescue nil)  ||
     SoapResponseRexml
 end

data/lib/rforce/soap_response_nokogiri.rb

@@ -0,0 +1,45 @@
+require 'nokogiri'
+
+module RForce
+  class SoapResponseNokogiri
+    def initialize(content)
+      @content = content
+    end
+
+    def parse
+      doc = Nokogiri::XML(@content)
+      body = doc.at_xpath("//soapenv:Body")
+      to_hash(body)
+    end
+
+    private
+    def to_hash(node)
+      if node.text?
+        stripped = node.text.strip
+        return stripped.empty? ? nil : stripped
+      end
+
+      children = node.children.reject {|c| c.text? && c.text.strip.empty? }
+
+      return nil if children.empty?
+
+      return children.first.text.strip if children.first.text?
+
+      elements = MethodHash.new
+
+      children.each do |elem|
+        name = elem.name.split(":").last.to_sym
+        
+        if !elements[name]
+          elements[name] = to_hash(elem)
+        elsif Array === elements[name]
+          elements[name] << to_hash(elem)
+        else
+          elements[name] = [elements[name]] << to_hash(elem)
+        end
+      end
+      
+      return elements.empty? ? nil : elements
+    end
+  end
+end

data/lib/rforce/version.rb

@@ -1,3 +1,3 @@
 module RForce
-  VERSION = '0.5.1'
+  VERSION = '0.6'
 end

data/spec/rforce_spec.rb

@@ -49,7 +49,7 @@ describe 'a SoapResponse implementation' do
     fname = File.join(File.dirname(__FILE__), 'soap-response.xml')
     @contents = File.open(fname) {|f| f.read}
 
-    [:rexml, :expat, :hpricot].each do |processor|
+    [:rexml, :expat, :hpricot, :nokogiri].each do |processor|
       name = "SoapResponse#{processor.to_s.capitalize}"
       variable = "@#{processor}_recs"
 
@@ -109,6 +109,65 @@ describe 'SoapResponseHpricot' do
   end
 end
 
+describe 'SoapResponseNokogiri' do
+    SOAP_WRAPPER = <<-XML
+<?xml version="1.0" encoding="UTF-8"?>
+<soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/" xmlns="urn:partner.soap.sforce.com" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:sf="urn:sobject.partner.soap.sforce.com">
+  <soapenv:Body>
+    %s
+  </soapnenv:Body>
+</soapenv:Envelope>
+XML
+  def wrap_in_salesforce_envelope(xml)
+    SOAP_WRAPPER % xml
+  end
+
+  it 'parses nested elements into nested hashes' do
+    xml = wrap_in_salesforce_envelope("""
+    <foo>
+      <bar>Bin</bar>
+    </foo>""")
+    
+    SoapResponseNokogiri.new(xml).parse.should == {:foo => {:bar => "Bin"}}
+  end
+
+  it 'parses repeated elements into arrays' do
+    xml = wrap_in_salesforce_envelope("""
+    <foo>
+      <bar>Bin</bar>
+      <bar>Bash</bar>
+    </foo>""")
+
+    SoapResponseNokogiri.new(xml).parse.should == {:foo => {:bar => ["Bin", "Bash"]}}
+  end
+
+  it 'disregards namespacing when determining hash keys' do
+    xml = wrap_in_salesforce_envelope("""
+    <soapenv:foo>
+      <bar>Bin</bar>
+      <soapenv:bar>Bash</bar>
+    </foo>""")
+
+   SoapResponseNokogiri.new(xml).parse.should == {:foo => {:bar => ["Bin", "Bash"]}} 
+  end
+
+  it 'unescapes any HTML contained in text nodes' do
+    xml = wrap_in_salesforce_envelope("""
+    <soapenv:foo>
+      <bar>Bin</bar>
+      <bar>&lt;tag attr=&quot;Bee&apos;s knees &amp; toes&quot;&gt;</bar>
+    </foo>""")
+
+    SoapResponseNokogiri.new(xml).parse()[:foo][:bar].last.should == %q(<tag attr="Bee's knees & toes">)
+  end
+
+  it 'returns an object that can be navigated via methods in addition to keys' do
+    xml = wrap_in_salesforce_envelope("<foo><bar><bin>bash</bin></bar></foo>")
+    SoapResponseNokogiri.new(xml).parse().foo.bar.bin.should == "bash"
+  end
+
+end
+
 CreateXml = <<HERE.gsub(/\n\s*/, '')
 <partner:create>
   <partner:sObjects>

data/tasks/timing.rake

@@ -7,7 +7,8 @@ task :timing do
 
   [:SoapResponseRexml,
    :SoapResponseExpat,
-   :SoapResponseHpricot].each do |name|
+   :SoapResponseHpricot,
+   :SoapResponseNokogiri].each do |name|
     begin
       klass = RForce.const_get name
       started_at = Time.now
@@ -15,6 +16,7 @@ task :timing do
       elapsed = Time.now - started_at
       puts "#{klass}: #{elapsed}"
     rescue NameError
+      puts $!
       # no-op
     end
   end

metadata

@@ -1,12 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: rforce
 version: !ruby/object:Gem::Version 
+  hash: 7
   prerelease: false
   segments: 
   - 0
-  - 5
-  - 1
-  version: 0.5.1
+  - 6
+  version: "0.6"
 platform: ruby
 authors: 
 - Ian Dees
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-21 00:00:00 -08:00
+date: 2011-01-18 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -25,6 +25,7 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 2
         - 0
@@ -39,6 +40,7 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         - 4
@@ -53,6 +55,7 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 9
         segments: 
         - 1
         - 3
@@ -67,6 +70,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 47
         segments: 
         - 2
         - 8
@@ -97,6 +101,7 @@ files:
 - lib/rforce/soap_response.rb
 - lib/rforce/soap_response_expat.rb
 - lib/rforce/soap_response_hpricot.rb
+- lib/rforce/soap_response_nokogiri.rb
 - lib/rforce/soap_response_rexml.rb
 - lib/rforce/version.rb
 - spec/rforce_spec.rb
@@ -119,6 +124,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
@@ -127,6 +133,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"