effective_storage 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f43ada6fb79a20117caa0e82a3a2853852e4db3e38c80bf6278b539b05fcdb3a
-  data.tar.gz: b727658f31266edf3646e8f6658b0b16c9b524439efd034caa83438e5c5a88a3
+  metadata.gz: e6b647a6cc8602078845e0112be3346f284705778fd081694deacf161a7ebf91
+  data.tar.gz: 1340ad269815fc10141936f997da57860a30ecdbb760658706fc84cb69281d64
 SHA512:
-  metadata.gz: e0d0f65d241af25b65e7e326a908614e4d439126edd464a15449a4a2d93a7cf2e5539cd5929b98902f1e346ac3854ceb86e690af0a312b79a97aa19b960c90ab
-  data.tar.gz: d6c1f5c005c079b9a3af3347c5f4fa590ddb4c788890683220b2202b2f574e82bedfde51d2b34964ea4e4359baf105f1af6dab1e4dc85a5a8a0ba26b231223c0
+  metadata.gz: 9c28337427ce9d4ef0782cf951a2b1bb6e5004b7ef3f4f7df842dfe54e2dc5dfe1578576a03d38bb55de85f0c504a5c1896b586a7f57f9c16768d75504f42f93
+  data.tar.gz: 307df9a832e70ae1709b0a24e6d665e1de1fedbad5d21d1b4347d8976ead29acd39682ffaac5eb83d0adc66f21c077139721df5d0e9707391b0996775e4c859e

data/README.md

@@ -61,14 +61,23 @@ All authorization checks are handled via the effective_resources gem found in th
 The permissions you actually want to define are as follows (using CanCan):
 
 ```ruby
-can(:show, ActiveStorage::Attachment) { |attachment| attachment.permission_public? }
+# Allow anyone to download a public file
+can(:show, ActiveStorage::Blob) { |blob| blob.permission_public? }
 
 if user.persisted?
 end
 
 if user.admin?
+  # This allows the admin to download any file
+  can :show, ActiveStorage::Blob
+
+  # Allows them to see the index screen
   can :admin, :effective_storage
-  can :index, ActiveStorage::Attachment
+  can :index, ActiveStorage::Blob
+
+  # Admin screen actions
+  can(:mark_inherited, ActiveStorage::Blob) { |blob| !blob.permission_inherited? }
+  can(:mark_public, ActiveStorage::Blob) { |blob| !blob.permission_public? }
 end
 ```
 

data/app/controllers/admin/storage_controller.rb

@@ -6,15 +6,7 @@ module Admin
     include Effective::CrudController
 
     page_title 'Storage'
-
-    resource_scope -> { ActiveStorage::Attachment.all }
+    resource_scope -> { ActiveStorage::Blob.all }
     datatable -> { Admin::EffectiveStorageDatatable.new }
-
-    private
-
-    def permitted_params
-      params.require(:active_storage_extension).permit!
-    end
-
   end
 end

data/app/controllers/effective/storage_controller.rb

@@ -0,0 +1,12 @@
+module Effective
+  class StorageController < ApplicationController
+    include Effective::CrudController
+
+    resource_scope -> { ActiveStorage::Blob.all }
+
+    before_action(if: -> { params.key?(:id) }) do
+      @blob = ActiveStorage::Blob.find_signed(params[:id])
+    end
+
+  end
+end

data/app/datatables/admin/effective_storage_datatable.rb

@@ -1,62 +1,86 @@
 module Admin
   class EffectiveStorageDatatable < Effective::Datatable
-    datatable do
-      order :created_at
+    filters do
+      scope :all
+      scope :attached
+      scope :unattached
+    end
 
+    datatable do
       col :created_at, as: :date
-      col :updated_at, visible: false
+
       col :id, visible: false
+      col :key, visible: false
 
-      col :record_type, visible: false
-      col :record_id, label: 'Record Id', visible: false
+      col :record_type, visible: false do |blob|
+        blob.attachments.map do |attachment|
+          content_tag(:div, attachment.record_type, class: 'col-resource_item')
+        end.join.html_safe
+      end
+
+      col :record_id, visible: false do |blob|
+        blob.attachments.map do |attachment|
+          content_tag(:div, attachment.record_id, class: 'col-resource_item')
+        end.join.html_safe
+      end
 
-      col :related_type, visible: false do |attachment|
-        attachment.record.try(:record_type)
+      col :related_type, visible: false do |blob|
+        blob.attachments.map do |attachment|
+          content_tag(:div, attachment.record.try(:record_type), class: 'col-resource_item')
+        end.join.html_safe
       end
 
-      col :related_id, label: 'Related Id', visible: false do |attachment|
-        attachment.record.try(:record_id)
+      col :related_id, visible: false, label: 'Related Id' do |blob|
+        blob.attachments.map do |attachment|
+          content_tag(:div, attachment.record.try(:record_id), class: 'col-resource_item')
+        end.join.html_safe
       end
 
-      col :resource_type do |attachment|
-        attachment.record.try(:record_type) || attachment.record_type
+      col :resource_type do |blob|
+        blob.attachments.map do |attachment|
+          content_tag(:div, class: 'col-resource_item') do
+            (attachment.record.try(:record_type) || attachment.record_type)
+          end
+        end.join.html_safe
       end
 
-      col :resource do |attachment|
-        record = attachment.record
-        record = attachment.record.record if record.respond_to?(:record) # ActionText::RichText will
+      col :resource do |blob|
+        blob.attachments.map do |attachment|
+          content_tag(:div, class: 'col-resource_item') do
+            record = attachment.record
+            record = attachment.record.record if record.respond_to?(:record) # ActionText::RichText will
 
-        url = Effective::Resource.new(record, namespace: :admin).action_path(:edit)
-        link_to(record, url, target: '_blank') if url
+            url = Effective::Resource.new(record, namespace: :admin).action_path(:edit)
+            link_to(record, url, target: '_blank') if url
+          end
+        end.join.html_safe
       end
 
-      col :filename, label: 'File' do |attachment|
+      col :filename, label: 'File' do |blob|
         content_tag(:div, class: 'col-resource_item') do
-          link_to(attachment.blob.filename, url_for(attachment.blob), target: '_blank')
+          link_to(blob.filename, url_for(blob), target: '_blank')
         end
       end
 
-      col :permission, search: Effective::ActiveStorageExtension::PERMISSIONS do |attachment|
-        if attachment.permission_public?
-          content_tag(:span, attachment.permission, class: 'badge badge-warning')
+      col :permission, search: Effective::ActiveStorageExtension::PERMISSIONS do |blob|
+        if blob.permission_public?
+          content_tag(:span, blob.permission, class: 'badge badge-warning')
         else
-          content_tag(:span, attachment.permission, class: 'badge badge-info')
+          content_tag(:span, blob.permission, class: 'badge badge-info')
         end
       end
 
-      col :content_type do |attachment|
-        attachment.blob.content_type
-      end
+      col :content_type
 
-      col :byte_size do |attachment|
-        number_to_human_size(attachment.blob.byte_size)
+      col :byte_size do |blob|
+        number_to_human_size(blob.byte_size)
       end
 
-      actions_col partial: 'admin/storage/datatable_actions', partial_as: :attachment
+      actions_col partial: 'admin/storage/datatable_actions', partial_as: :blob
     end
 
     collection do
-      ActiveStorage::Attachment.all.deep
+      ActiveStorage::Blob.all.deep.left_outer_joins(:attachments)
     end
 
   end

data/app/models/concerns/active_storage_authorization.rb

@@ -55,6 +55,9 @@ module ActiveStorageAuthorization
   def authorize_active_storage!
     return unless @blob.present?
 
+    # If the blob has been given permission
+    return true if authorized?(@blob)
+
     # If the blob is not attached to anything, permit the blob
     return true if @blob.attachments.blank? && authorize_content_download?(@blob)
 

data/app/models/concerns/{active_storage_attachment_extension.rb → active_storage_blob_extension.rb}

@@ -1,12 +1,14 @@
 # This is included into ActiveStorage::Attachment automatically by engine.rb
-module ActiveStorageAttachmentExtension
+module ActiveStorageBlobExtension
   extend ActiveSupport::Concern
 
   included do
-    has_many :active_storage_extensions, class_name: 'Effective::ActiveStorageExtension', inverse_of: :attachment, dependent: :destroy
+    has_many :active_storage_extensions, class_name: 'Effective::ActiveStorageExtension', inverse_of: :blob, dependent: :destroy
     accepts_nested_attributes_for :active_storage_extensions, allow_destroy: true
 
-    scope :deep, -> { includes(:active_storage_extensions, :blob, record: :record) }
+    scope :deep, -> { includes(:active_storage_extensions, attachments: [record: :record]) }
+
+    scope :attached, -> { joins(:attachments) }
   end
 
   module ClassMethods
@@ -15,7 +17,7 @@ module ActiveStorageAttachmentExtension
   # Instance methods
 
   def to_s
-    'attachment'
+    filename.presence || 'blob'
   end
 
   # Find or build
@@ -45,4 +47,8 @@ module ActiveStorageAttachmentExtension
     save!
   end
 
+  def purge!
+    purge
+  end
+
 end

data/app/models/effective/active_storage_extension.rb

@@ -1,6 +1,6 @@
 module Effective
   class ActiveStorageExtension < ActiveRecord::Base
-    belongs_to :attachment, class_name: 'ActiveStorage::Attachment'
+    belongs_to :blob, class_name: 'ActiveStorage::Blob'
 
     PERMISSIONS = ['inherited', 'public']
 

data/app/views/admin/storage/_datatable_actions.html.haml

@@ -1,8 +1,12 @@
 = dropdown(variation: :dropleft) do
-  - if EffectiveResources.authorized?(self, :mark_inherited, attachment)
-    = dropdown_link_to 'Mark as Inherited', effective_storage.mark_inherited_admin_storage_path(attachment),
+  - if EffectiveResources.authorized?(self, :mark_inherited, blob)
+    = dropdown_link_to 'Mark as Inherited', effective_storage.mark_inherited_admin_storage_path(blob),
       data: { method: :post, remote: true, confirm: "Mark as Inherited Permission?" }
 
-  - if EffectiveResources.authorized?(self, :mark_public, attachment)
-    = dropdown_link_to 'Mark as Public', effective_storage.mark_public_admin_storage_path(attachment),
+  - if EffectiveResources.authorized?(self, :mark_public, blob)
+    = dropdown_link_to 'Mark as Public', effective_storage.mark_public_admin_storage_path(blob),
       data: { method: :post, remote: true, confirm: "Mark as Public Permission?" }
+
+  - if EffectiveResources.authorized?(self, :purge, blob)
+    = dropdown_link_to 'Delete', effective_storage.purge_admin_storage_path(blob),
+      data: { method: :post, remote: true, confirm: "Really delete #{blob.to_s}?" }

data/config/routes.rb

@@ -5,13 +5,21 @@ Rails.application.routes.draw do
 end
 
 EffectiveStorage::Engine.routes.draw do
+  scope module: 'effective' do
+    resources :storage, only: [] do
+      post :mark_public, on: :member
+    end
+  end
+
   namespace :admin do
     resources :storage, only: [] do
       post :mark_inherited, on: :member
       post :mark_public, on: :member
+      post :purge, on: :member
     end
 
     get '/storage', to: 'storage#index', as: :storage
+
   end
 
 end

data/db/migrate/01_create_effective_storage.rb.erb

@@ -2,7 +2,7 @@ class CreateEffectiveStorage < ActiveRecord::Migration[6.0]
   def change
 
     create_table :active_storage_extensions do |t|
-      t.integer :attachment_id
+      t.integer :blob_id
       t.string :permission
 
       t.datetime :updated_at

data/lib/effective_storage/engine.rb

@@ -10,7 +10,7 @@ module EffectiveStorage
     # Include active_storage_attachment_extension concern
     initializer 'effective_storage.active_storage_attachment_extension' do |app|
       app.config.to_prepare do
-        ActiveStorage::Attachment.include(ActiveStorageAttachmentExtension)
+        ActiveStorage::Blob.include(ActiveStorageBlobExtension)
       end
     end
 

data/lib/effective_storage/version.rb

@@ -1,3 +1,3 @@
 module EffectiveStorage
-  VERSION = '0.1.0'.freeze
+  VERSION = '0.2.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_storage
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-08-25 00:00:00.000000000 Z
+date: 2022-08-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -133,10 +133,11 @@ files:
 - README.md
 - Rakefile
 - app/controllers/admin/storage_controller.rb
+- app/controllers/effective/storage_controller.rb
 - app/datatables/admin/effective_storage_datatable.rb
 - app/helpers/effective_storage_helper.rb
-- app/models/concerns/active_storage_attachment_extension.rb
 - app/models/concerns/active_storage_authorization.rb
+- app/models/concerns/active_storage_blob_extension.rb
 - app/models/effective/active_storage_extension.rb
 - app/views/admin/storage/_datatable_actions.html.haml
 - app/views/admin/storage/index.html.haml