salesforce_bulk_query 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7fa88413bbd297c98d25b68f77a9ca2988daf3eb
-  data.tar.gz: dbcfba2b8107df4ab4deb4adfd28d6db5c4ac132
+  metadata.gz: 93410e3eaddd8559f8127d9cad6ed1223093da53
+  data.tar.gz: f24d761b7d5e39c67efc54eb99c9e9006a7b3330
 SHA512:
-  metadata.gz: f5ae74d36d69674eb23a3ab57f6183d917556bda60192aa6ada277f12aced668c5038b39166be59a73b5b8016ed7bba1ffee4de538568edd1b08c31ee6abc4a2
-  data.tar.gz: 873f7b3e6d52a74df309403fb0386264e55952b03aab625c9d44da340d088ceef8f006adfa1897f647ff16a37a6f5059c09bc7b07755266324b390e539acedf5
+  metadata.gz: d849ee9f3525ecd0a92c57d4c997c7158d7b830892b0aaa221b9b38d7e55d0042d08dd19a020f1729d7deea37df9790d1e81bf4dab6bf15042cf2197d5501033
+  data.tar.gz: 11c53de51a4c6cbe7541e63cf2f236900b559d12b464e287c79c7b800db1d13ff1ff6ae097a21030c59cb6cb95d24c2512844c459728b73a51aed6b8aba380dd

data/lib/salesforce_bulk_query/connection.rb

@@ -114,9 +114,10 @@ module SalesforceBulkQuery
 
     def query_count(sobject, from, to)
       # do it with retries, if it doesn't succeed, return nil, don't fail.
+      soql = "SELECT COUNT() FROM #{sobject} WHERE CreatedDate >= #{from} AND CreatedDate < #{to}"
       begin
         with_retries do
-          q = @client.query("SELECT COUNT() FROM #{sobject} WHERE CreatedDate >= #{from} AND CreatedDate < #{to}")
+          q = @client.query(soql)
           return q.size
         end
       rescue Faraday::Error::TimeoutError => e
@@ -134,4 +135,4 @@ module SalesforceBulkQuery
       }
     end
   end
-end
+end

data/lib/salesforce_bulk_query/version.rb

@@ -1,3 +1,3 @@
 module SalesforceBulkQuery
-  VERSION = '0.1.5'
+  VERSION = '0.1.6'
 end

data/spec/salesforce_bulk_query_spec.rb

@@ -8,6 +8,8 @@ require 'set'
 # test co nejak nafakuje tu situaci v twc
 describe SalesforceBulkQuery do
   before :all do
+    WebMock.allow_net_connect!
+
     @client = SpecHelper.create_default_restforce
     @api = SpecHelper.create_default_api(@client)
     @entity = ENV['ENTITY'] || 'Opportunity'
@@ -53,19 +55,46 @@ describe SalesforceBulkQuery do
           end
         end
       end
+    end
+    context "when we want to mock things" do
+      before(:each) do
+        WebMock.allow_net_connect!
+      end
+      after(:each) do
+        WebMock.allow_net_connect!
+      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=.*"
+        host = URI.parse(@api.instance_url).host
+        query_url = "#{host}/services/data/v#{@api_version}/query"
         query_regexp = Regexp.new(query_url)
+        # 4 timeouts (first get the oldest record), then fake a
+        # 0 count query response
+        stub_request(:get, query_regexp).to_timeout.times(4).then.to_return(
+          :body => "{\"totalSize\":0,\"done\":true,\"records\":[]}",
+          :headers => {
+            "date"=>"Wed, 04 Feb 2015 01:18:45 GMT",
+            "set-cookie"=>"BrowserId=hahaha;Path=/;Domain=.salesforce.com;Expires=never",
+            "expires"=>"Thu, 01 Jan 1970 00:00:00 GMT",
+            "sforce-limit-info"=>"api-usage=6666/15000",
+            "content-type"=>"application/json;charset=UTF-8",
+            "transfer-encoding"=>"chunked"}
+        )
 
-        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"})
-
+        # do the actual request
         WebMock.allow_net_connect!
+        result = @api.query(
+          @entity,
+          "SELECT #{@field_list.join(', ')} FROM #{@entity}",
+          :count_lines => true,
+          :single_batch => true
+        )
 
-        result = @api.query(@entity, "SELECT #{@field_list.join(', ')} FROM #{@entity}", :count_lines => true, :single_batch => true)
-        require 'pry'; binding.pry
-
+        # check it
+        expect(result[:succeeded]).to be_true
+        expect(result[:unfinished_subqueries]).to be_empty
+        expect(result[:filenames]).not_to be_empty
+        expect(result[:jobs_done]).not_to be_empty
       end
     end
     context "when you give it all the options" do

data/spec/spec_helper.rb

@@ -7,11 +7,6 @@ RSpec.configure do |c|
   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

metadata

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