acts_as_favoritor 2.1.2 → 3.0.0

data/lib/acts_as_favoritor/favoritor_lib.rb

@@ -8,41 +8,26 @@ module ActsAsFavoritor
 
     # Retrieves the parent class name if using STI.
     def parent_class_name(obj)
-      unless parent_classes.include? obj.class.superclass
+      unless DEFAULT_PARENTS.include? obj.class.superclass
         return obj.class.base_class.name
       end
 
       obj.class.name
     end
 
-    def apply_options_to_scope(scope, options = {})
-      scope = scope.limit(options[:limit]) if options.key?(:limit)
-      scope = scope.includes(options[:includes]) if options.key?(:includes)
-      scope = scope.joins(options[:joins]) if options.key?(:joins)
-      scope = scope.where(options[:where]) if options.key?(:where)
-      scope = scope.order(options[:order]) if options.key?(:order)
-      scope
-    end
+    def build_result_for_scopes(scopes)
+      return if scopes.empty?
+
+      scopes = sanitized_scopes(scopes)
+      result = scopes.map { |scope| [scope, yield(scope)] }.to_h
+
+      return result[scopes.first] if scopes.size == 1
 
-    def parent_classes
-      DEFAULT_PARENTS
+      result
     end
 
-    def validate_scopes(method, options = {})
-      options[:scope] ||= [ActsAsFavoritor.configuration.default_scope]
-      if options[:scope].size > 1
-        options[:multiple_scopes] = true
-      else
-        options[:multiple_scopes] = false
-        options[:scope] = options[:scope][0]
-      end
-      if options.key? :parameter
-        parameter = options[:parameter]
-        options.delete :parameter
-        send(method, parameter, options)
-      else
-        send(method, options)
-      end
+    def sanitized_scopes(scopes)
+      scopes.map(&:to_sym)
     end
   end
 end

data/lib/acts_as_favoritor/version.rb

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

data/lib/generators/templates/model.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-class Favorite < ActiveRecord::Base
+class Favorite < ApplicationRecord
   extend ActsAsFavoritor::FavoritorLib
   extend ActsAsFavoritor::FavoriteScopes
 

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: acts_as_favoritor
 version: !ruby/object:Gem::Version
-  version: 2.1.2
+  version: 3.0.0
 platform: ruby
 authors:
 - Jonas Hübotter
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-05-03 00:00:00.000000000 Z
+date: 2019-05-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '5.2'
+        version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '5.2'
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: factory_bot
   requirement: !ruby/object:Gem::Requirement
@@ -42,18 +42,18 @@ dependencies:
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '5.2'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '5.2'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: rubocop
+  name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -67,7 +67,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: shoulda
+  name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -81,7 +81,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: shoulda_create
+  name: rubocop-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="