rforce 0.11 → 0.12

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 0f5d3cfdef0e31e56d1bc1d770e79f26323d0a6c
+  data.tar.gz: a73f9b20c24d37ba4a3a68b2c43e16a1d9204822
+SHA512:
+  metadata.gz: 861c42017d1f723532b074fef3e400e843f1fcf20e4da5448add773a769c02dc2c6ce17f2fc24d7eb009a44015e944f5297d8c55b8306dcbb71dc076b9004359
+  data.tar.gz: baa7d21e2f81675213086da031bb0eca550658d3a9625f94f9a7e820fa4c51bc4a620804356fa8f00dd8688c6537b7d4fa4133a47ad8ee9f8d7c156e26a4e2d3

data/History.txt

@@ -1,3 +1,12 @@
+== 0.12.0 2014-07-27
+* 2 enhancements
+  * Clearer errors when skipping login (Victor Stan)
+  * Allow passing in an optional logger (Jeff Jolma)
+* 3 bug fixes
+  * Fixed URL error in OAuth flow (reported by karthickbabuos)
+  * Corrected UTF-8 handling error (Maxime Rety)
+  * Fixed repeat login issue (Jeff Jolma)
+
 == 0.11.0 2013-06-08
 * 1 minor enhancement
   * Give the README an .rdoc extension for easy Github viewing

data/Manifest.txt

@@ -2,13 +2,15 @@ History.txt
 Manifest.txt
 README.rdoc
 Rakefile
+examples/oauth_setup.rb
+examples/oauth_use.rb
+examples/simple.rb
 lib/rforce.rb
 lib/rforce/binding.rb
 lib/rforce/method_keys.rb
 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

data/README.rdoc

@@ -1,9 +1,8 @@
 = rforce
 
-* http://rforce.rubyforge.org
-* http://rubyforge.org/projects/rforce
-* http://bitbucket.org/undees/rforce
 * http://github.com/undees/rforce
+* http://bitbucket.org/undees/rforce
+* http://rdoc.info/github/undees/rforce
 
 == DESCRIPTION:
 
@@ -75,7 +74,7 @@ Rather than enforcing adherence to the sforce.com schema, RForce assumes you are
 
 == LICENSE:
 
-Copyright (c) 2005-2013 Ian Dees and contributors
+Copyright (c) 2005-2014 Ian Dees and contributors
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/Rakefile

@@ -8,16 +8,19 @@ require 'hoe/gemspec2'
 Hoe.plugin :gemspec2
 
 Hoe.spec 'rforce' do
+  is_jruby = (RUBY_PLATFORM == 'java')
+  is_ruby18 = (RUBY_VERSION =~ /^1.8/)
+
   developer('Ian Dees', 'undees@gmail.com')
+  license('MIT')
 
   self.extra_deps << ['builder', '~> 3.0']
   self.extra_deps << ['oauth', '~> 0.4']
 
   self.extra_dev_deps << ['rspec', '~> 2.8']
   self.extra_dev_deps << ['hoe-gemspec2', '~> 1.1']
-  self.extra_dev_deps << ['hpricot', '~> 0.8']
-  self.extra_dev_deps << ['nokogiri', '~> 1.5']
-  self.extra_dev_deps << ['xmlparser', '~> 0.7']
+  self.extra_dev_deps << ['nokogiri', '~> 1.5'] unless is_ruby18
+  self.extra_dev_deps << ['xmlparser', '~> 0.7'] unless is_jruby
 
   self.rdoc_locations = ['undees@rforce.rubyforge.org:/var/www/gforge-projects/rforce']
   self.remote_rdoc_dir = ''

data/examples/oauth_setup.rb

@@ -0,0 +1,26 @@
+require 'oauth'
+
+consumer_key    = ENV['SALESFORCE_CONSUMER_KEY']
+consumer_secret = ENV['SALESFORCE_CONSUMER_SECRET']
+
+oauth_options = {
+  :site               => 'https://login.salesforce.com',
+  :scheme             => :body,
+  :request_token_path => '/_nc_external/system/security/oauth/RequestTokenHandler',
+  :authorize_path     => '/setup/secur/RemoteAccessAuthorizationPage.apexp',
+  :access_token_path  => '/_nc_external/system/security/oauth/AccessTokenHandler',
+}
+
+consumer = OAuth::Consumer.new consumer_key, consumer_secret, oauth_options
+# consumer.http.set_debug_output STDERR # if you're curious
+
+request       = consumer.get_request_token
+authorize_url = request.authorize_url :oauth_consumer_key => consumer_key
+
+puts "Go to #{authorize_url} in your browser, then enter the verification code:"
+verification_code = gets.strip
+
+access = request.get_access_token :oauth_verifier => verification_code
+
+puts "Access Token:  " + access.token
+puts "Access Secret: " + access.secret

data/examples/oauth_use.rb

@@ -0,0 +1,25 @@
+require 'rforce'
+
+oauth = {
+  :consumer_key    => ENV['SALESFORCE_CONSUMER_KEY'],
+  :consumer_secret => ENV['SALESFORCE_CONSUMER_SECRET'],
+  :access_token    => ENV['SALESFORCE_ACCESS_TOKEN'],
+  :access_secret   => ENV['SALESFORCE_ACCESS_SECRET'],
+  :login_url       => 'https://login.salesforce.com/services/OAuth/u/20.0'
+}
+
+binding = RForce::Binding.new \
+  'https://www.salesforce.com/services/Soap/u/20.0',
+  nil,
+  oauth
+
+binding.login_with_oauth
+
+answer = binding.search \
+  :searchString =>
+    'find {McFakerson Co} in name fields returning account(id)'
+
+account = answer.searchResponse.result.searchRecords.record
+account_id = account.Id
+
+puts account_id

data/examples/simple.rb

@@ -0,0 +1,20 @@
+require 'rforce'
+
+email    = ENV['SALESFORCE_USER']
+password = ENV['SALESFORCE_PASS']
+token    = ENV['SALESFORCE_TOKEN']
+
+binding = RForce::Binding.new \
+  'https://www.salesforce.com/services/Soap/u/20.0'
+
+binding.login \
+  email, password + token
+
+answer = binding.search \
+  :searchString =>
+    'find {McFakerson Co} in name fields returning account(id)'
+
+account = answer.searchResponse.result.searchRecords.record
+account_id = account.Id
+
+puts account_id

data/lib/rforce/binding.rb

@@ -44,99 +44,87 @@ module RForce
     MruHeader = '<partner:MruHeader soap:mustUnderstand="1"><partner:updateMru>true</partner:updateMru></partner:MruHeader>'
     ClientIdHeader = '<partner:CallOptions soap:mustUnderstand="1"><partner:client>%s</partner:client></partner:CallOptions>'
 
-    # Connect to the server securely.  If you pass an oauth hash, it
-    # must contain the keys :consumer_key, :consumer_secret,
+    # Create a binding to the server (after which you can call login
+    # or login_with_oauth to connect to it). If you pass an oauth
+    # hash, it must contain the keys :consumer_key, :consumer_secret,
     # :access_token, :access_secret, and :login_url.
     #
     # proxy may be a URL of the form http://user:pass@example.com:port
     #
-    def initialize(url, sid = nil, oauth = nil, proxy = nil)
+    # if a logger is specified, it will be used for very verbose SOAP logging
+    #
+    def initialize(url, sid = nil, oauth = nil, proxy = nil, logger = nil)
       @session_id = sid
       @oauth = oauth
       @proxy = proxy
       @batch_size = DEFAULT_BATCH_SIZE
-
-      init_server(url)
+      @logger = logger
+      @url = URI.parse(url)
     end
 
-
     def show_debug
       ENV['SHOWSOAP'] == 'true'
     end
 
+    def create_server(url)
+      server = Net::HTTP.Proxy(@proxy).new(url.host, url.port)
+      server.use_ssl = (url.scheme == 'https')
+      server.verify_mode = OpenSSL::SSL::VERIFY_NONE
 
-    def init_server(url)
-      @url = URI.parse(url)
-
-      if (@oauth)
-        consumer = OAuth::Consumer.new \
-          @oauth[:consumer_key],
-          @oauth[:consumer_secret],
-          {
-            :site => url,
-            :proxy => @proxy
-          }
-
-        consumer.http.set_debug_output $stderr if show_debug
-
-        @server  = OAuth::AccessToken.new \
-          consumer,
-          @oauth[:access_token],
-          @oauth[:access_secret]
-
-        class << @server
-          alias_method :post2, :post
-        end
-      else
-        @server = Net::HTTP.Proxy(@proxy).new(@url.host, @url.port)
-        @server.use_ssl = @url.scheme == 'https'
-        @server.verify_mode = OpenSSL::SSL::VERIFY_NONE
-
-        # run ruby with -d or env variable SHOWSOAP=true to see SOAP wiredumps.
-        @server.set_debug_output $stderr if show_debug
-      end
-    end
-
-    #  Connect to remote server
-    #
-    def connect(user, password)
-      @user = user
-      @password = password
+      # run ruby with -d or env variable SHOWSOAP=true to see SOAP wiredumps.
+      server.set_debug_output $stderr if show_debug
 
-      call_remote(:login, [:username, user, :password, password])
+      return server
     end
 
     # Log in to the server with a user name and password, remembering
     # the session ID returned to us by Salesforce.
     def login(user, password)
-      response = connect(user, password)
+      @user     = user
+      @password = password
+      @server   = create_server(@url)
+      response  = call_remote(:login, [:username, user, :password, password])
 
       raise "Incorrect user name / password [#{response.Fault}]" unless response.loginResponse
 
-      result = response[:loginResponse][:result]
+      result      = response[:loginResponse][:result]
       @session_id = result[:sessionId]
+      @url        = URI.parse(result[:serverUrl])
+      @server     = create_server(@url)
 
-      init_server(result[:serverUrl])
-
-      response
+      return response
     end
 
     # Log in to the server with OAuth, remembering
     # the session ID returned to us by Salesforce.
     def login_with_oauth
-      result = @server.post \
-        @oauth[:login_url],
+      consumer = OAuth::Consumer.new \
+        @oauth[:consumer_key],
+        @oauth[:consumer_secret]
+
+      access = OAuth::AccessToken.new \
+        consumer, @oauth[:access_token],
+        @oauth[:access_secret]
+
+      login_url = @oauth[:login_url]
+
+      result = access.post \
+        login_url,
         '',
         {'content-type' => 'application/x-www-form-urlencoded'}
 
       case result
       when Net::HTTPSuccess
-        doc = REXML::Document.new result.body
+        doc         = REXML::Document.new result.body
         @session_id = doc.elements['*/sessionId'].text
-        server_url  = doc.elements['*/serverUrl'].text
-        init_server server_url
+        @url        = URI.parse(doc.elements['*/serverUrl'].text)
+        @server     = access
+
+        class << @server
+          alias_method :post2, :post
+        end
 
-        return {:sessionId => @sessionId, :serverUrl => server_url}
+        return {:sessionId => @session_id, :serverUrl => @url.to_s}
       when Net::HTTPUnauthorized
         raise 'Invalid OAuth tokens'
       else
@@ -148,8 +136,11 @@ module RForce
     # a hash or (if order is important) an array of alternating
     # keys and values.
     def call_remote(method, args)
+      # Different URI requirements for regular vs. OAuth.  This is
+      # *screaming* for a refactor.
+      fallback_soap_url = @oauth ? @url.to_s : @url.path
 
-      urn, soap_url = block_given? ? yield : ["urn:partner.soap.sforce.com", @url.path]
+      urn, soap_url = block_given? ? yield : ["urn:partner.soap.sforce.com", fallback_soap_url]
 
       # Create XML text from the arguments.
       expanded = ''
@@ -181,6 +172,7 @@ module RForce
       # Fill in the blanks of the SOAP envelope with our
       # session ID and the expanded XML of our request.
       request = (Envelope % [@session_id, extra_headers, expanded])
+      @logger && @logger.info("RForce request: #{request}")
 
       # reset the batch size for the next request
       @batch_size = DEFAULT_BATCH_SIZE
@@ -201,14 +193,23 @@ module RForce
       end
 
       # Send the request to the server and read the response.
+      @logger && @logger.info("RForce request to host #{@server} url #{soap_url} headers: #{headers}")
       response = @server.post2(soap_url, request.lstrip, headers)
 
       # decode if we have encoding
       content = decode(response)
 
+      # Fix charset encoding. Needed because the "content" variable may contain a UTF-8
+      # or ISO-8859-1 string, but is carrying the US-ASCII encoding.
+      content = fix_encoding(content)
+
       # Check to see if INVALID_SESSION_ID was raised and try to relogin in
       if method != :login and @session_id and content =~ /sf:INVALID_SESSION_ID/
-        login(@user, @password)
+        if @user
+          login(@user, @password)
+        else
+          raise "INVALID_SESSION_ID"
+        end
 
         # repackage and rencode request with the new session id
         request = (Envelope % [@session_id, extra_headers, expanded])
@@ -218,12 +219,16 @@ module RForce
         response = @server.post2(soap_url, request.lstrip, headers)
 
         content = decode(response)
+
+        # Fix charset encoding. Needed because the "content" variable may contain a UTF-8
+        # or ISO-8859-1 string, but is carrying the US-ASCII encoding.
+        content = fix_encoding(content)
       end
 
+      @logger && @logger.info("RForce response: #{content}")
       SoapResponse.new(content).parse
     end
 
-
     # decode gzip
     def decode(response)
       encoding = response['Content-Encoding']
@@ -246,7 +251,6 @@ module RForce
       end
     end
 
-
     # encode gzip
     def encode(request)
       return request if show_debug
@@ -261,6 +265,28 @@ module RForce
       end
     end
 
+    # fix invalid US-ASCII strings by applying the correct encoding on ruby 1.9+
+    def fix_encoding(string)
+      if [:valid_encoding?, :force_encoding].all? { |m| string.respond_to?(m) }
+        if !string.valid_encoding?
+          # The 2 possible encodings in responses are UTF-8 and ISO-8859-1
+          # http://www.salesforce.com/us/developer/docs/api/Content/implementation_considerations.htm#topic-title_international
+          #
+          ["UTF-8", "ISO-8859-1"].each do |encoding_name|
+
+            s = string.dup.force_encoding(encoding_name)
+
+            if s.valid_encoding?
+              return s
+            end
+          end
+
+          raise "Invalid encoding in SOAP response: not in [US-ASCII, UTF-8, ISO-8859-1]"
+        end
+      end
+
+      return string
+    end
 
     # Turns method calls on this object into remote SOAP calls.
     def method_missing(method, *args)

data/lib/rforce/soap_response.rb

@@ -1,5 +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'
 
@@ -7,8 +6,7 @@ require 'rforce/soap_response_rexml'
 module RForce
   # Use the fastest XML parser available.
   SoapResponse =
-    (RForce::const_get(:SoapResponseExpat) rescue nil)    ||
     (RForce::const_get(:SoapResponseNokogiri) rescue nil) ||
-    (RForce::const_get(:SoapResponseHpricot) rescue nil)  ||
+    (RForce::const_get(:SoapResponseExpat) rescue nil)    ||
     SoapResponseRexml
 end

data/lib/rforce/version.rb

@@ -1,3 +1,3 @@
 module RForce
-  VERSION = '0.11'
+  VERSION = '0.12'
 end

data/spec/rforce_spec.rb

@@ -60,7 +60,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, :nokogiri].each do |processor|
+    [:rexml, :expat, :nokogiri].each do |processor|
       name     = "SoapResponse#{processor.to_s.capitalize}".to_sym
       variable = "@#{processor}_recs".to_sym
 
@@ -82,14 +82,10 @@ describe 'a SoapResponse implementation' do
 
   # Special-case expat tests for CI
   it 'returns the same results with expat' do
-    pending 'expat not installed' unless @expat_recs
+    skip 'expat not installed' unless @expat_recs
     @expat_recs.should == @rexml_recs
   end
 
-  it 'returns the same results with hpricot' do
-    @hpricot_recs.should == @rexml_recs
-  end
-
   it 'understands XML entities' do
     expected = "Bee's knees"
     @rexml_recs.first.Description.should == expected
@@ -98,16 +94,6 @@ describe 'a SoapResponse implementation' do
     if @expat_recs
       @expat_recs.first.Description.should == expected
     end
-
-    @hpricot_recs.first.Description.should == expected
-  end
-end
-
-describe 'SoapResponseHpricot' do
-  it 'parses basic XML entities' do
-    text = '<tag attr="Bee's knees & toes">'
-    SoapResponseHpricot.unescapeXML(text).should ==
-      %q(<tag attr="Bee's knees & toes">)
   end
 end
 
@@ -213,9 +199,11 @@ shared_examples_for 'a SOAP response' do
   end
 end
 
-describe 'SoapResponseNokogiri' do
-  it_behaves_like 'a SOAP response' do
-    let(:klass) { SoapResponseNokogiri }
+if RForce.const_defined? :SoapResponseNokogiri
+  describe 'SoapResponseNokogiri' do
+    it_behaves_like 'a SOAP response' do
+      let(:klass) { SoapResponseNokogiri }
+    end
   end
 end
 
@@ -234,12 +222,6 @@ describe 'SoapResponseRexml' do
   end
 end
 
-describe 'SoapResponseHpricot' do
-  it_behaves_like 'a SOAP response' do
-    let(:klass) { SoapResponseHpricot }
-  end
-end
-
 CreateXml = <<HERE.gsub(/\n\s*/, '')
 <partner:create>
   <partner:sObjects>

data/tasks/timing.rake

@@ -7,7 +7,6 @@ task :timing do
 
   [:SoapResponseRexml,
    :SoapResponseExpat,
-   :SoapResponseHpricot,
    :SoapResponseNokogiri].each do |name|
     begin
       klass = RForce.const_get name

metadata

@@ -1,20 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: rforce
 version: !ruby/object:Gem::Version
-  version: '0.11'
-  prerelease: 
+  version: '0.12'
 platform: ruby
 authors:
 - Ian Dees
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-08 00:00:00.000000000 Z
+date: 2014-07-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: builder
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -22,7 +20,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -30,7 +27,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: oauth
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -38,63 +34,55 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '0.4'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: rdoc
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.8'
+        version: '4.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.8'
+        version: '4.0'
 - !ruby/object:Gem::Dependency
-  name: hoe-gemspec2
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '2.8'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '2.8'
 - !ruby/object:Gem::Dependency
-  name: hpricot
+  name: hoe-gemspec2
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: '1.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -102,7 +90,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -110,7 +97,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: xmlparser
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -118,47 +104,28 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '0.7'
-- !ruby/object:Gem::Dependency
-  name: rdoc
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '3.10'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '3.10'
 - !ruby/object:Gem::Dependency
   name: hoe
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.13'
+        version: '3.12'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.13'
-description: ! 'RForce is a simple, usable binding to the Salesforce API.
+        version: '3.12'
+description: |-
+  RForce is a simple, usable binding to the Salesforce API.
 
-
-  {<img src="https://travis-ci.org/undees/rforce.png" />}[https://travis-ci.org/undees/rforce]'
+  {<img src="https://travis-ci.org/undees/rforce.png" />}[https://travis-ci.org/undees/rforce]
 email:
 - undees@gmail.com
 executables: []
@@ -166,18 +133,21 @@ extensions: []
 extra_rdoc_files:
 - History.txt
 - Manifest.txt
+- README.rdoc
 files:
 - History.txt
 - Manifest.txt
 - README.rdoc
 - Rakefile
+- examples/oauth_setup.rb
+- examples/oauth_use.rb
+- examples/simple.rb
 - lib/rforce.rb
 - lib/rforce/binding.rb
 - lib/rforce/method_keys.rb
 - 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
@@ -187,30 +157,30 @@ files:
 - spec/spec_helper.rb
 - tasks/timing.rake
 - .gemtest
-homepage: http://rforce.rubyforge.org
-licenses: []
+homepage: http://github.com/undees/rforce
+licenses:
+- MIT
+metadata: {}
 post_install_message: 
 rdoc_options:
 - --main
-- README.txt
+- README.rdoc
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: rforce
-rubygems_version: 1.8.21
+rubyforge_project: 
+rubygems_version: 2.0.14
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: RForce is a simple, usable binding to the Salesforce API
 test_files: []

data/lib/rforce/soap_response_hpricot.rb

@@ -1,90 +0,0 @@
-require 'hpricot'
-require 'cgi'
-
-
-module RForce
-  class SoapResponseHpricot
-    # Parses an XML string into structured data.
-    def initialize(content)
-      @content = content
-    end
-
-    # Digests an XML DOM node into nested Ruby types.
-    def parse
-      document = Hpricot.XML(@content)
-      node = document % 'soapenv:Body'
-      self.class.node_to_ruby node
-    end
-
-    private
-
-    def self.unescapeXML(string)
-      CGI.unescapeHTML(string).gsub("'", "'")
-    end
-
-    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?
-      end
-
-      if node.is_a?(Hpricot::Text)
-        return convert(SoapResponseHpricot.unescapeXML(node.inspect[1..-2]))
-      end
-
-      if children.first.is_a?(Hpricot::Text)
-        return convert(SoapResponseHpricot.unescapeXML(children.first.inspect[1..-2]))
-      end
-
-      # Convert nodes with children into MethodHashes.
-      elements = MethodHash.new
-
-      # Add all the element's children to the hash.
-      children.each do |e|
-        next if e.is_a?(Hpricot::Text) && e.to_s.strip.empty?
-        name = e.name
-
-        if name.include? ':'
-          name = name.split(':').last
-        end
-
-        name = name.to_sym
-
-        case elements[name]
-          # The most common case: unique child element tags.
-        when NilClass then
-          # <records> contents are always arrays
-          elements[name] = :records == name ? [node_to_ruby(e)] : node_to_ruby(e)
-
-          # Non-unique child elements become arrays:
-
-          # We've already created the array: just
-          # add the element.
-        when Array then
-          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
-          next if :Id == name # avoid duplicate <Id> tags
-          elements[name] = [elements[name]]
-          elements[name] << node_to_ruby(e)
-        end
-      end
-
-      return elements.empty? ? nil : elements
-    end
-
-    def self.convert(string)
-      return nil if string.nil?
-      s = string.strip
-
-      case s
-      when '' then nil
-      when 'true', 'false' then ('true' == s)
-      else s
-      end
-    end
-  end
-end