Merge pull request #75 from clio/fix_base_association_not_sym_bug

Make sure we correctly find the association within preload_scoped_relation method

Author: wendy-clio

.gitignore

@@ -50,3 +50,4 @@ Gemfile.lock
 
 # unless supporting rvm < 1.11.0 or doing something fancy, ignore this:
 .rvmrc
+.ruby-version

lib/jit_preloader/active_record/base.rb

@@ -22,6 +22,7 @@ def clear_jit_preloader!
     def preload_scoped_relation(name:, base_association:, preload_scope: nil)
       return jit_preload_scoped_relations[name] if jit_preload_scoped_relations&.key?(name)
 
+      base_association = base_association.to_sym
       records = jit_preloader&.records || [self]
       previous_association_values = {}
 
@@ -55,6 +56,7 @@ def preload_scoped_relation(name:, base_association:, preload_scope: nil)
     def preload_scoped_relation(name:, base_association:, preload_scope: nil)
       return jit_preload_scoped_relations[name] if jit_preload_scoped_relations&.key?(name)
 
+      base_association = base_association.to_sym
       records = jit_preloader&.records || [self]
       previous_association_values = {}
 

lib/jit_preloader/version.rb

@@ -1,3 +1,3 @@
 module JitPreloader
-  VERSION = "3.0.0"
+  VERSION = "3.1.0"
 end

spec/lib/jit_preloader/active_record/base_spec.rb

@@ -106,5 +106,27 @@ def call(contact)
         expect(value).to eq([])
       end
     end
+
+    context "when preload_scoped_relation with string base_association name" do
+      it "preload properly" do
+        contacts = Contact.jit_preload.limit(2).to_a
+
+        call_with_string = lambda { |contact| contact.preload_scoped_relation(
+          name: "American Addresses",
+          base_association: "addresses",
+          preload_scope: Address.where(country: usa)
+        ) }
+
+        usa_addresses = contacts.first.addresses.where(country: usa).to_a
+        expect do
+          expect(call_with_string.call(contacts.first)).to match_array usa_addresses
+        end.to make_database_queries(count: 1)
+
+        usa_addresses = contacts.last.addresses.where(country: usa).to_a
+        expect do
+          expect(call_with_string.call(contacts.last)).to match_array usa_addresses
+        end.to_not make_database_queries
+      end
+    end
   end
 end