effective_trash 0.3.2 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: fd64b9818e00706023f8e7756ceaa5dcdfd6ef01
-  data.tar.gz: afd0d089858ce9067dfc015e4df141d55f808411
+SHA256:
+  metadata.gz: 9af7c36500a43728404435cf41766d2b49835ded249048d04302eb99f76e55aa
+  data.tar.gz: 5e943b5ddf135a9bd2c93bf4c7e1e05e3cb3a20996b53d4afe2e64f271729b7b
 SHA512:
-  metadata.gz: b6c67bc50bda291c33831e20fc0a2680929abe593d2d6515a2311ff9867cb6492901a159467b4e3261bf326488d4432516c3548f92d3a3fd43fba8a85484dc72
-  data.tar.gz: 9b5d9185ff36a93efacd8eca43777901e89ce07dfad4cbe19f1747edd4fc086b0656ac080f6a049d6dfdb8709d71dd5b923fef20c6252d0a5ab89d0c92da6028
+  metadata.gz: 75c2bce4d510729ac5a54d584dc8ef645d6fde9d819014d1ac346190a453a4a37c696a3493751481f43461b616df5597088c5400c14dd45f096753d5a296c9a8
+  data.tar.gz: b3050933b150df392b026c14312b5b063c0579442e682d2794d27af924bc5aa53f82990f24d79a6becacc0f3e3188c41d80f8ab40f0cb72fc308a55f4754c3c0

data/app/controllers/admin/trash_controller.rb

@@ -11,16 +11,16 @@ module Admin
 
       @page_title = 'Trash'
 
-      EffectiveTrash.authorize!(self, :index, Effective::Trash)
-      EffectiveTrash.authorize!(self, :admin, :effective_trash)
+      EffectiveResources.authorize!(self, :index, Effective::Trash)
+      EffectiveResources.authorize!(self, :admin, :effective_trash)
     end
 
     def show
       @trash = Effective::Trash.all.find(params[:id])
       @page_title = "Trash item - #{@trash.trashed_to_s}"
 
-      EffectiveTrash.authorize!(self, :show, @trash)
-      EffectiveTrash.authorize!(self, :admin, :effective_trash)
+      EffectiveResources.authorize!(self, :show, @trash)
+      EffectiveResources.authorize!(self, :admin, :effective_trash)
     end
   end
 end

data/app/controllers/effective/trash_controller.rb

@@ -8,7 +8,7 @@ module Effective
 
       @page_title = 'Trash'
 
-      EffectiveTrash.authorize!(self, :index, Effective::Trash.new(user_id: current_user.id))
+      EffectiveResources.authorize!(self, :index, Effective::Trash.new(user_id: current_user.id))
     end
 
     # This is the User show event
@@ -16,12 +16,12 @@ module Effective
       @trash = Effective::Trash.where(user_id: current_user.id).find(params[:id])
       @page_title = "Trash item - #{@trash.to_s}"
 
-      EffectiveTrash.authorize!(self, :show, @trash)
+      EffectiveResources.authorize!(self, :show, @trash)
     end
 
     def restore
       @trash = Effective::Trash.find(params[:id])
-      EffectiveTrash.authorize!(self, :update, @trash)
+      EffectiveResources.authorize!(self, :update, @trash)
 
       Effective::Trash.transaction do
         begin

data/app/models/concerns/acts_as_trashable.rb

@@ -6,7 +6,11 @@ module ActsAsTrashable
       @acts_as_trashable_options = options.try(:first) || {}
 
       unless @acts_as_trashable_options.kind_of?(Hash)
-        raise ArgumentError.new("invalid arguments passed to (effective_trash) acts_as_trashable. Expecting no options.")
+        raise ArgumentError.new("invalid arguments passed to (effective_trash) acts_as_trashable.")
+      end
+
+      if (unknown = (@acts_as_trashable_options.keys - [:only, :except])).present?
+        raise ArgumentError.new("unknown keyword: #{unknown.join(', ')}")
       end
 
       include ::ActsAsTrashable
@@ -22,20 +26,17 @@ module ActsAsTrashable
 
     # Parse Options
     acts_as_trashable_options = {
-      only: Array(@acts_as_trashable_options[:only]).map { |attribute| attribute.to_s },
-      except: Array(@acts_as_trashable_options[:except]).map { |attribute| attribute.to_s },
-      additionally: Array(@acts_as_trashable_options[:additionally]).map { |attribute| attribute.to_s },
-      include_associated: @acts_as_trashable_options.fetch(:include_associated, true),
-      include_nested: @acts_as_trashable_options.fetch(:include_nested, true)
+      only: Array(@acts_as_trashable_options[:only]),
+      except: Array(@acts_as_trashable_options[:except]),
     }
 
     self.send(:define_method, :acts_as_trashable_options) { acts_as_trashable_options }
   end
 
   module ClassMethods
+    def acts_as_trashable?; true; end
   end
 
   # Regular instance methods
 
 end
-

data/config/effective_trash.rb

@@ -2,27 +2,6 @@ EffectiveTrash.setup do |config|
   # Configure Database Table
   config.trash_table_name = :trash
 
-  # Authorization Method
-  #
-  # This method is called by all controller actions with the appropriate action and resource
-  # If the method returns false, an Effective::AccessDenied Error will be raised (see README.md for complete info)
-  #
-  # Use via Proc (and with CanCan):
-  # config.authorization_method = Proc.new { |controller, action, resource| can?(action, resource) }
-  #
-  # Use via custom method:
-  # config.authorization_method = :my_authorization_method
-  #
-  # And then in your application_controller.rb:
-  #
-  # def my_authorization_method(action, resource)
-  #   current_user.is?(:admin)
-  # end
-  #
-  # Or disable the check completely:
-  # config.authorization_method = false
-  config.authorization_method = Proc.new { |controller, action, resource| authorize!(action, resource) } # CanCanCan
-
   # Admin Screens Layout Settings
   config.layout = 'application'   # All EffectiveTrash controllers will use this layout
 

data/lib/effective_trash/version.rb

@@ -1,3 +1,3 @@
 module EffectiveTrash
-  VERSION = '0.3.2'.freeze
+  VERSION = '0.4.0'.freeze
 end

data/lib/effective_trash.rb

@@ -4,33 +4,13 @@ require 'effective_trash/version'
 
 module EffectiveTrash
 
-  # The following are all valid config keys
-  mattr_accessor :trash_table_name
-
-  mattr_accessor :authorization_method
-  mattr_accessor :layout
-  mattr_accessor :routes_enabled
-
-  def self.setup
-    yield self
+  def self.config_keys
+    [
+      :trash_table_name, :layout, :routes_enabled
+    ]
   end
 
-  def self.authorized?(controller, action, resource)
-    @_exceptions ||= [Effective::AccessDenied, (CanCan::AccessDenied if defined?(CanCan)), (Pundit::NotAuthorizedError if defined?(Pundit))].compact
-
-    return !!authorization_method unless authorization_method.respond_to?(:call)
-    controller = controller.controller if controller.respond_to?(:controller)
-
-    begin
-      !!(controller || self).instance_exec((controller || self), action, resource, &authorization_method)
-    rescue *@_exceptions
-      false
-    end
-  end
-
-  def self.authorize!(controller, action, resource)
-    raise Effective::AccessDenied unless authorized?(controller, action, resource)
-  end
+  include EffectiveGem
 
   # This is set by the "set_effective_trash_current_user" before_filter.
   def self.current_user=(user)
@@ -44,18 +24,15 @@ module EffectiveTrash
   # Trash it - Does not delete the original object.
   # This is run in a before_destroy, or through a script.
   def self.trash!(obj)
-    args = if obj.respond_to?(:acts_as_trashable_options)
-      obj.acts_as_trashable_options.slice(:include_associated, :include_nested)
-    else
-      { include_associated: true, include_nested: true }
-    end
+    args = (obj.respond_to?(:acts_as_trashable_options) ? obj.acts_as_trashable_options : {})
+    details = Effective::Resource.new(obj).instance_attributes(only: args[:only], except: args[:except])
 
     trash = Effective::Trash.new(
       trashed: obj,
       user: EffectiveTrash.current_user,
       trashed_to_s: obj.to_s,
-      trashed_extra: (trashed_extra if obj.respond_to?(:trashed_extra)),
-      details: Effective::Resource.new(obj).instance_attributes(args)
+      trashed_extra: obj.try(:trashed_extra),
+      details: details
     ).save!
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_trash
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.4.0
 platform: ruby
 authors:
 - Code and Effect
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-09-19 00:00:00.000000000 Z
+date: 2023-05-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -80,7 +80,6 @@ files:
 - app/datatables/effective_trash_datatable.rb
 - app/helpers/effective_trash_helper.rb
 - app/models/concerns/acts_as_trashable.rb
-- app/models/effective/access_denied.rb
 - app/models/effective/trash.rb
 - app/views/admin/trash/_actions.html.haml
 - app/views/admin/trash/index.html.haml
@@ -102,7 +101,7 @@ homepage: https://github.com/code-and-effect/effective_trash
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -117,9 +116,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.4.5.1
-signing_key: 
+rubygems_version: 3.1.2
+signing_key:
 specification_version: 4
 summary: Trash and Restore any Active Record object.
 test_files: []

data/app/models/effective/access_denied.rb

@@ -1,17 +0,0 @@
-unless defined?(Effective::AccessDenied)
-  module Effective
-    class AccessDenied < StandardError
-      attr_reader :action, :subject
-
-      def initialize(message = nil, action = nil, subject = nil)
-        @message = message
-        @action = action
-        @subject = subject
-      end
-
-      def to_s
-        @message || I18n.t(:'unauthorized.default', :default => 'Access Denied')
-      end
-    end
-  end
-end