active_force 0.15.0 → 0.16.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 661e75020c19d46986c8556c2e39799831468741b96909bab00f40d3ffb1294c
-  data.tar.gz: c2549061250e05f2f145c3129c4f83c1d973b09097c77e03592b68b892f54e02
+  metadata.gz: 7691f9f6f82d893a6aafdf29cfc6228ab2fe31988fafcf5be95070347a0286de
+  data.tar.gz: 4d0da25e5e12f9014407dba1871953a0b05f58227188d53130eba27dd537aa4d
 SHA512:
-  metadata.gz: 2bb66f6e4278cc3552200adef1cf4bff72ee01681253b573aa28fb1f8f410bb09a836c043b0b9dc1f1df744167050a03c8ca538f0a1cbc025645ca6ebe90a6ef
-  data.tar.gz: e5e52a99e28c971a1fe7e4a7135031bfa15cbeeadb1c782a1252915ba593699bda99b0f1a6f832c673d129cdc10ed2527ecff391144c4db30783af87bd40090b
+  metadata.gz: 2e8cf96c34eb81e3e4236455538bc462de07d02f7149ab064125d4c86f52a96c7e61e98ff91b9fe48e3b5b6d79d88ded4bb47966800f021e153a970adac802b4
+  data.tar.gz: 6b7edaa7cf4161921b1d42c3a26fe896781bd3198ce981b2693852f3fe3ff6f1690e27e61ec781761fbe06d10634fc720013f1b2f3a266d3de6a189dd37af2a5

data/CHANGELOG.md

@@ -1,12 +1,22 @@
 # Changelog
 
 ## Not released
+
+## 0.16.0
+
+- Fix `default` in models when default value is overridden by the same value, it is still sent to salesforce (https://github.com/Beyond-Finance/active_force/pull/61)
+- Support to fetch multi-level associations during eager load (https://github.com/Beyond-Finance/active_force/pull/62)
+
+## 0.15.1
+
+- Revert new `pluck` implementation due to compatibility issues (https://github.com/Beyond-Finance/active_force/pull/60)
+
 ## 0.15.0
+
 - Fix model defaults so data is persisted in Salesforce (https://github.com/Beyond-Finance/active_force/pull/55)
 - Add `pluck` query method (https://github.com/Beyond-Finance/active_force/pull/51)
 - Add `#order` method to active query that accepts arguments in several formats ( symbol, string that has raw soql) (https://github.com/Beyond-Finance/active_force/pull/58)
 
-
 ## 0.14.0
 
 - Add `scoped_as` option to `has_one` association (https://github.com/Beyond-Finance/active_force/pull/50)

data/README.md

@@ -192,6 +192,21 @@ It is also possible to eager load associations:
 Comment.includes(:post)
 ```
 
+It is possible to eager load multi level associations
+
+In order to utilize multi level eager loads, the API version should be set to 58.0 or higher when instantiating a Restforce client 
+
+```ruby
+Restforce.new({api_version: '58.0'})
+```
+
+Examples:
+
+```ruby
+Comment.includes(post: :owner)
+Comment.includes({post: {owner: :account}})
+```
+
 ### Aggregates
 
 Summing the values of a column:

data/lib/active_force/active_query.rb

@@ -4,7 +4,6 @@ require 'forwardable'
 
 module ActiveForce
   class PreparedStatementInvalid < ArgumentError; end
-
   class RecordNotFound < StandardError
     attr_reader :table_name, :conditions
 
@@ -19,15 +18,16 @@ module ActiveForce
   class ActiveQuery < Query
     extend Forwardable
 
-    attr_reader :sobject, :association_mapping
+    attr_reader :sobject, :association_mapping, :belongs_to_association_mapping
 
     def_delegators :sobject, :sfdc_client, :build, :table_name, :mappings
     def_delegators :to_a, :each, :map, :inspect, :pluck, :each_with_object
 
-    def initialize sobject
+    def initialize (sobject, custom_table_name = nil)
       @sobject = sobject
       @association_mapping = {}
-      super table_name
+      @belongs_to_association_mapping = {}
+      super custom_table_name || table_name
       fields sobject.fields
     end
 
@@ -51,15 +51,6 @@ module ActiveForce
       sfdc_client.query(to_s).first.expr0
     end
 
-    def pluck(*fields)
-      fields = mappings.keys if fields.blank?
-
-      sfdc_client.query(select(*fields).to_s).map do |record|
-        values = fields.map { |field| cast_value(field, record) }
-        values.length == 1 ? values.first : values
-      end
-    end
-
     def limit limit
       super
       limit == 1 ? to_a.first : self
@@ -102,12 +93,9 @@ module ActiveForce
     end
 
     def includes(*relations)
-      relations.each do |relation|
-        association = sobject.associations[relation]
-        fields Association::EagerLoadProjectionBuilder.build association
-        # downcase the key and downcase when we do the comparison so we don't do any more crazy string manipulation
-        association_mapping[association.sfdc_association_field.downcase] = association.relation_name
-      end
+      includes_query = Association::EagerLoadBuilderForNestedIncludes.build(relations, sobject)
+      fields includes_query[:fields]
+      association_mapping.merge!(includes_query[:association_mapping])
       self
     end
 
@@ -217,12 +205,6 @@ module ActiveForce
       sfdc_client.query(self.to_s)
     end
 
-    def cast_value(field, object)
-      attribute_type = sobject.attribute_types[field.to_s]
-      value = object[mappings[field]]
-      attribute_type&.cast(value) || value
-    end
-
     def clone_self_and_clear_cache
       new_query = self.clone
       new_query.instance_variable_set(:@decorated_records, nil)

data/lib/active_force/association/belongs_to_association.rb

@@ -16,7 +16,11 @@ module ActiveForce
       end
 
       def default_relationship_name
-        parent.mappings[foreign_key].gsub(/__c\z/, '__r')
+        if !parent.custom_table? && !relation_model.custom_table?
+          relation_model.table_name
+        else
+          parent.mappings[foreign_key].gsub(/__c\z/, '__r')
+        end
       end
 
       def default_foreign_key

data/lib/active_force/association/eager_load_builder_for_nested_includes.rb

@@ -0,0 +1,84 @@
+module ActiveForce
+
+  module Association
+    class InvalidAssociationError < StandardError; end
+
+    class EagerLoadBuilderForNestedIncludes
+
+      class << self
+        def build(relations, current_sobject, parent_association_field = nil)
+          new(relations, current_sobject, parent_association_field).projections
+        end
+      end
+
+      attr_reader :relations, :current_sobject, :association_mapping, :parent_association_field, :fields
+
+      def initialize(relations, current_sobject, parent_association_field = nil)
+        @relations = [relations].flatten
+        @current_sobject = current_sobject
+        @association_mapping = {}
+        @parent_association_field = parent_association_field
+        @fields = []
+      end
+
+
+      def projections
+        relations.each do |relation|
+          case relation
+          when Symbol
+            association = current_sobject.associations[relation]
+            raise InvalidAssociationError, "Association named #{relation} was not found on #{current_sobject}" if association.nil?
+            build_includes(association)
+          when Hash
+            build_hash_includes(relation)
+          end
+        end
+        { fields: fields, association_mapping: association_mapping }
+      end
+
+      def build_includes(association)
+        fields.concat(EagerLoadProjectionBuilder.build(association, parent_association_field))
+        association_mapping[association.sfdc_association_field.downcase] = association.relation_name
+      end
+
+      def build_hash_includes(relation, model = current_sobject, parent_association_field = nil)
+        relation.each do |key, value|
+          association = model.associations[key]
+          raise InvalidAssociationError, "Association named #{key} was not found on #{model}" if association.nil?
+          case association
+          when ActiveForce::Association::BelongsToAssociation
+            build_includes(association)
+            nested_query = build_relation_for_belongs_to(association, value)
+            fields.concat(nested_query[:fields])
+            association_mapping.merge!(nested_query[:association_mapping])
+          else
+            nested_query = build_relation(association, value)
+            fields.concat(nested_query[:fields])
+            association_mapping.merge!(nested_query[:association_mapping])
+          end
+        end
+      end
+
+      private
+
+      def build_relation(association, nested_includes)
+        sub_query = Query.new(association.sfdc_association_field)
+        sub_query.fields association.relation_model.fields
+        association_mapping[association.sfdc_association_field.downcase] = association.relation_name
+        nested_includes_query = self.class.build(nested_includes, association.relation_model)
+        sub_query.fields nested_includes_query[:fields]
+        { fields: ["(#{sub_query})"], association_mapping: nested_includes_query[:association_mapping] }
+      end
+
+
+      def build_relation_for_belongs_to(association, nested_includes)
+        if parent_association_field.present?
+          current_parent_association_field = "#{parent_association_field}.#{association.sfdc_association_field}"
+        else
+          current_parent_association_field = association.sfdc_association_field
+        end
+        self.class.build(nested_includes, association.relation_model, current_parent_association_field)
+      end
+    end
+  end
+end

data/lib/active_force/association/eager_load_projection_builder.rb

@@ -2,31 +2,33 @@ module ActiveForce
   module Association
     class EagerLoadProjectionBuilder
       class << self
-        def build(association)
-          new(association).projections
+        def build(association, parent_association_field = nil)
+          new(association, parent_association_field).projections
         end
       end
 
-      attr_reader :association
+      attr_reader :association, :parent_association_field
 
-      def initialize(association)
+      def initialize(association, parent_association_field = nil)
         @association = association
+        @parent_association_field = parent_association_field
       end
 
       def projections
         klass = association.class.name.split('::').last
         builder_class = ActiveForce::Association.const_get "#{klass}ProjectionBuilder"
-        builder_class.new(association).projections
+        builder_class.new(association, parent_association_field).projections
       rescue NameError
         raise "Don't know how to build projections for #{klass}"
       end
     end
 
     class AbstractProjectionBuilder
-      attr_reader :association
+      attr_reader :association, :parent_association_field
 
-      def initialize(association)
+      def initialize(association, parent_association_field = nil)
         @association = association
+        @parent_association_field = parent_association_field
       end
 
       def projections
@@ -57,8 +59,13 @@ module ActiveForce
 
     class BelongsToAssociationProjectionBuilder < AbstractProjectionBuilder
       def projections
+        association_field = if parent_association_field.present?
+                              "#{ parent_association_field }.#{ association.sfdc_association_field }"
+                            else
+                              association.sfdc_association_field
+                            end
         association.relation_model.fields.map do |field|
-          "#{ association.sfdc_association_field }.#{ field }"
+          "#{ association_field }.#{ field }"
         end
       end
     end

data/lib/active_force/association/relation_model_builder.rb

@@ -2,19 +2,20 @@ module ActiveForce
   module Association
     class RelationModelBuilder
       class << self
-        def build(association, value)
-          new(association, value).build_relation_model
+        def build(association, value, association_mapping = {})
+          new(association, value, association_mapping).build_relation_model
         end
       end
 
-      def initialize(association, value)
+      def initialize(association, value, association_mapping = {})
         @association = association
         @value = value
+        @association_mapping = association_mapping
       end
 
       def build_relation_model
         klass = resolve_class
-        klass.new(@association, @value).call
+        klass.new(@association, @value, @association_mapping).call
       end
 
       private
@@ -28,11 +29,12 @@ module ActiveForce
     end
 
     class AbstractBuildFrom
-      attr_reader :association, :value
+      attr_reader :association, :value, :association_mapping
 
-      def initialize(association, value)
+      def initialize(association, value, association_mapping = {})
         @association = association
         @value = value
+        @association_mapping = association_mapping
       end
 
       def call
@@ -42,13 +44,13 @@ module ActiveForce
 
     class BuildFromHash < AbstractBuildFrom
       def call
-        association.build value
+        association.build(value, association_mapping)
       end
     end
 
     class BuildFromArray < AbstractBuildFrom
       def call
-        value.map { |mash| association.build mash }
+        value.map { |mash| association.build(mash, association_mapping) }
       end
     end
 

data/lib/active_force/association.rb

@@ -4,6 +4,7 @@ require 'active_force/association/relation_model_builder'
 require 'active_force/association/has_many_association'
 require 'active_force/association/has_one_association'
 require 'active_force/association/belongs_to_association'
+require 'active_force/association/eager_load_builder_for_nested_includes'
 
 module ActiveForce
   module Association

data/lib/active_force/sobject.rb

@@ -29,8 +29,7 @@ module ActiveForce
 
     class << self
       extend Forwardable
-      def_delegators :query, :not, :or, :where, :first, :last, :all, :find, :find!, :find_by, :find_by!, :sum, :count,
-                     :includes, :limit, :order, :select, :none, :pluck
+      def_delegators :query, :not, :or, :where, :first, :last, :all, :find, :find!, :find_by, :find_by!, :sum, :count, :includes, :limit, :order, :select, :none
       def_delegators :mapping, :table, :table_name, :custom_table?, :mappings
 
       private
@@ -69,7 +68,7 @@ module ActiveForce
           if association_mapping.has_key?(column.downcase)
             column = association_mapping[column.downcase]
           end
-          sobject.write_value column, value
+          sobject.write_value column, value, association_mapping
         end
       end
       sobject.clear_changes_information
@@ -174,10 +173,10 @@ module ActiveForce
       self
     end
 
-    def write_value key, value
+    def write_value key, value, association_mapping = {}
       if association = self.class.find_association(key.to_sym)
         field = association.relation_name
-        value = Association::RelationModelBuilder.build(association, value)
+        value = Association::RelationModelBuilder.build(association, value, association_mapping)
       elsif key.to_sym.in?(mappings.keys)
         # key is a field name
         field = key
@@ -228,9 +227,13 @@ module ActiveForce
     end
 
     def attributes_for_create
-      @attributes.each_value.select { |value| value.is_a?(ActiveModel::Attribute::UserProvidedDefault) }
-                            .map(&:name)
-                            .concat(changed)
+      default_attributes.concat(changed)
+    end
+
+    def default_attributes
+      @attributes.each_value.select do |value| 
+        value.is_a?(ActiveModel::Attribute::UserProvidedDefault) || value.instance_values["original_attribute"].is_a?(ActiveModel::Attribute::UserProvidedDefault)
+      end.map(&:name)
     end
 
     def attributes_for_update

data/lib/active_force/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ActiveForce
-  VERSION = '0.15.0'
+  VERSION = '0.16.0'
 end

data/spec/active_force/association_spec.rb

@@ -376,7 +376,7 @@ describe ActiveForce::SObject do
     it 'allows passing a foreign key' do
       Comment.belongs_to :post, foreign_key: :fancy_post_id
       allow(comment).to receive(:fancy_post_id).and_return "2"
-      expect(client).to receive(:query).with("SELECT Id, Title__c FROM Post__c WHERE (Id = '2') LIMIT 1")
+      expect(client).to receive(:query).with("SELECT Id, Title__c, BlogId FROM Post__c WHERE (Id = '2') LIMIT 1")
       comment.post
       Comment.belongs_to :post # reset association to original value
     end

data/spec/active_force/sobject/includes_spec.rb

@@ -285,6 +285,331 @@ module ActiveForce
           expect(account.owner.id).to eq '321'
         end
       end
+
+      context 'when invalid associations are passed' do
+        it 'raises an error' do
+          expect { Quota.includes(:invalid).find('123') }.to raise_error(ActiveForce::Association::InvalidAssociationError, 'Association named invalid was not found on Quota')
+        end
+      end
+    end
+
+    describe '.includes with nested associations' do
+
+      context 'with custom objects' do
+        it 'formulates the correct SOQL query' do
+          soql = Quota.includes(prez_clubs: :club_members).where(id: '123').to_s
+          expect(soql).to eq <<-SOQL.squish
+            SELECT Id, Bar_Id__c,
+              (SELECT Id, QuotaId,
+                (SELECT Id, Name, Email FROM ClubMembers__r)
+              FROM PrezClubs__r)
+            FROM Quota__c
+            WHERE (Bar_Id__c = '123')
+          SOQL
+        end
+
+        it 'builds the associated objects and caches them' do
+          response = [build_restforce_sobject({
+            'Id' => '123',
+            'PrezClubs__r' => build_restforce_collection([
+              {'Id' => '213', 'QuotaId' => '123', 'ClubMembers__r' => build_restforce_collection([
+                {'Id' => '213', 'Name' => 'abc', 'Email' => 'abc@af.com'},
+                {'Id' => '214', 'Name' => 'def', 'Email' => 'def@af.com'}
+              ])},
+              {'Id' => '214', 'QuotaId' => '123', 'ClubMembers__r' => build_restforce_collection([
+                {'Id' => '213', 'Name' => 'abc', 'Email' => 'abc@af.com'},
+                {'Id' => '214', 'Name' => 'def', 'Email' => 'def@af.com'}
+              ])}
+            ])
+          })]
+          allow(client).to receive(:query).once.and_return response
+          account = Quota.includes(prez_clubs: :club_members).find '123'
+          expect(account.prez_clubs).to be_an Array
+          expect(account.prez_clubs.all? { |o| o.is_a? PrezClub }).to eq true
+          expect(account.prez_clubs.first.club_members).to be_an Array
+          expect(account.prez_clubs.first.club_members.all? { |o| o.is_a? ClubMember }).to eq true
+          expect(account.prez_clubs.first.club_members.first.id).to eq '213'
+          expect(account.prez_clubs.first.club_members.first.name).to eq 'abc'
+          expect(account.prez_clubs.first.club_members.first.email).to eq 'abc@af.com'
+        end
+      end
+
+      context 'with namespaced sobjects' do
+        it 'formulates the correct SOQL query' do
+          soql = Salesforce::Account.includes({partner_opportunities: :owner}).where(id: '123').to_s
+          expect(soql).to eq <<-SOQL.squish
+            SELECT Id, Business_Partner__c,
+              (SELECT Id, OwnerId, AccountId, Business_Partner__c, Owner.Id
+              FROM Opportunities)
+            FROM Account
+            WHERE (Id = '123')
+          SOQL
+        end
+
+        it 'builds the associated objects and caches them' do
+          response = [build_restforce_sobject({
+            'Id' => '123',
+            'opportunities' => build_restforce_collection([
+              {'Id' => '213', 'AccountId' => '123', 'OwnerId' => '321', 'Business_Partner__c' => '123', 'Owner' => {'Id' => '321'}},
+              {'Id' => '214', 'AccountId' => '123', 'OwnerId' => '321', 'Business_Partner__c' => '123', 'Owner' => {'Id' => '321'}}            ])
+          })]
+          allow(client).to receive(:query).once.and_return response
+          account = Salesforce::Account.includes({partner_opportunities: :owner}).find '123'
+          expect(account.partner_opportunities).to be_an Array
+          expect(account.partner_opportunities.all? { |o| o.is_a? Salesforce::Opportunity }).to eq true
+          expect(account.partner_opportunities.first.owner).to be_a Salesforce::User
+          expect(account.partner_opportunities.first.owner.id).to eq '321'
+        end
+      end
+
+      context 'an array association nested within a hash association' do
+        it 'formulates the correct SOQL query' do
+          soql = Club.includes(book_clubs: [:club_members, :books]).where(id: '123').to_s
+          expect(soql).to eq <<-SOQL.squish
+            SELECT Id,
+            (SELECT Id, Name, Location,
+              (SELECT Id, Name, Email FROM ClubMembers__r),
+              (SELECT Id, Title, Author FROM Books__r)
+            FROM BookClubs__r)
+            FROM Club__c
+            WHERE (Id = '123')
+          SOQL
+        end
+
+        it 'builds the associated objects and caches them' do
+          response = [build_restforce_sobject({
+            'Id' => '123',
+            'BookClubs__r' => build_restforce_collection([
+              {
+                'Id' => '213',
+                'Name' => 'abc',
+                'Location' => 'abc_location',
+                'ClubMembers__r' => build_restforce_collection([{'Id' => '213', 'Name' => 'abc', 'Email' => 'abc@af.com'},{'Id' => '214', 'Name' => 'def', 'Email' => 'def@af.com'}]),
+                'Books__r' => build_restforce_collection([{'Id' => '213', 'Title' => 'Foo', 'Author' => 'author1'},{'Id' => '214', 'Title' => 'Bar', 'Author' => 'author2'}]),
+              },
+              {
+                'Id' => '214',
+                'Name' => 'def',
+                'Location' => 'def_location',
+                'ClubMembers__r' => build_restforce_collection([{'Id' => '213', 'Name' => 'abc', 'Email' => 'abc@af.com'},{'Id' => '214', 'Name' => 'def', 'Email' => 'def@af.com'}]),
+                'Books__r' => build_restforce_collection([{'Id' => '213', 'Title' => 'Foo', 'Author' => 'author1'},{'Id' => '214', 'Title' => 'Bar', 'Author' => 'author2'}]),
+              }
+            ])
+          })]
+          allow(client).to receive(:query).once.and_return response
+          club = Club.includes(book_clubs: [:club_members, :books]).find(id: '123')
+          expect(club.book_clubs).to be_an Array
+          expect(club.book_clubs.all? { |o| o.is_a? BookClub }).to eq true
+          expect(club.book_clubs.first.name).to eq 'abc'
+          expect(club.book_clubs.first.location).to eq 'abc_location'
+          expect(club.book_clubs.first.club_members).to be_an Array
+          expect(club.book_clubs.first.club_members.all? { |o| o.is_a? ClubMember }).to eq true
+          expect(club.book_clubs.first.club_members.first.id).to eq '213'
+          expect(club.book_clubs.first.club_members.first.name).to eq 'abc'
+          expect(club.book_clubs.first.club_members.first.email).to eq 'abc@af.com'
+          expect(club.book_clubs.first.books).to be_an Array
+          expect(club.book_clubs.first.books.all? { |o| o.is_a? Book }).to eq true
+          expect(club.book_clubs.first.books.first.id).to eq '213'
+          expect(club.book_clubs.first.books.first.title).to eq 'Foo'
+          expect(club.book_clubs.first.books.first.author).to eq 'author1'
+        end
+      end
+
+      context 'a hash association nested within a hash association' do
+        it 'formulates the correct SOQL query' do
+          soql = Club.includes(book_clubs: {club_members: :membership}).where(id: '123').to_s
+          expect(soql).to eq <<-SOQL.squish
+            SELECT Id,
+            (SELECT Id, Name, Location,
+              (SELECT Id, Name, Email,
+                (SELECT Id, Type, Club_Member_Id__c FROM Membership__r)
+              FROM ClubMembers__r)
+            FROM BookClubs__r)
+            FROM Club__c
+            WHERE (Id = '123')
+          SOQL
+        end
+
+        it 'builds the associated objects and caches them' do
+          response = [build_restforce_sobject({
+            'Id' => '123',
+            'BookClubs__r' => build_restforce_collection([
+              {
+                'Id' => '213',
+                'Name' => 'abc',
+                'Location' => 'abc_location',
+                'ClubMembers__r' => build_restforce_collection([
+                  {'Id' => '213', 'Name' => 'abc', 'Email' => 'abc@af.com', 'Membership__r' => build_restforce_collection([{'Id' => '111', 'Type' => 'Gold'}])},
+                  {'Id' => '214', 'Name' => 'abc', 'Email' => 'abc@af.com', 'Membership__r' => build_restforce_collection([{'Id' => '222', 'Type' => 'Silver'}])},
+                ]),
+              },
+              {
+                'Id' => '214',
+                'Name' => 'def',
+                'Location' => 'def_location',
+                'ClubMembers__r' => build_restforce_collection([
+                  {'Id' => '213', 'Name' => 'abc', 'Email' => 'abc@af.com', 'Membership__r' => build_restforce_collection([{'Id' => '111', 'Type' => 'Gold'}])},
+                  {'Id' => '214', 'Name' => 'abc', 'Email' => 'abc@af.com', 'Membership__r' => build_restforce_collection([{'Id' => '222', 'Type' => 'Silver'}])},
+                ]),
+              }
+            ])
+          })]
+          allow(client).to receive(:query).once.and_return response
+          club = Club.includes(book_clubs: {club_members: :membership}).find(id: '123')
+          expect(club.book_clubs).to be_an Array
+          expect(club.book_clubs.all? { |o| o.is_a? BookClub }).to eq true
+          expect(club.book_clubs.first.id).to eq '213'
+          expect(club.book_clubs.first.name).to eq 'abc'
+          expect(club.book_clubs.first.location).to eq 'abc_location'
+          expect(club.book_clubs.first.club_members).to be_an Array
+          expect(club.book_clubs.first.club_members.all? { |o| o.is_a? ClubMember }).to eq true
+          expect(club.book_clubs.first.club_members.first.id).to eq '213'
+          expect(club.book_clubs.first.club_members.first.name).to eq 'abc'
+          expect(club.book_clubs.first.club_members.first.email).to eq 'abc@af.com'
+          expect(club.book_clubs.first.club_members.first.membership).to be_a Membership
+          expect(club.book_clubs.first.club_members.first.membership.id).to eq '111'
+          expect(club.book_clubs.first.club_members.first.membership.type).to eq 'Gold'
+        end
+      end
+
+      context 'mulitple nested associations' do
+        it 'formulates the correct SOQL query' do
+          soql = Club.includes({prez_clubs: {club_members: :membership}}, {book_clubs: [:club_members, :books]}).where(id: '123').to_s
+          expect(soql).to eq <<-SOQL.squish
+            SELECT Id,
+            (SELECT Id, QuotaId,
+              (SELECT Id, Name, Email,
+                (SELECT Id, Type, Club_Member_Id__c FROM Membership__r)
+              FROM ClubMembers__r)
+            FROM PrezClubs__r),
+            (SELECT Id, Name, Location,
+              (SELECT Id, Name, Email FROM ClubMembers__r),
+              (SELECT Id, Title, Author FROM Books__r)
+            FROM BookClubs__r)
+            FROM Club__c
+            WHERE (Id = '123')
+          SOQL
+        end
+
+        it 'builds the associated objects and caches them' do
+          response = [build_restforce_sobject({
+            'Id' => '123',
+            'PrezClubs__r' => build_restforce_collection([
+              {'Id' => '213', 'QuotaId' => '123', 'ClubMembers__r' => build_restforce_collection([
+                {'Id' => '213', 'Name' => 'abc', 'Email' => 'abc@af.com', 'Membership__r' => build_restforce_collection([{'Id' => '111', 'Type' => 'Gold'}])},
+                {'Id' => '214', 'Name' => 'def', 'Email' => 'def@af.com', 'Membership__r' => build_restforce_collection([{'Id' => '222', 'Type' => 'Silver'}])},
+              ])},
+              {'Id' => '214', 'QuotaId' => '123', 'ClubMembers__r' => build_restforce_collection([
+                {'Id' => '213', 'Name' => 'abc', 'Email' => 'abc@af.com', 'Membership__r' => build_restforce_collection([{'Id' => '111', 'Type' => 'Gold'}])},
+                {'Id' => '214', 'Name' => 'def', 'Email' => 'def@af.com', 'Membership__r' => build_restforce_collection([{'Id' => '222', 'Type' => 'Silver'}])},
+              ])}
+            ]),
+            'BookClubs__r' => build_restforce_collection([
+              {
+                'Id' => '213',
+                'Name' => 'abc',
+                'Location' => 'abc_location',
+                'ClubMembers__r' => build_restforce_collection([
+                  {'Id' => '213', 'Name' => 'abc', 'Email' => 'abc@af.com'},
+                  {'Id' => '214', 'Name' => 'abc', 'Email' => 'abc@af.com'},
+                ]),
+                'Books__r' => build_restforce_collection([
+                  {'Id' => '213', 'Title' => 'Foo', 'Author' => 'author1'},
+                  {'Id' => '214', 'Title' => 'Bar', 'Author' => 'author2'},
+                ])
+              },
+              {
+                'Id' => '214',
+                'Name' => 'def',
+                'Location' => 'def_location',
+                'ClubMembers__r' => build_restforce_collection([
+                  {'Id' => '213', 'Name' => 'abc', 'Email' => 'abc@af.com'},
+                  {'Id' => '214', 'Name' => 'abc', 'Email' => 'abc@af.com'},
+                ]),
+                'Books__r' => build_restforce_collection([
+                  {'Id' => '213', 'Title' => 'Foo', 'Author' => 'author1'},
+                  {'Id' => '214', 'Title' => 'Bar', 'Author' => 'author2'},
+                ])
+              }
+            ])
+          })]
+          allow(client).to receive(:query).once.and_return response
+          club = Club.includes({prez_clubs: {club_members: :membership}}, {book_clubs: [:club_members, :books]}).find(id: '123')
+          expect(club.prez_clubs).to be_an Array
+          expect(club.prez_clubs.all? { |o| o.is_a? PrezClub }).to eq true
+          expect(club.prez_clubs.first.club_members).to be_an Array
+          expect(club.prez_clubs.first.club_members.all? { |o| o.is_a? ClubMember }).to eq true
+          expect(club.prez_clubs.first.club_members.first.id).to eq '213'
+          expect(club.prez_clubs.first.club_members.first.name).to eq 'abc'
+          expect(club.prez_clubs.first.club_members.first.email).to eq 'abc@af.com'
+          expect(club.prez_clubs.first.club_members.first.membership).to be_a Membership
+          expect(club.prez_clubs.first.club_members.first.membership.id).to eq '111'
+          expect(club.prez_clubs.first.club_members.first.membership.type).to eq 'Gold'
+          expect(club.book_clubs).to be_an Array
+          expect(club.book_clubs.all? { |o| o.is_a? BookClub }).to eq true
+          expect(club.book_clubs.first.id).to eq '213'
+          expect(club.book_clubs.first.name).to eq 'abc'
+          expect(club.book_clubs.first.location).to eq 'abc_location'
+          expect(club.book_clubs.first.club_members).to be_an Array
+          expect(club.book_clubs.first.club_members.all? { |o| o.is_a? ClubMember }).to eq true
+          expect(club.book_clubs.first.club_members.first.id).to eq '213'
+          expect(club.book_clubs.first.club_members.first.name).to eq 'abc'
+          expect(club.book_clubs.first.club_members.first.email).to eq 'abc@af.com'
+          expect(club.book_clubs.first.books).to be_an Array
+          expect(club.book_clubs.first.books.all? { |o| o.is_a? Book }).to eq true
+          expect(club.book_clubs.first.books.first.id).to eq '213'
+          expect(club.book_clubs.first.books.first.title).to eq 'Foo'
+          expect(club.book_clubs.first.books.first.author).to eq 'author1'
+        end
+      end
+
+      context 'nested belongs-to association' do
+        it 'formulates the correct SOQL query' do
+          soql = Comment.includes(post: :blog).where(id: '123').to_s
+          expect(soql).to eq <<-SOQL.squish
+            SELECT Id, PostId, PosterId__c, FancyPostId, Body__c,
+              PostId.Id, PostId.Title__c, PostId.BlogId,
+                PostId.BlogId.Id, PostId.BlogId.Name, PostId.BlogId.Link__c
+            FROM Comment__c
+            WHERE (Id = '123')
+          SOQL
+        end
+
+        it 'builds the associated objects and caches them' do
+          response = [build_restforce_sobject({
+            'Id' => '123',
+            'PostId' => '321',
+            'PosterId__c' => '432',
+            'FancyPostId' => '543',
+            'Body__c' => 'body',
+            'PostId' => {
+              'Id' => '321',
+              'Title__c' => 'title',
+              'BlogId' => '432',
+              'BlogId' => {
+                'Id' => '432',
+                'Name' => 'name',
+                'Link__c' => 'link'
+              }
+            }
+          })]
+          allow(client).to receive(:query).once.and_return response
+          comment = Comment.includes(post: :blog).find '123'
+          expect(comment.post).to be_a Post
+          expect(comment.post.id).to eq '321'
+          expect(comment.post.title).to eq 'title'
+          expect(comment.post.blog).to be_a Blog
+          expect(comment.post.blog.id).to eq '432'
+          expect(comment.post.blog.name).to eq 'name'
+          expect(comment.post.blog.link).to eq 'link'
+        end
+      end
+
+      context 'when invalid nested associations are passed' do
+        it 'raises an error' do
+          expect { Quota.includes(prez_clubs: :invalid).find('123') }.to raise_error(ActiveForce::Association::InvalidAssociationError, 'Association named invalid was not found on PrezClub')
+        end
+      end
     end
   end
 end

data/spec/active_force/sobject_spec.rb

@@ -96,6 +96,20 @@ describe ActiveForce::SObject do
         it 'sets percent field upon object instantiation' do
           expect(subject.new(**instantiation_attributes)[:percent]).to eq(percent)
         end
+
+        context 'when the override to default value is the same as the default value' do
+          let(:percent) { 50.0 }
+
+          it 'sends percent to salesforce' do
+            expect(client).to receive(:create!)
+                          .with(anything, hash_including('Percent_Label' => percent))
+            subject.create(**instantiation_attributes)
+          end
+
+          it 'sets percent field upon object instantiation' do
+            expect(subject.new(**instantiation_attributes)[:percent]).to eq(percent)
+          end
+        end
       end
     end
 
@@ -354,71 +368,6 @@ describe ActiveForce::SObject do
     end
   end
 
-  describe '#pluck' do
-    let(:record_attributes) { [] }
-
-    before do
-      collection = build_restforce_collection(record_attributes.map { |a| build_restforce_sobject(a) })
-      allow(client).to receive(:query).and_return(collection)
-    end
-
-    it 'returns empty array if no records returned from query' do
-      expect(Whizbang.pluck).to eq([])
-    end
-
-    it 'works with another query' do
-      expected = 'SELECT Id, Text_Label FROM Whizbang__c WHERE (Checkbox_Label = true)'
-      Whizbang.where(checkbox: true).pluck(:id, :text)
-      expect(client).to have_received(:query).with(expected)
-    end
-
-    context 'when given no fields' do
-      it 'queries for all fields' do
-        expected = "SELECT #{Whizbang.fields.join ', '} FROM Whizbang__c"
-        Whizbang.pluck
-        expect(client).to have_received(:query).with(expected)
-      end
-    end
-
-    context 'when given one field' do
-      let(:ids) { ['a', 'b', 1] }
-      let(:record_attributes) { ids.map { |v| { 'Id' => v } } }
-
-      it 'queries for only that field' do
-        expected = 'SELECT Id FROM Whizbang__c'
-        Whizbang.pluck(:id)
-        expect(client).to have_received(:query).with(expected)
-      end
-
-      it 'returns an array of casted values for that field' do
-        expect(Whizbang.pluck(:id)).to match_array(ids.map(&:to_s))
-      end
-    end
-
-    context 'when given more than one field' do
-      let(:record_attributes) do
-        [
-          { 'Text_Label' => 'test1', 'Date_Label' => '2023-01-01' },
-          { 'Text_Label' => 'test2', 'Date_Label' => '2023-01-02' }
-        ]
-      end
-
-      it 'queries for only those fields' do
-        expected = 'SELECT Text_Label, Date_Label FROM Whizbang__c'
-        Whizbang.pluck(:text, :date)
-        expect(client).to have_received(:query).with(expected)
-      end
-
-      it 'returns an array of arrays of casted values in the correct order' do
-        expected = [
-          ['test1', Date.new(2023, 1, 1)],
-          ['test2', Date.new(2023, 1, 2)]
-        ]
-        expect(Whizbang.pluck(:text, :date)).to match_array(expected)
-      end
-    end
-  end
-
   describe '#reload' do
     let(:client) do
       double("sfdc_client", query: [Restforce::Mash.new(Id: 1, Name: 'Jeff')])

data/spec/support/sobjects.rb

@@ -10,6 +10,7 @@ end
 class Post < ActiveForce::SObject
   self.table_name = "Post__c"
   field :title
+  field :blog_id, from: "BlogId"
   has_many :comments
   has_many :impossible_comments, model: Comment, scoped_as: ->{ where('1 = 0') }
   has_many :reply_comments, model: Comment, scoped_as: ->(post){ where(body: "RE: #{post.title}").order('CreationDate DESC') }
@@ -17,6 +18,13 @@ class Post < ActiveForce::SObject
   has_many :poster_comments, { foreign_key: :poster_id, model: Comment }
   has_one :last_comment, model: Comment, scoped_as: -> { where.not(body: nil).order('CreatedDate DESC') }
   has_one :repeat_comment, model: Comment, scoped_as: ->(post) { where(body: post.title) }
+  belongs_to :blog
+end
+
+class Blog < ActiveForce::SObject
+  field :name, from: 'Name'
+  field :link, from: 'Link__c'
+  has_many :posts
 end
 class Territory < ActiveForce::SObject
   field :quota_id, from: "Quota__c"
@@ -26,7 +34,40 @@ end
 class PrezClub < ActiveForce::SObject
   field :quota_id, from: 'QuotaId'
   belongs_to :quota
+  has_many :club_members
+  has_one :club_owner
+end
+
+class Club < ActiveForce::SObject
+  has_many :book_clubs
+  has_many :prez_clubs
+end
+
+class BookClub < ActiveForce::SObject
+  field :name, from: 'Name'
+  field :location, from: 'Location'
+  has_many :club_members
+  has_many :books
 end
+class ClubMember < ActiveForce::SObject
+  field :name, from: 'Name'
+  field :email, from: 'Email'
+  has_one :membership
+end
+
+class Book < ActiveForce::SObject
+  field :title, from: 'Title'
+  field :author, from: 'Author'
+end
+class Membership < ActiveForce::SObject
+  field :type, from: 'Type'
+  field :club_member_id, from: 'Club_Member_Id__c'
+end
+
+class ClubOwner < ActiveForce::SObject
+  field :name, from: 'Name'
+end
+
 class Quota < ActiveForce::SObject
   field :id, from: 'Bar_Id__c'
   has_many :prez_clubs

metadata

@@ -1,17 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: active_force
 version: !ruby/object:Gem::Version
-  version: 0.15.0
+  version: 0.16.0
 platform: ruby
 authors:
 - Eloy Espinaco
 - Pablo Oldani
 - Armando Andini
 - José Piccioni
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-05-26 00:00:00.000000000 Z
+date: 2023-07-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -150,6 +150,7 @@ files:
 - lib/active_force/association.rb
 - lib/active_force/association/association.rb
 - lib/active_force/association/belongs_to_association.rb
+- lib/active_force/association/eager_load_builder_for_nested_includes.rb
 - lib/active_force/association/eager_load_projection_builder.rb
 - lib/active_force/association/has_many_association.rb
 - lib/active_force/association/has_one_association.rb
@@ -192,7 +193,7 @@ metadata:
   bug_tracker_uri: https://github.com/Beyond-Finance/active_force/issues
   changelog_uri: https://github.com/Beyond-Finance/active_force/blob/main/CHANGELOG.md
   source_code_uri: https://github.com/Beyond-Finance/active_force
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -207,8 +208,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.6
-signing_key:
+rubygems_version: 3.1.6
+signing_key: 
 specification_version: 4
 summary: Help you implement models persisting on Sales Force within Rails using RESTForce
 test_files: