has_friendship 0.0.3 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5748ee44d7db6b70f9f1066be963b6b580aebc02
-  data.tar.gz: 3c61eb3e760db7546fae7cebb8672dc1f2c2357c
+  metadata.gz: b3ec9dd62bd0dc88ac3f2f24c3a358cdb0a3f627
+  data.tar.gz: b6eb97452db346ec53035758f58eff3b0d926851
 SHA512:
-  metadata.gz: c6e9033ebbf31b6f827790e2b645a1a96aeb46bcdf29f6e7002aebf27dd902c37a3520792158139653840a02506e81229237426645b4f9c8efd8d5e4b8a72511
-  data.tar.gz: c3e82476466b52cad99dd727e83ac57929e0b37ae174c301043dcc48697d985aee76fb09804197ecce77451f5ad6230c37a24f04a038bfd20f1603a7cdeac22d
+  metadata.gz: 1a89cb131c5523a31dcce5b211c63d0dbe5e46d09f78c562caf08201e1c81513ee5d6c8df1dd4ffef145fa22bdac7972aede1428d9cbfab1b1978fc9561be58c
+  data.tar.gz: 858c9683fee0765f24a8eb51ae6bc04b5d4e0b053856687c1ad5b874d8a0ea050591751d81260319bb11f8c6013613cae279651675e1090b52155bf2ac9b18dd

data/lib/generators/has_friendship/has_friendship_generator.rb

@@ -13,6 +13,9 @@ class HasFriendshipGenerator < Rails::Generators::Base
   end
 
   def create_migration_file
-    migration_template 'migration.rb', 'db/migrate/create_friendships.rb'
+    migration_template 'create_friendships.rb',
+                       'db/migrate/create_friendships.rb'
+    migration_template 'add_blocker_id_to_friendships.rb',
+                       'db/migrate/add_blocker_id_to_friendships.rb'
   end
-end
+end

data/lib/generators/has_friendship/templates/add_blocker_id_to_friendships.rb

@@ -0,0 +1,9 @@
+class AddBlockerIdToFriendships < ActiveRecord::Migration
+  def self.up
+    add_column :friendships, :blocker_id, :integer, default: nil
+  end
+
+  def self.down
+    remove_column :friendships, :blocker_id
+  end
+end

data/lib/generators/has_friendship/templates/{migration.rb → create_friendships.rb}

@@ -4,9 +4,9 @@ class CreateFriendships < ActiveRecord::Migration
       t.references :friendable, polymorphic: true
       t.integer  :friend_id
       t.string   :status
-      
+
       t.timestamps
     end
   end
 
-end
+end

data/lib/has_friendship/friendable.rb

@@ -6,9 +6,14 @@ module HasFriendship
     end
 
     def has_friendship
-
       class_eval do
-        has_many :friendships, as: :friendable, class_name: "HasFriendship::Friendship", dependent: :destroy
+        has_many :friendships, as: :friendable,
+                 class_name: "HasFriendship::Friendship", dependent: :destroy
+
+        has_many :blocked_friends,
+                  -> { where friendships: { status: 'blocked' } },
+                  through: :friendships
+
         has_many :friends,
                   -> { where friendships: { status: 'accepted' } },
                   through: :friendships
@@ -37,42 +42,57 @@ module HasFriendship
       def friend_request(friend)
         unless self == friend || HasFriendship::Friendship.exist?(self, friend)
           transaction do
-            HasFriendship::Friendship.create(friendable_id: self.id, friendable_type: self.class.base_class.name, friend_id: friend.id, status: 'pending')
-            HasFriendship::Friendship.create(friendable_id: friend.id, friendable_type: friend.class.base_class.name, friend_id: self.id, status: 'requested')
+            HasFriendship::Friendship.create_relation(self, friend, status: 'pending')
+            HasFriendship::Friendship.create_relation(friend, self, status: 'requested')
           end
         end
       end
 
       def accept_request(friend)
-        transaction do
-          pending_friendship = HasFriendship::Friendship.find_friendship(friend, self)
-          pending_friendship.status = 'accepted'
-          pending_friendship.save
-
-          requeseted_friendship = HasFriendship::Friendship.find_friendship(self, friend)
-          requeseted_friendship.status = 'accepted'
-          requeseted_friendship.save
+        on_relation_with(friend) do |one, other|
+          HasFriendship::Friendship.find_unblocked_friendship(one, other)
+                                   .update(status: 'accepted')
         end
       end
 
       def decline_request(friend)
-        transaction do
-          HasFriendship::Friendship.find_friendship(friend, self).destroy
-          HasFriendship::Friendship.find_friendship(self, friend).destroy
+        on_relation_with(friend) do |one, other|
+          HasFriendship::Friendship.find_unblocked_friendship(one, other).destroy
+        end
+      end
+
+      alias_method :remove_friend, :decline_request
+
+      def block_friend(friend)
+        on_relation_with(friend) do |one, other|
+          HasFriendship::Friendship.find_unblocked_friendship(one, other)
+                                   .update(status: 'blocked', blocker_id: self.id)
+        end
+      end
+
+      def unblock_friend(friend)
+        return unless has_blocked(friend)
+        on_relation_with(friend) do |one, other|
+          HasFriendship::Friendship.find_blocked_friendship(one, other).destroy
         end
       end
 
-      def remove_friend(friend)
+      def on_relation_with(friend)
         transaction do
-          HasFriendship::Friendship.find_friendship(friend, self).destroy
-          HasFriendship::Friendship.find_friendship(self, friend).destroy
+          yield(self, friend)
+          yield(friend, self)
         end
       end
 
       def friends_with?(friend)
-        HasFriendship::Friendship.where(friendable_id: self.id, friend_id: friend.id, status: 'accepted').present?
+        HasFriendship::Friendship.find_relation(self, friend).any?
       end
 
+      private
+
+      def has_blocked(friend)
+        HasFriendship::Friendship.find_one_side(self, friend).blocker_id == self.id
+      end
     end
   end
 end

data/lib/has_friendship/friendship.rb

@@ -1,16 +1,37 @@
 module HasFriendship
   class Friendship < ActiveRecord::Base
+    def self.relation_attributes(one, other)
+      {
+        friendable_id: one.id,
+        friendable_type: one.class.base_class.name,
+        friend_id: other.id
+      }
+    end
+
+    def self.create_relation(one, other, options)
+      relation = new relation_attributes(one, other)
+      relation.attributes = options
+      relation.save
+    end
 
-    def self.check_one_side(friendable, friend)
-      find_by(friendable_id: friendable.id, friendable_type: friendable.class.base_class.name, friend_id: friend.id).present?
+    def self.find_relation(friendable, friend)
+      where relation_attributes(friendable, friend)
     end
 
     def self.exist?(friendable, friend)
-      check_one_side(friendable, friend) && check_one_side(friend, friendable)
+      find_relation(friendable, friend).any? && find_relation(friend, friendable).any?
+    end
+
+    def self.find_unblocked_friendship(friendable, friend)
+      find_relation(friendable, friend).where.not(status: "blocked").first
+    end
+
+    def self.find_blocked_friendship(friendable, friend)
+      find_relation(friendable, friend).where(status: "blocked").first
     end
 
-    def self.find_friendship(friendable, friend)
-      find_by(friendable_id: friendable.id, friendable_type: friendable.class.base_class.name, friend_id: friend.id)
+    def self.find_one_side(one, other)
+      find_by(relation_attributes(one, other))
     end
   end
 end

data/lib/has_friendship/version.rb

@@ -1,3 +1,3 @@
 module HasFriendship
-  VERSION = "0.0.3"
+  VERSION = "0.1.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: has_friendship
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.1.0
 platform: ruby
 authors:
 - Sung Won Cho
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-29 00:00:00.000000000 Z
+date: 2015-12-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.1.8
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.1.8
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -122,6 +122,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: tzinfo-data
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: 
 email:
 - mikeswcho@gmail.com
@@ -132,7 +146,8 @@ files:
 - MIT-LICENSE
 - Rakefile
 - lib/generators/has_friendship/has_friendship_generator.rb
-- lib/generators/has_friendship/templates/migration.rb
+- lib/generators/has_friendship/templates/add_blocker_id_to_friendships.rb
+- lib/generators/has_friendship/templates/create_friendships.rb
 - lib/has_friendship.rb
 - lib/has_friendship/extender.rb
 - lib/has_friendship/friendable.rb