add require 'squeel' to spec_helper and change the likes and likes?…

… methods back to squeel
socializer · Feb 13, 2014 · 90d2a3c · 90d2a3c
1 parent 8f42d3e
commit 90d2a3c
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/app/models/socializer/person.rb b/app/models/socializer/person.rb
@@ -66,14 +66,14 @@ def contact_of
     def likes
       activity_obj_id   = activity_object.id
       verbs_of_interest = %w(like unlike)
-      query = Activity.joins(:verb).where(actor_id: activity_obj_id, target_id: nil, socializer_verbs: { name: verbs_of_interest })
-      @likes ||= query.group(:activity_object_id).having('COUNT(1) % 2 == 1')
+      query = Activity.joins { verb }.where { actor_id.eq(activity_obj_id) & target_id.eq(nil) & verb.name.in(verbs_of_interest) }
+      @likes ||= query.group { activity_object_id }.having('COUNT(1) % 2 == 1')
     end
 
     def likes?(object)
       activity_obj_id   = activity_object.id
       verbs_of_interest = %w(like unlike)
-      query = Activity.joins(:verb).where(activity_object_id: object.id, actor_id: activity_obj_id, socializer_verbs: { name: verbs_of_interest })
+      query = Activity.joins { verb }.where { activity_object_id.eq(object.id) & actor_id.eq(activity_obj_id) & verb.name.in(verbs_of_interest) }
       query.count.odd?
     end
 

diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
@@ -30,6 +30,7 @@
 require 'factory_girl_rails'
 require 'database_cleaner'
 require 'shoulda-matchers'
+require 'squeel'
 
 ENGINE_RAILS_ROOT = File.join(File.dirname(__FILE__), '../')