acts_as_favoritor 1.1.2 → 1.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 76ca5a001f34e1c116394acdf0b14ee10e7af8eb
-  data.tar.gz: b3fb2d0f0eea52611bb492f7c2c547971dbf24b5
+  metadata.gz: 7a2b31e850114a77b2f9784b5240e6f2a7a32256
+  data.tar.gz: fb8fea27d053678cf7640837788232af73d6501c
 SHA512:
-  metadata.gz: ee98332d5dcbad109d348d4a6ef86fecc6709b8f5d5a497da404adecdc78404f91a389c9e4a60592fb8c542210503ed43471362a39601794ffd8475527f67256
-  data.tar.gz: 262e4a3890b63782f77b302b3a792bf4bc311199b6fabaacdde5f826fb21a283cb620cb3e840fa17192f8e2f240eb86c02f2c7ab9f845a7e4dc615d73d39072b
+  metadata.gz: 4fae80a894f000d0cb63d0d97c43833afdf529c80b599318f9d3c3513b17b5950f5436eb328a82cce2c5830a294fe2bd88a1d0b70ed47d4c64ba0f27fddb7840
+  data.tar.gz: a7913c4206d756539eccb8da806f012f1b5213345100266ad08e71bc04cdc0328f3e99ac33e49d485eb2541a52c0615e9fd52eed45426678e503bd8e6fb67cca

data/CHANGELOG.md

@@ -4,6 +4,11 @@
 
 * nothing yet
 
+### 1.1.3 - 2017-08-23
+
+* bugfixes
+    * `fix NoMethodError: undefined method 'each' for <SCOPE>:String`
+
 ### 1.1.2 - 2017-08-23
 
 * bugfixes

data/README.md

@@ -20,6 +20,7 @@ You are able to differentiate followers, favorites, watchers and whatever else y
 * [Configuration](#configuration)
 * [Testing](#testing)
     * [Test Coverage](#test-coverage)
+* [To Do](#to-do)
 * [Contributing](#contributing)
     * [Contributors](#contributors)
 * [License](#license)
@@ -52,8 +53,9 @@ Now run the generator:
 
     $ rails g acts_as_favoritor
 
-You can set your default scope by passing `--scope custom_scope`. Learn more about scopes [here](#scopes)
-You can skip the creation of a configuration file by passing `--skip_configuration`. Learn more about configuring `acts_as_favoritor` [here](#configuration)
+You can set your default scope by passing `--scope custom_scope`. Learn more about scopes [here](#scopes).
+
+You can skip the creation of a configuration file by passing `--skip_configuration`. Learn more about configuring `acts_as_favoritor` [here](#configuration).
 
 To wrap things up, migrate the changes into your database:
 
@@ -108,13 +110,13 @@ user.favorites_count
 # Returnes `user`'s favorites that have not been blocked as an array of `Favorite` records.
 user.all_favorites
 
-# Returns all favorited objects of `user` as an array (unblocked). This can be a collection of different object types, eg: `User`, `Book`.
+# Returns all favorited objects of `user` as an array (unblocked). 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`.
 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, eg: `User`, `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`.
 user.favorited_by_type 'Book'
 
 # Returns the exact same result as `user.favorited_by_type 'User'`.
@@ -215,6 +217,8 @@ So lets see how this works:
 ```ruby
 user.favorite book, scope: [:favorite, :watching]
 user.remove_favorite book, scope: [:watching]
+second_user = User.find 2
+user.favorite second_user, scope: [:follow]
 book.block user, scope: [:all] # applies to all scopes
 ```
 
@@ -284,6 +288,12 @@ Test coverage can be calculated using SimpleCov. Make sure you have the [simplec
 
 ---
 
+## To Do
+
+* Adding magic methods for scopes, e.g.: `user.follow second_user` instead of `user.favorite second_user, scope: [:follow]`
+
+---
+
 ## Contributing
 
 We hope that you will consider contributing to `acts_as_favoritor`. Please read this short overview for some information about how to get started:

data/acts_as_favoritor.gemspec

@@ -17,7 +17,7 @@ Gem::Specification.new do |gem|
     gem.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
     gem.require_paths = ['lib']
 
-    gem.required_ruby_version = '>= 2.0'
+    gem.required_ruby_version = '>= 2.3'
 
     gem.add_dependency 'activerecord', '>= 4.0'
 

data/lib/acts_as_favoritor/favoritable.rb

@@ -19,7 +19,7 @@ module ActsAsFavoritor #:nodoc:
             def favoritors_count options = {}
                 if options.has_key?(:multiple_scopes) == false
                     validate_scopes __method__, options
-                elsif options[:multiple_scopes] == true
+                elsif options[:multiple_scopes]
                     results = {}
                     options[:scope].each do |scope|
                         results[scope] = favorited.unblocked.send(scope + '_list').count
@@ -35,7 +35,7 @@ module ActsAsFavoritor #:nodoc:
                 if options.has_key?(:multiple_scopes) == false
                     options[:parameter] = favoritor_type
                     validate_scopes __method__, options
-                elsif options[:multiple_scopes] == true
+                elsif options[:multiple_scopes]
                     results = {}
                     options[:scope].each do |scope|
                         favorites = favoritor_type.constantize.joins(:favorites).where('favorites.blocked': false,
@@ -72,7 +72,7 @@ module ActsAsFavoritor #:nodoc:
                 if options.has_key?(:multiple_scopes) == false
                     options[:parameter] = favoritor_type
                     validate_scopes __method__, options
-                elsif options[:multiple_scopes] == true
+                elsif options[:multiple_scopes]
                     results = {}
                     options[:scope].each do |scope|
                         results[scope] = favorited.unblocked.send(scope + '_list').for_favoritor_type(favoritor_type).count
@@ -104,7 +104,7 @@ module ActsAsFavoritor #:nodoc:
             def blocked_favoritors_count options = {}
                 if options.has_key?(:multiple_scopes) == false
                     validate_scopes __method__, options
-                elsif options[:multiple_scopes] == true
+                elsif options[:multiple_scopes]
                     results = {}
                     options[:scope].each do |scope|
                         results[scope] = favorited.blocked.send(scope + '_list').count
@@ -119,7 +119,7 @@ module ActsAsFavoritor #:nodoc:
             def favoritors_scoped options = {}
                 if options.has_key?(:multiple_scopes) == false
                     validate_scopes __method__, options
-                elsif options[:multiple_scopes] == true
+                elsif options[:multiple_scopes]
                     results = {}
                     options[:scope].each do |scope|
                         results[scope] = favorited.send(scope + '_list').includes :favoritor
@@ -133,16 +133,16 @@ module ActsAsFavoritor #:nodoc:
             def favoritors options = {}
                 if options.has_key?(:multiple_scopes) == false
                     validate_scopes __method__, options
-                elsif options[:multiple_scopes] == true
+                elsif options[:multiple_scopes]
                     results = {}
                     options[:scope].each do |scope|
-                        favoritors_scope = favoritors_scoped(scope).unblocked
+                        favoritors_scope = favoritors_scoped(scope: scope).unblocked
                         favoritors_scope = apply_options_to_scope favoritors_scope, options
                         results[scope] = favoritors_scope.to_a.collect{ |f| f.favoritor }
                     end
                     return results
                 else
-                    favoritors_scope = favoritors_scoped(options[:scope]).unblocked
+                    favoritors_scope = favoritors_scoped(scope: options[:scope]).unblocked
                     favoritors_scope = apply_options_to_scope favoritors_scope, options
                     return favoritors_scope.to_a.collect{ |f| f.favoritor }
                 end
@@ -151,16 +151,16 @@ module ActsAsFavoritor #:nodoc:
             def blocks options = {}
                 if options.has_key?(:multiple_scopes) == false
                     validate_scopes __method__, options
-                elsif options[:multiple_scopes] == true
+                elsif options[:multiple_scopes]
                     results = {}
                     options[:scope].each do |scope|
-                        blocked_favoritors_scope = favoritors_scoped(scope).blocked
+                        blocked_favoritors_scope = favoritors_scoped(scope: scope).blocked
                         blocked_favoritors_scope = apply_options_to_scope blocked_favoritors_scope, options
                         results[scope] = blocked_favoritors_scope.to_a.collect{ |f| f.favoritor }
                     end
                     return results
                 else
-                    blocked_favoritors_scope = favoritors_scoped(options[:scope]).blocked
+                    blocked_favoritors_scope = favoritors_scoped(scope: options[:scope]).blocked
                     blocked_favoritors_scope = apply_options_to_scope blocked_favoritors_scope, options
                     return blocked_favoritors_scope.to_a.collect{ |f| f.favoritor }
                 end
@@ -172,7 +172,7 @@ module ActsAsFavoritor #:nodoc:
                 if options.has_key?(:multiple_scopes) == false
                     options[:parameter] = favoritor
                     validate_scopes __method__, options
-                elsif options[:multiple_scopes] == true
+                elsif options[:multiple_scopes]
                     results = {}
                     options[:scope].each do |scope|
                         results[scope] = favorited.unblocked.send(scope + '_list').for_favoritor(favoritor).first.present?
@@ -187,7 +187,7 @@ module ActsAsFavoritor #:nodoc:
                 if options.has_key?(:multiple_scopes) == false
                     options[:parameter] = favoritor
                     validate_scopes __method__, options
-                elsif options[:multiple_scopes] == true
+                elsif options[:multiple_scopes]
                     results = {}
                     options[:scope].each do |scope|
                         results[scope] = get_favorite_for(favoritor, scope: scope) ? block_existing_favorite(favoritor, scope: scope) : block_future_favorite(favoritor, scope: scope)
@@ -202,14 +202,14 @@ module ActsAsFavoritor #:nodoc:
                 if options.has_key?(:multiple_scopes) == false
                     options[:parameter] = favoritor
                     validate_scopes __method__, options
-                elsif options[:multiple_scopes] == true
+                elsif options[:multiple_scopes]
                     results = {}
                     options[:scope].each do |scope|
-                        results[scope] = get_favorite_for(favoritor, scope: scope).update_attribute :blocked, false
+                        results[scope] = get_favorite_for(favoritor, scope: scope)&.update_attribute :blocked, false
                     end
                     return results
                 else
-                    return get_favorite_for(favoritor, scope: options[:scope]).update_attribute :blocked, false
+                    return get_favorite_for(favoritor, scope: options[:scope])&.update_attribute :blocked, false
                 end
             end
 
@@ -217,7 +217,7 @@ module ActsAsFavoritor #:nodoc:
                 if options.has_key?(:multiple_scopes) == false
                     options[:parameter] = favoritor
                     validate_scopes __method__, options
-                elsif options[:multiple_scopes] == true
+                elsif options[:multiple_scopes]
                     results = {}
                     options[:scope].each do |scope|
                         results[scope] = favorited.send(scope + '_list').for_favoritor(favoritor).first
@@ -234,7 +234,7 @@ module ActsAsFavoritor #:nodoc:
                 if options.has_key?(:multiple_scopes) == false
                     options[:parameter] = favoritor
                     validate_scopes __method__, options
-                elsif options[:multiple_scopes] == true
+                elsif options[:multiple_scopes]
                     results = {}
                     options[:scope].each do |scope|
                         results[scope] = Favorite.create favoritable: self, favoritor: favoritor, blocked: true, scope: scope
@@ -249,7 +249,7 @@ module ActsAsFavoritor #:nodoc:
                 if options.has_key?(:multiple_scopes) == false
                     options[:parameter] = favoritor
                     validate_scopes __method__, options
-                elsif options[:multiple_scopes] == true
+                elsif options[:multiple_scopes]
                     results = {}
                     options[:scope].each do |scope|
                         results[scope] = get_favorite_for(favoritor, scope: scope).block!

data/lib/acts_as_favoritor/favoritor.rb

@@ -20,7 +20,7 @@ module ActsAsFavoritor #:nodoc:
                 if options.has_key?(:multiple_scopes) == false
                     options[:parameter] = favoritable
                     validate_scopes __method__, options
-                elsif options[:multiple_scopes] == true
+                elsif options[:multiple_scopes]
                     results = {}
                     options[:scope].each do |scope|
                         results[scope] = 0 < Favorite.unblocked.send(scope + '_list').for_favoritor(self).for_favoritable(favoritable).count
@@ -35,8 +35,7 @@ module ActsAsFavoritor #:nodoc:
             def favorites_count options = {}
                 if options.has_key?(:multiple_scopes) == false
                     validate_scopes __method__, options
-                elsif options[:multiple_scopes] == true
-                    raise options.to_s
+                elsif options[:multiple_scopes]
                     results = {}
                     options[:scope].each do |scope|
                         results[scope] = Favorite.unblocked.send(scope + '_list').for_favoritor(self).count
@@ -53,7 +52,7 @@ module ActsAsFavoritor #:nodoc:
                 if options.has_key?(:multiple_scopes) == false
                     options[:parameter] = favoritable
                     validate_scopes __method__, options
-                elsif options[:multiple_scopes] == true
+                elsif options[:multiple_scopes]
                     results = {}
                     options[:scope].each do |scope|
                         if self != favoritable && scope != 'all'
@@ -75,16 +74,16 @@ module ActsAsFavoritor #:nodoc:
                 if options.has_key?(:multiple_scopes) == false
                     options[:parameter] = favoritable
                     validate_scopes __method__, options
-                elsif options[:multiple_scopes] == true
+                elsif options[:multiple_scopes]
                     results = {}
                     options[:scope].each do |scope|
-                        if favorite = get_favorite(favoritable).send(scope + '_list')
+                        if favorite = get_favorite(favoritable)&.send(scope + '_list')
                             results[scope] = favorite.destroy
                         end
                     end
                     return results
                 else
-                    if favorite = get_favorite(favoritable).send(options[:scope] + '_list')
+                    if favorite = get_favorite(favoritable)&.send(options[:scope] + '_list')
                         return favorite.destroy
                     end
                 end
@@ -94,7 +93,7 @@ module ActsAsFavoritor #:nodoc:
             def favorites_scoped options = {}
                 if options.has_key?(:multiple_scopes) == false
                     validate_scopes __method__, options
-                elsif options[:multiple_scopes] == true
+                elsif options[:multiple_scopes]
                     results = {}
                     options[:scope].each do |scope|
                         results[scope] = favorites.unblocked.send(scope + '_list').includes :favoritable
@@ -110,15 +109,15 @@ module ActsAsFavoritor #:nodoc:
                 if options.has_key?(:multiple_scopes) == false
                     options[:parameter] = favoritable_type
                     validate_scopes __method__, options
-                elsif options[:multiple_scopes] == true
+                elsif options[:multiple_scopes]
                     results = {}
                     options[:scope].each do |scope|
-                        favorites_scope = favorites_scoped(scope).for_favoritable_type favoritable_type
+                        favorites_scope = favorites_scoped(scope: scope).for_favoritable_type favoritable_type
                         results[scope] = favorites_scope = apply_options_to_scope favorites_scope, options
                     end
                     return results
                 else
-                    favorites_scope = favorites_scoped(options[:scope]).for_favoritable_type favoritable_type
+                    favorites_scope = favorites_scoped(scope: options[:scope]).for_favoritable_type favoritable_type
                     return favorites_scope = apply_options_to_scope(favorites_scope, options)
                 end
             end
@@ -127,15 +126,15 @@ module ActsAsFavoritor #:nodoc:
             def all_favorites options = {}
                 if options.has_key?(:multiple_scopes) == false
                     validate_scopes __method__, options
-                elsif options[:multiple_scopes] == true
+                elsif options[:multiple_scopes]
                     results = {}
                     options[:scope].each do |scope|
-                        favorites_scope = favorites_scoped scope
+                        favorites_scope = favorites_scoped scope: scope
                         results[scope] = favorites_scope = apply_options_to_scope favorites_scope, options
                     end
                     return results
                 else
-                    favorites_scope = favorites_scoped options[:scope]
+                    favorites_scope = favorites_scoped scope: options[:scope]
                     return favorites_scope = apply_options_to_scope(favorites_scope, options)
                 end
             end
@@ -150,7 +149,7 @@ module ActsAsFavoritor #:nodoc:
                 if options.has_key?(:multiple_scopes) == false
                     options[:parameter] = favoritable_type
                     validate_scopes __method__, options
-                elsif options[:multiple_scopes] == true
+                elsif options[:multiple_scopes]
                     results = {}
                     options[:scope].each do |scope|
                         favoritables = favoritable_type.constantize.joins(:favorited).where('favorites.blocked': false,
@@ -187,7 +186,7 @@ module ActsAsFavoritor #:nodoc:
                 if options.has_key?(:multiple_scopes) == false
                     options[:parameter] = favoritable_type
                     validate_scopes __method__, options
-                elsif options[:multiple_scopes] == true
+                elsif options[:multiple_scopes]
                     results = {}
                     options[:scope].each do |scope|
                         results[scope] = favorites.unblocked.send(scope + '_list').for_favoritable_type(favoritable_type).count
@@ -221,7 +220,7 @@ module ActsAsFavoritor #:nodoc:
                 if options.has_key?(:multiple_scopes) == false
                     options[:parameter] = favoritable
                     validate_scopes __method__, options
-                elsif options[:multiple_scopes] == true
+                elsif options[:multiple_scopes]
                     results = {}
                     options[:scope].each do |scope|
                         results[scope] = favorites.unblocked.send(scope + '_list').for_favoritable(favoritable).first

data/lib/acts_as_favoritor/favoritor_lib.rb

@@ -39,9 +39,9 @@ module ActsAsFavoritor
         def validate_scopes method, options = {}
             options[:scope] = options[:scope] || ActsAsFavoritor.default_scope
             if options[:scope].size > 1
-                options[:multiple_scopes] = true
+                options[:multiple_scopes] = false # ?
             else
-                options[:multiple_scopes] = false
+                options[:multiple_scopes] = true # ?
                 options[:scope] = options[:scope][0]
             end
             if options.has_key? :parameter

data/lib/acts_as_favoritor/version.rb

@@ -1,5 +1,5 @@
 module ActsAsFavoritor
 
-    VERSION = '1.1.2'
+    VERSION = '1.1.3'
 
 end

data/lib/generators/acts_as_favoritor_generator.rb

@@ -19,6 +19,7 @@ class ActsAsFavoritorGenerator < Rails::Generators::Base
     end
 
     def create_migration_file
+        @rails_version = Rails::VERSION::STRING[0..2].to_f
         migration_template 'migration.rb.erb', 'db/migrate/acts_as_favoritor_migration.rb'
     end
 

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

@@ -1,4 +1,4 @@
-class ActsAsFavoritorMigration < ActiveRecord::Migration<% if Rails::VERSION::MAJOR >= 5 %>[Rails::VERSION::STRING[0..2].to_f]<% end %>
+class ActsAsFavoritorMigration < ActiveRecord::Migration<% if Rails::VERSION::MAJOR >= 5 %>[<%= @rails_version %>]<% end %>
     def self.up
         create_table :favorites, force: true do |t|
             t.references :favoritable, polymorphic: true, null: false

data/test/acts_as_favoritable_test.rb

@@ -234,8 +234,8 @@ class ActsAsFavoritableTest < ActiveSupport::TestCase
             end
 
             should 'return the favoritors for given type' do
-                assert_equal @sam.favorites_by_type('Band').first.favoritable, @green_day.becomes(Band)
-                assert_equal @sam.favorites_by_type('Band').second.favoritable, @blink_182.becomes(Band)
+                assert_equal @sam.favorites_by_type('Band').first&.favoritable, @green_day.becomes(Band)
+                assert_equal @sam.favorites_by_type('Band').second&.favoritable, @blink_182.becomes(Band)
                 assert @green_day.favoritors_by_type('User').include?(@sam)
                 assert @blink_182.favoritors_by_type('User').include?(@sam)
             end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: acts_as_favoritor
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.1.3
 platform: ruby
 authors:
 - Jonas Hübotter
@@ -185,7 +185,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.0'
+      version: '2.3'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="