restforce-db 3.0.0 → 3.1.0

data/test/lib/restforce/db/attacher_test.rb

@@ -0,0 +1,93 @@
+require_relative "../../../test_helper"
+
+describe Restforce::DB::Attacher do
+
+  configure!
+  mappings!
+
+  let(:attacher) { Restforce::DB::Attacher.new(mapping) }
+
+  describe "#run", vcr: { match_requests_on: [:method, VCR.request_matchers.uri_without_param(:q)] } do
+    let(:attributes) do
+      {
+        "SynchronizationId__c" => "CustomObject::#{database_record.id}",
+      }
+    end
+    let(:database_record) { database_model.create! }
+    let(:salesforce_id) { Salesforce.create!(salesforce_model, attributes) }
+
+    describe "given a Salesforce record with an upsert ID" do
+      before do
+        salesforce_id
+      end
+
+      describe "for a Passive strategy" do
+        before do
+          mapping.strategy = Restforce::DB::Strategies::Passive.new
+          attacher.run
+        end
+
+        it "does nothing" do
+          expect(database_record.reload).to_not_be :salesforce_id?
+        end
+      end
+
+      describe "for an Always strategy" do
+        before do
+          mapping.strategy = Restforce::DB::Strategies::Always.new
+          attacher.run
+        end
+
+        it "links the Salesforce record to the matching database record" do
+          expect(database_record.reload).to_be :salesforce_id?
+        end
+
+        it "wipes the SynchronizationId__c" do
+          salesforce_record = mapping.salesforce_record_type.find(salesforce_id).record
+          expect(salesforce_record.SynchronizationId__c).to_be_nil
+        end
+
+        describe "when the matching database record has a salesforce_id" do
+          let(:old_id) { "a001a000001E1vFAKE" }
+          let(:database_record) { database_model.create!(salesforce_id: old_id) }
+
+          it "does not change the current Salesforce ID" do
+            expect(database_record.reload.salesforce_id).to_equal old_id
+          end
+
+          it "wipes the SynchronizationId__c" do
+            salesforce_record = mapping.salesforce_record_type.find(salesforce_id).record
+            expect(salesforce_record.SynchronizationId__c).to_be_nil
+          end
+        end
+
+        describe "when no matching database record can be found" do
+          let(:database_record) { nil }
+          let(:attributes) do
+            {
+              "SynchronizationId__c" => "CustomObject::1",
+            }
+          end
+
+          it "wipes the SynchronizationId__c" do
+            salesforce_record = mapping.salesforce_record_type.find(salesforce_id).record
+            expect(salesforce_record.SynchronizationId__c).to_be_nil
+          end
+        end
+
+        describe "when the upsert ID is for another database model" do
+          let(:attributes) do
+            {
+              "SynchronizationId__c" => "User::1",
+            }
+          end
+
+          it "does not wipe the SynchronizationId__c" do
+            salesforce_record = mapping.salesforce_record_type.find(salesforce_id).record
+            expect(salesforce_record.SynchronizationId__c).to_not_be_nil
+          end
+        end
+      end
+    end
+  end
+end

data/test/lib/restforce/db/field_processor_test.rb

@@ -5,42 +5,81 @@ describe Restforce::DB::FieldProcessor do
   configure!
 
   let(:processor) { Restforce::DB::FieldProcessor.new }
+  let(:dummy_client) do
+    Object.new.tap do |client|
+
+      def client.describe(_)
+        raise "This has already been invoked!" if @already_run
+        @already_run = true
+
+        Struct.new(:fields).new([
+          { "name" => "Createable", "createable" => true, "updateable" => false },
+          { "name" => "Updateable", "createable" => false, "updateable" => true },
+          { "name" => "Both", "createable" => true, "updateable" => true },
+          { "name" => "Neither", "createable" => false, "updateable" => false },
+        ])
+      end
+
+    end
+  end
+
+  describe "#available_fields" do
+    let(:fields) do
+      %w(
+        Createable
+        Updateable
+        Both
+        Neither
+        Relationship__r.Relateable
+      )
+    end
+
+    it "filters the passed fields to only existing fields for an object" do
+      Restforce::DB.stub(:client, dummy_client) do
+        excessive_fields = fields + ["NonExistent"]
+        expect(processor.available_fields("CustomObject__c", excessive_fields)).to_equal(fields)
+      end
+    end
+
+    it "filters the passed fields to only createable fields" do
+      Restforce::DB.stub(:client, dummy_client) do
+        expect(processor.available_fields("CustomObject__c", fields, :create)).to_equal(%w(
+          Createable
+          Both
+        ))
+      end
+    end
+
+    it "filters the passed fields to only updateable fields" do
+      Restforce::DB.stub(:client, dummy_client) do
+        expect(processor.available_fields("CustomObject__c", fields, :update)).to_equal(%w(
+          Updateable
+          Both
+        ))
+      end
+    end
+  end
 
   describe "#process" do
     let(:attributes) do
       {
-        "Creatable"  => "This field is create-only!",
+        "Createable" => "This field is create-only!",
         "Updateable" => "And... this field is update-only!",
         "Both"       => "But... this field allows both!",
+        "Neither"    => "Unfortunately, this field allows neither.",
       }
     end
-    let(:dummy_client) do
-      Object.new.tap do |client|
 
-        def client.describe(_)
-          raise "This has already been invoked!" if @already_run
-          @already_run = true
-
-          Struct.new(:fields).new([
-            { "name" => "Creatable", "createable" => true, "updateable" => false },
-            { "name" => "Updateable", "createable" => false, "updateable" => true },
-            { "name" => "Both", "createable" => true, "updateable" => true },
-          ])
-        end
-
-      end
-    end
-
-    it "removes the read-only fields from the passed attribute Hash on :create" do
+    it "removes the non-creatable fields from the passed attribute Hash on :create" do
       Restforce::DB.stub(:client, dummy_client) do
         expect(processor.process("CustomObject__c", attributes, :create)).to_equal(
-          "Creatable" => attributes["Creatable"],
-          "Both"      => attributes["Both"],
+          "Createable" => attributes["Createable"],
+          "Both"       => attributes["Both"],
         )
       end
     end
 
-    it "removes the read-only fields from the passed attribute Hash on :update" do
+    it "removes the non-updateable fields from the passed attribute Hash on :update" do
       Restforce::DB.stub(:client, dummy_client) do
         expect(processor.process("CustomObject__c", attributes, :update)).to_equal(
           "Updateable" => attributes["Updateable"],
@@ -51,11 +90,11 @@ describe Restforce::DB::FieldProcessor do
 
     it "invokes the client only once for a single SObject Type" do
       Restforce::DB.stub(:client, dummy_client) do
-        processor.process("CustomObject__c", attributes)
+        processor.process("CustomObject__c", attributes, :update)
 
         # Our dummy client is configured to raise an error if `#describe` is
         # invoked more than once. There is no "wont_raise" in Minitest.
-        processor.process("CustomObject__c", attributes)
+        processor.process("CustomObject__c", attributes, :create)
       end
     end
   end

data/test/lib/restforce/db/record_types/salesforce_test.rb

@@ -28,6 +28,11 @@ describe Restforce::DB::RecordTypes::Salesforce do
       expect(sync_from.synced?).to_equal(true)
     end
 
+    it "wipes the temporary SynchronizationId__c value used for upsert" do
+      Salesforce.records << [salesforce_model, instance.Id]
+      expect(instance.SynchronizationId__c).to_be_nil
+    end
+
     describe "when a Salesforce record already exists for the database instance" do
 
       it "uses the existing record" do

data/test/lib/restforce/db/worker_test.rb

@@ -20,7 +20,8 @@ describe Restforce::DB::Worker do
 
       ## 1b. The record is synced to Salesforce.
       worker.send :reset!
-      worker.send :propagate, mapping
+      worker.send :task, Restforce::DB::Initializer, mapping
+
       expect(database_record.reload).to_be :salesforce_id?
       Salesforce.records << [salesforce_model, database_record.salesforce_id]
 
@@ -43,8 +44,8 @@ describe Restforce::DB::Worker do
         # We sleep here to ensure we pick up our manual changes.
         sleep 1 if VCR.current_cassette.recording?
         worker.send :reset!
-        worker.send :collect, mapping
-        worker.send :synchronize, mapping
+        worker.send :task, Restforce::DB::Collector, mapping
+        worker.send :task, Restforce::DB::Synchronizer, mapping
       end
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: restforce-db
 version: !ruby/object:Gem::Version
-  version: 3.0.0
+  version: 3.1.0
 platform: ruby
 authors:
 - Andrew Horner
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-06-25 00:00:00.000000000 Z
+date: 2015-06-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -216,6 +216,7 @@ files:
 - lib/restforce/db/associations/has_many.rb
 - lib/restforce/db/associations/has_one.rb
 - lib/restforce/db/associator.rb
+- lib/restforce/db/attacher.rb
 - lib/restforce/db/attribute_map.rb
 - lib/restforce/db/cleaner.rb
 - lib/restforce/db/client.rb
@@ -243,6 +244,7 @@ files:
 - lib/restforce/db/strategy.rb
 - lib/restforce/db/synchronization_error.rb
 - lib/restforce/db/synchronizer.rb
+- lib/restforce/db/task.rb
 - lib/restforce/db/timestamp_cache.rb
 - lib/restforce/db/tracker.rb
 - lib/restforce/db/version.rb
@@ -279,6 +281,13 @@ files:
 - test/cassettes/Restforce_DB_Associations_HasOne/with_an_inverse_mapping/_synced_for_/when_no_matching_associated_record_has_been_synchronized/returns_false.yml
 - test/cassettes/Restforce_DB_Associator/_run/given_a_BelongsTo_association/given_another_record_for_association/when_the_Salesforce_association_is_out_of_date/updates_the_association_ID_in_Salesforce.yml
 - test/cassettes/Restforce_DB_Associator/_run/given_a_BelongsTo_association/given_another_record_for_association/when_the_database_association_is_out_of_date/updates_the_associated_record_in_the_database.yml
+- test/cassettes/Restforce_DB_Attacher/_run/given_a_Salesforce_record_with_an_upsert_ID/for_a_Passive_strategy/does_nothing.yml
+- test/cassettes/Restforce_DB_Attacher/_run/given_a_Salesforce_record_with_an_upsert_ID/for_an_Always_strategy/links_the_Salesforce_record_to_the_matching_database_record.yml
+- test/cassettes/Restforce_DB_Attacher/_run/given_a_Salesforce_record_with_an_upsert_ID/for_an_Always_strategy/when_no_matching_database_record_can_be_found/wipes_the_SynchronizationID__c_on_the_Salesforce_record.yml
+- test/cassettes/Restforce_DB_Attacher/_run/given_a_Salesforce_record_with_an_upsert_ID/for_an_Always_strategy/when_the_matching_database_record_has_a_salesforce_id/does_not_change_the_current_Salesforce_ID.yml
+- test/cassettes/Restforce_DB_Attacher/_run/given_a_Salesforce_record_with_an_upsert_ID/for_an_Always_strategy/when_the_matching_database_record_has_a_salesforce_id/wipes_the_SynchronizationId__c.yml
+- test/cassettes/Restforce_DB_Attacher/_run/given_a_Salesforce_record_with_an_upsert_ID/for_an_Always_strategy/when_the_upsert_ID_is_for_another_database_model/does_not_wipe_the_SynchronizationId__c.yml
+- test/cassettes/Restforce_DB_Attacher/_run/given_a_Salesforce_record_with_an_upsert_ID/for_an_Always_strategy/wipes_the_SynchronizationId__c.yml
 - test/cassettes/Restforce_DB_Cleaner/_run/given_a_synchronized_Salesforce_record/when_the_mapping_has_no_conditions/does_not_drop_the_synchronized_database_record.yml
 - test/cassettes/Restforce_DB_Cleaner/_run/given_a_synchronized_Salesforce_record/when_the_record_does_not_meet_the_mapping_conditions/but_meets_conditions_for_a_parallel_mapping/does_not_drop_the_synchronized_database_record.yml
 - test/cassettes/Restforce_DB_Cleaner/_run/given_a_synchronized_Salesforce_record/when_the_record_does_not_meet_the_mapping_conditions/drops_the_synchronized_database_record.yml
@@ -304,6 +313,7 @@ files:
 - test/cassettes/Restforce_DB_RecordTypes_Salesforce/_create_/creates_a_record_in_Salesforce_from_the_passed_database_record_s_attributes.yml
 - test/cassettes/Restforce_DB_RecordTypes_Salesforce/_create_/updates_the_database_record_with_the_Salesforce_record_s_ID.yml
 - test/cassettes/Restforce_DB_RecordTypes_Salesforce/_create_/when_a_Salesforce_record_already_exists_for_the_database_instance/uses_the_existing_record.yml
+- test/cassettes/Restforce_DB_RecordTypes_Salesforce/_create_/wipes_the_temporary_SynchronizationId__c_value_used_for_upsert.yml
 - test/cassettes/Restforce_DB_RecordTypes_Salesforce/_find/finds_existing_records_in_Salesforce.yml
 - test/cassettes/Restforce_DB_RecordTypes_Salesforce/_find/given_a_set_of_mapping_conditions/when_a_record_does_not_meet_the_conditions/does_not_find_the_record.yml
 - test/cassettes/Restforce_DB_RecordTypes_Salesforce/_find/given_a_set_of_mapping_conditions/when_a_record_meets_the_conditions/finds_the_record.yml
@@ -313,8 +323,6 @@ files:
 - test/cassettes/Restforce_DB_Strategies_Associated/_build_/given_an_inverse_mapping/with_a_synchronized_association_record/wants_to_build_a_new_record.yml
 - test/cassettes/Restforce_DB_Strategies_Associated/_build_/given_an_inverse_mapping/with_an_existing_database_record/does_not_want_to_build_a_new_record.yml
 - test/cassettes/Restforce_DB_Strategies_Associated/_build_/given_an_inverse_mapping/with_no_synchronized_association_record/does_not_want_to_build_a_new_record.yml
-- test/cassettes/Restforce_DB_Synchronizer/_run/given_a_Salesforce_record_with_an_associated_database_record/updates_the_database_record.yml
-- test/cassettes/Restforce_DB_Synchronizer/_run/given_a_Salesforce_record_with_an_associated_database_record/updates_the_salesforce_record.yml
 - test/cassettes/Restforce_DB_Synchronizer/_run/given_a_Salesforce_record_with_an_associated_database_record/when_the_change_timestamp_is_stale/does_not_update_the_database_record.yml
 - test/cassettes/Restforce_DB_Synchronizer/_run/given_a_Salesforce_record_with_an_associated_database_record/when_the_change_timestamp_is_stale/does_not_update_the_salesforce_record.yml
 - test/cassettes/Restforce_DB_Synchronizer/_run/given_a_Salesforce_record_with_an_associated_database_record/when_the_changes_are_current/updates_the_database_record.yml
@@ -329,6 +337,7 @@ files:
 - test/lib/restforce/db/associations/has_many_test.rb
 - test/lib/restforce/db/associations/has_one_test.rb
 - test/lib/restforce/db/associator_test.rb
+- test/lib/restforce/db/attacher_test.rb
 - test/lib/restforce/db/attribute_map_test.rb
 - test/lib/restforce/db/cleaner_test.rb
 - test/lib/restforce/db/collector_test.rb