has_friendship 1.1.8 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e20071df795f101aa2094be0905f86da5ad60d054db8c53273d8aab2f2ae72e2
-  data.tar.gz: dcabee55a10aa221ef939e4cb16c49e5d34dcbf8d42bfb1b3d671f95ce941291
+  metadata.gz: 13eb70587325d65d16b6ddb7a5d2d1c31ea7820363cf263eb4519b6a6a0ae087
+  data.tar.gz: 2589815aa21a588236ab240f10b29b68e8fbb4a99c93dcdda1d49a47ed44fdba
 SHA512:
-  metadata.gz: 181496a60ca7f54a628b21b1452433ab008b4233f08dabc67efbcd3db2b06b45a22efc48f392adab45168f8410bdb94770c7bdb741d227fb64b09907f75ff103
-  data.tar.gz: 549f33d9e1511faaa528200985231efbc3f841fecb10fa2c604758b14e82b61648647b3479fee4cc47c2ed4ed24021fe83b79934f10fa18f535cc1bf60743ba0
+  metadata.gz: 00366d386441bf4bbfd90ffc527e563d4296dd40d1597e97de8a3db93c47eb88745014859aa73af25ce5cea23ed0d4ccb1e78ec38b3fa0bb2d0fcbd4827f285b
+  data.tar.gz: 51ef8240e5efb99bf76d0d0d731d71932c8062e51ac84ce24d753001b22c16f0c4262f567b6f17adc2a158e6ea0daaf62ae4897526b235354ea4487c01ba5d57

data/db/migrate/4_add_unique_index_to_friendships.rb

@@ -10,7 +10,16 @@ AddUniqueIndexToFriendships.class_eval do
   def self.up
     return if index_exists?(:friendships, [:friendable_id, :friend_id])
 
-    add_index :friendships, [:friendable_id, :friend_id], unique: true, algorithm: :concurrently
+    options = { unique: true }
+
+    adapter_name = connection.adapter_name.downcase
+    if adapter_name.include?('mysql') || adapter_name.include?('postgres')
+        adapter_name.include?('postgis')
+      # These are the only DB adapters that support an index algorithm.
+      options[:algorithm] = :concurrently
+    end
+
+    add_index :friendships, [:friendable_id, :friend_id], **options
   end
 
   def self.down

data/lib/has_friendship/engine.rb

@@ -1,5 +1,27 @@
 module HasFriendship
   class Engine < ::Rails::Engine
+    # Don't bother with isolate_namespace; we're only working with
+    # one table here.
+    #
     # isolate_namespace HasFriendship
+
+    #
+    # NOTE ABOUT DATABASE MIGRATIONS
+    #
+    # This Gem uses the `has_friendship:install:migrations` Rake task,
+    # which is automatically provided by Rails::Engine. That Rake task
+    # will copy the migration files from the Gem's db/migrate/
+    # directory into the host app (with newly-generated timestamps).
+    #
+    # We use this `install:migrations` approach to provide developer
+    # control. The application developer must be allowed to inspect
+    # and modify the migration files (e.g. to change the foreign key
+    # type from INTEGER to a UUID) before running `db:migrate`.
+    #
+    # Do not use the Rails Engine's `initializer :append_migrations`
+    # feature in this Gem. Otherwise, the application developer would
+    # loose that control.
+    #
+
   end
 end

data/lib/has_friendship/friendable.rb

@@ -77,12 +77,12 @@ module HasFriendship
 
       def block_friend(friend)
         on_relation_with(friend) do |one, other|
-          HasFriendship::Friendship.find_unblocked_friendship(one, other).block!
+          HasFriendship::Friendship.find_unblocked_friendship(one, other).block_by(self)
         end
       end
 
       def unblock_friend(friend)
-        return unless has_blocked(friend)
+        return unless has_blocked?(friend)
         on_relation_with(friend) do |one, other|
           HasFriendship::Friendship.find_blocked_friendship(one, other).destroy
         end
@@ -101,7 +101,7 @@ module HasFriendship
 
       private
 
-      def has_blocked(friend)
+      def has_blocked?(friend)
         HasFriendship::Friendship.find_one_side(self, friend).blocker_id == self.id
       end
 

data/lib/has_friendship/friendship.rb

@@ -1,4 +1,6 @@
 module HasFriendship
+  FRIENDSHIP_ENUM_VALUES = { pending: 0, requested: 1, accepted: 2, blocked: 3 }
+
   class Friendship < ActiveRecord::Base
     validate :satisfy_custom_conditions
 
@@ -10,8 +12,20 @@ module HasFriendship
       friendable.try(:on_friendship_destroyed, record)
     end
 
-    enum status: { pending: 0, requested: 1, accepted: 2, blocked: 3 } do
+    attr_reader :status_was
+
+    if Rails.gem_version >= Gem::Version.new('7.0')
+        stats_def = [ :status, FRIENDSHIP_ENUM_VALUES ]
+    else
+        stats_def = [ status: FRIENDSHIP_ENUM_VALUES ]
+    end
+
+    enum *stats_def do
       event :accept do
+        before do
+          @status_was = self.status
+        end
+
         transition [:pending, :requested] => :accepted
 
         after do
@@ -20,10 +34,6 @@ module HasFriendship
       end
 
       event :block do
-        before do
-          self.blocker_id = self.friendable.id
-        end
-
         after do
           friendable.on_friendship_blocked(self)
         end
@@ -31,6 +41,11 @@ module HasFriendship
       end
     end
 
+    def block_by(blocker)
+      self.blocker_id = blocker.id
+      self.block!
+    end
+
     def self.relation_attributes(one, other, status: nil)
       attr = {
         friendable_id: one.id,

data/lib/has_friendship/version.rb

@@ -1,3 +1,3 @@
 module HasFriendship
-  VERSION = "1.1.8"
+  VERSION = "1.2.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: has_friendship
 version: !ruby/object:Gem::Version
-  version: 1.1.8
+  version: 1.2.1
 platform: ruby
 authors:
 - Sung Won Cho
-autorequire: 
+- Paul Walrath
 bindir: bin
 cert_chain: []
-date: 2020-01-02 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -17,9 +17,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 4.2.0
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '6.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -27,9 +24,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 4.2.0
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '6.1'
 - !ruby/object:Gem::Dependency
   name: activemodel
   requirement: !ruby/object:Gem::Requirement
@@ -37,9 +31,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 4.2.0
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '6.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -47,9 +38,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 4.2.0
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '6.1'
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
@@ -57,9 +45,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 4.2.0
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '6.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -67,9 +52,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 4.2.0
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '6.1'
 - !ruby/object:Gem::Dependency
   name: stateful_enum
   requirement: !ruby/object:Gem::Requirement
@@ -155,7 +137,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: coveralls
+  name: coveralls_reborn
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -196,9 +178,79 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: 
+- !ruby/object:Gem::Dependency
+  name: base64
+  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'
+- !ruby/object:Gem::Dependency
+  name: drb
+  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'
+- !ruby/object:Gem::Dependency
+  name: mutex_m
+  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'
+- !ruby/object:Gem::Dependency
+  name: benchmark
+  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'
+- !ruby/object:Gem::Dependency
+  name: appraisal
+  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'
 email:
 - mikeswcho@gmail.com
+- paul@walrath.ca
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -219,7 +271,6 @@ homepage: https://github.com/sungwoncho/has_friendship
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -234,8 +285,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.6.9
 specification_version: 4
 summary: Add social network friendship features to your Active Record models.
 test_files: []