restforce-db 0.4.0 → 0.5.0

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

@@ -8,46 +8,6 @@ describe Restforce::DB::RecordTypes::ActiveRecord do
   let(:record_type) { mapping.database_record_type }
   let(:salesforce_id) { "a001a000001E1vREAL" }
 
-  describe "#sync!" do
-    let(:sync_from) do
-      Struct.new(:id, :last_update, :attributes).new(
-        salesforce_id,
-        Time.now,
-        name:    "Some name",
-        example: "Some text",
-      )
-    end
-    let(:instance) { record_type.sync!(sync_from).record }
-
-    describe "without an existing database record" do
-
-      it "creates a new database record from the passed Salesforce record" do
-        expect(instance.salesforce_id).to_equal salesforce_id
-        expect(instance.name).to_equal sync_from.attributes[:name]
-        expect(instance.example).to_equal sync_from.attributes[:example]
-        expect(instance.synchronized_at).to_not_be_nil
-      end
-    end
-
-    describe "with an existing database record" do
-      let!(:sync_to) do
-        database_model.create!(
-          name:            "Existing name",
-          example:         "Existing sample text",
-          salesforce_id:   salesforce_id,
-          synchronized_at: Time.now,
-        )
-      end
-
-      it "updates the existing database record" do
-        expect(instance).to_equal sync_to.reload
-        expect(instance.name).to_equal sync_from.attributes[:name]
-        expect(instance.example).to_equal sync_from.attributes[:example]
-        expect(instance.synchronized_at).to_not_be_nil
-      end
-    end
-  end
-
   describe "#create!" do
     let(:attributes) do
       {

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

@@ -0,0 +1,40 @@
+require_relative "../../../test_helper"
+
+describe Restforce::DB::Runner do
+  before { Restforce::DB.last_run = Time.now }
+  after { Restforce::DB.last_run = nil }
+
+  let(:runner) { Restforce::DB::Runner.new }
+
+  describe "#initialize" do
+
+    it "prefills the Collector's last_run timestamp with the global configuration" do
+      expect(runner.last_run).to_equal Restforce::DB.last_run
+    end
+  end
+
+  describe "#tick!" do
+
+    it "updates the run timestamps" do
+      prior_run = runner.last_run
+      new_run   = runner.tick!
+
+      expect(runner.last_run).to_equal new_run
+      expect(runner.before).to_equal new_run
+      expect(runner.after).to_equal prior_run
+    end
+
+    describe "with a configured delay" do
+      let(:delay) { 5 }
+      let(:runner) { Restforce::DB::Runner.new(delay) }
+
+      it "offsets the timestamps" do
+        prior_run = runner.last_run
+        new_run   = runner.tick!
+
+        expect(runner.before).to_equal new_run - delay
+        expect(runner.after).to_equal prior_run - delay
+      end
+    end
+  end
+end

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

@@ -5,16 +5,7 @@ describe Restforce::DB::Synchronizer do
   configure!
   mappings!
 
-  let(:synchronizer) { mapping.synchronizer }
-
-  describe "#initialize" do
-    before { Restforce::DB.last_run = Time.now }
-    after { Restforce::DB.last_run = nil }
-
-    it "prefills the Synchronizer's last_run timestamp with the global configuration" do
-      expect(synchronizer.last_run).to_equal Restforce::DB.last_run
-    end
-  end
+  let(:synchronizer) { Restforce::DB::Synchronizer.new(mapping) }
 
   describe "#run", vcr: { match_requests_on: [:method, VCR.request_matchers.uri_without_param(:q)] } do
     let(:attributes) do
@@ -30,59 +21,8 @@ describe Restforce::DB::Synchronizer do
       )
     end
 
-    describe "given an existing Salesforce record" do
-      before do
-        salesforce_id
-      end
-
-      describe "for a root mapping" do
-        before do
-          synchronizer.run
-        end
-
-        it "creates a matching database record" do
-          record = database_model.last
-
-          expect(record.name).to_equal attributes[:name]
-          expect(record.example).to_equal attributes[:example]
-          expect(record.salesforce_id).to_equal salesforce_id
-        end
-      end
-
-      describe "for a non-root mapping" do
-        let(:through) { "SomeField__c" }
-
-        before do
-          synchronizer.run
-        end
-
-        it "does not create a database record" do
-          expect(database_model.last).to_be_nil
-        end
-      end
-    end
-
-    describe "given an existing database record" do
-      let(:database_record) { database_model.create!(attributes) }
-      let(:salesforce_id) { database_record.reload.salesforce_id }
-
-      before do
-        database_record
-        synchronizer.run
-
-        Salesforce.records << [salesforce_model, salesforce_id]
-      end
-
-      it "populates Salesforce with the new record" do
-        record = mapping.salesforce_record_type.find(salesforce_id).record
-
-        expect(record.Name).to_equal attributes[:name]
-        expect(record.Example_Field__c).to_equal attributes[:example]
-      end
-    end
-
     describe "given a Salesforce record with an associated database record" do
-      let!(:database_attributes) do
+      let(:database_attributes) do
         {
           name:            "Some existing name",
           example:         "Some existing sample text",
@@ -93,36 +33,36 @@ describe Restforce::DB::Synchronizer do
         database_model.create!(database_attributes.merge(salesforce_id: salesforce_id))
       end
 
-      describe "when synchronization is stale" do
-        before do
-          # Set the synchronization timestamp to 5 seconds before the Salesforce
-          # modification timestamp.
-          updated = mapping.salesforce_record_type.find(salesforce_id).last_update
-          database_record.update!(synchronized_at: updated - 5)
-
-          synchronizer.run
+      let(:changes) { { [salesforce_id, salesforce_model] => accumulator } }
+      let(:new_attributes) do
+        {
+          "Name" => "Some new name",
+          "Example_Field__c" => "New sample text",
+        }
+      end
+      let(:accumulator) do
+        Restforce::DB::Accumulator.new.tap do |accumulator|
+          accumulator.store(Time.now, new_attributes)
         end
+      end
 
-        it "updates the database record" do
-          record = database_record.reload
-
-          expect(record.name).to_equal attributes[:name]
-          expect(record.example).to_equal attributes[:example]
-        end
+      before do
+        database_record
+        synchronizer.run(changes)
       end
 
-      describe "when synchronization is up-to-date" do
-        before do
-          database_record.touch(:synchronized_at)
-          synchronizer.run
-        end
+      it "updates the database record" do
+        record = database_record.reload
 
-        it "does not update the database record" do
-          record = database_record.reload
+        expect(record.name).to_equal new_attributes["Name"]
+        expect(record.example).to_equal new_attributes["Example_Field__c"]
+      end
 
-          expect(record.name).to_equal database_attributes[:name]
-          expect(record.example).to_equal database_attributes[:example]
-        end
+      it "updates the salesforce record" do
+        record = mapping.salesforce_record_type.find(salesforce_id).record
+
+        expect(record.Name).to_equal new_attributes["Name"]
+        expect(record.Example_Field__c).to_equal new_attributes["Example_Field__c"]
       end
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: restforce-db
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Andrew Horner
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-04-02 00:00:00.000000000 Z
+date: 2015-04-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -214,15 +214,20 @@ files:
 - Rakefile
 - bin/console
 - bin/setup
+- lib/file_daemon.rb
 - lib/generators/restforce/install_generator.rb
 - lib/generators/restforce/migration_generator.rb
 - lib/generators/templates/config.yml
 - lib/generators/templates/migration.rb.tt
 - lib/generators/templates/script
 - lib/restforce/db.rb
+- lib/restforce/db/accumulator.rb
 - lib/restforce/db/associations/active_record.rb
+- lib/restforce/db/attribute_map.rb
+- lib/restforce/db/collector.rb
 - lib/restforce/db/command.rb
 - lib/restforce/db/configuration.rb
+- lib/restforce/db/initializer.rb
 - lib/restforce/db/instances/active_record.rb
 - lib/restforce/db/instances/base.rb
 - lib/restforce/db/instances/salesforce.rb
@@ -231,6 +236,7 @@ files:
 - lib/restforce/db/record_types/active_record.rb
 - lib/restforce/db/record_types/base.rb
 - lib/restforce/db/record_types/salesforce.rb
+- lib/restforce/db/runner.rb
 - lib/restforce/db/synchronizer.rb
 - lib/restforce/db/tracker.rb
 - lib/restforce/db/version.rb
@@ -238,7 +244,15 @@ files:
 - lib/restforce/extensions.rb
 - restforce-db.gemspec
 - test/cassettes/Restforce_DB/accessing_Salesforce/uses_the_configured_credentials.yml
+- test/cassettes/Restforce_DB_Collector/_run/given_a_Salesforce_record_with_an_associated_database_record/returns_the_attributes_from_both_records.yml
+- test/cassettes/Restforce_DB_Collector/_run/given_an_existing_Salesforce_record/returns_the_attributes_from_the_Salesforce_record.yml
+- test/cassettes/Restforce_DB_Collector/_run/given_an_existing_database_record/returns_the_attributes_from_the_database_record.yml
+- test/cassettes/Restforce_DB_Initializer/_run/given_an_existing_Salesforce_record/for_a_non-root_mapping/does_not_create_a_database_record.yml
+- test/cassettes/Restforce_DB_Initializer/_run/given_an_existing_Salesforce_record/for_a_root_mapping/creates_a_matching_database_record.yml
+- test/cassettes/Restforce_DB_Initializer/_run/given_an_existing_database_record/for_a_root_mapping/populates_Salesforce_with_the_new_record.yml
 - test/cassettes/Restforce_DB_Instances_Salesforce/_copy_/updates_the_record_with_the_attributes_from_the_copied_object.yml
+- test/cassettes/Restforce_DB_Instances_Salesforce/_synced_/when_a_matching_database_record_exists/returns_true.yml
+- test/cassettes/Restforce_DB_Instances_Salesforce/_synced_/when_no_matching_database_record_exists/returns_false.yml
 - test/cassettes/Restforce_DB_Instances_Salesforce/_update_/updates_the_local_record_with_the_passed_attributes.yml
 - test/cassettes/Restforce_DB_Instances_Salesforce/_update_/updates_the_record_in_Salesforce_with_the_passed_attributes.yml
 - test/cassettes/Restforce_DB_RecordTypes_Salesforce/_create_/creates_a_record_in_Salesforce_from_the_passed_database_record_s_attributes.yml
@@ -248,19 +262,21 @@ files:
 - 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
 - test/cassettes/Restforce_DB_RecordTypes_Salesforce/_find/returns_nil_when_no_matching_record_exists.yml
-- test/cassettes/Restforce_DB_Synchronizer/_run/given_a_Salesforce_record_with_an_associated_database_record/when_synchronization_is_stale/updates_the_database_record.yml
-- test/cassettes/Restforce_DB_Synchronizer/_run/given_a_Salesforce_record_with_an_associated_database_record/when_synchronization_is_up-to-date/does_not_update_the_database_record.yml
-- test/cassettes/Restforce_DB_Synchronizer/_run/given_an_existing_Salesforce_record/for_a_non-root_mapping/does_not_create_a_database_record.yml
-- test/cassettes/Restforce_DB_Synchronizer/_run/given_an_existing_Salesforce_record/for_a_root_mapping/creates_a_matching_database_record.yml
-- test/cassettes/Restforce_DB_Synchronizer/_run/given_an_existing_database_record/populates_Salesforce_with_the_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/lib/restforce/db/accumulator_test.rb
 - test/lib/restforce/db/associations/active_record_test.rb
+- test/lib/restforce/db/attribute_map_test.rb
+- test/lib/restforce/db/collector_test.rb
 - test/lib/restforce/db/configuration_test.rb
+- test/lib/restforce/db/initializer_test.rb
 - test/lib/restforce/db/instances/active_record_test.rb
 - test/lib/restforce/db/instances/salesforce_test.rb
 - test/lib/restforce/db/mapping_test.rb
 - test/lib/restforce/db/model_test.rb
 - test/lib/restforce/db/record_types/active_record_test.rb
 - test/lib/restforce/db/record_types/salesforce_test.rb
+- test/lib/restforce/db/runner_test.rb
 - test/lib/restforce/db/synchronizer_test.rb
 - test/lib/restforce/db/tracker_test.rb
 - test/lib/restforce/db_test.rb