amistad 0.9.2 → 0.10.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: ed824f9e11cab8950dd941dd080bc73304d86411
+  data.tar.gz: 6e2ca13bb345b5e8a3ecfb220e565cbd39a8fd99
+SHA512:
+  metadata.gz: 15245fd8370230189b7837512b19c2c1468140d385993057f5325151c1768f3ec6a91804a7fd4baf06af510b900e3b8e7db0124d6b6c8db80337aa11bc96917f
+  data.tar.gz: c29d4ed8fa6228e31ca7d7dbebef793aa3d40635456c5123ac1883ab0c3516fb790ce5465c68cfd257cb276ef5d2b9561c2cd8b63d1c4e3f8e71c42a11fa14eb

data/Gemfile.lock

@@ -1,79 +1,92 @@
 PATH
   remote: .
   specs:
-    amistad (0.9.2)
+    amistad (0.10.0)
       squeel
 
 GEM
   remote: http://rubygems.org/
   specs:
-    activemodel (3.2.8)
-      activesupport (= 3.2.8)
-      builder (~> 3.0.0)
-    activerecord (3.2.8)
-      activemodel (= 3.2.8)
-      activesupport (= 3.2.8)
-      arel (~> 3.0.2)
-      tzinfo (~> 0.3.29)
-    activesupport (3.2.8)
-      i18n (~> 0.6)
-      multi_json (~> 1.0)
-    arel (3.0.2)
-    awesome_print (1.1.0)
-    bson (1.7.0)
-    bson_ext (1.7.0)
-      bson (~> 1.7.0)
-    builder (3.0.4)
-    database_cleaner (0.9.1)
-    diff-lcs (1.1.3)
-    fuubar (1.1.0)
-      rspec (~> 2.0)
-      rspec-instafail (~> 0.2.0)
-      ruby-progressbar (~> 1.0.0)
-    i18n (0.6.1)
-    mongo (1.7.0)
-      bson (~> 1.7.0)
-    mongo_mapper (0.12.0)
-      activemodel (~> 3.0)
-      activesupport (~> 3.0)
-      plucky (~> 0.5.2)
-    mongoid (3.0.9)
-      activemodel (~> 3.1)
-      moped (~> 1.1)
-      origin (~> 1.0)
-      tzinfo (~> 0.3.22)
-    moped (1.2.7)
-    multi_json (1.3.6)
-    mysql2 (0.3.11)
-    origin (1.0.9)
-    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)
-      rspec-expectations (~> 2.11.0)
-      rspec-mocks (~> 2.11.0)
-    rspec-core (2.11.1)
-    rspec-expectations (2.11.3)
-      diff-lcs (~> 1.1.3)
-    rspec-instafail (0.2.4)
-    rspec-mocks (2.11.3)
-    ruby-progressbar (1.0.2)
-    sqlite3 (1.3.6)
-    squeel (1.0.13)
-      activerecord (~> 3.0)
-      activesupport (~> 3.0)
-      polyamorous (~> 0.5.0)
-    tzinfo (0.3.33)
+    activemodel (4.1.6)
+      activesupport (= 4.1.6)
+      builder (~> 3.1)
+    activerecord (4.1.6)
+      activemodel (= 4.1.6)
+      activesupport (= 4.1.6)
+      arel (~> 5.0.0)
+    activesupport (4.1.6)
+      i18n (~> 0.6, >= 0.6.9)
+      json (~> 1.7, >= 1.7.7)
+      minitest (~> 5.1)
+      thread_safe (~> 0.1)
+      tzinfo (~> 1.1)
+    arel (5.0.1.20140414130214)
+    awesome_print (1.2.0)
+    bson (2.2.0)
+    bson_ext (1.5.1)
+    builder (3.2.2)
+    connection_pool (2.0.0)
+    database_cleaner (1.3.0)
+    diff-lcs (1.2.5)
+    fuubar (2.0.0)
+      rspec (~> 3.0)
+      ruby-progressbar (~> 1.4)
+    i18n (0.6.11)
+    jnunemaker-validatable (1.8.4)
+      activesupport (>= 2.3.4)
+    json (1.8.1)
+    minitest (5.4.1)
+    mongo (1.3.1)
+      bson (>= 1.3.1)
+    mongo_mapper (0.8.6)
+      activesupport (>= 2.3.4)
+      jnunemaker-validatable (~> 1.8.4)
+      plucky (~> 0.3.6)
+    mongoid (4.0.0)
+      activemodel (~> 4.0)
+      moped (~> 2.0.0)
+      origin (~> 2.1)
+      tzinfo (>= 0.3.37)
+    moped (2.0.0)
+      bson (~> 2.2)
+      connection_pool (~> 2.0)
+      optionable (~> 0.2.0)
+    mysql2 (0.3.16)
+    optionable (0.2.0)
+    origin (2.1.1)
+    pg (0.17.1)
+    plucky (0.3.8)
+      mongo (~> 1.3)
+    polyamorous (1.1.0)
+      activerecord (>= 3.0)
+    rake (10.3.2)
+    rspec (3.1.0)
+      rspec-core (~> 3.1.0)
+      rspec-expectations (~> 3.1.0)
+      rspec-mocks (~> 3.1.0)
+    rspec-core (3.1.4)
+      rspec-support (~> 3.1.0)
+    rspec-expectations (3.1.1)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.1.0)
+    rspec-mocks (3.1.1)
+      rspec-support (~> 3.1.0)
+    rspec-support (3.1.0)
+    ruby-progressbar (1.6.0)
+    sqlite3 (1.3.9)
+    squeel (1.2.1)
+      activerecord (>= 3.0)
+      activesupport (>= 3.0)
+      polyamorous (~> 1.1.0)
+    thread_safe (0.3.4)
+    tzinfo (1.2.2)
+      thread_safe (~> 0.1)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  activerecord
+  activerecord (>= 4.0.0)
   amistad!
   awesome_print
   bson_ext
@@ -81,9 +94,9 @@ DEPENDENCIES
   database_cleaner
   fuubar
   mongo_mapper
-  mongoid
-  mysql2
-  pg
+  mongoid (>= 4.0.0)
+  mysql2 (>= 0.3.16)
+  pg (>= 0.17.1)
   rake
-  rspec
-  sqlite3
+  rspec (~> 3.1.0)
+  sqlite3 (>= 1.3.9)

data/README.markdown

@@ -1,6 +1,6 @@
 # amistad #
 
-Amistad adds friendships management into a rails 3.0 application. it supports ActiveRecord 3.0.x, Mongoid 3.0.x and MongoMapper 0.12.0.
+Amistad adds friendships management into a rails application. it supports ActiveRecord, Mongoid and MongoMapper.
 
 ## Installation ##
 

data/amistad.gemspec

@@ -18,13 +18,13 @@ Gem::Specification.new do |s|
 
   s.add_development_dependency "bundler"
   s.add_development_dependency "rake"
-  s.add_development_dependency "rspec"
-  s.add_development_dependency "activerecord"
-  s.add_development_dependency "mysql2"
-  s.add_development_dependency "pg"
+  s.add_development_dependency "rspec", "~> 3.1.0"
+  s.add_development_dependency "activerecord", ">= 4.0.0"
+  s.add_development_dependency "mysql2", ">= 0.3.16"
+  s.add_development_dependency "pg", ">= 0.17.1"
   s.add_development_dependency "database_cleaner"
-  s.add_development_dependency "sqlite3"
-  s.add_development_dependency "mongoid"
+  s.add_development_dependency "sqlite3", ">= 1.3.9"
+  s.add_development_dependency "mongoid", ">= 4.0.0"
   s.add_development_dependency "bson_ext"
   s.add_development_dependency "fuubar"
   s.add_development_dependency "awesome_print"

data/lib/amistad/active_record_friend_model.rb

@@ -12,15 +12,9 @@ module Amistad
         :class_name => "Amistad::Friendships::#{Amistad.friendship_model}",
         :foreign_key => "friendable_id"
 
-      has_many  :pending_invited,
-        :through => :friendships,
-        :source => :friend,
-        :conditions => { :'friendships.pending' => true, :'friendships.blocker_id' => nil }
 
-      has_many  :invited,
-        :through => :friendships,
-        :source => :friend,
-        :conditions => { :'friendships.pending' => false, :'friendships.blocker_id' => nil }
+      has_many  :pending_invited, -> { where(:'friendships.pending' => true, :'friendships.blocker_id' => nil) }, :through => :friendships, :source => :friend
+      has_many  :invited, -> { where(:'friendships.pending' => false, :'friendships.blocker_id' => nil) }, :through => :friendships, :source => :friend
 
       #####################################################################################
       # inverse friendships
@@ -29,15 +23,8 @@ module Amistad
         :class_name => "Amistad::Friendships::#{Amistad.friendship_model}",
         :foreign_key => "friend_id"
 
-      has_many  :pending_invited_by,
-        :through => :inverse_friendships,
-        :source => :friendable,
-        :conditions => { :'friendships.pending' => true, :'friendships.blocker_id' => nil }
-
-      has_many  :invited_by,
-        :through => :inverse_friendships,
-        :source => :friendable,
-        :conditions => { :'friendships.pending' => false, :'friendships.blocker_id' => nil }
+      has_many  :pending_invited_by, ->  { where(:'friendships.pending' => true, :'friendships.blocker_id' => nil) }, :through => :inverse_friendships, :source => :friendable
+      has_many  :invited_by, -> { where(:'friendships.pending' => false, :'friendships.blocker_id' => nil) }, :through => :inverse_friendships, :source => :friendable
 
       #####################################################################################
       # blocked friendships
@@ -46,15 +33,9 @@ module Amistad
         :class_name => "Amistad::Friendships::#{Amistad.friendship_model}",
         :foreign_key => "blocker_id"
 
-      has_many  :blockades,
-        :through => :blocked_friendships,
-        :source => :friend,
-        :conditions => "friend_id <> blocker_id"
+      has_many  :blockades, -> {where("friend_id <> blocker_id")}, :through => :blocked_friendships, :source => :friend
+      has_many  :blockades_by, -> {where("friendable_id <> blocker_id")} , :through => :blocked_friendships, :source => :friendable
 
-      has_many  :blockades_by,
-        :through => :blocked_friendships,
-        :source => :friendable,
-        :conditions => "friendable_id <> blocker_id"
     end
 
     # suggest a user to become a friend. If the operation succeeds, the method returns true, else false
@@ -76,6 +57,7 @@ module Amistad
       return false if friendship.nil?
       friendship.destroy
       self.reload && user.reload if friendship.destroyed?
+      true
     end
 
     # returns the list of approved friends

data/lib/amistad/mongo_mapper_friend_model.rb

@@ -35,17 +35,6 @@ module Amistad
         Array,
         :default => []
 
-      attr_accessible(
-        :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,
-      )
-
       %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)

data/lib/amistad/mongoid_friend_model.rb

@@ -35,16 +35,6 @@ module Amistad
         :type => Array,
         :default => []
 
-      attr_accessible(
-        :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,
-      )
     end
   end
 end

data/lib/amistad/version.rb

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

data/spec/activerecord/activerecord_spec_helper.rb

@@ -19,6 +19,3 @@ RSpec.configure do |config|
   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/activerecord/friend_spec.rb

@@ -5,9 +5,6 @@ describe "The friend model" do
     reload_environment
     User = Class.new(ActiveRecord::Base)
 
-    ActiveSupport.on_load(:active_record) do
-      attr_accessible(nil)
-    end
   end
 
   it_should_behave_like "friend with parameterized models" do

data/spec/support/activerecord/friendship_examples.rb

@@ -1,10 +1,10 @@
 shared_examples_for "the friendship model" do  
   it "should validate presence of the user's id and the friend's id" do
     friendship = Amistad.friendship_class.new
-    friendship.valid?.should be_false
-    friendship.errors.should include(:friendable_id)
-    friendship.errors.should include(:friend_id)
-    friendship.errors.size.should == 2
+    expect(friendship.valid?).to eq(false)
+    expect(friendship.errors).to include(:friendable_id)
+    expect(friendship.errors).to include(:friend_id)
+    expect(friendship.errors.size).to eq(2)
   end
 
   context "when creating friendship" do
@@ -14,29 +14,29 @@ shared_examples_for "the friendship model" do
     end
 
     it "should be pending" do
-      @friendship.pending?.should be_true
+      expect(@friendship.pending?).to eq(true)
     end
 
     it "should not be approved" do
-      @friendship.approved?.should be_false
+      expect(@friendship.approved?).to eq(false)
     end
 
     it "should be active" do
-      @friendship.active?.should be_true
+      expect(@friendship.active?).to eq(true)
     end
 
     it "should not be blocked" do
-      @friendship.blocked?.should be_false
+      expect(@friendship.blocked?).to eq(false)
     end
 
     it "should be available to block only by invited user" do
-      @friendship.can_block?(@david).should be_true
-      @friendship.can_block?(@jane).should be_false
+      expect(@friendship.can_block?(@david)).to eq(true)
+      expect(@friendship.can_block?(@jane)).to eq(false)
     end
 
     it "should not be available to unblock" do
-      @friendship.can_unblock?(@jane).should be_false
-      @friendship.can_unblock?(@david).should be_false
+      expect(@friendship.can_unblock?(@jane)).to eq(false)
+      expect(@friendship.can_unblock?(@david)).to eq(false)
     end
   end
 
@@ -48,29 +48,29 @@ shared_examples_for "the friendship model" do
     end
 
     it "should be approved" do
-      @friendship.approved?.should be_true
+      expect(@friendship.approved?).to eq(true)
     end
 
     it "should not be pending" do
-      @friendship.pending?.should be_false
+      expect(@friendship.pending?).to eq(false)
     end
 
     it "should be active" do
-      @friendship.active?.should be_true
+      expect(@friendship.active?).to eq(true)
     end
 
     it "should not be blocked" do
-      @friendship.blocked?.should be_false
+      expect(@friendship.blocked?).to eq(false)
     end
 
     it "should be available to block by both users" do
-      @friendship.can_block?(@jane).should be_true
-      @friendship.can_block?(@david).should be_true
+      expect(@friendship.can_block?(@jane)).to eq(true)
+      expect(@friendship.can_block?(@david)).to eq(true)
     end
 
     it "should not be availabel to unblock" do
-      @friendship.can_unblock?(@jane).should be_false
-      @friendship.can_unblock?(@david).should be_false
+      expect(@friendship.can_unblock?(@jane)).to eq(false)
+      expect(@friendship.can_unblock?(@david)).to eq(false)
     end
   end
 
@@ -82,29 +82,29 @@ shared_examples_for "the friendship model" do
     end
 
     it "should not be approved" do
-      @friendship.approved?.should be_false
+      expect(@friendship.approved?).to eq(false)
     end
 
     it "should be pending" do
-      @friendship.pending?.should be_true
+      expect(@friendship.pending?).to eq(true)
     end
 
     it "should not be active" do
-      @friendship.active?.should be_false
+      expect(@friendship.active?).to eq(false)
     end
 
     it "should be blocked" do
-      @friendship.blocked?.should be_true
+      expect(@friendship.blocked?).to eq(true)
     end
 
     it "should not be available to block" do
-      @friendship.can_block?(@jane).should be_false
-      @friendship.can_block?(@david).should be_false
+      expect(@friendship.can_block?(@jane)).to eq(false)
+      expect(@friendship.can_block?(@david)).to eq(false)
     end
 
     it "should be available to unblock only by user who blocked it" do
-      @friendship.can_unblock?(@david).should be_true
-      @friendship.can_unblock?(@jane).should be_false
+      expect(@friendship.can_unblock?(@david)).to eq(true)
+      expect(@friendship.can_unblock?(@jane)).to eq(false)
     end
   end
-end
+end