dry_crud 7.1.0 → 8.0.0

data/app/helpers/dry_crud/table/actions.rb

@@ -1,12 +1,10 @@
 module DryCrud
   module Table
-
     # Adds action columns to the table builder.
     # Predefined actions are available for show, edit and destroy.
     # Additionally, a special col type to define cells linked to the show page
     # of the row entry is provided.
     module Actions
-
       extend ActiveSupport::Concern
 
       included do
@@ -30,7 +28,7 @@ module DryCrud
         action_col do |entry|
           path = action_path(entry, &block)
           if path
-            table_action_link('zoom-in',
+            table_action_link("zoom-in",
                               path,
                               **html_options.clone)
           end
@@ -45,7 +43,7 @@ module DryCrud
           path = action_path(entry, &block)
           if path
             path = edit_polymorphic_path(path) unless path.is_a?(String)
-            table_action_link('pencil', path, **html_options.clone)
+            table_action_link("pencil", path, **html_options.clone)
           end
         end
       end
@@ -57,12 +55,11 @@ module DryCrud
         action_col do |entry|
           path = action_path(entry, &block)
           if path
-            table_action_link('trash',
+            table_action_link("trash",
                               path,
-                              **html_options.merge(
-                                data: { 'turbo-confirm': ti(:confirm_delete),
-                                        'turbo-method': :delete }
-                              ))
+                              **html_options,
+                              data: { 'turbo-confirm': ti(:confirm_delete),
+                                      'turbo-method': :delete })
           end
         end
       end
@@ -70,13 +67,13 @@ module DryCrud
       # Action column inside a table. No header.
       # The cell content should be defined in the passed block.
       def action_col(&block)
-        col('', class: 'action', &block)
+        col("", class: "action", &block)
       end
 
       # Generic action link inside a table.
       def table_action_link(icon, url, **html_options)
         add_css_class(html_options, "bi-#{icon}")
-        link_to('', url, html_options)
+        link_to("", url, html_options)
       end
 
       private
@@ -86,8 +83,6 @@ module DryCrud
       def action_path(entry)
         block_given? ? yield(entry) : path_args(entry)
       end
-
     end
-
   end
 end

data/app/helpers/dry_crud/table/builder.rb

@@ -1,6 +1,5 @@
 module DryCrud
   module Table
-
     # A simple helper to easily define tables listing several rows of the same
     # data type.
     #
@@ -10,7 +9,6 @@ module DryCrud
     #     t.attrs :name, :city
     #   end
     class Builder
-
       include Sorting
       include Actions
 
@@ -39,7 +37,7 @@ module DryCrud
       # Define a column for the table with the given header, the html_options
       # used for each td and a block rendering the contents of a cell for the
       # current entry. The columns appear in the order they are defined.
-      def col(header = '', **html_options, &block)
+      def col(header = "", **html_options, &block)
         @cols << Col.new(header, html_options, @template, block)
       end
 
@@ -76,9 +74,9 @@ module DryCrud
         entry = entries.present? ? entry_class.new : nil
         case column_type(entry, attr)
         when :integer, :float, :decimal
-          'right' unless association(entry, attr, :belongs_to)
+          "right" unless association(entry, attr, :belongs_to)
         when :boolean
-          'center'
+          "center"
         end
       end
 
@@ -110,7 +108,6 @@ module DryCrud
           entries.first.class
         end
       end
-
     end
   end
 end

data/app/helpers/dry_crud/table/col.rb

@@ -1,9 +1,7 @@
 module DryCrud
   module Table
-
     # Helper class to store column information.
     class Col # :nodoc:
-
       delegate :tag, :capture, to: :template
 
       attr_reader :header, :html_options, :template, :block
@@ -17,7 +15,7 @@ module DryCrud
 
       # Runs the Col block for the given entry.
       def content(entry)
-        entry.nil? ? '' : capture(entry, &block)
+        entry.nil? ? "" : capture(entry, &block)
       end
 
       # Renders the header cell of the Col.
@@ -29,7 +27,6 @@ module DryCrud
       def html_cell(entry)
         tag.td(content(entry), **html_options)
       end
-
     end
   end
 end

data/app/helpers/dry_crud/table/sorting.rb

@@ -1,11 +1,9 @@
 module DryCrud
   module Table
-
     # Provides headers with sort links. Expects a method :sortable?(attr)
     # in the template/controller to tell if an attribute is sortable or not.
     # Extracted into an own module for convenience.
     module Sorting
-
       # Create a header with sort links and a mark for the current sort
       # direction.
       def sort_header(attr, label = nil)
@@ -40,10 +38,10 @@ module DryCrud
       def current_mark(attr)
         if current_sort?(attr)
           # rubocop:disable Rails/OutputSafety
-          (sort_dir(attr) == 'asc' ? ' ↑' : ' ↓').html_safe
+          (sort_dir(attr) == "asc" ? " ↑" : " ↓").html_safe
           # rubocop:enable Rails/OutputSafety
         else
-          ''
+          ""
         end
       end
 
@@ -54,14 +52,13 @@ module DryCrud
 
       # The sort direction to use in the sort link for the given attribute.
       def sort_dir(attr)
-        current_sort?(attr) && params[:sort_dir] == 'asc' ? 'desc' : 'asc'
+        current_sort?(attr) && params[:sort_dir] == "asc" ? "desc" : "asc"
       end
 
       # Delegate to template.
       def params
         template.params
       end
-
     end
   end
 end

data/app/helpers/form_helper.rb

@@ -6,12 +6,11 @@
 # * #crud_form - A #standard_form for the current +entry+, with the given
 #   attributes or default.
 module FormHelper
-
   # Renders a form using Crud::FormBuilder.
   def plain_form(object, **options, &block)
     options[:html] ||= {}
-    add_css_class(options[:html], 'form-horizontal')
-    options[:html][:role] ||= 'form'
+    add_css_class(options[:html], "form-horizontal")
+    options[:html][:role] ||= "form"
     options[:builder] ||= DryCrud::Form::Builder
     options[:cancel_url] ||= polymorphic_path(object, returning: true)
 
@@ -25,13 +24,13 @@ module FormHelper
   # if present. An options hash may be given as the last argument.
   def standard_form(object, *attrs, **options, &block)
     plain_form(object, **options) do |form|
-      content = [form.error_messages]
+      content = [ form.error_messages ]
 
       content << if block_given?
                    capture(form, &block)
-                 else
+      else
                    form.labeled_input_fields(*attrs)
-                 end
+      end
 
       content << form.standard_actions
       safe_join(content)
@@ -45,5 +44,4 @@ module FormHelper
     attrs = default_crud_attrs - %i[created_at updated_at] if attrs.blank?
     standard_form(path_args(entry), *attrs, **options, &block)
   end
-
 end

data/app/helpers/format_helper.rb

@@ -6,19 +6,18 @@
 # Futher helpers standartize the layout of multiple attributes (#render_attrs),
 # values with labels (#labeled) and simple lists.
 module FormatHelper
-
   # Formats a basic value based on its Ruby class.
   def f(value)
     case value
     when Float, BigDecimal
-      number_with_precision(value, precision: t('number.format.precision'),
-                                   delimiter: t('number.format.delimiter'))
+      number_with_precision(value, precision: t("number.format.precision"),
+                                   delimiter: t("number.format.delimiter"))
     when Integer
-      number_with_delimiter(value, delimiter: t('number.format.delimiter'))
+      number_with_delimiter(value, delimiter: t("number.format.delimiter"))
     when Date   then l(value)
     when Time   then "#{l(value.to_date)} #{l(value, format: :time)}"
-    when true   then t('global.yes')
-    when false  then t('global.no')
+    when true   then t("global.yes")
+    when false  then t("global.no")
     when nil    then UtilityHelper::EMPTY_STRING
     else value.to_s
     end
@@ -47,7 +46,7 @@ module FormatHelper
   # Renders a list of attributes with label and value for a given object.
   # Optionally surrounded with a div.
   def render_attrs(obj, *attrs)
-    content_tag_nested(:dl, attrs, class: 'dl-horizontal') do |a|
+    content_tag_nested(:dl, attrs, class: "dl-horizontal") do |a|
       labeled_attr(obj, a)
     end
   end
@@ -61,14 +60,14 @@ module FormatHelper
   # presentation.
   def labeled(label, content = nil, &block)
     content = capture(&block) if block_given?
-    render('shared/labeled', label: label, content: content)
+    render("shared/labeled", label: label, content: content)
   end
 
   # Transform the given text into a form as used by labels or table headers.
   def captionize(text, clazz = nil)
     text = text.to_s
     if clazz.respond_to?(:human_attribute_name)
-      text_without_id = text.end_with?('_ids') ? text[0..-5].pluralize : text
+      text_without_id = text.end_with?("_ids") ? text[0..-5].pluralize : text
       clazz.human_attribute_name(text_without_id)
     else
       text.humanize.titleize
@@ -80,7 +79,7 @@ module FormatHelper
   # Checks whether a format_{class}_{attr} or format_{attr} helper method is
   # defined and calls it if is.
   def format_with_helper(obj, attr)
-    class_name = obj.class.name.underscore.tr('/', '_')
+    class_name = obj.class.name.underscore.tr("/", "_")
     format_type_attr_method = :"format_#{class_name}_#{attr}"
     format_attr_method = :"format_#{attr}"
 
@@ -123,7 +122,7 @@ module FormatHelper
     when :decimal
       number_with_precision(val.to_s.to_f,
                             precision: column_property(obj, attr, :scale),
-                            delimiter: t('number.format.delimiter'))
+                            delimiter: t("number.format.delimiter"))
     else f(val)
     end
   end
@@ -159,7 +158,6 @@ module FormatHelper
   # Returns true if no link should be created when formatting the given
   # association.
   def assoc_link?(_assoc, val)
-    respond_to?("#{val.class.model_name.singular_route_key}_path".to_sym)
+    respond_to?(:"#{val.class.model_name.singular_route_key}_path")
   end
-
 end

data/app/helpers/i18n_helper.rb

@@ -1,7 +1,6 @@
 # Translation helpers extending the Rails +translate+ helper to support
 # translation inheritance over the controller class hierarchy.
 module I18nHelper
-
   # Translates the passed key by looking it up over the controller hierarchy.
   # The key is searched in the following order:
   #  - {controller}.{current_partial}.{key}
@@ -13,7 +12,7 @@ module I18nHelper
   #  - ...
   #  - global.{key}
   def translate_inheritable(key, **variables)
-    partial = defined?(@virtual_path) ? @virtual_path.gsub(/.*\/_?/, '') : nil
+    partial = defined?(@virtual_path) ? @virtual_path.gsub(/.*\/_?/, "") : nil
     defaults = inheritable_translation_defaults(key, partial)
     variables[:default] ||= defaults
     t(defaults.shift, **variables)
@@ -30,8 +29,8 @@ module I18nHelper
   #  - global.associations.{key}
   def translate_association(key, assoc = nil, **variables)
     if assoc && assoc.options[:polymorphic].nil?
-      variables[:default] ||= [association_klass_key(assoc, key).to_sym,
-                               :"global.associations.#{key}"]
+      variables[:default] ||= [ association_klass_key(assoc, key).to_sym,
+                               :"global.associations.#{key}" ]
       t(association_owner_key(assoc, key), **variables)
     else
       t("global.associations.#{key}", **variables)
@@ -44,20 +43,20 @@ module I18nHelper
 
   # General translation key based on the klass of the association.
   def association_klass_key(assoc, key)
-    k = 'activerecord.associations.'
+    k = "activerecord.associations."
     k << assoc.klass.model_name.singular
-    k << '.'
+    k << "."
     k << key.to_s
   end
 
   # Specific translation key based on the owner model and the name
   # of the association.
   def association_owner_key(assoc, key)
-    k = 'activerecord.associations.models.'
+    k = "activerecord.associations.models."
     k << assoc.active_record.model_name.singular
-    k << '.'
+    k << "."
     k << assoc.name.to_s
-    k << '.'
+    k << "."
     k << key.to_s
   end
 
@@ -79,5 +78,4 @@ module I18nHelper
     defaults << :"#{folder}.#{action_name}.#{key}"
     defaults << :"#{folder}.global.#{key}"
   end
-
 end

data/app/helpers/table_helper.rb

@@ -7,14 +7,13 @@
 # * #crud_table - A sortable #plain_table for the current +entries+, with the
 #   given attributes or default and the standard crud action links.
 module TableHelper
-
   # Renders a table for the given entries. One column is rendered for each
   # attribute passed. If a block is given, the columns defined therein are
   # appended to the attribute columns.
   # If entries is empty, an appropriate message is rendered.
   # An options hash may be given as the last argument.
   def plain_table(entries, *attrs, **options)
-    add_css_class(options, 'table table-striped table-hover')
+    add_css_class(options, "table table-striped table-hover")
     builder = options.delete(:builder) || DryCrud::Table::Builder
     builder.table(entries, self, **options) do |t|
       t.attrs(*attrs)
@@ -29,7 +28,7 @@ module TableHelper
     if entries.present?
       plain_table(entries, *attrs, **options, &block)
     else
-      tag.div(ti(:no_list_entries), class: 'table')
+      tag.div(ti(:no_list_entries), class: "table")
     end
   end
 
@@ -77,5 +76,4 @@ module TableHelper
       attrs
     end
   end
-
 end

data/app/helpers/utility_helper.rb

@@ -1,10 +1,9 @@
-require 'English'
+require "English"
 
 # View helpers for basic functions used in various other helpers.
 module UtilityHelper
-
   # non-breaking space asserts better css.
-  EMPTY_STRING = ' '.html_safe.freeze
+  EMPTY_STRING = " ".html_safe.freeze
 
   # Render a content tag with the collected contents rendered
   # by &block for each item in collection.
@@ -21,8 +20,8 @@ module UtilityHelper
   # Returns the css class for the given flash level.
   def flash_class(level)
     case level
-    when :notice then 'success'
-    when :alert then 'error'
+    when :notice then "success"
+    when :alert then "error"
     else level.to_s
     end
   end
@@ -72,13 +71,12 @@ module UtilityHelper
   # Returns the name of the attr and it's corresponding field
   def assoc_and_id_attr(attr)
     attr = attr.to_s
-    if attr.end_with?('_id')
-      [attr[0..-4], attr]
-    elsif attr.end_with?('_ids')
-      [attr[0..-5].pluralize, attr]
+    if attr.end_with?("_id")
+      [ attr[0..-4], attr ]
+    elsif attr.end_with?("_ids")
+      [ attr[0..-5].pluralize, attr ]
     else
-      [attr, "#{attr}_id"]
+      [ attr, "#{attr}_id" ]
     end
   end
-
 end

data/app/views/layouts/application.html.erb

@@ -10,7 +10,7 @@
   <%= csp_meta_tag %>
 
   <%= stylesheet_link_tag 'application', 'data-turbo-track': 'reload' %>
-  <%= javascript_include_tag 'application', 'data-turbo-track': 'reload', defer: true %>
+  <%= javascript_include_tag 'application', 'data-turbo-track': 'reload', type: 'module', defer: true %>
 
   <%= yield :head %>
 </head>

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

@@ -12,7 +12,7 @@
     = csp_meta_tag
 
     = stylesheet_link_tag 'application', 'data-turbo-track': 'reload'
-    = javascript_include_tag 'application', 'data-turbo-track': 'reload', defer: true
+    = javascript_include_tag 'application', 'data-turbo-track': 'reload', type: 'module', defer: true
 
     = yield :head
 

data/lib/dry_crud/engine.rb

@@ -1,10 +1,9 @@
 module DryCrud
   # Dry Crud Rails engine
   class Engine < Rails::Engine
-
     # Fields with errors are directly styled in DryCrud::FormBuilder.
     # Rails should just output the plain html tag.
-    initializer 'dry_crud.field_error_proc' do |_app|
+    initializer "dry_crud.field_error_proc" do |_app|
       ActionView::Base.field_error_proc =
         proc { |html_tag, _instance| html_tag }
     end
@@ -21,6 +20,5 @@ module DryCrud
         paths.prepend(dry_crud_helpers)
       end
     end
-
   end
 end

data/lib/dry_crud.rb

@@ -1,4 +1,4 @@
-require 'dry_crud/engine'
+require "dry_crud/engine"
 
 # Base namespace
 module DryCrud

data/lib/generators/dry_crud/dry_crud_generator.rb

@@ -1,15 +1,15 @@
 begin
-  require 'generators/dry_crud/dry_crud_generator_base'
+  require "generators/dry_crud/dry_crud_generator_base"
 rescue LoadError => _e
   # ok, we are in the rake task
 end
 
 # Copies all dry_crud files to the rails application.
 class DryCrudGenerator < DryCrudGeneratorBase
-  desc 'Copy all dry_crud files to the application.'
+  desc "Copy all dry_crud files to the application."
 
-  class_options %w[templates -t] => 'erb'
-  class_options %w[tests] => 'testunit'
+  class_options %w[templates -t] => "erb"
+  class_options %w[tests] => "testunit"
 
   # copy everything to application
   def install_dry_crud
@@ -19,7 +19,7 @@ class DryCrudGenerator < DryCrudGeneratorBase
       copy_crud_test_model
     end
 
-    readme 'INSTALL'
+    readme "INSTALL"
   end
 
   private
@@ -27,29 +27,29 @@ class DryCrudGenerator < DryCrudGeneratorBase
   def should_copy?(file_source)
     !file_source.end_with?(exclude_template) &&
       !file_source.start_with?(exclude_test_dir) &&
-      file_source != 'INSTALL'
+      file_source != "INSTALL"
   end
 
   def copy_crud_test_model
-    unless exclude_test_dir == 'spec'
-      template(File.join('test', 'support', 'crud_test_model.rb'),
-               File.join('spec', 'support', 'crud_test_model.rb'))
-      template(File.join('test', 'support', 'crud_test_models_controller.rb'),
-               File.join('spec', 'support', 'crud_test_models_controller.rb'))
-      template(File.join('test', 'support', 'crud_test_helper.rb'),
-               File.join('spec', 'support', 'crud_test_helper.rb'))
+    unless exclude_test_dir == "spec"
+      template(File.join("test", "support", "crud_test_model.rb"),
+               File.join("spec", "support", "crud_test_model.rb"))
+      template(File.join("test", "support", "crud_test_models_controller.rb"),
+               File.join("spec", "support", "crud_test_models_controller.rb"))
+      template(File.join("test", "support", "crud_test_helper.rb"),
+               File.join("spec", "support", "crud_test_helper.rb"))
     end
   end
 
   def exclude_template
-    options[:templates].casecmp('haml').zero? ? '.erb' : '.haml'
+    options[:templates].casecmp("haml").zero? ? ".erb" : ".haml"
   end
 
   def exclude_test_dir
     case options[:tests].downcase
-    when 'rspec' then 'test'
-    when 'all' then 'exclude_nothing'
-    else 'spec'
+    when "rspec" then "test"
+    when "all" then "exclude_nothing"
+    else "spec"
     end
   end
 end

data/lib/generators/dry_crud/dry_crud_generator_base.rb

@@ -1,31 +1,31 @@
-require 'rails/generators'
+require "rails/generators"
 
 # Generates all dry crud files
 class DryCrudGeneratorBase < Rails::Generators::Base
   def self.template_root
-    File.join(File.dirname(__FILE__), 'templates')
+    File.join(File.dirname(__FILE__), "templates")
   end
 
   def self.gem_root
-    File.join(File.dirname(__FILE__), '..', '..', '..')
+    File.join(File.dirname(__FILE__), "..", "..", "..")
   end
 
   def self.source_paths
-    [gem_root,
-     template_root]
+    [ gem_root,
+     template_root ]
   end
 
   private
 
   def all_template_files
     { self.class.gem_root =>
-        template_files(self.class.gem_root, 'app', 'config'),
+        template_files(self.class.gem_root, "app", "config"),
       self.class.template_root =>
         template_files(self.class.template_root) }
   end
 
   def template_files(root, *folders)
-    pattern = File.join('**', '**')
+    pattern = File.join("**", "**")
     pattern = File.join("{#{folders.join(',')}}", pattern) if folders.present?
     Dir.chdir(root) do
       Dir.glob(pattern).sort.reject { |f| File.directory?(f) }
@@ -47,7 +47,7 @@ class DryCrudGeneratorBase < Rails::Generators::Base
   end
 
   def copy_file_source(file_source)
-    if file_source.end_with?('.erb')
+    if file_source.end_with?(".erb")
       copy_file(file_source)
     else
       template(file_source)

data/lib/generators/dry_crud/file_generator.rb

@@ -1,16 +1,16 @@
-require 'generators/dry_crud/dry_crud_generator_base'
+require "generators/dry_crud/dry_crud_generator_base"
 
 module DryCrud
   # Copies one file of dry_crud to the rails application.
   class FileGenerator < ::DryCrudGeneratorBase
     desc "Copy one file from dry_crud to the application.\n" \
-         'FILENAME is a part of the name of the file to copy. ' \
-         'Must match exactly one file.'
+         "FILENAME is a part of the name of the file to copy. " \
+         "Must match exactly one file."
 
     argument :filename,
              type: :string,
-             desc: 'Name or part of the filename to copy. ' \
-                   'Must match exactly one file.'
+             desc: "Name or part of the filename to copy. " \
+                   "Must match exactly one file."
 
     # rubocop:disable Rails/Output
     def copy_matching_file
@@ -21,7 +21,7 @@ module DryCrud
       when 0
         puts "No file containing '#{filename}' found in dry_crud."
       else
-        puts 'Please be more specific. ' \
+        puts "Please be more specific. " \
              "All the following files match '#{filename}':"
         files.each do |f|
           puts " * #{f}"

data/lib/generators/dry_crud/templates/config/initializers/field_error_proc.rb

@@ -2,4 +2,4 @@
 
 # Fields with errors are directly styled in Crud::FormBuilder.
 # Rails should just output the plain html tag.
-ActionView::Base.field_error_proc = proc { |html_tag, instance| html_tag }
+ActionView::Base.field_error_proc = proc { |html_tag, instance| html_tag }