effective_trash 0.2.6 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9aa7496caf63e3f09ad0778be9ef6c6b4a8667cd
-  data.tar.gz: af51ec535165f1a72c6f1bcf930f4761033bbed3
+  metadata.gz: 1a76939023ec96d1a1a7616553bb4c985518e1f8
+  data.tar.gz: c1af33bc21f015d7eb486e5ba2b5e068b69bc222
 SHA512:
-  metadata.gz: b8cf68d4f4fb439e7b99d6c687d93ac6def8e81707b26903d0de556defa9098c1953ca0ec2ce40c8d2a05f056f51582b179a799c13f4905c34df20e284deb9b6
-  data.tar.gz: 88dede0f9ca2cb31a9b0a75273fecf8d5db4551768718b0e2c22f89bade54748caa5c3857b3804af2b6550ab507672e19292bc1639fe13d3054006d3620f6960
+  metadata.gz: 0431a81ded3b5a6b0b17a487fe47e9c013f671e1fc0add41a35e60f45e8815dfcc53950cfc7d5d3c29f5a14158aa1bdd1065d569a1cd6ca109c96aa8df20b559
+  data.tar.gz: 89576b17f5547c5949d86edd7eb9d7f78816c861b4a2ae34e66d9860370766234d7e8682aafbc1610cf8414a80aa2553e04ed5f79cc2a3add70f988943ac8a0d

data/MIT-LICENSE

@@ -1,4 +1,4 @@
-Copyright 2017 Code and Effect Inc.
+Copyright 2018 Code and Effect Inc.
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/app/controllers/admin/trash_controller.rb

@@ -2,31 +2,25 @@
 
 module Admin
   class TrashController < ApplicationController
-    respond_to?(:before_action) ? before_action(:authenticate_user!) : before_filter(:authenticate_user!) # Devise
+    before_action :authenticate_user!
 
     layout (EffectiveTrash.layout.kind_of?(Hash) ? EffectiveTrash.layout[:admin_trash] : EffectiveTrash.layout)
 
-    helper EffectiveTrashHelper
-
     def index
-      if Gem::Version.new(EffectiveDatatables::VERSION) < Gem::Version.new('3.0')
-        @datatable = Effective::Datatables::Trash.new
-      else
-        @datatable = EffectiveTrashDatatable.new(self)
-      end
+      @datatable = EffectiveTrashDatatable.new(self)
 
       @page_title = 'Trash'
 
-      EffectiveTrash.authorized?(self, :index, Effective::Trash)
-      EffectiveTrash.authorized?(self, :admin, :effective_trash)
+      EffectiveTrash.authorize!(self, :index, Effective::Trash)
+      EffectiveTrash.authorize!(self, :admin, :effective_trash)
     end
 
     def show
       @trash = Effective::Trash.all.find(params[:id])
       @page_title = "Trash item - #{@trash.trashed_to_s}"
 
-      EffectiveTrash.authorized?(self, :show, @trash)
-      EffectiveTrash.authorized?(self, :admin, :effective_trash)
+      EffectiveTrash.authorize!(self, :show, @trash)
+      EffectiveTrash.authorize!(self, :admin, :effective_trash)
     end
   end
 end

data/app/controllers/effective/trash_controller.rb

@@ -1,23 +1,14 @@
 module Effective
   class TrashController < ApplicationController
-    if respond_to?(:before_action) # Devise
-      before_action :authenticate_user!
-    else
-      before_filter :authenticate_user!
-    end
+    before_action :authenticate_user!
 
     # This is the User index event
     def index
-
-      if Gem::Version.new(EffectiveDatatables::VERSION) < Gem::Version.new('3.0')
-        @datatable = Effective::Datatables::Trash.new(user_id: current_user.id)
-      else
-        @datatable = EffectiveTrashDatatable.new(self, user_id: current_user.id)
-      end
+      @datatable = EffectiveTrashDatatable.new(self, user_id: current_user.id)
 
       @page_title = 'Trash'
 
-      EffectiveTrash.authorized?(self, :index, Effective::Trash.new(user_id: current_user.id))
+      EffectiveTrash.authorize!(self, :index, Effective::Trash.new(user_id: current_user.id))
     end
 
     # This is the User show event
@@ -25,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.authorized?(self, :show, @trash)
+      EffectiveTrash.authorize!(self, :show, @trash)
     end
 
     def restore
-      @trash = Effective::Trash.all.find(params[:id])
-      EffectiveTrash.authorized?(self, :update, @trash)
+      @trash = Effective::Trash.find(params[:id])
+      EffectiveTrash.authorize!(self, :update, @trash)
 
       Effective::Trash.transaction do
         begin
@@ -42,7 +33,12 @@ module Effective
         end
       end
 
-      redirect_back(fallback_location: effective_trash.trash_path)
+      if request.referer.to_s.include?(effective_trash.admin_trash_index_path)
+        redirect_to effective_trash.admin_trash_index_path
+      else
+        redirect_to effective_trash.trash_index_path
+      end
+
     end
 
   end

data/app/datatables/effective_trash_datatable.rb

@@ -1,47 +1,45 @@
-unless Gem::Version.new(EffectiveDatatables::VERSION) < Gem::Version.new('3.0')
-  class EffectiveTrashDatatable < Effective::Datatable
-    datatable do
-      order :created_at, :desc
+class EffectiveTrashDatatable < Effective::Datatable
+  datatable do
+    order :created_at, :desc
 
-      col :created_at, label: 'Destroyed at'
-      col :id, visible: false
+    col :created_at, label: 'Destroyed at'
+    col :id, visible: false
 
-      unless attributes[:user_id] || attributes[:user] || (attributes[:user] == false)
-        col :user, label: 'Destroyed by'
-      end
-
-      col :trashed_type, label: 'Type'
-      col :trashed_id, label: 'Original Id', visible: false
-      col :trashed_to_s, label: 'Item'
+    unless attributes[:user_id] || attributes[:user] || (attributes[:user] == false)
+      col :user, label: 'Destroyed by'
+    end
 
-      col :details, visible: false do |trash|
-        tableize_hash(trash.details)
-      end
+    col :trashed_type, label: 'Type'
+    col :trashed_id, label: 'Original Id', visible: false
+    col :trashed_to_s, label: 'Item'
 
-      unless attributes[:actions] == false
-        actions_col partial: 'admin/trash/actions', partial_as: :trash
-      end
+    col :details, visible: false do |trash|
+      tableize_hash(trash.details)
     end
 
-    # A nil attributes[:log_id] means give me all the top level log entries
-    # If we set a log_id then it's for sub trash
-    collection do
-      collection = Effective::Trash.all.includes(:user)
+    unless attributes[:actions] == false
+      actions_col partial: 'admin/trash/actions', partial_as: :trash
+    end
+  end
 
-      if attributes[:user_id].present?
-        collection = collection.where(user_id: attributes[:user_id])
-      end
+  # A nil attributes[:log_id] means give me all the top level log entries
+  # If we set a log_id then it's for sub trash
+  collection do
+    collection = Effective::Trash.deep.all
 
-      if attributes[:user].present?
-        collection = collection.where(user: attributes[:user])
-      end
+    if attributes[:user_id].present?
+      collection = collection.where(user_id: attributes[:user_id])
+    end
 
-      if attributes[:trashed_id] && attributes[:trashed_type]
-        collection = collection.where(trashed_id: attributes[:trashed_id], trashed_type: attributes[:trashed_type])
-      end
+    if attributes[:user].present?
+      collection = collection.where(user: attributes[:user])
+    end
 
-      collection
+    if attributes[:trashed_id] && attributes[:trashed_type]
+      collection = collection.where(trashed_id: attributes[:trashed_id], trashed_type: attributes[:trashed_type])
     end
 
+    collection
   end
+
 end

data/app/helpers/effective_trash_helper.rb

@@ -1,7 +1,7 @@
 module EffectiveTrashHelper
 
   def render_trash(trash)
-    render(partial: 'effective/trash/trash', locals: {trash: trash})
+    render(partial: 'effective/trash/trash', locals: { trash: trash })
   end
 
 end

data/app/models/effective/trash.rb

@@ -3,7 +3,7 @@ module Effective
     self.table_name = EffectiveTrash.trash_table_name.to_s
 
     belongs_to :trashed, polymorphic: true  # The original item type and id. Note that this object will never exist as it's deleted.
-    belongs_to :user, optional: true  # The user that destroyed the original resource
+    belongs_to :user # The user that destroyed the original resource
 
     # Attributes
     # trashed_type       :string
@@ -16,7 +16,8 @@ module Effective
 
     serialize :details, Hash
 
-    default_scope -> { order(updated_at: :desc) }
+    scope :deep, -> { includes(:user, :trashed) }
+    scope :sorted, -> { order(:id) }
 
     def to_s
       trashed_to_s.presence || [trashed_type, trashed_id].join(' ').presence || 'New Trash item'
@@ -49,6 +50,7 @@ module Effective
     # When we delete ourselves, we restore this trash item first
     def restore!
       to_object.save!(validate: false)
+      destroy!
     end
 
   end

data/app/views/admin/trash/_actions.html.haml

@@ -1,15 +1,11 @@
-:ruby
-  show_path =
-    if datatable.try(:admin_namespace?)
-      effective_trash.admin_trash_path(trash)
-    elsif datatables_admin_path?
-      effective_trash.admin_trash_path(trash)
-    else
-      effective_trash.trash_path(trash)
-    end
+- show_path = (datatable.admin_namespace? ? effective_trash.admin_trash_path(trash) : effective_trash.trash_path(trash))
 
-= link_to show_path, title: 'view' do
-  %span.glyphicon.glyphicon-eye-open
+- if defined?(EffectiveBootstrap)
+  = show_icon_to(show_path)
+  = icon_to('repeat', effective_trash.restore_trash_path(trash), title: 'Restore', data: { confirm: 'Restore this item?'})
+- else
+  = link_to show_path, title: 'view' do
+    %span.glyphicon.glyphicon-eye-open
 
-= link_to effective_trash.restore_trash_path(trash), title: 'Restore', data: {confirm: 'Restore this item?'} do
-  %span.glyphicon.glyphicon-retweet
+  = link_to effective_trash.restore_trash_path(trash), title: 'Restore', data: {confirm: 'Restore this item?'} do
+    %span.glyphicon.glyphicon-retweet

data/app/views/effective/trash/_trash.html.haml

@@ -1,7 +1,12 @@
-.panel.panel-default
-  .panel-body
-    %p= trash.trashed_to_s
+.panel.panel-default.card
+  .panel-heading.card-header
+    .row
+      .col-md-10
+        %p= trash.trashed_to_s
+      .col-md-2.text-right
+        = link_to 'Restore', effective_trash.restore_trash_path(trash), class: 'btn btn-primary', data: { confirm: 'Restore this item?'}
 
+  .panel-body.card-body
     - if trash.trashed_extra.present?
       %p= trash.trashed_extra
 

data/app/views/effective/trash/index.html.haml

@@ -1,6 +1,3 @@
 %h1.effective-heading= @page_title
 
-- if @datatable.present?
-  = render_datatable(@datatable)
-- else
-  %p You have no previously trashed items
+= render_datatable(@datatable)

data/lib/effective_trash/set_current_user.rb

@@ -2,12 +2,11 @@ module EffectiveTrash
   module SetCurrentUser
     module ActionController
 
+      # Add me to your ApplicationController
+      # before_action :set_effective_trash_current_user
+
       def set_effective_trash_current_user
-        if respond_to?(:current_user)
-          EffectiveTrash.current_user = current_user
-        else
-          raise "(effective_trash) set_effective_trash_current_user expects a current_user() method to be available"
-        end
+        EffectiveTrash.current_user = current_user
       end
 
     end

data/lib/effective_trash/version.rb

@@ -1,3 +1,3 @@
 module EffectiveTrash
-  VERSION = '0.2.6'.freeze
+  VERSION = '0.3.0'.freeze
 end

data/lib/effective_trash.rb

@@ -16,10 +16,20 @@ module EffectiveTrash
   end
 
   def self.authorized?(controller, action, resource)
-    if authorization_method.respond_to?(:call) || authorization_method.kind_of?(Symbol)
-      raise Effective::AccessDenied.new() unless (controller || self).instance_exec(controller, action, resource, &authorization_method)
+    @_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
-    true
+  end
+
+  def self.authorize!(controller, action, resource)
+    raise Effective::AccessDenied unless authorized?(controller, action, resource)
   end
 
   # This is set by the "set_effective_trash_current_user" before_filter.

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_trash
 version: !ruby/object:Gem::Version
-  version: 0.2.6
+  version: 0.3.0
 platform: ruby
 authors:
 - Code and Effect
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-07 00:00:00.000000000 Z
+date: 2018-03-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.2.0
+        version: 4.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.2.0
+        version: 4.0.0
 - !ruby/object:Gem::Dependency
   name: effective_datatables
   requirement: !ruby/object:Gem::Requirement
@@ -52,20 +52,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: coffee-rails
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: devise
   requirement: !ruby/object:Gem::Requirement
@@ -95,7 +81,6 @@ files:
 - app/helpers/effective_trash_helper.rb
 - app/models/concerns/acts_as_trashable.rb
 - app/models/effective/access_denied.rb
-- app/models/effective/datatables/trash.rb
 - app/models/effective/trash.rb
 - app/views/admin/trash/_actions.html.haml
 - app/views/admin/trash/index.html.haml

data/app/models/effective/datatables/trash.rb

@@ -1,53 +0,0 @@
-if Gem::Version.new(EffectiveDatatables::VERSION) < Gem::Version.new('3.0')
-  module Effective
-    module Datatables
-      class Trash < Effective::Datatable
-        include EffectiveTrashHelper
-
-        datatable do
-          default_order :created_at, :desc
-
-          table_column :created_at, label: 'Destroyed at'
-          table_column :id, visible: false
-
-          unless attributes[:user_id] || attributes[:user] || (attributes[:user] == false)
-            table_column :user, label: 'Destroyed by'
-          end
-
-          table_column :trashed_type, label: 'Type'
-          table_column :trashed_id, label: 'Original Id', visible: false
-          table_column :trashed_to_s, label: 'Item'
-
-          table_column :details, visible: false, sortable: false do |trash|
-            tableize_hash(trash.details, th: true, sub_th: false, width: '100%')
-          end
-
-          unless attributes[:actions] == false
-            actions_column partial: 'admin/trash/actions', partial_local: :trash
-          end
-        end
-
-        # A nil attributes[:log_id] means give me all the top level log entries
-        # If we set a log_id then it's for sub trash
-        def collection
-          collection = Effective::Trash.all.includes(:user)
-
-          if attributes[:user_id].present?
-            collection = collection.where(user_id: attributes[:user_id])
-          end
-
-          if attributes[:user].present?
-            collection = collection.where(user: attributes[:user])
-          end
-
-          if attributes[:trashed_id] && attributes[:trashed_type]
-            collection = collection.where(trashed_id: attributes[:trashed_id], trashed_type: attributes[:trashed_type])
-          end
-
-          collection
-        end
-
-      end
-    end
-  end
-end