salesforce_bulk_query 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 37e885fe7f443a9c7ab9b3006f862e134d0b0fbb
-  data.tar.gz: 0ded5e51edde95927af934907f3a98326f9971f9
+  metadata.gz: 81149267dbb6113a6a151f4cfe86fb9617a7ac4c
+  data.tar.gz: f31ea42f31cee0c7ad519d7d2f327091130d7032
 SHA512:
-  metadata.gz: 19f45a42a8b1f3be36f9681fecae0a70670baa5fe1eab5d39339ec0ced4a299071b5eaefbc04d8776b8eda9fbbb59dee0db2f5eadf477a13fce05e1021d363f0
-  data.tar.gz: b851dabb3da32e4ecdc693471dc9462c112a2488a5bdf78ede5c481cb025220c1032871476ae3f7c7bb98ca437c286c23070bf8fdccb782a229809aca7f5279f
+  metadata.gz: 26c32884ca08555921c25dea35529f42cd7cb50beaeac6c46b354e825ca97d61ae4960f9ecbdafd6a8633b0eb49c3abcd408ac6d3e7bead02f8e82bf494cfd09
+  data.tar.gz: ecd73fc49fa27ef6d04fbf73d9160f548bad4691ebbbb6b80d03441f40769ce6238f9f2f505a01c40482d43c5b599bd455b700ad4517ae95bccfa15dc927c31b

data/lib/salesforce_bulk_query/batch.rb

@@ -77,7 +77,7 @@ module SalesforceBulkQuery
     end
 
     def get_filename
-      return "#{@sobject}_#{@batch_id}_#{@start}-#{@stop}.csv"
+      return "#{@sobject}_#{@start}_#{@stop}_#{@batch_id}.csv"
     end
 
     def get_result(options={})

data/lib/salesforce_bulk_query/job.rb

@@ -177,6 +177,7 @@ module SalesforceBulkQuery
       @logger.info "unfinished batches: #{unfinished_batches}\nverification_fail_batches: #{verification_fail_batches}" if @logger
 
       return {
+        :finished => @unfinished_batches.empty?,
         :filenames => @filenames,
         :unfinished_batches => @unfinished_batches,
         :verification_fail_batches => verification_fail_batches

data/lib/salesforce_bulk_query/query.rb

@@ -86,13 +86,12 @@ module SalesforceBulkQuery
       # check all jobs statuses and split what should be split
       @jobs_in_progress.each do |job|
 
-        # check job status
-        job_status = job.check_status
-        job_over_limit = job.over_limit?
-        job_done = job_status[:succeeded] || job_over_limit
-
         # download what's available
         job_results = job.get_available_results(options)
+
+        job_over_limit = job.over_limit?
+        job_done = job_results[:finished] || job_over_limit
+
         @logger.debug "job_results: #{job_results}" if @logger
 
         unfinished_batches = job_results[:unfinished_batches]

data/lib/salesforce_bulk_query/version.rb

@@ -1,3 +1,3 @@
 module SalesforceBulkQuery
-  VERSION = '0.1.2'
+  VERSION = '0.1.3'
 end

data/spec/spec_helper.rb

@@ -6,6 +6,7 @@ RSpec.configure do |c|
   c.filter_run :focus => true
   c.run_all_when_everything_filtered = true
   c.filter_run_excluding :skip => true
+  c.formatter = :documentation
 end
 
 class SpecHelper

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: salesforce_bulk_query
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Petr Cvengros
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-29 00:00:00.000000000 Z
+date: 2015-02-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json