five-two-nw-olivander 0.1.2.13 → 0.1.2.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3fafc0f233f53a5a60c3be296bc128cbbb3700959f82b05cf41029ac144c6a89
-  data.tar.gz: d6a987479ebe1d30a5f4671a0ca6ede3912f852e1c9cb2e549053802dc42340e
+  metadata.gz: c162440a26c8e6f7df1adfe3b568705fcefed8383f8c35fb3ee586cdb47e5af9
+  data.tar.gz: a20899ee325a8c056ab694615e3f56c2ab72f9ba99a3d0c1b5bb674f26e49e6f
 SHA512:
-  metadata.gz: 2aafa57f69b573299d2857fa04ebe05db1407c0c83c1657c54afbe6eda6e164caf670909e53e30362b2e952d666648126a97b463f50ecd116d9384d7c48c9993
-  data.tar.gz: 8b3d2b995b2afa004fc2bb2fe313a1aabf448d638ddd45d5ff24fe33bf04674b6be97afe1b67c636fd612a478e6ed75190daddd9b42271fc8e0f64e29d691831
+  metadata.gz: ddfda85d4db1af90c5b64a9cb30e1c1d631b17ad2cff1643ca0540de24057842176c1f49572c501c07f2167cc4548d671823ed35ab34c5caa6fbc855b9a93a66
+  data.tar.gz: 7956f79b03ba67ba808c68a8f0c7562ff2393a3386705a4a39f029b52056021d0c4ca2092da1107cfe3bf59b0defd868e22644c90f0a0e32d928e64b43322858

data/app/controllers/concerns/olivander/resources/route_builder.rb

@@ -6,7 +6,7 @@ module Olivander
                     :no_route, :path_helper
 
       def initialize(sym, action: nil, controller: nil, verb: :get, confirm: false, turbo_frame: nil, collection: false, crud_action: false,
-                     show_in_form: true, show_in_datatable: true, no_route: false)
+                     show_in_form: true, show_in_datatable: true, no_route: false, path_helper: nil)
         self.sym = sym
         self.action = action || sym
         self.controller = controller
@@ -18,6 +18,7 @@ module Olivander
         self.show_in_form = show_in_form
         self.show_in_datatable = show_in_datatable
         self.no_route = no_route
+        self.path_helper = path_helper
       end
     end
 
@@ -96,13 +97,14 @@ module Olivander
           self.current_resource = nil
         end
 
-        def action(sym, verb: :get, confirm: false, turbo_frame: nil, collection: false, show_in_datatable: true, show_in_form: true, no_route: false, controller: nil, action: nil)
+        def action(sym, verb: :get, confirm: false, turbo_frame: nil, collection: false, show_in_datatable: true,
+                   show_in_form: true, no_route: false, controller: nil, action: nil, path_helper: nil)
           raise 'Must be invoked in a resource block' unless current_resource.present?
 
           controller ||= current_resource.model
           current_resource.actions << ResourceAction.new(
             sym, action: action, controller: controller, verb: verb, confirm: confirm, turbo_frame: turbo_frame, collection: collection,
-            show_in_datatable: show_in_datatable, show_in_form: show_in_form, no_route: no_route
+            show_in_datatable: show_in_datatable, show_in_form: show_in_form, no_route: no_route, path_helper: path_helper
           )
         end
 

data/app/helpers/olivander/application_helper.rb

@@ -18,7 +18,8 @@ module Olivander
     end
 
     def authorized_resource_actions(route_builder, resource, for_action: :show)
-      plural_name = resource.is_a?(Class) ? resource.table_name : resource.class.table_name
+      raw_name = resource.is_a?(Class) ? resource.name : resource.class.name
+      plural_name = raw_name.demodulize.underscore.pluralize
       routed_resource = route_builder.resources[plural_name.to_sym]
       return [] if routed_resource.nil?
 

data/app/views/application/show.html.haml

@@ -6,3 +6,7 @@
     .col-12
       = render_resource_form(@resource)
 
+- begin
+  = render partial: 'show_additional'
+- rescue ActionView::MissingTemplate
+  - Rails.logger.debug "did not find additional show partial"

data/app/views/effective/resource/_actions_dropleft.html.haml

@@ -1,4 +1,5 @@
 - route_builder = @context&.route_builder || datatable.class::ROUTE_BUILDER
 = dropdown(variation: :dropleft, btn_class: btn_class) do
   - authorized_resource_actions(route_builder, resource, for_action: action_name).select{ |x| x.show_in_datatable }.each do |a|
-    = dropdown_link_to a.sym, send(a.path_helper, resource.id)
+    - path = a.path_helper.is_a?(Proc) ? a.path_helper.call(resource) : send(a.path_helper, resource.id)
+    = dropdown_link_to a.sym, path

data/lib/olivander/version.rb

@@ -1,3 +1,3 @@
 module Olivander
-  VERSION = "0.1.2.13"
+  VERSION = "0.1.2.15"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: five-two-nw-olivander
 version: !ruby/object:Gem::Version
-  version: 0.1.2.13
+  version: 0.1.2.15
 platform: ruby
 authors:
 - Eric Dennis
@@ -189,7 +189,6 @@ files:
 - app/controllers/concerns/olivander/resources/route_builder.rb
 - app/controllers/olivander/application_controller.rb
 - app/datatables/olivander/datatable.rb
-- app/datatables/test_datatable.rb
 - app/helpers/olivander/application_helper.rb
 - app/jobs/olivander/application_job.rb
 - app/mailers/olivander/application_mailer.rb

data/app/datatables/test_datatable.rb

@@ -1,15 +0,0 @@
-class TestDatatable < Effective::Datatable
-  datatable do
-    col :id
-    col :name
-    col :description
-  end
-
-  collection do
-    [
-      [1, 'doo'],
-      [2, 'doo'],
-      [3, 'doo'],
-    ]
-  end
-end