executrix 1.0.0 → 1.1.0

data/.ruby-version

@@ -1 +1 @@
-1.9.3-p392
+1.9.3-p429

data/.travis.yml

@@ -3,7 +3,7 @@ bundler_args: --without documentation production
 rvm:
   - 1.9.3
   - 2.0.0
-  - jruby-19mode
+  - jruby-19mode-1.7.4
   - rbx-19mode
 matrix:
   allow_failures:

data/CHANGELOG.md

@@ -0,0 +1,8 @@
+## 1.1.0 (June 16th, 2013)
+
+- Add possibility to fetch OrgId after login
+- Update default Salesforce API version to 28.0
+
+## 1.0.0 (May 13th, 2013)
+
+- initial release (rewrite of [salesforce_bulk](https://github.com/jorgevaldivia/salesforce_bulk))

data/README.md

@@ -1,6 +1,8 @@
 # Executrix
 
-DISCLAIMER: This gem is a rewrite of the [salesforce_bulk](https://github.com/jorgevaldivia/salesforce_bulk) gem. As the original maintainer didn't respon to my [pull-request](https://github.com/jorgevaldivia/salesforce_bulk/pull/14) I decided to rerelease the gem under different name. This is it.
+[![Build Status](https://travis-ci.org/propertybase/executrix.png?branch=master)](https://travis-ci.org/propertybase/executrix) [![Coverage Status](https://coveralls.io/repos/propertybase/executrix/badge.png?branch=master)](https://coveralls.io/r/propertybase/executrix) [![Code Climate](https://codeclimate.com/github/propertybase/executrix.png)](https://codeclimate.com/github/propertybase/executrix) [![Dependency Status](https://gemnasium.com/propertybase/executrix.png)](https://gemnasium.com/propertybase/executrix) [![Gem Version](https://badge.fury.io/rb/executrix.png)](http://badge.fury.io/rb/executrix)
+
+DISCLAIMER: This gem is a rewrite of the [salesforce_bulk](https://github.com/jorgevaldivia/salesforce_bulk) gem. As the original maintainer didn't respon to my [pull-request](https://github.com/jorgevaldivia/salesforce_bulk/pull/14) I decided to rerelease the gem under different name.
 
 The original Copyright Notice and all the original commit logs have been retained.
 
@@ -33,6 +35,16 @@ salesforce = Executrix::Api.new('YOUR_SALESFORCE_SANDBOX_USERNAME', 'YOUR_SALESF
 
 Note: the second parameter is a combination of your Salesforce token and password. So if your password is xxxx and your token is yyyy, the second parameter will be xxxxyyyy
 
+#### OrgId
+
+After you created the client object you can fetch the OrgId via `org_id`.
+
+This will fetch the 15 digit OrgId.
+
+~~~ ruby
+salesforce.org_id # '00D50000000IehZ'
+~~~
+
 ### Operations
 
 ~~~ ruby

data/executrix.gemspec

@@ -6,8 +6,8 @@ require 'executrix/version'
 Gem::Specification.new do |gem|
   gem.name        = 'executrix'
   gem.version     = Executrix::VERSION
-  gem.authors     = ["Jorge Valdivia"]
-  gem.email       = ["jorge@valdivia.me"]
+  gem.authors     = ['Jorge Valdivia', 'Leif Gensert']
+  gem.email       = ['jorge@valdivia.me', 'leif@propertybase.com']
   gem.homepage    = 'https://github.com/propertybase/executrix'
   gem.summary     = %q{Ruby support for the Salesforce Bulk API}
   gem.description = %q{This gem provides a super simple interface for the Salesforce Bulk API. It provides support for insert, update, upsert, delete, and query.}
@@ -20,8 +20,8 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
 
   gem.add_dependency 'rake'
-  gem.add_dependency 'nori', '~> 2.0'
-  gem.add_dependency 'nokogiri', '~> 1.5'
-  gem.add_development_dependency 'rspec', '~> 2.13'
-  gem.add_development_dependency 'webmock', '~> 1.11'
+  gem.add_dependency 'nori', '< 2.3'
+  gem.add_dependency 'nokogiri', '< 1.7'
+  gem.add_development_dependency 'rspec', '< 2.14'
+  gem.add_development_dependency 'webmock', '< 1.12'
 end

data/lib/executrix.rb

@@ -6,7 +6,7 @@ require 'executrix/connection'
 
 module Executrix
   class Api
-    SALESFORCE_API_VERSION = '27.0'
+    SALESFORCE_API_VERSION = '28.0'
 
     def initialize(username, password, sandbox = false, api_version = SALESFORCE_API_VERSION)
       @connection = Executrix::Connection.connect(

data/lib/executrix/connection.rb

@@ -19,6 +19,11 @@ module Executrix
       self
     end
 
+    def org_id
+      raise 'please login first' unless @session_id
+      @session_id.split('!').first
+    end
+
     def create_job operation, sobject, external_field
       Executrix::Http.create_job(
         @instance,

data/lib/executrix/version.rb

@@ -1,3 +1,3 @@
 module Executrix
-  VERSION = '1.0.0'
+  VERSION = '1.1.0'
 end

data/spec/lib/executrix/batch_spec.rb

@@ -15,7 +15,7 @@ describe Executrix::Batch do
       b = described_class.new nil, nil, -1
       expected_status = {
           state: 'Completed',
-          state_message: 'Empty Request'
+          state_message: 'Empty Request',
         }
       b.should_not_receive(:status)
       expect(b.final_status).to eq(expected_status)
@@ -41,8 +41,8 @@ describe Executrix::Batch do
       b.should_receive(:status).once.and_return(expected_running_state)
       b.should_receive(:status).once.and_return(expected_final_state)
       b.should_receive(:results).once.and_return({g: :tfo})
-      expect{|blk| b.final_status(0, &blk)}.
-        to yield_successive_args(expected_running_state, expected_final_state)
+      expect{|blk| b.final_status(0, &blk)}
+        .to yield_successive_args(expected_running_state, expected_final_state)
     end
 
     it 'should raise exception when batch fails' do
@@ -52,8 +52,8 @@ describe Executrix::Batch do
         {
           state: 'Failed',
           state_message: expected_error_message})
-      expect{b.final_status}.
-        to raise_error(StandardError, expected_error_message)
+      expect{b.final_status}
+        .to raise_error(StandardError, expected_error_message)
     end
   end
 end

data/spec/lib/executrix/connection_spec.rb

@@ -11,13 +11,12 @@ describe Executrix::Connection do
     query_batch: 2,
     query_batch_result_id: 2,
     query_batch_result_data: 3,
-
   }.each do |method_name, num_of_params|
     describe "##{method_name}" do
       it 'should delegate correctly to Http class' do
-        Executrix::Http.
-          should_receive(method_name).
-          and_return({})
+        Executrix::Http
+          .should_receive(method_name)
+          .and_return({})
         subject.send(method_name, *Array.new(num_of_params))
       end
     end
@@ -25,18 +24,33 @@ describe Executrix::Connection do
 
   describe '#add_query' do
     it 'should delegate correctly to Http class' do
-      Executrix::Http.should_receive(:add_batch).
-          and_return({})
+      Executrix::Http.should_receive(:add_batch)
+          .and_return({})
       subject.add_query(nil, nil)
     end
   end
 
+  describe '#org_id' do
+    it 'should raise exception when not logged in' do
+      expect {subject.org_id}.to raise_error(RuntimeError)
+    end
+
+    it 'should return correct OrgId after login' do
+      org_id = '00D50000000IehZ'
+      Executrix::Http
+      .should_receive(:login)
+      .and_return({session_id: "#{org_id}!AQcAQH0dMHZfz972Szmpkb58urFRkgeBGsxL_QJWwYMfAbUeeG7c1E6LYUfiDUkWe6H34r1AAwOR8B8fLEz6n04NPGRrq0FM"})
+      expect(subject.login.org_id).to eq(org_id)
+    end
+  end
+
+
   describe '#add_batch' do
     it 'should delegate correctly to underlying classes' do
-      Executrix::Http.should_receive(:add_batch).
-          and_return({})
-      Executrix::Helper.should_receive(:records_to_csv).
-        and_return('My,Awesome,CSV')
+      Executrix::Http.should_receive(:add_batch)
+          .and_return({})
+      Executrix::Helper.should_receive(:records_to_csv)
+        .and_return('My,Awesome,CSV')
       subject.add_batch(nil, 'non emtpy records')
     end
 

data/spec/lib/executrix/http_spec.rb

@@ -18,11 +18,11 @@ describe Executrix::Http do
   
     it 'should return a response object' do
        expected_body = 'correct result'
-        stub_request(:post, 'https://test.host').
-          with(
+        stub_request(:post, 'https://test.host')
+          .with(
             body: post_request.body,
-            headers: post_request.headers).
-          to_return(:body => expected_body)
+            headers: post_request.headers)
+          .to_return(:body => expected_body)
        res = Executrix::Http.process_http_request(post_request)
        expect(res).to eq(expected_body)
     end
@@ -141,16 +141,16 @@ describe Executrix::Http do
     end
 
     it 'should raise an error for faulty login' do
-      Executrix::Http.should_receive(:process_http_request).
-        and_return(login_error)
-      expect{ Executrix::Http.login('a','b','c', 'd') }.
-        to raise_error(RuntimeError, login_error_message)
+      Executrix::Http.should_receive(:process_http_request)
+        .and_return(login_error)
+      expect{ Executrix::Http.login('a','b','c', 'd') }
+        .to raise_error(RuntimeError, login_error_message)
     end
 
     it 'should return hash for correct login' do
       [login_success, login_success_new].each do |login_response|
-        Executrix::Http.should_receive(:process_http_request).
-          and_return(login_response)
+        Executrix::Http.should_receive(:process_http_request)
+          .and_return(login_response)
         result = Executrix::Http.login('a','b','c', 'd')
         expect(result).to be_a(Hash)
         expect(result).to have_key(:session_id)
@@ -190,8 +190,8 @@ describe Executrix::Http do
     end
 
     it 'should return hash for creating job' do
-      Executrix::Http.should_receive(:process_http_request).
-        and_return(create_job_success)
+      Executrix::Http.should_receive(:process_http_request)
+        .and_return(create_job_success)
       result = Executrix::Http.create_job('a','b','c','d', 'e')
       expect(result).to be_a(Hash)
       expect(result).to have_key(:id)
@@ -219,8 +219,8 @@ describe Executrix::Http do
     end
 
     it 'should return hash for adding batch' do
-      Executrix::Http.should_receive(:process_http_request).
-        and_return(add_batch_success)
+      Executrix::Http.should_receive(:process_http_request)
+        .and_return(add_batch_success)
       result = Executrix::Http.add_batch(:post,'a','b','c','d')
       expect(result).to be_a(Hash)
       expect(result).to have_key(:id)
@@ -259,8 +259,8 @@ describe Executrix::Http do
     end
 
     it 'should return hash for closing job' do
-      Executrix::Http.should_receive(:process_http_request).
-        and_return(close_job_success)
+      Executrix::Http.should_receive(:process_http_request)
+        .and_return(close_job_success)
       result = Executrix::Http.close_job('a','b','c','d')
       expect(result).to be_a(Hash)
       expect(result).to have_key(:id)
@@ -281,10 +281,10 @@ describe Executrix::Http do
     end
 
     it 'should raise an exception on faulty authorization' do
-      Executrix::Http.should_receive(:process_http_request).
-        and_return(invalid_session_id)
-      expect{Executrix::Http.query_batch('a','b','c','d','e')}.
-        to raise_error(RuntimeError, 'InvalidSessionId: Invalid session id')
+      Executrix::Http.should_receive(:process_http_request)
+        .and_return(invalid_session_id)
+      expect{Executrix::Http.query_batch('a','b','c','d','e')}
+        .to raise_error(RuntimeError, 'InvalidSessionId: Invalid session id')
     end
   end
 
@@ -296,8 +296,8 @@ describe Executrix::Http do
     end
 
     it 'should return hash including the result id' do
-      Executrix::Http.should_receive(:process_http_request).
-        and_return(batch_result_success)
+      Executrix::Http.should_receive(:process_http_request)
+        .and_return(batch_result_success)
       result = Executrix::Http.query_batch_result_id('a','b','c','d','e')
       expect(result).to be_a(Hash)
       expect(result).to have_key(:result)
@@ -318,8 +318,8 @@ describe Executrix::Http do
     end
 
     it 'should return array of arrays for data' do
-      Executrix::Http.should_receive(:process_http_request).
-        and_return(batch_result_data_success)
+      Executrix::Http.should_receive(:process_http_request)
+        .and_return(batch_result_data_success)
       result = Executrix::Http.query_batch_result_data('a','b','c','d','e','f')
       expect(result).to eq([
         {'Id' => '003M000057GH39aIAD', 'my_external_id__c' => 'K-00J799'},
@@ -327,8 +327,8 @@ describe Executrix::Http do
     end
 
     it 'should return correct array with spaces' do
-      Executrix::Http.should_receive(:process_http_request).
-        and_return(batch_result_data_with_spaces_success)
+      Executrix::Http.should_receive(:process_http_request)
+        .and_return(batch_result_data_with_spaces_success)
       result = Executrix::Http.query_batch_result_data('a','b','c','d','e','f')
       expect(result).to eq([
         {'Id' => '003K000057GH39aIAD', 'Name' => 'Master of Disaster'},

data/spec/lib/executrix_spec.rb

@@ -18,19 +18,19 @@ describe Executrix::Api do
   }.each do |method_name, num_of_params|
     describe "##{method_name}" do
       it 'should delegate to #start_job' do
-        Executrix::Connection.
-          should_receive(:connect).
-          and_return(empty_connection)
+        Executrix::Connection
+          .should_receive(:connect)
+          .and_return(empty_connection)
         s = described_class.new(nil, nil)
-        s.should_receive(:start_job).
-          with(method_name.to_s, *Array.new(num_of_params))
+        s.should_receive(:start_job)
+          .with(method_name.to_s, *Array.new(num_of_params))
         s.send(method_name, *Array.new(num_of_params))
       end
 
       it 'should trigger correct workflow' do
-        Executrix::Connection.
-          should_receive(:connect).
-          and_return(empty_connection)
+        Executrix::Connection
+          .should_receive(:connect)
+          .and_return(empty_connection)
         s = described_class.new(nil, nil)
         empty_connection.should_receive(:create_job).ordered
         empty_connection.should_receive(:add_batch).ordered
@@ -43,12 +43,12 @@ describe Executrix::Api do
 
   describe '#query' do
     it 'should trigger correct workflow' do
-      Executrix::Connection.
-          should_receive(:connect).
-          and_return(empty_connection)
-      Executrix::Batch.
-        should_receive(:new).
-        and_return(empty_batch)
+      Executrix::Connection
+          .should_receive(:connect)
+          .and_return(empty_connection)
+      Executrix::Batch
+        .should_receive(:new)
+        .and_return(empty_batch)
 
       s = described_class.new(nil, nil)
       sobject_input = 'sobject_stub'

metadata

@@ -1,89 +1,101 @@
 --- !ruby/object:Gem::Specification
 name: executrix
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  prerelease:
+  version: 1.1.0
 platform: ruby
 authors:
 - Jorge Valdivia
-autorequire: 
+- Leif Gensert
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2013-05-13 00:00:00.000000000 Z
+date: 2013-06-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+    none: false
+  prerelease: false
+  type: :runtime
 - !ruby/object:Gem::Dependency
   name: nori
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - <
+      - !ruby/object:Gem::Version
+        version: '2.3'
+    none: false
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - <
       - !ruby/object:Gem::Version
-        version: '2.0'
-  type: :runtime
+        version: '2.3'
+    none: false
   prerelease: false
+  type: :runtime
+- !ruby/object:Gem::Dependency
+  name: nokogiri
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - <
       - !ruby/object:Gem::Version
-        version: '2.0'
-- !ruby/object:Gem::Dependency
-  name: nokogiri
+        version: '1.7'
+    none: false
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - <
       - !ruby/object:Gem::Version
-        version: '1.5'
-  type: :runtime
+        version: '1.7'
+    none: false
   prerelease: false
+  type: :runtime
+- !ruby/object:Gem::Dependency
+  name: rspec
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - <
       - !ruby/object:Gem::Version
-        version: '1.5'
-- !ruby/object:Gem::Dependency
-  name: rspec
+        version: '2.14'
+    none: false
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - <
       - !ruby/object:Gem::Version
-        version: '2.13'
-  type: :development
+        version: '2.14'
+    none: false
   prerelease: false
+  type: :development
+- !ruby/object:Gem::Dependency
+  name: webmock
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - <
       - !ruby/object:Gem::Version
-        version: '2.13'
-- !ruby/object:Gem::Dependency
-  name: webmock
+        version: '1.12'
+    none: false
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - <
       - !ruby/object:Gem::Version
-        version: '1.11'
-  type: :development
+        version: '1.12'
+    none: false
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.11'
-description: This gem provides a super simple interface for the Salesforce Bulk API.
-  It provides support for insert, update, upsert, delete, and query.
+  type: :development
+description: This gem provides a super simple interface for the Salesforce Bulk API. It provides support for insert, update, upsert, delete, and query.
 email:
 - jorge@valdivia.me
+- leif@propertybase.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -92,6 +104,7 @@ files:
 - .rspec
 - .ruby-version
 - .travis.yml
+- CHANGELOG.md
 - Gemfile
 - Guardfile
 - LICENSE
@@ -112,26 +125,33 @@ files:
 - spec/spec_helper.rb
 homepage: https://github.com/propertybase/executrix
 licenses: []
-metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
+      segments:
+      - 0
+      hash: 2
       version: '0'
+  none: false
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
+      segments:
+      - 0
+      hash: 2
       version: '0'
+  none: false
 requirements: []
 rubyforge_project: executrix
-rubygems_version: 2.0.0
-signing_key: 
-specification_version: 4
+rubygems_version: 1.8.24
+signing_key:
+specification_version: 3
 summary: Ruby support for the Salesforce Bulk API
 test_files:
 - spec/lib/executrix/batch_spec.rb

checksums.yaml

@@ -1,15 +0,0 @@
----
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    M2I4ZDNlY2E3NzEyMjNiOThiMDFjMTg0Yjk0ZmM0ZDIxOThlOTgxNw==
-  data.tar.gz: !binary |-
-    MzllZDVhODY1NDNhNTY4ZmIwMmE0M2NjZmM1NWNhZDA1NTE4MzA2Nw==
-!binary "U0hBNTEy":
-  metadata.gz: !binary |-
-    NDg4ODI3NWZhYjU0MjZiNWE5MzIwYmNjOTg0YTUzODE5ODlkYmMxMjMxODE3
-    MTVjYWU5ZGQxZjIwNzVkNzBiZmQ4ZWJlNGU5OGE1MWEyZDY4Nzk5NTQ1ZjRm
-    NzRlYjgwYzA3YWFmOTQ3ZmMwMTcwYzY5MDgyMjdkMzFjYTQ3OTM=
-  data.tar.gz: !binary |-
-    NjM0ZjQ3YTg1MWJiNDBmYWM2YWE2YTI2ZTZiNmY3YzYyZGI1ZDBhOGEwYmIx
-    M2RkZTRlOTQ2ODI1Y2E3ZDhjOWIwZjEwNDc1M2QzOGY5MDRjZWY0MWY2M2Q3
-    ZDU3MjRmYWVkOWM2YmViYTNhYzBhMjk0YTZiMDEyNTJjMzdlZjM=