amistad 0.9.0 → 0.9.1

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    amistad (0.9.0)
+    amistad (0.9.1)
 
 GEM
   remote: http://rubygems.org/
@@ -48,6 +48,8 @@ GEM
     pg (0.14.1)
     plucky (0.5.2)
       mongo (~> 1.5)
+    polyamorous (0.5.0)
+      activerecord (~> 3.0)
     rake (0.9.2.2)
     rspec (2.11.0)
       rspec-core (~> 2.11.0)
@@ -60,6 +62,10 @@ GEM
     rspec-mocks (2.11.3)
     ruby-progressbar (1.0.2)
     sqlite3 (1.3.6)
+    squeel (1.0.11)
+      activerecord (~> 3.0)
+      activesupport (~> 3.0)
+      polyamorous (~> 0.5.0)
     tzinfo (0.3.33)
 
 PLATFORMS
@@ -80,3 +86,4 @@ DEPENDENCIES
   rake
   rspec
   sqlite3
+  squeel

data/amistad.gemspec

@@ -27,6 +27,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency "fuubar"
   s.add_development_dependency "awesome_print"
   s.add_development_dependency "mongo_mapper"
+  s.add_development_dependency "squeel"
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")

data/lib/amistad/active_record_friend_model.rb

@@ -1,3 +1,5 @@
+require 'squeel'
+
 module Amistad
   module ActiveRecordFriendModel
     extend ActiveSupport::Concern
@@ -72,13 +74,33 @@ module Amistad
     def remove_friendship(user)
       friendship = find_any_friendship_with(user)
       return false if friendship.nil?
-      friendship.destroy && friendship.destroyed?
+      friendship.destroy
+      self.reload && user.reload if friendship.destroyed?
     end
 
     # returns the list of approved friends
     def friends
-      self.reload
-      self.invited + self.invited_by
+      friendship_model = Amistad::Friendships.const_get(:"#{Amistad.friendship_model}")
+
+      approved_friendships = friendship_model.where{
+        ( friendable_id == my{id} ) &
+        ( pending       == false  ) &
+        ( blocker_id    == nil    )
+      }
+
+      approved_inverse_friendships = friendship_model.where{
+        ( friend_id  == my{id} ) &
+        ( pending    == false   ) &
+        ( blocker_id == nil     )
+      }
+
+      predicate = self.class.where{
+        ( id.in(approved_friendships.select{friend_id})              ) |
+        ( id.in(approved_inverse_friendships.select{friendable_id})  )
+      }
+
+      # puts predicate.to_sql
+      predicate
     end
 
     # total # of invited and invited_by without association loading

data/lib/amistad/version.rb

@@ -1,3 +1,3 @@
 module Amistad
-  VERSION = "0.9.0"
+  VERSION = "0.9.1"
 end

data/spec/activerecord/activerecord_spec_helper.rb

@@ -18,3 +18,7 @@ RSpec.configure do |config|
     DatabaseCleaner.clean
   end
 end
+
+# needed in order to be able to compare arrays with ActiveRecord relations
+RSpec::Matchers::OperatorMatcher.register(ActiveRecord::Relation, '=~', RSpec::Matchers::BuiltIn::MatchArray)
+

data/spec/support/friend_examples.rb

@@ -166,6 +166,7 @@ shared_examples_for "a friend model" do
       @mary.friends.size.should == 1
       @mary.friends.should include(@victoria)
       @mary.invited_by.should include(@victoria)
+
       @victoria.remove_friendship(@mary).should be_true
       @victoria.friends.size.should == 2
       @victoria.friends.should_not include(@mary)
@@ -182,6 +183,7 @@ shared_examples_for "a friend model" do
       @james.friends.size.should == 2
       @james.friends.should include(@victoria)
       @james.invited.should include(@victoria)
+
       @victoria.remove_friendship(@james).should be_true
       @victoria.friends.size.should == 2
       @victoria.friends.should_not include(@james)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: amistad
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.9.1
   prerelease: 
 platform: ruby
 authors:
@@ -219,6 +219,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: squeel
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Extends your user model with friendships management methods
 email:
 - dev@raw1z.fr
@@ -277,7 +293,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 340186368039761558
+      hash: -1868389087235153998
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -286,7 +302,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 340186368039761558
+      hash: -1868389087235153998
 requirements: []
 rubyforge_project: amistad
 rubygems_version: 1.8.23