salesforce_bulk_query 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 81149267dbb6113a6a151f4cfe86fb9617a7ac4c
-  data.tar.gz: f31ea42f31cee0c7ad519d7d2f327091130d7032
+  metadata.gz: 7484e5d5b0279583ceeddffed721fd2db9d91144
+  data.tar.gz: 038249d4c8779cbe070a95c9c592ffbc36b96693
 SHA512:
-  metadata.gz: 26c32884ca08555921c25dea35529f42cd7cb50beaeac6c46b354e825ca97d61ae4960f9ecbdafd6a8633b0eb49c3abcd408ac6d3e7bead02f8e82bf494cfd09
-  data.tar.gz: ecd73fc49fa27ef6d04fbf73d9160f548bad4691ebbbb6b80d03441f40769ce6238f9f2f505a01c40482d43c5b599bd455b700ad4517ae95bccfa15dc927c31b
+  metadata.gz: 0f12e0c19cad6c15b7e0b4985971e1b5c594a27f1f0c9609e54408e735b01763f7c6b8e6de2da40f26667f29f6f527fc70b442af7082e72c303f54170cda2e48
+  data.tar.gz: b0bd17a0267354414eba9c03914ab8f6e7005014a276e3df1a6bff3cdd56827420df10438402d544599bf5a0b73cfbf4fe4e5866afeab25eddfeb579912df1c3

data/lib/salesforce_bulk_query/batch.rb

@@ -119,7 +119,7 @@ module SalesforceBulkQuery
       api_count = @connection.query_count(@sobject, @start, @stop)
       # if we weren't able to get the count, fail.
       if api_count.nil?
-        return false
+        return @verification = false
       end
 
       # count the records in the csv

data/lib/salesforce_bulk_query/connection.rb

@@ -119,7 +119,8 @@ module SalesforceBulkQuery
           q = @client.query("SELECT COUNT() FROM #{sobject} WHERE CreatedDate >= #{from} AND CreatedDate < #{to}")
           return q.size
         end
-      rescue TimeoutError => e
+      rescue Faraday::Error::TimeoutError => e
+        @logger.warn "Timeout getting count: #{soql}. Error: #{e}. Taking it as failed verification" if @logger
         return nil
       end
     end
@@ -133,4 +134,4 @@ module SalesforceBulkQuery
       }
     end
   end
-end
+end

data/lib/salesforce_bulk_query/logger.rb

@@ -24,7 +24,7 @@ module SalesforceBulkQuery
         dump :url => env[:url].to_s,
           :method => env[:method],
           :headers => env[:request_headers],
-          :body => env[:body][0..MAX_LOG_LENGTH]
+          :body => env[:body] ? env[:body][0..MAX_LOG_LENGTH] : nil
       end
       super
     end
@@ -33,7 +33,7 @@ module SalesforceBulkQuery
       debug('response') do
         dump :status => env[:status].to_s,
           :headers => env[:response_headers],
-          :body => env[:body][0..MAX_LOG_LENGTH]
+          :body => env[:body] ? env[:body][0..MAX_LOG_LENGTH] : nil
       end
     end
 

data/lib/salesforce_bulk_query/version.rb

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

data/salesforce_bulk_query.gemspec

@@ -24,10 +24,8 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'pry', '~>0.9'
   s.add_development_dependency 'pry-stack_explorer', '~>0.4' if RUBY_PLATFORM != 'java'
   s.add_development_dependency 'rake', '~> 10.3'
-  s.add_development_dependency 'coveralls', '~> 0.7', '>= 0.7.0'
-
-
-
+  s.add_development_dependency 'coveralls', '~> 0.7'
+  s.add_development_dependency 'webmock', '~> 1.20'
 
   s.files = `git ls-files`.split($/)
   s.require_paths = ['lib']

data/spec/salesforce_bulk_query_spec.rb

@@ -12,6 +12,7 @@ describe SalesforceBulkQuery do
     @api = SpecHelper.create_default_api(@client)
     @entity = ENV['ENTITY'] || 'Opportunity'
     @field_list = (ENV['FIELD_LIST'] || "Id,CreatedDate").split(',')
+    @api_version = SpecHelper.api_version
   end
 
   describe "instance_url" do
@@ -52,6 +53,20 @@ describe SalesforceBulkQuery do
           end
         end
       end
+      it "catches the timeout error for query" do
+        # stub the timeout on query
+        query_url = "na12.salesforce.com/services/data/v#{@api_version}/query"
+        # "https://na12.salesforce.com/services/data/v#{@api_version}/query?q=.*"
+        query_regexp = Regexp.new(query_url)
+
+        stub_request(:get, query_regexp).to_timeout.times(4).then.to_return(:body => "{\"totalSize\":0,\"done\":true,\"records\":[]}", :headers => {"User-Agent"=>"Faraday v0.8.9", "Authorization"=>"OAuth abcd"})
+
+        WebMock.allow_net_connect!
+
+        result = @api.query(@entity, "SELECT #{@field_list.join(', ')} FROM #{@entity}", :count_lines => true, :single_batch => true)
+        require 'pry'; binding.pry
+
+      end
     end
     context "when you give it all the options" do
       it "downloads a single file" do

data/spec/spec_helper.rb

@@ -1,12 +1,17 @@
 require 'salesforce_bulk_query'
 require 'restforce'
-
+require 'webmock/rspec'
 
 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
+
+  # whitelist codeclimate.com so test coverage can be reported
+  c.after(:suite) do
+    WebMock.disable_net_connect!(:allow => 'codeclimate.com')
+  end
 end
 
 class SpecHelper
@@ -18,10 +23,14 @@ class SpecHelper
       :security_token => ENV['TOKEN'],
       :client_id => ENV['CLIENT_ID'],
       :client_secret => ENV['CLIENT_SECRET'],
-      :api_version => ENV['API_VERSION'] || DEFAULT_API_VERSION
+      :api_version => api_version
     )
   end
 
+  def self.api_version
+    ENV['API_VERSION'] || DEFAULT_API_VERSION
+  end
+
   def self.create_default_api(restforce)
     # switch off the normal logging
     Restforce.log = false

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: salesforce_bulk_query
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Petr Cvengros
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-02 00:00:00.000000000 Z
+date: 2015-02-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -129,9 +129,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.7'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.7.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -139,9 +136,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.7'
-    - - ">="
+- !ruby/object:Gem::Dependency
+  name: webmock
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.20'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.7.0
+        version: '1.20'
 description: A library for downloading data from Salesforce Bulk API. We only focus
   on querying, other operations of the API aren't supported. Designed to handle a
   lot of data.