amistad 0.10.1 → 0.10.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f50e0deb3b3780d566b3f87b9c231b31a204fa12
-  data.tar.gz: 6a67c57e4a335a248f9d205400a42041b71296e2
+  metadata.gz: aaaa2fddb20b9484faeb8efb2915055bb33d63ea
+  data.tar.gz: e09283b1a63c21c22fba1231cfc9bcb7f57e9d73
 SHA512:
-  metadata.gz: 15550b7dc044f530c06af839736bda248895fd6f1e252f3bc3d2eceb6b6e616d91e06843f189b7be6a7ea55aa54db37dd39b4c33134e5d84b5d2c1ca8b7561ef
-  data.tar.gz: 685977b29742d67f9e82ec1e2cd6064203f70807ee4570f4142600f211c8e07f7a8995e2cfbf64214e86b3bb5573044672c7a46688b7ea9e16a62fb250b6dd68
+  metadata.gz: a955343572bda74bae2314f3d03b5f7948ec205fbcedd1144f69c35be3267fe7fedb5e089fa7246b05121c5a6382f8c63eba23e97d41f49dbfc004eccfb1476b
+  data.tar.gz: 46d4de03c839fb7da3ee1db399d9c63f47542fa8623f7ee0d43a4b225db5f1da42d898dd1c46743c0775aea2b10d2e02293aa44b622d85870a50c554c5e50a74

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    amistad (0.10.1)
+    amistad (0.10.2)
 
 GEM
   remote: http://rubygems.org/

data/lib/amistad/active_record_friend_model.rb

@@ -62,10 +62,10 @@ module Amistad
     def friends
       friendship_model = Amistad::Friendships.const_get(:"#{Amistad.friendship_model}")
 
-      approved_friendship_ids = friendship_model.where(friendable_id: id, pending: false, blocker_id: nil).select(:friend_id).map(&:friend_id)
-      approved_inverse_friendship_ids = friendship_model.where(friend_id: id, pending: false, blocker_id: nil).select(:friendable_id).map(&:friendable_id)
+      approved_friendship = friendship_model.where(friendable_id: id, pending: false, blocker_id: nil).select(:friend_id).to_sql
+      approved_inverse_friendship = friendship_model.where(friend_id: id, pending: false, blocker_id: nil).select(:friendable_id).to_sql
 
-      self.class.where(id: approved_friendship_ids + approved_inverse_friendship_ids)
+      self.class.where("id in (#{approved_friendship}) OR id in (#{approved_inverse_friendship})")
     end
 
     # total # of invited and invited_by without association loading

data/lib/amistad/version.rb

@@ -1,3 +1,3 @@
 module Amistad
-  VERSION = "0.10.1"
+  VERSION = "0.10.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: amistad
 version: !ruby/object:Gem::Version
-  version: 0.10.1
+  version: 0.10.2
 platform: ruby
 authors:
 - Rawane ZOSSOU
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-15 00:00:00.000000000 Z
+date: 2014-10-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler