crudable-rails 1.5.1 → 1.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6bc075d091ac9fd062d7aa5c2ab7cceecaaa189c152d603a73006891650a661f
-  data.tar.gz: 1cca79a75e27ec9fdf7d82b889030fc1c208caa63308993b2accf5226789a347
+  metadata.gz: fc3416b37cdcba0d62e5da5cc65373ffe498e077c209ab305303dbdd89942a42
+  data.tar.gz: e847455e16084ef8fa1610718f2aec087c45463a31770f88dd847c18c6358c61
 SHA512:
-  metadata.gz: 9b8f108bf56e924eb6c47fafaeabacc2a2e2b94380cfd7cd885e9ded0bc4f36f83155d63449d1349b7a9c1a56d2a21ec6f9281d5668ffa5f3c4b3597f11628e9
-  data.tar.gz: 00e9eb6393f9582fb722ea57794c5ba234eab1eecded762fd0d14760adae60098cfbc2c1d89d531b68e17fd2c2ad842b6acfff23c124578fa725cd8ace03660b
+  metadata.gz: 2d6abc3f5a289011d558a213bef542f380c31c5efedf8359dbceecb6f63d543f3ec53c0a294d68828d424ed9b234dc162f73f07de188bd533e045a31063f47f3
+  data.tar.gz: 49906b171b7f358709f59553cf0fd10677e0b4b90d379bd7c99a07bad1d4ab456e79573027ba50547abb2ac743df4b89fc1ed1b56a8c11c26babf2db847b1ad5

data/README.md

@@ -231,7 +231,7 @@ The following private methods are available for use in your controllers:
 
 ### `after_create_redirect_path`
 
-This method should return the path to redirect to after a successful create. By default this will redirect to the namespaced index of the resource being created.
+This method should return the path to redirect to after a successful create. By default this will redirect to the namespaced member (show) path of the resource being created, including any nest parents — the same shape as `after_update_redirect_path`.
 
 ### `after_create_notice`
 

data/Rakefile

@@ -2,4 +2,8 @@
 
 require 'bundler/setup'
 
+Dir.glob('lib/tasks/**/*.rake', base: __dir__).sort.each { |task| load File.join(__dir__, task) }
+
 require 'bundler/gem_tasks'
+
+Rake::Task['build'].enhance(['release:check'])

data/lib/crudable/rails/base.rb

@@ -122,7 +122,9 @@ module Crudable
         resource = friendly_finders? ? resource_class.friendly : resource_class
         instance = find_instance(resource)
 
-        return redirect_to (resource_namespace + [instance]), status: :moved_permanently if should_redirect?(instance)
+        # url_for keeps the current action/path parents and only swaps the finder param
+        # (e.g. numeric id → slug on edit stays on edit, not show).
+        return redirect_to url_for(finder_param => instance.to_param), status: :moved_permanently if should_redirect?(instance)
 
         instance_variable_set("@#{resource_var_name}", instance)
       rescue ActiveRecord::RecordNotFound
@@ -155,7 +157,27 @@ module Crudable
       end
 
       def should_redirect?(instance)
-        friendly_finders? && request.path != polymorphic_path(resource_namespace + [instance])
+        friendly_finders? && params[finder_param].to_s != instance.to_param.to_s
+      end
+
+      # Polymorphic args for a member path, including namespace and nest parents.
+      # e.g. [:admin, account, product] → admin_account_product_path
+      def resource_member_path_args(instance = nil)
+        instance ||= instance_variable_get("@#{resource_var_name}")
+        resource_namespace + resource_path_parents + [instance]
+      end
+
+      # Loaded path parents in route order (supports multi-level nesting when Nestable
+      # has set each parent ivar, including intermediate ones).
+      def resource_path_parents
+        return [] unless respond_to?(:parent_present?, true) && parent_present?
+        return [] unless respond_to?(:parent_id_param_keys, true)
+
+        parent_id_param_keys.map(&:to_s).filter_map do |key|
+          next unless key.end_with?('_id')
+
+          instance_variable_get("@#{key.delete_suffix('_id')}")
+        end
       end
 
       def singleton?
@@ -222,15 +244,7 @@ module Crudable
       end
 
       def after_create_redirect_path
-        if respond_to?(:parent_present?) && parent_present? && instance_variable_get("@#{parent_var_name}")
-          parent = instance_variable_get("@#{parent_var_name}")
-          resource_namespace + [parent, plural_resource_var_name.to_sym]
-        else
-          resource_namespace + [plural_resource_var_name.to_sym]
-        end
-      rescue NoMethodError
-        # Fallback if parent_present? or parent_var_name methods aren't available
-        resource_namespace + [plural_resource_var_name.to_sym]
+        resource_member_path_args
       end
 
       def after_create_notice
@@ -238,7 +252,7 @@ module Crudable
       end
 
       def after_update_redirect_path
-        resource_namespace + [instance_variable_get("@#{resource_var_name}")]
+        resource_member_path_args
       end
 
       def after_update_notice

data/lib/crudable/rails/nestable.rb

@@ -13,10 +13,7 @@ module Crudable
       def find_parent
         return unless parent_present?
 
-        parent_scope = parent_class
-        parent_scope = parent_class.friendly if parent_friendly_finders?
-        instance_variable_set("@#{parent_var_name}", parent_scope.find(params[parent_id_param]))
-        self.class.send(:decorates_assigned, parent_var_name.to_sym) if defined?(Draper)
+        load_path_parents
       rescue ActiveRecord::RecordNotFound => e
         # Only catch and render 404 if we're in a request context
         # Check if we have a request object (indicates we're in a request context)
@@ -26,6 +23,45 @@ module Crudable
         nil # Explicitly stop execution to prevent further action execution
       end
 
+      # Loads every `*_id` path parent (shallow → deep) so multi-level nested routes
+      # can build polymorphic member paths that include the full ancestor chain.
+      # Scoping still uses the deepest parent via parent_id_param / parent_var_name.
+      def load_path_parents
+        parent_id_param_keys.map(&:to_s).grep(/\A(.+)_id\z/).each do |key|
+          load_path_parent(key)
+        end
+      end
+
+      def load_path_parent(key)
+        var_name = key.sub(/_id\z/, '')
+        return if instance_variable_get("@#{var_name}").present?
+
+        klass = parent_class_for(key)
+        scope = parent_find_scope_for(klass, key)
+        instance_variable_set("@#{var_name}", scope.find(params[key]))
+        self.class.send(:decorates_assigned, var_name.to_sym) if defined?(Draper)
+      end
+
+      # Resolve the model class for a path parent param.
+      # Deepest parent uses #parent_class so controllers can override for namespaced models
+      # (e.g. Admin::Client). Override this for non-default intermediate parents.
+      def parent_class_for(key)
+        if key.to_s == parent_id_param.to_s
+          parent_class
+        else
+          key.to_s.sub(/_id\z/, '').classify.constantize
+        end
+      end
+
+      def parent_find_scope_for(klass, key)
+        use_friendly = if key.to_s == parent_id_param.to_s
+                         parent_friendly_finders?
+                       else
+                         defined?(FriendlyId) && klass.respond_to?(:friendly) && friendly_finders?
+                       end
+        use_friendly ? klass.friendly : klass
+      end
+
       def parent_id_param
         return nil unless use_parent_as_scope?
 

data/lib/crudable/rails/version.rb

@@ -3,6 +3,6 @@
 # Crudable Version
 module Crudable
   module Rails
-    VERSION = '1.5.1'
+    VERSION = '1.5.2'
   end
 end

data/lib/generators/crudable/templates/crudable_controller.rb.tt

@@ -124,15 +124,13 @@ class <%= controller_class_name %>Controller < ApplicationController
   # end
   #
   # # Customize success redirects/flash messages.
+  # # Defaults redirect create/update to the member path (including nest parents).
   # def after_create_redirect_path
-  #   if respond_to?(:parent_present?) && parent_present? && instance_variable_get("@#{parent_var_name}")
-  #     parent = instance_variable_get("@#{parent_var_name}")
-  #     resource_namespace + [parent, :<%= plural_table_name %>]
+  #   if parent_present?
+  #     resource_namespace + [instance_variable_get("@#{parent_var_name}"), @<%= singular_table_name %>]
   #   else
-  #     resource_namespace + [:<%= plural_table_name %>]
+  #     resource_namespace + [@<%= singular_table_name %>]
   #   end
-  # rescue NoMethodError
-  #   resource_namespace + [:<%= plural_table_name %>]
   # end
   #
   # def after_create_notice
@@ -140,7 +138,11 @@ class <%= controller_class_name %>Controller < ApplicationController
   # end
   #
   # def after_update_redirect_path
-  #   resource_namespace + [@<%= singular_table_name %>]
+  #   if parent_present?
+  #     resource_namespace + [instance_variable_get("@#{parent_var_name}"), @<%= singular_table_name %>]
+  #   else
+  #     resource_namespace + [@<%= singular_table_name %>]
+  #   end
   # end
   #
   # def after_update_notice

data/lib/tasks/release.rake

@@ -0,0 +1,59 @@
+# frozen_string_literal: true
+
+namespace :release do
+  desc 'Fail if any lib/ file is not world-readable (run before gem build)'
+  task :check do
+    root = File.expand_path('../..', __dir__)
+
+    non_readable = Dir.chdir(root) do
+      `find lib -type f ! -perm -004`.strip.split("\n").reject(&:empty?)
+    end
+
+    if non_readable.any?
+      warn 'The following files under lib/ are not world-readable (need at least o+r):'
+      non_readable.each { |path| warn "  #{path}" }
+      abort 'release:check failed'
+    end
+
+    puts 'release:check passed (all lib/ files are world-readable)'
+  end
+
+  desc 'Verify a built .gem has world-readable lib/ files (default: newest pkg/crudable-rails-*.gem)'
+  task :verify_gem, [:gem_path] do |_task, args|
+    root = File.expand_path('../..', __dir__)
+    gem_path = args[:gem_path]
+    if gem_path.nil? || gem_path.empty?
+      candidates = Dir.glob(File.join(root, 'pkg', 'crudable-rails-*.gem'))
+      abort 'No gem found under pkg/. Run gem build first or pass gem_path.' if candidates.empty?
+
+      gem_path = candidates.max_by { |path| File.mtime(path) }
+    else
+      gem_path = File.expand_path(gem_path, root)
+    end
+
+    abort "Gem not found: #{gem_path}" unless File.file?(gem_path)
+
+    listing = `tar -xOf "#{gem_path}" data.tar.gz | tar -tvzf -`
+    abort 'Could not read gem contents' if listing.empty?
+
+    bad_entries = listing.lines.map(&:chomp).select do |line|
+      path = line.split.last
+      next false unless path.start_with?('lib/')
+
+      mode = line.split.first
+      next true unless mode&.start_with?('-')
+
+      mode[7] != 'r' # other-read in ls -l style (-rwxrwxrwx)
+    end
+
+    if bad_entries.any?
+      warn 'The following paths in the gem are not world-readable:'
+      bad_entries.each { |entry| warn "  #{entry}" }
+      abort 'release:verify_gem failed'
+    end
+
+    controller_line = `tar -xOf "#{gem_path}" data.tar.gz | tar -tvzf - | grep 'lib/crudable/rails/controller.rb'`.strip
+    puts 'release:verify_gem passed'
+    puts controller_line if controller_line && !controller_line.empty?
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: crudable-rails
 version: !ruby/object:Gem::Version
-  version: 1.5.1
+  version: 1.5.2
 platform: ruby
 authors:
 - Tomislav Simnett
@@ -121,6 +121,7 @@ files:
 - lib/generators/crudable/templates/turbo_forms/edit.turbo_stream.erb.tt
 - lib/generators/crudable/templates/turbo_forms/new.turbo_stream.erb.tt
 - lib/tasks/crudable_tasks.rake
+- lib/tasks/release.rake
 homepage: https://gitlab.com/initforthe/crudable-rails
 licenses:
 - MIT