restforce-db 4.0.3 → 4.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 222aeaddc4fb94b32a2b2eaacb3482762ede6c37
-  data.tar.gz: 46a1f5236ee978d5753432cbbf46aac25c32970e
+  metadata.gz: c8a5c9eba12dc0b5c61dd46c6f72668d5b0e2328
+  data.tar.gz: a967c9fd3a4940ec403cb6386d7b1b510d6fc666
 SHA512:
-  metadata.gz: 20120c3a574b33d70d4794a6ac868452661cbd247a069ba3f0e480a16cc1e299ac7bae17067d10bcb9a387009b0fef66b99a8e8796f99711733d378ba9f220e0
-  data.tar.gz: 88161ce17126fe187092bbb8b006c4178eb946d30b7b7234084f1898f33b4e2638ca036875bb554c2b2e9bc4dc69d9a7587528d4d71da19698519efa7fdb3740
+  metadata.gz: 2ae6ffc5111235b6dbd23ab20e78076f6d47478bd706f8b2630b289a29eca449a23bad0d9bbc781fe65e304b5252d8498b1e805ca4d5c7ad579d1e37b7f5b86c
+  data.tar.gz: 1b4e5db790c4bc2d000519b57cc3321a1c34a5332c2858f693616692e548258c168aa076b5a7d3e0d729593477f998ef398145af9c66f8d7895652def7c33264

data/lib/forked_process.rb

@@ -4,6 +4,8 @@ require "English"
 # forked process, and relaying its output to another block.
 class ForkedProcess
 
+  class UnsuccessfulExit < RuntimeError; end
+
   # Public: Define a callback which will be run in a forked process.
   #
   # Yields an IO object opened for writing when `run` is invoked.
@@ -39,7 +41,7 @@ class ForkedProcess
     @read_block.call(reader)
     Process.wait(pid)
 
-    raise "Forked process did not exit successfully" unless $CHILD_STATUS.success?
+    raise UnsuccessfulExit unless $CHILD_STATUS.success?
   end
 
 end

data/lib/restforce/db/task_manager.rb

@@ -59,6 +59,11 @@ module Restforce
 
       # Internal: Log a description and response time for a specific named task.
       #
+      # NOTE: AuthenticationErrors from Restforce's middleware seem to be linked
+      # to thread-safety issues, so we want to error out the entire processing
+      # loop in the event that we run into one of these. This is the reason for
+      # the fairly convoluted `rescue` chain below.
+      #
       # name       - A String task name.
       # task_class - A Restforce::DB::Task subclass.
       # mapping    - A Restforce::DB::Mapping.
@@ -70,6 +75,9 @@ module Restforce
         log format("  FINISHED #{name} after %.4f", runtime)
 
         true
+      rescue Restforce::AuthenticationError => e
+        error(e)
+        raise e
       rescue => e
         error(e)
         false

data/lib/restforce/db/version.rb

@@ -3,7 +3,7 @@ module Restforce
   # :nodoc:
   module DB
 
-    VERSION = "4.0.3"
+    VERSION = "4.0.4"
 
   end
 

data/lib/restforce/db/worker.rb

@@ -127,10 +127,11 @@ module Restforce
 
           begin
             forked.run
-          rescue => e
+          rescue ForkedProcess::UnsuccessfulExit => e
             # NOTE: Due to thread-safety issues in any of a number of libraries
-            # included in the host application (even ActiveSupport itself), our
-            # forked processes may occasionally encounter LoadErrors.
+            # included in the host application (even in ActiveSupport itself),
+            # our forked processes may occasionally encounter various annoying
+            # and intermittent errors.
             #
             # Retrying here is our way of handling that. It's not great, but
             # it's the best we can do for now without sacrificing the benefits

data/lib/restforce/extensions.rb

@@ -1,5 +1,23 @@
 module Restforce
 
+  # :nodoc:
+  class Middleware::Authentication < Restforce::Middleware # rubocop:disable Style/ClassAndModuleChildren
+
+    # Internal: Get an error message for the passed response. Overrides the
+    # default behavior of the middleware to correctly handle broken responses
+    # from Faraday.
+    #
+    # Returns a String.
+    def error_message(response)
+      if response.status == 0
+        "Request was closed prematurely"
+      else
+        "#{response.body['error']}: #{response.body['error_description']}"
+      end
+    end
+
+  end
+
   # :nodoc:
   class SObject
 

data/test/lib/forked_process_test.rb

@@ -0,0 +1,39 @@
+require_relative "../test_helper"
+
+describe ForkedProcess do
+
+  describe "running a forked process" do
+    let(:process) do
+      ForkedProcess.new.tap do |forked|
+        forked.write { |writer| writer.write("Hello!") }
+      end
+    end
+
+    describe "#run" do
+
+      it "synchronizes the `write` block's output into a `read` block" do
+        value = nil
+
+        process.read { |reader| value = reader.read }
+        process.run
+
+        expect(value).to_equal("Hello!")
+      end
+
+      describe "when the write block exits unsuccessfully due to an error" do
+        let(:process) do
+          ForkedProcess.new.tap do |forked|
+            forked.write { |_| raise "Whoops!" }
+            forked.read { |_| nil }
+          end
+        end
+
+        it "raises an UnsuccessfulExit exception" do
+          expect { silence_stream(STDERR) { process.run } }.to_raise(
+            ForkedProcess::UnsuccessfulExit,
+          )
+        end
+      end
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: restforce-db
 version: !ruby/object:Gem::Version
-  version: 4.0.3
+  version: 4.0.4
 platform: ruby
 authors:
 - Andrew Horner
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-09-09 00:00:00.000000000 Z
+date: 2015-09-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -337,6 +337,7 @@ files:
 - test/cassettes/Restforce_DB_Synchronizer/_run/given_a_Salesforce_record_with_no_associated_database_record/does_nothing_for_this_specific_mapping.yml
 - test/cassettes/Restforce_DB_Worker/a_race_condition_during_synchronization/does_not_change_the_user-entered_name_on_the_database_record.yml
 - test/cassettes/Restforce_DB_Worker/a_race_condition_during_synchronization/overrides_the_stale-but-more-recent_name_on_the_Salesforce.yml
+- test/lib/forked_process_test.rb
 - test/lib/restforce/db/accumulator_test.rb
 - test/lib/restforce/db/adapter_test.rb
 - test/lib/restforce/db/association_cache_test.rb