five-two-nw-olivander 0.1.2.35 → 0.1.2.36

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 21de4f9aa55c8f41410166a668b724d89d0f7800adef266b6c6ded9b3d52a665
-  data.tar.gz: d4de2dfa99389c5df48c39cd8854f9ea3cb0a855f0ea11dfdb1e0cf5f9991e7d
+  metadata.gz: 3e55a54429f0d10d6f23e477b5615cb32f1c2cbbccbd6a622b73f2cb07b70131
+  data.tar.gz: 04d1f0ee790725256e7a65b93c20baf0c2199fe7c3dbfbc5b7f576f6decf93bb
 SHA512:
-  metadata.gz: c9e38f0a1c8fd0802f26b47fa0d889e354f57baa56bfb62cd1b07b29e670112410dd23eb1b55765ecaedfbe15a50a5b1927ee67ca40826c6b57773a7d28bdf3f
-  data.tar.gz: 90e0d42e5a80bfc5a2dac29ac6f26e8091dc697daa3868646422b343ee5dee495455933960504e77b777e12d20ff298a2fb4cba8c6f7870a16f25b96f752eb08
+  metadata.gz: 3a9555b4ebbfdbd0d55df3c3a0ec03b7e48ccd0be00fd1c25700511ae2bc2085451d3d0d023bb340cd6b1a5a0e8131b3c58311dcd33c6befa2c195ead6cbcc34
+  data.tar.gz: dfb311cdc4987aaf562859af28e0d81d2beb944fe75fdfad53fede0045f42ffd925e6ebff562e72b0a4e9c57dff8e93068af88349be2923a14c430346cef7448

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

@@ -23,10 +23,11 @@ module Olivander
     end
 
     class RoutedResource
-      attr_accessor :model, :actions
+      attr_accessor :model, :namespaces, :actions
 
-      def initialize(model, crud_actions)
+      def initialize(model, namespaces, crud_actions)
         self.model = model
+        self.namespaces = namespaces
         self.actions = []
         %i[index new create edit show update destroy].each do |ca|
           next unless crud_actions.include?(ca)
@@ -90,8 +91,8 @@ module Olivander
       end
 
       class_methods do
-        def resource(model, only: DEFAULT_CRUD_ACTIONS, except: [], &block)
-          self.current_resource = RoutedResource.new(model, DEFAULT_CRUD_ACTIONS & (only - except))
+        def resource(model, only: DEFAULT_CRUD_ACTIONS, except: [], namespaces: [], &block)
+          self.current_resource = RoutedResource.new(model, namespaces, DEFAULT_CRUD_ACTIONS & (only - except))
           yield if block_given?
           resources[model] = current_resource
           self.current_resource = nil
@@ -109,9 +110,7 @@ module Olivander
         end
 
         def build_routes(mapper)
-          Rails.logger.info "building routes..."
-          build_resource_routes(mapper)
-          Rails.logger.info "...routes built"
+          build_resources_routes(mapper)
         end
 
         def set_controller_and_helper(a)
@@ -121,10 +120,19 @@ module Olivander
           self.last_path_helper = a.path_helper
         end
 
-        def build_resource_routes(mapper)
+        def build_resources_routes(mapper)
           resources.keys.each do |k|
-            before_routes = Rails.application.routes.named_routes.helper_names
             r = resources[k]
+            build_resource_route(mapper, r, r.namespaces)
+          end
+        end
+
+        def build_resource_route(mapper, r, namespaces)
+          if namespaces.size.positive?
+            mapper.namespace namespaces.first do
+              build_resource_route(mapper, r, r.namespaces.last(r.namespaces.size - 1))
+            end
+          else
             mapper.resources r.model, only: [] do
               mapper.collection do
                 r.collection_actions.each do |ba|
@@ -160,10 +168,6 @@ module Olivander
                 end
               end
             end
-            after_routes = Rails.application.routes.named_routes.helper_names
-            net_routes = after_routes - before_routes
-            # Rails.logger.info "added these route helpers:\n#{net_routes}"
-            # binding.pry if k == :projects
           end
         end
       end

data/app/helpers/olivander/application_helper.rb

@@ -45,7 +45,8 @@ module Olivander
     end
 
     def resource_form_action_label(resource, action)
-      return I18n.t("activerecord.actions.#{resource}.#{action}") if I18n.exists?("activerecord.actions.#{resource}.#{action}")
+      key = resource.class.name.underscore
+      return I18n.t("activerecord.actions.#{key}.#{action}") if I18n.exists?("activerecord.actions.#{key}.#{action}")
       return I18n.t("activerecord.actions.#{action}") if I18n.exists?("activerecord.actions.#{action}")
 
       action.to_s.titleize

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

@@ -2,4 +2,5 @@
 = 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|
     - path = a.path_helper.is_a?(Proc) ? a.path_helper.call(resource) : send(a.path_helper, resource.id)
-    = dropdown_link_to resource_form_action_label(resource, a.sym), path
+    - data = a.turbo_frame.present? ? { turbo: true, turbo_frame: a.turbo_frame } : {}
+    = dropdown_link_to resource_form_action_label(resource, a.sym), path, data: data

data/lib/olivander/version.rb

@@ -1,3 +1,3 @@
 module Olivander
-  VERSION = '0.1.2.35'.freeze
+  VERSION = '0.1.2.36'.freeze
 end

metadata

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