has_friendship 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 705e193cc6e95b8661e5897d2e2cda94fe5fe26b
-  data.tar.gz: 3833bf8514f56070397c975101ac50a57fe21615
+  metadata.gz: 498832a304c1e5234ed5ed576727d2f98a236b50
+  data.tar.gz: 4cf1a787e0e8034df4351707dd086c5409dde83c
 SHA512:
-  metadata.gz: d548a1dc0cf9619ce0cc9deb827894d94d27a9b4b1df78a4db1f3e9fc559061c52960942b69948086d8324fb596514345507338ab29382851374b1b4fe3a0a24
-  data.tar.gz: 9afea893eb09c57e734324e3ed7b845ca26bf4658ab6b1d563344a67b3d842033f32d80671a93ba2a7ae0e002f42b10f0cca1de07b53a2fc4b16d7139fae2a31
+  metadata.gz: b9319fd2d7592610e5e2c040c84f8083d2526d848ddc2ac84fea1e286e62b13a593922526c676d71963a69b065e4b6d5c089e2415d28c38ffddd4f162f8910fb
+  data.tar.gz: 889c71eb0c6ae727428041b430c1eb3a61ddc7f3082efc5158587fab5ba1994aa328b0a749c28a47ac9bcf9ef3c57cba8f94f35fa5e1715bb4fc2d390717bb4a

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

@@ -3,7 +3,7 @@ class CreateFriendships < ActiveRecord::Migration
     create_table :friendships do |t|
       t.references :friendable, polymorphic: true
       t.integer  :friend_id
-      t.string   :status
+      t.integer  :status, index: true
 
       t.timestamps
     end

data/lib/has_friendship/friendable.rb

@@ -11,21 +11,21 @@ module HasFriendship
                  class_name: "HasFriendship::Friendship", dependent: :destroy
 
         has_many :blocked_friends,
-                  -> { where friendships: { status: 'blocked' } },
+                  -> { where friendships: { status: 3 } },
                   through: :friendships,
                   source: :friend
 
         has_many :friends,
-                  -> { where friendships: { status: 'accepted' } },
+                  -> { where friendships: { status: 2 } },
                   through: :friendships
 
         has_many :requested_friends,
-                  -> { where friendships: { status: 'requested' } },
+                  -> { where friendships: { status: 1 } },
                   through: :friendships,
                   source: :friend
 
         has_many :pending_friends,
-                  -> { where friendships: { status: 'pending' } },
+                  -> { where friendships: { status: 0 } },
                   through: :friendships,
                   source: :friend
 
@@ -43,16 +43,15 @@ module HasFriendship
       def friend_request(friend)
         unless self == friend || HasFriendship::Friendship.exist?(self, friend)
           transaction do
-            HasFriendship::Friendship.create_relation(self, friend, status: 'pending')
-            HasFriendship::Friendship.create_relation(friend, self, status: 'requested')
+            HasFriendship::Friendship.create_relation(self, friend, status: 0)
+            HasFriendship::Friendship.create_relation(friend, self, status: 1)
           end
         end
       end
 
       def accept_request(friend)
         on_relation_with(friend) do |one, other|
-          HasFriendship::Friendship.find_unblocked_friendship(one, other)
-                                   .update(status: 'accepted')
+          HasFriendship::Friendship.find_unblocked_friendship(one, other).accept!
         end
       end
 
@@ -66,8 +65,7 @@ module HasFriendship
 
       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)
+          HasFriendship::Friendship.find_unblocked_friendship(one, other).block!
         end
       end
 
@@ -86,7 +84,7 @@ module HasFriendship
       end
 
       def friends_with?(friend)
-        HasFriendship::Friendship.find_relation(self, friend, status: 'accepted').any?
+        HasFriendship::Friendship.find_relation(self, friend, status: 2).any?
       end
 
       private

data/lib/has_friendship/friendship.rb

@@ -1,5 +1,20 @@
 module HasFriendship
   class Friendship < ActiveRecord::Base
+
+    enum status: { pending: 0, requested: 1, accepted: 2, blocked: 3 } do
+      event :accept do
+        transition [:pending, :requested] => :accepted
+      end
+
+      event :block do
+        before do
+          self.blocker_id = self.friendable.id
+        end
+
+        transition all - [:blocked] => :blocked
+      end
+    end
+
     def self.relation_attributes(one, other, status: nil)
       attr = {
         friendable_id: one.id,
@@ -29,11 +44,11 @@ module HasFriendship
     end
 
     def self.find_unblocked_friendship(friendable, friend)
-      find_relation(friendable, friend).where.not(status: "blocked").first
+      find_relation(friendable, friend).where.not(status: 3).first
     end
 
     def self.find_blocked_friendship(friendable, friend)
-      find_relation(friendable, friend).where(status: "blocked").first
+      find_relation(friendable, friend).where(status: 3).first
     end
 
     def self.find_one_side(one, other)

data/lib/has_friendship/version.rb

@@ -1,3 +1,3 @@
 module HasFriendship
-  VERSION = "0.1.3"
+  VERSION = "0.1.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: has_friendship
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Sung Won Cho
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-04 00:00:00.000000000 Z
+date: 2016-04-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -24,6 +24,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '4.0'
+- !ruby/object:Gem::Dependency
+  name: stateful_enum
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement