five-two-nw-olivander 0.1.2.3 → 0.1.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 597764e454652e4a42b1d81c7d63db17f9495a662886fd9184c7fc3790d16c75
-  data.tar.gz: faa979538cb5fa01390a65e0378054b3f916b3f3630ac45e586ff64fb43e9ffa
+  metadata.gz: c0e0ab6690c2db84473cb79a4287db92eacc150390017c848b84a9297bcf182f
+  data.tar.gz: d075048882ce46be84002ee1e14618777bc9d0a3b6ded2709fb002b39b446d2a
 SHA512:
-  metadata.gz: b1d0847e4694082bcbf22f3717f4ea551f1144697b51e809539118402f347e46158767a8fdca8eab49b1262dde97e09ad964f8722b0d3701cfbfe3789478da34
-  data.tar.gz: 92df52efda623339deb45a35ad86c5a52e0205ba5eb49e71aa70d5683eb2df079825531407f58634c0970c0a6802b8c62081e6c910fdedd494dec4a88fbd90a6
+  metadata.gz: 8310faaad17dcdf36bfdcf63aeb1378ae1b5a630e4cbe8bd1d75ae9745f4d8bfd363514ff4150d0027ac1015487b1febcaa863c9ed86a7f990ab917242f1c440
+  data.tar.gz: d033c74985c4e1e963b44932c4cf9a7aabd3b31d1f283d1fd89443e37375dc0343da80300d7608c3069b89e7f776f8718979538bd8163628ca94a49182d7e123

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

@@ -25,29 +25,43 @@ module Olivander
       def initialize(model, crud_actions)
         self.model = model
         self.actions = []
-        crud_actions.each do |ca|
-          actions << ResourceAction.new(ca, controller: model, crud_action: true)
+        %i[index new create edit show update destroy].each do |ca|
+          next unless crud_actions.include?(ca)
+          actions << ResourceAction.new(ca, controller: model, verb: resolve_crud_action_verb(ca), collection: resolve_crud_action_collection(ca), crud_action: true)
         end
       end
 
-      def crud_actions
-        actions.select{ |x| x.crud_action }
+      def resolve_crud_action_verb(ca)
+        case ca
+        when :create
+          :post
+        when :update
+          :patch
+        when :destroy
+          :delete
+        else
+          :get
+        end
+      end
+
+      def resolve_crud_action_collection(ca)
+        %i[index new create].include?(ca)
       end
 
-      def additional_actions
-        actions.select{ |x| !x.crud_action }
+      def crud_actions
+        actions.select{ |x| x.crud_action }
       end
 
       def member_actions
-        additional_actions.select{ |x| !x.collection }
+        actions.select{ |x| !x.collection }
       end
 
       def collection_actions
-        additional_actions.select{ |x| x.collection }
+        actions.select{ |x| x.collection }
       end
 
       def datatable_bulk_actions
-        collection_actions.select{ |x| x.show_in_datatable }
+        collection_actions.select{ |x| x.show_in_datatable && !x.crud_action }
       end
 
       def unpersisted_crud_actions
@@ -96,7 +110,25 @@ module Olivander
         def build_resource_routes(mapper)
           resources.keys.each do |k|
             r = resources[k]
-            mapper.resources r.model, only: r.crud_actions.map{ |ca| ca.action } do
+            mapper.resources r.model, only: [] do
+              mapper.collection do
+                r.collection_actions.each do |ba|
+                  next if ba.no_route
+                  next if ba.action == :new
+
+                  if ba.confirm
+                    mapper.get ba.action, action: "confirm_#{ba.action}"
+                    mapper.post ba.action
+                  else
+                    mapper.send(ba.verb, ba.action)
+                  end
+                end
+              end
+
+              mapper.new do
+                mapper.get :new
+              end if r.collection_actions.select{ |x| x.action == :new }.size.positive?
+
               mapper.member do
                 r.member_actions.each do |ma|
                   next if ma.no_route
@@ -108,18 +140,6 @@ module Olivander
                   end
                 end
               end
-
-              mapper.collection do
-                r.collection_actions.each do |ba|
-                  next if ba.no_route
-                  if ba.confirm
-                    mapper.get ba.action, action: "confirm_#{ba.action}"
-                    mapper.post ba.action
-                  else
-                    mapper.send(ma.verb, ba.action)
-                  end
-                end
-              end
             end
           end
         end

data/app/helpers/olivander/application_helper.rb

@@ -17,18 +17,18 @@ module Olivander
       "avatar#{SecureRandom.random_number(4)}.png"
     end
 
-    def authorized_resource_actions(resource, for_action: :show)
+    def authorized_resource_actions(route_builder, resource, for_action: :show)
       plural_name = resource.is_a?(Class) ? resource.table_name : resource.class.table_name
-      routed_resource = @context.route_builder.resources[plural_name.to_sym]
+      routed_resource = route_builder.resources[plural_name.to_sym]
       actions = resource.is_a?(Class) ?
         (routed_resource.unpersisted_crud_actions | routed_resource.collection_actions) : 
         (resource.persisted? ? (routed_resource.persisted_crud_actions | routed_resource.member_actions): [])
       actions.reject{ |a| a.sym == for_action }
     end
 
-    def resource_form_actions(resource, for_action: :show)
+    def resource_form_actions(route_builder, resource, for_action: :show)
       [].tap do |output|
-        authorized_resource_actions(resource, for_action: for_action).select{ |x| x.show_in_form }.each do |a|
+        authorized_resource_actions(route_builder, resource, for_action: for_action).select{ |x| x.show_in_form }.each do |a|
           output << link_to(a.sym, {controller: a.controller, action: a.action}, method: a.verb, class: 'btn btn-primary', data: { turbo: true })
         end
       end.join('&nbsp;').html_safe

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

@@ -3,7 +3,7 @@
   .card
     .card-header
       .card-tools
-        = resource_form_actions(@resource, for_action: action_name.to_sym)
+        = resource_form_actions(@context.route_builder, @resource, for_action: action_name.to_sym)
     .card-body
       =f.error_notification
       =f.error_notification message: f.object.errors[:base].to_sentence if f.object.errors[:base].present?

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

@@ -6,7 +6,7 @@
       .card-header
         %h3.card-title= @page_title
         .card-tools
-          = resource_form_actions(resource.klass, for_action: :index)
+          = resource_form_actions(@context.route_builder, resource.klass, for_action: :index)
       .card-body
         - if @datatable
           = render_datatable(@datatable)

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

@@ -1,3 +1,7 @@
+- if @context.nil?
+  - parts = datatable.class.name.split('::')
+  - parts[parts.size-1] = 'Controller'
+  - parts.join('::').constantize.new.build_context
 = dropdown(variation: :dropleft, btn_class: btn_class) do
-  - authorized_resource_actions(resource, for_action: action_name).select{ |x| x.show_in_datatable }.each do |a|
+  - authorized_resource_actions(@context.route_builder, resource, for_action: action_name).select{ |x| x.show_in_datatable }.each do |a|
     = dropdown_link_to a.sym, { controller: a.controller, action: a.action, id: resource.id }

data/lib/olivander/version.rb

@@ -1,3 +1,3 @@
 module Olivander
-  VERSION = "0.1.2.3"
+  VERSION = "0.1.2.5"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: five-two-nw-olivander
 version: !ruby/object:Gem::Version
-  version: 0.1.2.3
+  version: 0.1.2.5
 platform: ruby
 authors:
 - Eric Dennis