refer 1.0.4 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 91e18770d147ea9f2fea478624dd409e4b22d3f656fb8b2a48ba370cbc9c0985
-  data.tar.gz: d57ac0f354306e11941261661a3c468314bc9e8df17186840c9c60515e8a06c2
+  metadata.gz: 20a30a9135827cc25dc86ab2d399162e63817f1cbb063a05414b23296d9aa8d6
+  data.tar.gz: 23f345dec5970fcfabbbf298de2bfa65ad963218aae53d49f0703e856cb834b1
 SHA512:
-  metadata.gz: d1bf9dfadefbb59da1bcbae9de04a546ef4a9b38d1bd828bb96ff537ce3dc73194c54a23647f3529ff81ee474e0d78a49a8a9ae26d335dd2da6272acf9154dbd
-  data.tar.gz: 632b1254ae1678221cdee7edd9f174f5209f0b02b024f9f37b829053cfd0ca63b512f188c7507707974246a438271409fe9cbfa4b644eb6b863fa6684477e013
+  metadata.gz: da6f63c3cfc32730d3bcaeab604861e2f5b6581306c3ab9806b83264f99145b3e5b34b822d065336b39ab4e22b7efb7926a613aac626f564f1fe494557d8ccb3
+  data.tar.gz: 0cdf66d6870970330a36b51e9a2bfa316a2175260779bac3eedfe262b6edd07dac3519ff57302a919f126078bf4ec82321771f5eca797d9b656359d69ffde1b8

data/app/models/refer/referral.rb

@@ -1,26 +1,21 @@
 module Refer
   class Referral < ApplicationRecord
-    belongs_to :referrer, polymorphic: true
+    belongs_to :referrer, polymorphic: true, default: -> { referral_code&.referrer }
     belongs_to :referee, polymorphic: true
     belongs_to :referral_code, optional: true, counter_cache: true
 
     scope :completed, -> { where.not(completed_at: nil) }
 
-    before_validation do
-      self.referrer = referral_code&.referrer
-    end
-
     validate :ensure_not_self_referral
 
+    after_update_commit -> { Refer.referral_completed&.call(self) }, if: -> { saved_change_to_completed_at? && completed_at? }
+
     def ensure_not_self_referral
       errors.add(:base, "Self-referrals are not allowed") if referrer == referee
     end
 
     def complete!(**attributes)
-      return if completed_at?
-
-      update attributes.with_defaults(completed_at: Time.current)
-      Refer.referral_completed&.call(self)
+      update(attributes.with_defaults(completed_at: Time.current)) unless completed_at?
     end
   end
 end

data/db/migrate/20261007000000_add_unique_index_to_refer_referrals_referee.rb

@@ -0,0 +1,6 @@
+class AddUniqueIndexToReferReferralsReferee < ActiveRecord::Migration[7.1]
+  def change
+    remove_index :refer_referrals, [ :referee_type, :referee_id ]
+    add_index :refer_referrals, [ :referee_type, :referee_id ], unique: true
+  end
+end

data/lib/refer/controller.rb

@@ -16,7 +16,7 @@ module Refer
 
     def set_refer_cookie(param_name: Refer.param_name, cookie_name: Refer.cookie_name, code: nil, track_visit: Refer.track_visits)
       code ||= params[param_name]
-      return if code.blank?
+      return unless code.is_a?(String) && code.present?
 
       cookies[cookie_name] = Refer.cookie(code) if Refer.overwrite_cookie || cookies[cookie_name].blank?
       ReferralCode.find_by(code: code)&.track_visit(request) if track_visit

data/lib/refer/version.rb

@@ -1,3 +1,3 @@
 module Refer
-  VERSION = "1.0.4"
+  VERSION = "1.1.0"
 end

data/lib/refer.rb

@@ -1,5 +1,6 @@
 require "refer/version"
 require "refer/engine"
+require "ipaddr"
 require "securerandom"
 
 module Refer
@@ -17,7 +18,9 @@ module Refer
   mattr_accessor :referral_completed
 
   class Error < StandardError; end
-  class AlreadyReferred < Error; end
+  class AlreadyReferred < Error
+    def initialize(referee) = super("#{referee} has already been referred")
+  end
 
   def self.referred?(referee)
     Referral.where(referee: referee).exists?
@@ -26,11 +29,15 @@ module Refer
   def self.refer(code:, referee:)
     return if referred?(referee)
     ReferralCode.find_by(code: code)&.referrals&.create(referee: referee)
+  rescue ActiveRecord::RecordNotUnique
+    nil
   end
 
   def self.refer!(code:, referee:)
-    raise AlreadyReferred, "#{referee} has already been referred" if referred?(referee)
+    raise AlreadyReferred, referee if referred?(referee)
     ReferralCode.find_by!(code: code).referrals.create!(referee: referee)
+  rescue ActiveRecord::RecordNotUnique
+    raise AlreadyReferred, referee
   end
 
   def self.cookie(code)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: refer
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.1.0
 platform: ruby
 authors:
 - Chris Oliver
@@ -41,6 +41,7 @@ files:
 - db/migrate/20240611180738_create_refer_referrals.rb
 - db/migrate/20240611183349_create_refer_referral_codes.rb
 - db/migrate/20240701172643_create_refer_visits.rb
+- db/migrate/20261007000000_add_unique_index_to_refer_referrals_referee.rb
 - lib/generators/refer/install/USAGE
 - lib/generators/refer/install/install_generator.rb
 - lib/generators/refer/model/USAGE
@@ -73,7 +74,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.7.2
+rubygems_version: 4.0.20
 specification_version: 4
 summary: Referral codes & affiliate links for Ruby on Rails apps
 test_files: []