acts_as_favoritor 4.0.1 → 4.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c9a4ceadc5d7cd5517f8f4f6d234b5588f991e43271cf268be6df619400be3ac
-  data.tar.gz: 9aaa2da1aad9087ddd85fe0b9bc7454c27fba2d704fe3a63b314fae77861826f
+  metadata.gz: ba4bae7bff5166a5903eccb9ed03fdc8905844309dac8b509d805dc945f09a4e
+  data.tar.gz: 61061b39d5f29094fe329c00aac91df4988667522c945f859c4762381da4a117
 SHA512:
-  metadata.gz: f277da7298d714bb96c01c3899ba973d631b324164a6472730480a6d50cc70892d401725004377addc8d29287348a10954f034e813e2e7ad69d6f21f200cb3f0
-  data.tar.gz: 65e9de4bf1b195b9d831efa02a86e91f2248fc1e5629e9c729a98ab146351a38dd609290adebd48cef236bf605b2f92cc132ad2350c93e2fb68f9f9c86271752
+  metadata.gz: eb97712eb98769614cd99a910633ec0b397feec7d55282f42884915c8246732f0b1b611ace2dae13c5360c998ba49f3ac02b0c9a8a7421b9ac2a3e57714493e0
+  data.tar.gz: 726d2a2aec78589821dabc017d5f53b8a142d961a3caa21eae436d5d6cbda4b231d613305ae8099aae4340addc09be508b68d09479b104d199c3fc586ec1c0cc

data/README.md

@@ -92,48 +92,44 @@ user.favorite(book)
 # `user` removes `book` from favorites.
 user.unfavorite(book)
 
-# Whether `user` has marked `book` as his favorite. Returns `true` or `false`.
+# Whether `user` has marked `book` as his favorite.
 user.favorited?(book)
 
-# Returnes `user`'s favorites that have not been blocked as an array of `Favorite` records.
+# Returns an Active Record relation of `user`'s `Favorite` records that have not been blocked.
 user.all_favorites
 
-# Returns all favorited objects of `user` as an array (unblocked). This can be a collection of different object types, e.g.: `User`, `Book`.
+# Returns an array of all unblocked favorited objects of `user`. This can be a collection of different object types, e.g.: `User`, `Book`.
 user.all_favorited
 
-# Returns an array of `Favorite` records where the `favoritable_type` is `Book`.
+# Returns an Active Record relation of `Favorite` records where the `favoritable_type` is `Book`.
 user.favorites_by_type('Book')
 
-# Returns an array of all favorited objects of `user` where `favoritable_type` is 'Book', this can be a collection of different object types, e.g.: `User`, `Book`.
+# Returns an Active Record relation of all favorited objects of `user` where `favoritable_type` is 'Book'.
 user.favorited_by_type('Book')
 
-# Returns the exact same result as `user.favorited_by_type 'User'`.
+# Returns the exact same as `user.favorited_by_type('User')`.
 user.favorited_users
 
-# Whether `user` has been blocked by `book`. Returns `true` or `false`.
+# Whether `user` has been blocked by `book`.
 user.blocked_by?(book)
 
-# Returns an array including all blocked Favorite records.
+# Returns an array of all favoritables that blocked `user`.
 user.blocked_by
 ```
 
-These methods take an optional hash parameter of ActiveRecord options (`:limit`, `:order`, etc...)
-
-    favorites_by_type, all_favorites, all_favorited, favorited_by_type
-
 ### `acts_as_favoritable` methods
 
 ```ruby
 # Returns all favoritors of a model that `acts_as_favoritable`
 book.favoritors
 
-# Returns an array of records with type `User` following `book`.
+# Returns an Active Record relation of records with type `User` following `book`.
 book.favoritors_by_type('User')
 
-# Returns the exact same as `book.favoritors_by_type 'User'`.
+# Returns the exact same as `book.favoritors_by_type('User')`.
 book.user_favoritors
 
-# Whether `book` has been favorited by `user`. Returns `true` or `false`.
+# Whether `book` has been favorited by `user`.
 book.favorited_by?(user)
 
 # Block a favoritor
@@ -142,30 +138,26 @@ book.block(user)
 # Unblock a favoritor
 book.unblock(user)
 
-# Whether `book` has blocked `user` as favoritor. Returns `true` or `false`.
+# Whether `book` has blocked `user` as favoritor.
 book.blocked?(user)
 
-# Returns an array including all blocked Favoritor records.
+# Returns an array of all blocked favoritors.
 book.blocked
 ```
 
-These methods take an optional hash parameter of ActiveRecord options (`:limit`, `:order`, etc...)
-
-    favoritors_by_type, favoritors, blocks
-
 ### `Favorite` model
 
 ```ruby
-# Returns all `Favorite` records where `blocked` is `false`.
+# Returns an Active Record relation of all `Favorite` records where `blocked` is `false`.
 Favorite.unblocked
 
-# Returns all `Favorite` records where `blocked` is `true`.
+# Returns an Active Record relation of all `Favorite` records where `blocked` is `true`.
 Favorite.blocked
 
-# Returns all favorites of `user`, including those who were blocked.
+# Returns an Active Record relation of all favorites of `user`, including those who were blocked.
 Favorite.for_favoritor(user)
 
-# Returns all favoritors of `book`, including those who were blocked.
+# Returns an Active Record relation of all favoritors of `book`, including those who were blocked.
 Favorite.for_favoritable(book)
 ```
 

data/lib/acts_as_favoritor/favoritable.rb

@@ -55,8 +55,11 @@ module ActsAsFavoritor
                              scopes: [ActsAsFavoritor.configuration
                                                      .default_scope])
         self.class.build_result_for_scopes scopes do |scope|
-          favorited.unblocked.send("#{scope}_list")
-                   .for_favoritor_type(favoritor_type).map(&:favoritor)
+          favoritor_type.constantize.includes(:favorites)
+                        .where(favorites: {
+                                 blocked: false, favoritable_id: id,
+                                 favoritable_type: self.class.name, scope: scope
+                               })
         end
       end
 

data/lib/acts_as_favoritor/favoritor.rb

@@ -49,7 +49,7 @@ module ActsAsFavoritor
         self.class.build_result_for_scopes scopes do |scope|
           return nil if self == favoritable
 
-          inc_cache(scope) if ActsAsFavoritor.configuration.cache
+          inc_cache(favoritable, scope) if ActsAsFavoritor.configuration.cache
 
           favorites.for_favoritable(favoritable).send("#{scope}_list")
                    .first_or_create!
@@ -62,7 +62,7 @@ module ActsAsFavoritor
           favorite_record = get_favorite(favoritable, scope)
           return nil unless favorite_record.present?
 
-          dec_cache(scope) if ActsAsFavoritor.configuration.cache
+          dec_cache(favoritable, scope) if ActsAsFavoritor.configuration.cache
           favorite_record.destroy!
         end
       end
@@ -101,8 +101,11 @@ module ActsAsFavoritor
                             scopes: [ActsAsFavoritor.configuration
                                                     .default_scope])
         self.class.build_result_for_scopes scopes do |scope|
-          favorites.unblocked.send("#{scope}_list").includes(:favoritable)
-                   .for_favoritable_type(favoritable_type).map(&:favoritable)
+          favoritable_type.constantize.includes(:favorited)
+                          .where(favorites: {
+                                   blocked: false, favoritor_id: id,
+                                   favoritor_type: self.class.name, scope: scope
+                                 })
         end
       end
 
@@ -129,7 +132,7 @@ module ActsAsFavoritor
       end
 
       # rubocop:disable Metrics/AbcSize
-      def inc_cache(scope)
+      def inc_cache(favoritable, scope)
         favoritor_score[scope] = (favoritor_score[scope] || 0) + 1
         favoritor_total[scope] = (favoritor_total[scope] || 0) + 1
         save!
@@ -141,7 +144,7 @@ module ActsAsFavoritor
         favoritable.save!
       end
 
-      def dec_cache(scope)
+      def dec_cache(favoritable, scope)
         favoritor_score[scope] = (favoritor_score[scope] || 0) - 1
         favoritor_score.delete(scope) unless favoritor_score[scope].positive?
         save!

data/lib/acts_as_favoritor/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: acts_as_favoritor
 version: !ruby/object:Gem::Version
-  version: 4.0.1
+  version: 4.0.2
 platform: ruby
 authors:
 - Jonas Hübotter
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-05-10 00:00:00.000000000 Z
+date: 2019-05-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -38,6 +38,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: pry
+  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: rails
   requirement: !ruby/object:Gem::Requirement