Merge remote-tracking branch 'origin/master'

app/models/geographic_area.rb

@@ -98,20 +98,26 @@ def self.ancestors_and_descendants_of(geographic_area)
 
   # TODO: Test
   # A scope. Matches GeographicAreas that have name and parent name.
+  # Like:
+  #   GeographicArea.with_name_and_parent_names(%w{Champaign Illinois})
   scope :with_name_and_parent_name, -> (names) {
-    joins(:parent).
-      where(name: names[0], parent: {name: names[1]})
+    joins('join geographic_areas ga on ga.id = geographic_areas.parent_id').
+    where(name: names[0]).
+    where(['ga.name = ?', names[1] ])
   }
 
   # TODO: Test, or extend a general method
   # Matches GeographicAreas that match name, parent name, parent name
   # Like:
-  #   GeographicArea.with_name_and_parents(%{United\ States Illinois Champaign})
-  scope :with_name_and_parents, -> (names) {
-    joins(parent: :parent).
-      where(name: names[0].to_s, parent: {name: names[1].to_s, parent: {name: names[2]}})
+  #   GeographicArea.with_name_and_parent_names(%w{Champaign Illinois United\ States})
+  scope :with_name_and_parent_names, -> (names) {
+    joins('join geographic_areas ga on ga.id = geographic_areas.parent_id').
+    joins('join geographic_areas gb on gb.id = ga.parent_id').
+    where(name: names[0]).
+    where(['ga.name = ?', names[1] ]).
+    where(['gb.name = ?', names[2] ])
   }
-
+ 
   # Route out to a scope given the length of the
   # search array.  Could be abstracted to 
   # build nesting on the fly if we actually

spec/models/projects_sources_spec.rb

@@ -12,7 +12,7 @@
       specify 'project' do
         expect(project_source.errors.include?(:project)).to be_truthy
       end
-      specify 'project' do
+      specify 'source' do
         expect(project_source.errors.include?(:source)).to be_truthy
       end
     end