executrix 1.1.2 → 1.1.3

data/.travis.yml

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

data/lib/executrix.rb

@@ -44,7 +44,6 @@ module Executrix
       batch_id = @connection.add_query(job_id, query)
       @connection.close_job job_id
       batch_reference = Executrix::Batch.new @connection, job_id, batch_id
-      batch_reference.init_result_id
       batch_reference.final_status
     end
 

data/lib/executrix/batch.rb

@@ -34,18 +34,17 @@ module Executrix
       @connection.query_batch @job_id, @batch_id
     end
 
-    # only needed for query
-    def init_result_id
-      max_retries = 5
-      retry_count = 0
-      while @result_id.nil? && retry_count < max_retries
-        @result_id = @connection.query_batch_result_id(@job_id, @batch_id)[:result]
-        retry_count += 1
-      end
-    end
-
     def results
+      init_result_id
       @connection.query_batch_result_data(@job_id, @batch_id, @result_id)
     end
+
+    private
+    def init_result_id
+      result_raw = @connection.query_batch_result_id(@job_id, @batch_id)
+      if result_raw
+        @result_id = result_raw[:result]
+      end
+    end
   end
 end

data/lib/executrix/version.rb

@@ -1,3 +1,3 @@
 module Executrix
-  VERSION = '1.1.2'
+  VERSION = '1.1.3'
 end

data/spec/lib/executrix_spec.rb

@@ -56,7 +56,6 @@ describe Executrix::Api do
       empty_connection.should_receive(:create_job).ordered
       empty_connection.should_receive(:add_query).ordered
       empty_connection.should_receive(:close_job).ordered
-      empty_batch.should_receive(:init_result_id).ordered
       empty_batch.should_receive(:final_status).ordered
       s.query(sobject_input, query_input)
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: executrix
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.1.3
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-04 00:00:00.000000000 Z
+date: 2013-07-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -105,7 +105,6 @@ files:
 - .rspec
 - .ruby-version
 - .travis.yml
-- CHANGELOG.md
 - Gemfile
 - Guardfile
 - LICENSE
@@ -138,7 +137,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 203849975840229404
+      hash: -2027489645870901694
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -147,7 +146,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 203849975840229404
+      hash: -2027489645870901694
 requirements: []
 rubyforge_project: executrix
 rubygems_version: 1.8.23

data/CHANGELOG.md

@@ -1,12 +0,0 @@
-## 1.1.1 (June 21th, 2013)
-
-- Now really make OrgId accessible
-
-## 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))