five-two-nw-olivander 0.1.2.4 → 0.1.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d551785ee277728e208fb537527d00e201b93b89f796de075295f271c90ff879
-  data.tar.gz: f079e183a76a7724c16099542aeaef9159f5d4ff64ef227267a8de6dcd03b7c0
+  metadata.gz: 8321bd8a5b34a8550a97d74784c9303f430ec4a4417cd8acadf564f8fcd92687
+  data.tar.gz: 27697dcd2ca0669e2ad81f770b98760dacadb9d1e0bae849ccc047728a89e0c9
 SHA512:
-  metadata.gz: 1abaa3d2a03cb74f5d38077e2070a90ca63a12f27799a6d000fdb3506272c9890b284fbc76a59049bd1b5fe1766d51f11658f96fe28298baf83e80ab7436719e
-  data.tar.gz: dadd557fabc44933a35bf795173c37d3753b7f40cfae8fa2979978923b78312904e96c8a66e12da01a46fbb24917f22476a5ca72ea815f7358f56fc7766a6a90
+  metadata.gz: a9f824c7aa7a5a8356f2eceeb149e91daef1e7d94eb22bce75d70f3584508d2347b65cf66c383b4512bc26809d1052e09b72cda5e9e6d0224c6fe81c928af3c8
+  data.tar.gz: 1f0b34e2dc130103bcaacf848e17ab6e76bd5f7db84414160201b265623f0fcdd55e391dcf85acebb2ae2946b97240d06edcace6018b08cd6c21e703d34ca3d9

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

@@ -21,8 +21,8 @@ module Olivander
       plural_name = resource.is_a?(Class) ? resource.table_name : resource.class.table_name
       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): [])
+        (routed_resource.unpersisted_crud_actions | routed_resource.collection_actions.select{ |x| !x.crud_action }) : 
+        (resource.persisted? ? (routed_resource.persisted_crud_actions | routed_resource.member_actions.select{ |x| !x.crud_action }): [])
       actions.reject{ |a| a.sym == for_action }
     end
 

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.4"
+  VERSION = "0.1.2.6"
 end

metadata

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