restforce-db 2.0.1 → 2.1.0

data/test/cassettes/Restforce_DB_Synchronizer/_run/given_a_Salesforce_record_with_no_associated_database_record/does_nothing_for_this_specific_mapping.yml

@@ -38,11 +38,11 @@ http_interactions:
     body:
       encoding: ASCII-8BIT
       string: '{"id":"https://login.salesforce.com/id/00D1a000000H3O9EAK/0051a000000UGT8AAO","issued_at":"1428689765521","token_type":"Bearer","instance_url":"https://<host>","signature":"iVn8K79ySw/26GQM8/ZHlQ7tE1l2EUH+WGphHVWkQFg=","access_token":"00D1a000000H3O9!AQ4AQO48p7VCPJTqs85KtBx3kEBjPhP.lCvkGK3ayiFCcg2H2nbFwdKZaBetwWzVAndOSywkSvoT7_YZEmwLnhtbJ1A3E5NZ"}'
-    http_version: 
+    http_version:
   recorded_at: Fri, 10 Apr 2015 18:16:05 GMT
 - request:
     method: post
-    uri: https://<host>/services/data/v26.0/sobjects/CustomObject__c
+    uri: https://<host>/services/data/<api_version>/sobjects/CustomObject__c
     body:
       encoding: UTF-8
       string: '{"Name":"Custom object","Example_Field__c":"Some sample text"}'
@@ -72,7 +72,7 @@ http_interactions:
       Sforce-Limit-Info:
       - api-usage=58/15000
       Location:
-      - "/services/data/v26.0/sobjects/CustomObject__c/a001a000001LXBfAAO"
+      - "/services/data/<api_version>/sobjects/CustomObject__c/a001a000001LXBfAAO"
       Content-Type:
       - application/json;charset=UTF-8
       Transfer-Encoding:
@@ -80,11 +80,11 @@ http_interactions:
     body:
       encoding: ASCII-8BIT
       string: '{"id":"a001a000001LXBfAAO","success":true,"errors":[]}'
-    http_version: 
+    http_version:
   recorded_at: Fri, 10 Apr 2015 18:16:05 GMT
 - request:
     method: get
-    uri: https://<host>/services/data/v26.0/query?q=select%20Id,%20SystemModstamp,%20Name,%20Example_Field__c%20from%20CustomObject__c%20where%20Id%20=%20%27a001a000001LXBfAAO%27
+    uri: https://<host>/services/data/<api_version>/query?q=select%20Id,%20SystemModstamp,%20Name,%20Example_Field__c%20from%20CustomObject__c%20where%20Id%20=%20%27a001a000001LXBfAAO%27
     body:
       encoding: US-ASCII
       string: ''
@@ -117,13 +117,13 @@ http_interactions:
       - chunked
     body:
       encoding: ASCII-8BIT
-      string: '{"totalSize":1,"done":true,"records":[{"attributes":{"type":"CustomObject__c","url":"/services/data/v26.0/sobjects/CustomObject__c/a001a000001LXBfAAO"},"Id":"a001a000001LXBfAAO","SystemModstamp":"2015-04-10T18:16:05.000+0000","Name":"Custom
+      string: '{"totalSize":1,"done":true,"records":[{"attributes":{"type":"CustomObject__c","url":"/services/data/<api_version>/sobjects/CustomObject__c/a001a000001LXBfAAO"},"Id":"a001a000001LXBfAAO","SystemModstamp":"2015-04-10T18:16:05.000+0000","Name":"Custom
         object","Example_Field__c":"Some sample text"}]}'
-    http_version: 
+    http_version:
   recorded_at: Fri, 10 Apr 2015 18:16:05 GMT
 - request:
     method: get
-    uri: https://<host>/services/data/v26.0/query?q=select%20Id,%20SystemModstamp,%20Name,%20Example_Field__c%20from%20CustomObject__c%20where%20Id%20=%20%27a001a000001LXBfAAO%27
+    uri: https://<host>/services/data/<api_version>/query?q=select%20Id,%20SystemModstamp,%20Name,%20Example_Field__c%20from%20CustomObject__c%20where%20Id%20=%20%27a001a000001LXBfAAO%27
     body:
       encoding: US-ASCII
       string: ''
@@ -156,13 +156,13 @@ http_interactions:
       - chunked
     body:
       encoding: ASCII-8BIT
-      string: '{"totalSize":1,"done":true,"records":[{"attributes":{"type":"CustomObject__c","url":"/services/data/v26.0/sobjects/CustomObject__c/a001a000001LXBfAAO"},"Id":"a001a000001LXBfAAO","SystemModstamp":"2015-04-10T18:16:05.000+0000","Name":"Custom
+      string: '{"totalSize":1,"done":true,"records":[{"attributes":{"type":"CustomObject__c","url":"/services/data/<api_version>/sobjects/CustomObject__c/a001a000001LXBfAAO"},"Id":"a001a000001LXBfAAO","SystemModstamp":"2015-04-10T18:16:05.000+0000","Name":"Custom
         object","Example_Field__c":"Some sample text"}]}'
-    http_version: 
+    http_version:
   recorded_at: Fri, 10 Apr 2015 18:16:06 GMT
 - request:
     method: delete
-    uri: https://<host>/services/data/v26.0/sobjects/CustomObject__c/a001a000001LXBfAAO
+    uri: https://<host>/services/data/<api_version>/sobjects/CustomObject__c/a001a000001LXBfAAO
     body:
       encoding: US-ASCII
       string: ''
@@ -192,6 +192,6 @@ http_interactions:
     body:
       encoding: UTF-8
       string: ''
-    http_version: 
+    http_version:
   recorded_at: Fri, 10 Apr 2015 18:16:09 GMT
 recorded_with: VCR 2.9.3

data/test/lib/restforce/db/associations/belongs_to_test.rb

@@ -60,6 +60,23 @@ describe Restforce::DB::Associations::BelongsTo do
         it "returns a nil lookup value in the hash" do
           expect(association.lookups(object)).to_equal("Friend__c" => nil)
         end
+
+        describe "and the underlying association is one-to-many" do
+          let(:association) { Restforce::DB::Associations::BelongsTo.new(:admirers, through: "Friend__c") }
+          let(:inverse_mapping) do
+            Restforce::DB::Mapping.new(User, "Contact").tap do |map|
+              map.fields = { email: "Email" }
+              map.associations << Restforce::DB::Associations::HasOne.new(
+                :favorite,
+                through: "Friend__c",
+              )
+            end
+          end
+
+          it "still returns a nil lookup value in the hash" do
+            expect(association.lookups(object)).to_equal("Friend__c" => nil)
+          end
+        end
       end
     end
 

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

@@ -16,6 +16,10 @@ describe Restforce::DB::Cleaner do
     end
     let(:salesforce_id) { Salesforce.create!(salesforce_model, attributes) }
 
+    before do
+      Restforce::DB::Registry << mapping
+    end
+
     describe "given a synchronized Salesforce record" do
       before do
         database_model.create!(salesforce_id: salesforce_id)
@@ -47,13 +51,25 @@ describe Restforce::DB::Cleaner do
           mapping.conditions = ["Name != '#{attributes['Name']}'"]
         end
 
-        describe "for a non-Passive strategy" do
+        it "drops the synchronized database record" do
+          cleaner.run
+          expect(database_model.last).to_be_nil
+        end
+
+        describe "but meets conditions for a parallel mapping" do
+          let(:parallel_mapping) do
+            Restforce::DB::Mapping.new(database_model, salesforce_model).tap do |map|
+              map.conditions = ["Name = '#{attributes['Name']}'"]
+            end
+          end
+
           before do
-            cleaner.run
+            Restforce::DB::Registry << parallel_mapping
           end
 
-          it "drops the synchronized database record" do
-            expect(database_model.last).to_be_nil
+          it "does not drop the synchronized database record" do
+            cleaner.run
+            expect(database_model.last).to_not_be_nil
           end
         end
       end

data/test/support/active_record.rb

@@ -31,6 +31,7 @@ ActiveRecord::Schema.define do
 
   create_table :users do |table|
     table.column :email,           :string
+    table.column :favorite_id,     :integer
     table.column :salesforce_id,   :string
     table.column :synchronized_at, :datetime
     table.timestamps null: false
@@ -44,6 +45,7 @@ end
 class CustomObject < ActiveRecord::Base
 
   belongs_to :user, inverse_of: :custom_object, autosave: true
+  has_many :admirers, class_name: "User", inverse_of: :favorite, foreign_key: :favorite_id
   has_many :details, inverse_of: :custom_object
 
 end
@@ -59,5 +61,6 @@ end
 class User < ActiveRecord::Base
 
   has_one :custom_object, inverse_of: :user
+  belongs_to :favorite, class_name: "CustomObject", inverse_of: :admirers, foreign_key: :favorite_id
 
 end

data/test/support/vcr.rb

@@ -18,6 +18,14 @@ VCR.configure do |c|
       CGI.escape(Secrets["client"][secret])
     end
   end
+
+  c.filter_sensitive_data("<api_version>") do
+    api_version = Secrets["client"].fetch("api_version") do
+      Restforce::DB::Configuration::DEFAULT_API_VERSION
+    end
+
+    "v#{api_version}"
+  end
 end
 
 MinitestVcr::Spec.configure!

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: restforce-db
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.1.0
 platform: ruby
 authors:
 - Andrew Horner
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-05-18 00:00:00.000000000 Z
+date: 2015-05-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -256,6 +256,7 @@ files:
 - test/cassettes/Restforce_DB_Associations_BelongsTo/with_an_inverse_mapping/_build/when_the_association_is_non-building/proceeds_without_constructing_any_records.yml
 - test/cassettes/Restforce_DB_Associations_BelongsTo/with_an_inverse_mapping/_build/with_an_unrelated_association_mapping/proceeds_without_raising_an_error.yml
 - test/cassettes/Restforce_DB_Associations_BelongsTo/with_an_inverse_mapping/_lookups/returns_a_hash_of_the_associated_records_lookup_IDs.yml
+- test/cassettes/Restforce_DB_Associations_BelongsTo/with_an_inverse_mapping/_lookups/when_there_is_currently_no_associated_record/and_the_underlying_association_is_one-to-many/still_returns_a_nil_lookup_value_in_the_hash.yml
 - test/cassettes/Restforce_DB_Associations_BelongsTo/with_an_inverse_mapping/_lookups/when_there_is_currently_no_associated_record/returns_a_nil_lookup_value_in_the_hash.yml
 - test/cassettes/Restforce_DB_Associations_BelongsTo/with_an_inverse_mapping/_synced_for_/when_a_matching_associated_record_has_been_synchronized/returns_true.yml
 - test/cassettes/Restforce_DB_Associations_BelongsTo/with_an_inverse_mapping/_synced_for_/when_no_matching_associated_record_has_been_synchronized/returns_false.yml
@@ -277,7 +278,8 @@ files:
 - 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_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/for_a_non-Passive_strategy/drops_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
 - test/cassettes/Restforce_DB_Cleaner/_run/given_a_synchronized_Salesforce_record/when_the_record_meets_the_mapping_conditions/does_not_drop_the_synchronized_database_record.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