acts_as_favoritor 5.0.2 → 5.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 64b49c4243f1a6d24e08294de2ee32e19f7b9587ed7f796c2d9d335e6083025a
-  data.tar.gz: dc8bc1751b08a7c9837a9a7f1ee1bf4f8059401d11147df8b1c8500fa58151fb
+  metadata.gz: c785314efa34b1f88cfee3d6c39acef924fb989e6a2654c65241a07facd707b0
+  data.tar.gz: 28dfbd0a05eab1723e871df1aec6657aabae38875402f03f5f2347ccedb7bc22
 SHA512:
-  metadata.gz: fb5c2de5270701e94c32b22c703796f309e53db7ad56f55a2171fbe9ebd600f4e7d85084fb5152fbb69539b29ecb0bf9d67f24a6f649ec0818c9089f80c17816
-  data.tar.gz: a58a52e5fa812dcc2e985f9be277663be0dc0d4ee3d90e25db362391132e38185e2fe18de6f3a84811b48565afe6caadaad7b38502d998f293ce1d1a2ddecfa2
+  metadata.gz: af2a517dc943fa69ea7d5442beced5d086a31a9586e1587fecf4ae3c0ad57ab9579099731ec5d92e794075b3d804e0facf7605fa196cdb3531edfb1f4d9855d0
+  data.tar.gz: 5e19c65f8f122686cf452f3690f18856e0e235d443e0772c8e4c4468d1b43bea2a46653e495f68d18dc0591ac6e725c2f53f8e3de7cbc5f6ddc0c2b89b9664a4

data/lib/acts_as_favoritor/favoritor.rb

@@ -50,10 +50,11 @@ module ActsAsFavoritor
         self.class.build_result_for_scopes(scopes || scope) do |s|
           return nil if self == favoritable
 
-          result = favorites.for_favoritable(favoritable).send("#{s}_list")
-                            .first_or_create!
-          inc_cache(favoritable, s) if ActsAsFavoritor.configuration.cache
-          result
+          favorites.for_favoritable(favoritable).send("#{s}_list")
+                   .first_or_create! do |new_record|
+            inc_cache(favoritable, s) if ActsAsFavoritor.configuration.cache
+            new_record
+          end
         end
       end
 
@@ -65,7 +66,7 @@ module ActsAsFavoritor
           return nil unless favorite_record.present?
 
           result = favorite_record.destroy!
-          dec_cache(favoritable, s) if ActsAsFavoritor.configuration.cache
+          dec_cache(favoritable, s) if ActsAsFavoritor.configuration.cache && result.destroyed?
           result
         end
       end

data/lib/acts_as_favoritor/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ActsAsFavoritor
-  VERSION = '5.0.2'
+  VERSION = '5.0.3'
 end

data/lib/generators/templates/migration.rb.erb

@@ -19,7 +19,8 @@ class ActsAsFavoritorMigration < ActiveRecord::Migration<%= migration_version %>
               ['favoritable_id', 'favoritable_type'],
               name: 'fk_favoritables'
     add_index :favorites,
-              ['favoritable_id', 'favoritor_id', 'favoritable_type'],
+              ['favoritable_type', 'favoritable_id', 'favoritor_type',
+              'favoritor_id', 'scope'],
               name: 'uniq_favorites__and_favoritables', unique: true
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: acts_as_favoritor
 version: !ruby/object:Gem::Version
-  version: 5.0.2
+  version: 5.0.3
 platform: ruby
 authors:
 - Jonas Hübotter