rforce 0.7 → 0.8

data/Manifest.txt

@@ -1,3 +1,4 @@
+.gemtest
 History.txt
 Manifest.txt
 README.txt

data/README.txt

@@ -18,10 +18,10 @@ Rather than enforcing adherence to the sforce.com schema, RForce assumes you are
 === Logging in with a user name and password
 
   binding = RForce::Binding.new \
-    'https://www.salesforce.com/services/Soap/u/10.0'
+    'https://www.salesforce.com/services/Soap/u/20.0'
 
   binding.login \
-    'email', 'password_with_token'
+    'email', 'password' + 'token'
 
 === Logging in with OAuth
 

data/Rakefile

@@ -2,8 +2,6 @@
 
 $:.unshift './lib'
 
-require 'rubygems'
-gem 'hoe', '~> 2.8'
 require 'hoe'
 require 'hoe/gemspec2'
 
@@ -15,7 +13,7 @@ Hoe.spec 'rforce' do
   self.extra_deps << ['builder', '~> 3.0']
   self.extra_deps << ['oauth', '~> 0.4']
 
-  self.extra_dev_deps << ['rspec', '~> 1.3']
+  self.extra_dev_deps << ['rspec', '~> 2.8']
   self.extra_dev_deps << ['hoe-gemspec2', '~> 1.1']
 
   self.rdoc_locations = ['undees@rforce.rubyforge.org:/var/www/gforge-projects/rforce']
@@ -24,6 +22,8 @@ Hoe.spec 'rforce' do
   self.rspec_options = ['-rubygems', '--options', 'spec/spec.opts']
 end
 
+task :test => :spec
+
 Dir['tasks/**/*.rake'].each { |rake| load rake }
 
 # vim: syntax=Ruby

data/lib/rforce/binding.rb

@@ -24,7 +24,7 @@ module RForce
 <soap:Envelope xmlns:xsd="http://www.w3.org/2001/XMLSchema"
     xmlns:soap="http://schemas.xmlsoap.org/soap/envelope/"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns:partner="urn:partner.soap.sforce.com">
+    xmlns:partner="urn:partner.soap.sforce.com"
     xmlns:spartner="urn:sobject.partner.soap.sforce.com">
   <soap:Header>
     <partner:SessionHeader soap:mustUnderstand='1'>
@@ -49,9 +49,13 @@ module RForce
     # Connect to the server securely.  If you pass an oauth hash, it
     # must contain the keys :consumer_key, :consumer_secret,
     # :access_token, :access_secret, and :login_url.
-    def initialize(url, sid = nil, oauth = nil)
+    #
+    # proxy may be a URL of the form http://user:pass@example.com:port
+    #
+    def initialize(url, sid = nil, oauth = nil, proxy = nil)
       @session_id = sid
       @oauth = oauth
+      @proxy = proxy
       @batch_size = DEFAULT_BATCH_SIZE
 
       init_server(url)
@@ -70,7 +74,10 @@ module RForce
         consumer = OAuth::Consumer.new \
           @oauth[:consumer_key],
           @oauth[:consumer_secret],
-          { :site => url }
+          {
+            :site => url,
+            :proxy => @proxy
+          }
 
         consumer.http.set_debug_output $stderr if show_debug
 
@@ -83,7 +90,7 @@ module RForce
           alias_method :post2, :post
         end
       else
-        @server = Net::HTTP.new(@url.host, @url.port)
+        @server = Net::HTTP.Proxy(@proxy).new(@url.host, @url.port)
         @server.use_ssl = @url.scheme == 'https'
         @server.verify_mode = OpenSSL::SSL::VERIFY_NONE
 
@@ -92,16 +99,21 @@ module RForce
       end
     end
 
+    #  Connect to remote server
+    #
+    def connect(user, password)
+      @user = user
+      @password = password
+
+      call_remote(:login, [:username, user, :password, password])
+    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)
-      @user = user
-      @password = password
-
-      response = call_remote(:login, [:username, user, :password, password])
+      response = connect(user, password)
 
-      raise "Incorrect user name / password [#{response.fault}]" unless response.loginResponse
+      raise "Incorrect user name / password [#{response.Fault}]" unless response.loginResponse
 
       result = response[:loginResponse][:result]
       @session_id = result[:sessionId]
@@ -248,11 +260,11 @@ module RForce
 
     # Turns method calls on this object into remote SOAP calls.
     def method_missing(method, *args)
-      unless args.size == 1 && [Hash, Array].include?(args[0].class)
-        raise 'Expected 1 Hash or Array argument'
+      unless args.empty? || (args.size == 1 && [Hash, Array].include?(args[0].class))
+        raise 'Expected at most 1 Hash or Array argument'
       end
 
-      call_remote method, args[0]
+      call_remote method, args[0] || []
     end
   end
 end

data/lib/rforce/version.rb

@@ -1,3 +1,3 @@
 module RForce
-  VERSION = '0.7'
+  VERSION = '0.8'
 end

data/spec/spec_helper.rb

@@ -18,12 +18,12 @@ module RForceXmlMatchers
 
       @expected.each_with_index do |exp_rec, index|
         act_rec = @actual[index]
-        
+
         # Only bother to look at the first <Id>
         # tag in a (presumably) duplicated set.
         act_id = first_id(act_rec[:Id])
         exp_id = first_id(exp_rec[:Id])
-        
+
         return false if different '<Id>', act_id, exp_id
         return false if different 'keys', act_rec.keys, exp_rec.keys
 
@@ -61,6 +61,6 @@ module RForceXmlMatchers
   end
 end
 
-Spec::Runner.configure do |config|
+RSpec.configure do |config|
   config.include(RForceXmlMatchers)
 end

metadata

@@ -1,110 +1,93 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: rforce
-version: !ruby/object:Gem::Version 
-  hash: 5
+version: !ruby/object:Gem::Version
+  version: '0.8'
   prerelease: 
-  segments: 
-  - 0
-  - 7
-  version: "0.7"
 platform: ruby
-authors: 
+authors:
 - Ian Dees
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-02-05 00:00:00 -08:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-01-29 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: builder
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &70294392794600 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 3
-        - 0
-        version: "3.0"
+      - !ruby/object:Gem::Version
+        version: '3.0'
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: oauth
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *70294392794600
+- !ruby/object:Gem::Dependency
+  name: oauth
+  requirement: &70294392793960 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        - 4
-        version: "0.4"
+      - !ruby/object:Gem::Version
+        version: '0.4'
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: rspec
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *70294392793960
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: &70294392793160 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 9
-        segments: 
-        - 1
-        - 3
-        version: "1.3"
+      - !ruby/object:Gem::Version
+        version: '2.8'
   type: :development
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
+  prerelease: false
+  version_requirements: *70294392793160
+- !ruby/object:Gem::Dependency
   name: hoe-gemspec2
+  requirement: &70294392792460 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.1'
+  type: :development
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: *70294392792460
+- !ruby/object:Gem::Dependency
+  name: rdoc
+  requirement: &70294392791540 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 13
-        segments: 
-        - 1
-        - 1
-        version: "1.1"
+      - !ruby/object:Gem::Version
+        version: '3.10'
   type: :development
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: hoe
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: *70294392791540
+- !ruby/object:Gem::Dependency
+  name: hoe
+  requirement: &70294392790720 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 47
-        segments: 
-        - 2
-        - 8
-        - 0
-        version: 2.8.0
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.13'
   type: :development
-  version_requirements: *id005
+  prerelease: false
+  version_requirements: *70294392790720
 description: RForce is a simple, usable binding to the Salesforce API.
-email: 
+email:
 - undees@gmail.com
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - History.txt
 - Manifest.txt
 - README.txt
-files: 
+files:
+- .gemtest
 - History.txt
 - Manifest.txt
 - README.txt
@@ -124,40 +107,30 @@ files:
 - spec/spec.opts
 - spec/spec_helper.rb
 - tasks/timing.rake
-has_rdoc: true
 homepage: http://rforce.rubyforge.org
 licenses: []
-
 post_install_message: 
-rdoc_options: 
+rdoc_options:
 - --main
 - README.txt
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: rforce
-rubygems_version: 1.4.1
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: RForce is a simple, usable binding to the Salesforce API.
 test_files: []
-