effective_resources 2.2.10 → 2.2.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3f5258d38255a23862d15be45d82d15d68596bb42b2f31f88e5159c339e2fae8
-  data.tar.gz: c6dba77a6cdb45ec02fead79b8050cee8c482325ec772a53ffde5cea9facc754
+  metadata.gz: a2e1045a3f584c05b66281ec3239905cd43100ee124bf9c0fdcfeff7d289fd6f
+  data.tar.gz: 6276115c7a5104f3f51ce56c54681c0ab775fb63c8ff2f362e3f6fd51fcfebde
 SHA512:
-  metadata.gz: c0f15eacdd2e1b34c85b57921dd21d01f3dfb1b22e45f17b45c2f0a066add4f0ede0856e649e843a77c016212c5133e88b780980ce48cc30c844a6e0e735149c
-  data.tar.gz: 22088c964406e716aa5d430372813632064278e1a02e1a4fa09f6845a1a8d55b5799a14ce2d29329b624fe59d7d7b1710fcb0437242c345848de21e9bd2a46cb
+  metadata.gz: b5dfd7efe2f70a7b9b5aa337cfbe915700fa211006e95d5d754e631565a1301367e7690b650394c19681bf3a47f2645ecdc1a02fef850abc3931d65c36893228
+  data.tar.gz: 768dbb29366b8ad1df0cc5e9deed4f3e2c216df6de6175c60384033524f12a49c5425b900e16f6c71cd5fa0cf7e4c537aab28f4b824955ec0ee95e651422bd2f

data/app/models/concerns/has_many_purgable.rb

@@ -1,11 +1,14 @@
 # HasManyPurgable
 #
-# Mark your model with 'has_many_purgable' or 'has_one_purgable' to allow any has_many or has_one to be purgable
+# Mark your model with 'has_many_purgable' or 'has_one_purgable' (both the same thing)
+# to allow any has_many_attached or has_one_attached to be purgable.
+#
 # Pass 'has_many_purgable :files, :avatar' to only allow the files and avatar to be purged.
+#
 # Works with effective_bootstrap file_field to display a Delete file on save checkbox
-# to submit a _purge_attached array or association names to purge.
+# to submit a _purge array of attachments to purge.
 #
-# You must permit the attribute _purge_attached: []
+# You must permit the attribute _purge: []
 
 module HasManyPurgable
   extend ActiveSupport::Concern
@@ -30,13 +33,13 @@ module HasManyPurgable
     options = @has_many_purgable_options
     self.send(:define_method, :has_many_purgable_options) { options }
 
-    attr_accessor :_purge_attached
+    attr_accessor :_purge
 
     effective_resource do
-      _purge_attached     :permitted_param
+      _purge  :permitted_param
     end
 
-    with_options(if: -> { _purge_attached.present? }) do
+    with_options(if: -> { _purge.present? }) do
       before_validation { has_many_purgable_mark_for_destruction }
       after_save { has_many_purgable_purge }
     end
@@ -62,7 +65,7 @@ module HasManyPurgable
 
   # As submitted by the form and permitted by our associations and options
   def has_many_purgable_attachments
-    submitted = (Array(_purge_attached) - [nil, '', '0', ' ', 'false', 'f', 'off']).map(&:to_sym)
+    submitted = (Array(_purge) - [nil, '', '0', ' ', 'false', 'f', 'off']).map(&:to_sym)
     submitted & has_many_purgable_names
   end
 

data/app/models/effective/resources/paths.rb

@@ -8,18 +8,34 @@ module Effective
         Tenant.engine_path(tenant).sub("#{Rails.root}/", '') if tenant?
       end
 
+      # Model
       def model_file
         File.join(*[tenant_path, 'app/models', class_path, "#{name}.rb"].compact)
       end
 
+      # Controller
       def controller_file
         File.join(*[tenant_path, 'app/controllers', class_path, namespace, "#{plural_name}_controller.rb"].compact)
       end
 
+      def admin_effective_controller_file
+        File.join(*[tenant_path, 'app/controllers', namespace, "#{plural_name}_controller.rb"].compact)
+      end
+
+      # Datatable
       def datatable_file
         File.join(*[tenant_path, 'app/datatables', class_path, namespace, "#{plural_name}_datatable.rb"].compact)
       end
 
+      def effective_datatable_file
+        File.join(*[tenant_path, 'app/datatables', namespace, "effective_#{plural_name}_datatable.rb"].compact)
+      end
+
+      def admin_effective_datatable_file
+        File.join(*[tenant_path, 'app/datatables', namespace, "effective_#{plural_name}_datatable.rb"].compact)
+      end
+
+      # Views
       def view_file(action = :index, partial: false)
         File.join(*[tenant_path, 'app/views', class_path, namespace, plural_name, "#{'_' if partial}#{action}.html.haml"].compact)
       end
@@ -28,8 +44,8 @@ module Effective
         File.join(*[class_path, namespace, plural_name, action].compact)
       end
 
-      def flat_view_file(action = :index, partial: false)
-        File.join(*[tenant_path, 'app/views', class_path, plural_name, "#{'_' if partial}#{action}.html.haml"].compact)
+      def admin_effective_view_file(action = :index, partial: false)
+        File.join(*[tenant_path, 'app/views', namespace, plural_name, "#{'_' if partial}#{action}.html.haml"].compact)
       end
 
       def routes_file

data/lib/effective_resources/version.rb

@@ -1,3 +1,3 @@
 module EffectiveResources
-  VERSION = '2.2.10'.freeze
+  VERSION = '2.2.12'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_resources
 version: !ruby/object:Gem::Version
-  version: 2.2.10
+  version: 2.2.12
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-01-31 00:00:00.000000000 Z
+date: 2023-02-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails