salesforce_bulk 0.0.3 → 0.0.4

data/lib/salesforce_bulk.rb

@@ -1,71 +1,70 @@
-require 'net/http'
-require 'xmlsimple'
-require 'csv'
-require "salesforce_bulk/version"
-require 'salesforce_bulk/job'
-require 'salesforce_bulk/connection'
-
-module SalesforceBulk
-  # Your code goes here...
-  class Api
-
-    @@SALESFORCE_API_VERSION = '23.0'
-
-    def initialize(username, password)
-      @connection = SalesforceBulk::Connection.new(username, password, @@SALESFORCE_API_VERSION)
-    end
-
-    def upsert(sobject, records, external_field)
-      self.do_operation('upsert', sobject, records, external_field)
-    end
-
-    def update(sobject, records)
-      self.do_operation('update', sobject, records, nil)
-    end
-    
-    def create(sobject, records)
-      self.do_operation('insert', sobject, records, nil)
-    end
-
-    def delete(sobject, records)
-      self.do_operation('delete', sobject, records, nil)
-    end
-
-    def query(sobject, query)
-      self.do_operation('query', sobject, query, nil)
-    end
-
-    #private
-
-    def do_operation(operation, sobject, records, external_field)
-      job = SalesforceBulk::Job.new(operation, sobject, records, external_field, @connection)
-
-      # TODO: put this in one function
-      job_id = job.create_job()
-      if(operation == "query")
-        batch_id = job.add_query()
-      else
-        batch_id = job.add_batch()
-      end
-      job.close_job()
-
-      state = job.check_batch_status()
-      while true
-        #puts "\nstate is #{state}\n"
-        state = job.check_batch_status()
-        if state != "Queued"
-          break
-        end
-        sleep(2) # wait x seconds and check again
-      end
-
-      if state == 'Completed'
-        job.get_batch_result()
-      else
-        return "error"
-      end
-
-    end
-
-  end  # End class
-end
+require 'net/https'
+require 'xmlsimple'
+require 'csv'
+require "salesforce_bulk/version"
+require 'salesforce_bulk/job'
+require 'salesforce_bulk/connection'
+
+module SalesforceBulk
+  # Your code goes here...
+  class Api
+
+    @@SALESFORCE_API_VERSION = '23.0'
+
+    def initialize(username, password)
+      @connection = SalesforceBulk::Connection.new(username, password, @@SALESFORCE_API_VERSION)
+    end
+
+    def upsert(sobject, records, external_field)
+      self.do_operation('upsert', sobject, records, external_field)
+    end
+
+    def update(sobject, records)
+      self.do_operation('update', sobject, records, nil)
+    end
+    
+    def create(sobject, records)
+      self.do_operation('insert', sobject, records, nil)
+    end
+
+    def delete(sobject, records)
+      self.do_operation('delete', sobject, records, nil)
+    end
+
+    def query(sobject, query)
+      self.do_operation('query', sobject, query, nil)
+    end
+
+    #private
+
+    def do_operation(operation, sobject, records, external_field)
+      job = SalesforceBulk::Job.new(operation, sobject, records, external_field, @connection)
+
+      # TODO: put this in one function
+      job_id = job.create_job()
+      if(operation == "query")
+        batch_id = job.add_query()
+      else
+        batch_id = job.add_batch()
+      end
+      job.close_job()
+
+      while true
+        state = job.check_batch_status()
+        #puts "\nstate is #{state}\n"
+        if state != "Queued"
+          break
+        end
+        sleep(2) # wait x seconds and check again
+      end
+
+      if state == 'Completed'
+        job.get_batch_result()
+      else
+        return "error"
+      end
+
+    end
+
+  end  # End class
+end

data/lib/salesforce_bulk/connection.rb

@@ -60,10 +60,7 @@ module SalesforceBulk
 
       #puts "#{host} -- #{path} -- #{headers.inspect}\n"
 
-      http = Net::HTTP.new(host)
-      http.verify_mode = OpenSSL::SSL::VERIFY_NONE
-      resp = http.post(path, xml, headers)
-      return resp.body
+      https(host).post(path, xml, headers).body
     end
 
     def get_request(host, path, headers)
@@ -74,14 +71,18 @@ module SalesforceBulk
         headers['X-SFDC-Session'] = @session_id;
       end
 
-      http = Net::HTTP.new(host)
-      http.verify_mode = OpenSSL::SSL::VERIFY_NONE
-      resp = http.get(path, headers)
-      return resp.body
+      https(host).get(path, headers).body
+    end
+
+    def https(host)
+      req = Net::HTTP.new(host, 443)
+      req.use_ssl = true
+      req.verify_mode = OpenSSL::SSL::VERIFY_NONE
+      req
     end
 
     def parse_instance()
-      @server_url =~ /https:\/\/([a-z]{2,2}[0-9]{1,1})-api/
+      @server_url =~ /https:\/\/([a-z]{2,2}[0-9]{1,2})-api/
       @instance = $~.captures[0]
     end
 

data/lib/salesforce_bulk/job.rb

@@ -34,7 +34,7 @@ module SalesforceBulk
 
     def close_job()
       xml = "#{@@XML_HEADER}<jobInfo xmlns=\"http://www.force.com/2009/06/asyncapi/dataload\">"
-      xml += "state>Closed</state>"
+      xml += "<state>Closed</state>"
       xml += "</jobInfo>"
 
       path = "job/#{@@job_id}"

data/lib/salesforce_bulk/version.rb

@@ -1,3 +1,3 @@
 module SalesforceBulk
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

data/salesforce_bulk.gemspec

@@ -1,29 +1,27 @@
-# -*- encoding: utf-8 -*-
-$:.push File.expand_path("../lib", __FILE__)
-require "salesforce_bulk/version"
-
-Gem::Specification.new do |s|
-  s.name        = "salesforce_bulk"
-  s.version     = SalesforceBulk::VERSION
-  s.authors     = ["Jorge Valdivia"]
-  s.email       = ["jorge@valdivia.me"]
-  s.homepage    = "https://github.com/jorgevaldivia/salesforce_bulk"
-  s.summary     = %q{Ruby support for the Salesforce Bulk API}
-  s.description = %q{This gem provides a super simple interface for the Salesforce Bulk API. It provides support for insert, update, upsert, delete, and query.}
-
-  s.rubyforge_project = "salesforce_bulk"
-
-  s.files         = `git ls-files`.split("\n")
-  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
-  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
-  s.require_paths = ["lib"]
-
-  # specify any dependencies here; for example:
-  # s.add_development_dependency "rspec"
-  # s.add_runtime_dependency "rest-client"
-
-  #s.add_development_dependency "net-http"
-  #s.add_development_dependency "xmlsimple"
-  #s.add_development_dependency "csv"
-
-end
+# -*- encoding: utf-8 -*-
+$:.push File.expand_path("../lib", __FILE__)
+require "salesforce_bulk/version"
+
+Gem::Specification.new do |s|
+  s.name        = "salesforce_bulk"
+  s.version     = SalesforceBulk::VERSION
+  s.authors     = ["Jorge Valdivia"]
+  s.email       = ["jorge@valdivia.me"]
+  s.homepage    = "https://github.com/jorgevaldivia/salesforce_bulk"
+  s.summary     = %q{Ruby support for the Salesforce Bulk API}
+  s.description = %q{This gem provides a super simple interface for the Salesforce Bulk API. It provides support for insert, update, upsert, delete, and query.}
+
+  s.rubyforge_project = "salesforce_bulk"
+
+  s.files         = `git ls-files`.split("\n")
+  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
+  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
+  s.require_paths = ["lib"]
+
+  # specify any dependencies here; for example:
+  # s.add_development_dependency "rspec"
+  # s.add_runtime_dependency "rest-client"
+
+  s.add_dependency "xml-simple"
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: salesforce_bulk
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,8 +9,19 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-10-19 00:00:00.000000000Z
-dependencies: []
+date: 2011-11-18 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: xml-simple
+  requirement: &24345852 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *24345852
 description: This gem provides a super simple interface for the Salesforce Bulk API.
   It provides support for insert, update, upsert, delete, and query.
 email:
@@ -48,7 +59,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: salesforce_bulk
-rubygems_version: 1.8.10
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: Ruby support for the Salesforce Bulk API