amistad 0.9.1 → 0.9.2

data/Gemfile.lock

@@ -1,7 +1,8 @@
 PATH
   remote: .
   specs:
-    amistad (0.9.1)
+    amistad (0.9.2)
+      squeel
 
 GEM
   remote: http://rubygems.org/
@@ -62,7 +63,7 @@ GEM
     rspec-mocks (2.11.3)
     ruby-progressbar (1.0.2)
     sqlite3 (1.3.6)
-    squeel (1.0.11)
+    squeel (1.0.13)
       activerecord (~> 3.0)
       activesupport (~> 3.0)
       polyamorous (~> 0.5.0)
@@ -86,4 +87,3 @@ DEPENDENCIES
   rake
   rspec
   sqlite3
-  squeel

data/README.markdown

@@ -14,7 +14,7 @@ Then run:
 
 ## Usage ##
 
-Refer to the wiki pages for usage and friendships management.
+Refer to the [wiki pages](https://github.com/raw1z/amistad/wiki) for usage and friendships management documentation.
 
 ## Testing ##
 

data/amistad.gemspec

@@ -14,6 +14,8 @@ Gem::Specification.new do |s|
 
   s.rubyforge_project = "amistad"
 
+  s.add_dependency 'squeel'
+
   s.add_development_dependency "bundler"
   s.add_development_dependency "rake"
   s.add_development_dependency "rspec"
@@ -27,7 +29,6 @@ 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

@@ -94,13 +94,10 @@ module Amistad
         ( blocker_id == nil     )
       }
 
-      predicate = self.class.where{
+      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/mongoid_friend_model.rb

@@ -45,14 +45,6 @@ module Amistad
         :blocked_pending_friend_ids,
         :blocked_pending_inverse_friend_ids,
       )
-
-      %w(friend_ids inverse_friend_ids pending_friend_ids pending_inverse_friend_ids blocked_friend_ids blocked_inverse_friend_ids blocked_pending_friend_ids blocked_pending_inverse_friend_ids).each do |attribute|
-        define_method(attribute.to_sym) do
-          value = read_attribute(attribute)
-          write_attribute(attribute, value = []) if value.nil?
-          value
-        end
-      end
     end
   end
 end

data/lib/amistad/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: amistad
 version: !ruby/object:Gem::Version
-  version: 0.9.1
+  version: 0.9.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,17 +9,17 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-01 00:00:00.000000000 Z
+date: 2012-11-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: squeel
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
@@ -28,7 +28,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -44,7 +44,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -60,7 +60,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: activerecord
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -76,7 +76,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: mysql2
+  name: activerecord
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -92,7 +92,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: pg
+  name: mysql2
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -108,7 +108,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: database_cleaner
+  name: pg
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -124,7 +124,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: sqlite3
+  name: database_cleaner
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -140,7 +140,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: mongoid
+  name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -156,7 +156,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: bson_ext
+  name: mongoid
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -172,7 +172,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: fuubar
+  name: bson_ext
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -188,7 +188,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: awesome_print
+  name: fuubar
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -204,7 +204,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: mongo_mapper
+  name: awesome_print
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -220,7 +220,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: squeel
+  name: mongo_mapper
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -243,7 +243,6 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
-- CHANGELOG
 - Gemfile
 - Gemfile.lock
 - LICENCE
@@ -293,7 +292,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1868389087235153998
+      hash: 2475975757639508485
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -302,7 +301,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1868389087235153998
+      hash: 2475975757639508485
 requirements: []
 rubyforge_project: amistad
 rubygems_version: 1.8.23

data/CHANGELOG

@@ -1,62 +0,0 @@
-Version 0.7.5 (30.09.2011)
---------------------------
-- Updated Rakefile to add default task that runs the ActiveRecord and Mongoid tests [David Czarnecki]
-- Only load the relevant ORM classes depending on which is in use [David Czarnecki]
-- Checked compatibilty with Rails 3.1
-- Updated the dependencies versions
-
-Version 0.7.4 (23.04.2011)
---------------------------
-- Checked compatibilty with Mongoid 2.0 final release
-- Updated the dependencies versions
-
-Version 0.7.3 (19.02.2011)
---------------------------
-- Fixed a bug occuring with mongoid when the users were created before amistad was activated in the user model (thanks to Drew Baumann for signaling this bug)
-
-Version 0.7.2 (16.02.2011)
---------------------------
-- Added total_friends() and total_blocked() which count friendships and blocks without loading associations (by David Czarnecki)
-- Added namespaced rake tasks spec:activerecord and spec:mongoid (suggested by Adrian Dulić)
-- Use fuubar
-
-Version 0.7.1 (12.02.2011)
---------------------------
-- Totally mess the previous relase. This one fix it.
-
-Version 0.7.0 (12.02.2011)
---------------------------
-- add mongoid support
-- method remove changed to remove_friendship
-
-Version 0.6.0 (06.01.2011)
---------------------------
-- improved blocking and unblocking friends
-- method is_friend_with? changed to friend_with?
-- method is_connected_with? changed to connected_with?
-- method was_invited_by? changed to invited_by?
-- method has_invited? changed to invited?
-- added method blocked?
-
-Version 0.5.8 (08.12.2010)
---------------------------
-- made find_any_friendship_with public
-
-Version 0.5.7 (07.12.2010)
---------------------------
-- fixed bug with invitation approving
-- cleaned up the invite and approve methods
-
-Version 0.5.6 (30.11.2010)
---------------------------
-- added has_invited? method in FriendModel
-- added is_connected_with? method in FriendModel
-- improved was_invited_by?
-
-Version 0.5.5 (29.11.2010)
---------------------------
-- added unblock method in FriendModel
-
-Version 0.5.2 (28.11.2010)
---------------------------
-- Migrated gem to bundler