dry_crud 6.0.0 → 8.0.0

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

@@ -1,10 +1,8 @@
 module DryCrud
   module Table
-
     # Helper class to store column information.
-    class Col #:nodoc:
-
-      delegate :content_tag, :capture, to: :template
+    class Col # :nodoc:
+      delegate :tag, :capture, to: :template
 
       attr_reader :header, :html_options, :template, :block
 
@@ -17,19 +15,18 @@ 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.
       def html_header
-        content_tag(:th, header, html_options)
+        tag.th(header, **html_options)
       end
 
       # Renders a table cell for the given entry.
       def html_cell(entry)
-        content_tag(:td, content(entry), html_options)
+        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,16 +6,15 @@
 # * #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)
+  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)
 
-    form_for(object, options, &block)
+    form_for(object, **options, &block)
   end
 
   # Renders a standard form for the given entry and attributes.
@@ -23,15 +22,15 @@ module FormHelper
   # If a block is given, custom input fields may be rendered and attrs is
   # ignored. Before the input fields, the error messages are rendered,
   # if present. An options hash may be given as the last argument.
-  def standard_form(object, *attrs, &block)
-    plain_form(object, attrs.extract_options!) do |form|
-      content = [form.error_messages]
+  def standard_form(object, *attrs, **options, &block)
+    plain_form(object, **options) do |form|
+      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)
@@ -41,11 +40,8 @@ module FormHelper
   # Renders a crud form for the current entry with default_crud_attrs or the
   # given attribute array. An options hash may be given as the last argument.
   # If a block is given, a custom form may be rendered and attrs is ignored.
-  def crud_form(*attrs, &block)
-    options = attrs.extract_options!
+  def crud_form(*attrs, **options, &block)
     attrs = default_crud_attrs - %i[created_at updated_at] if attrs.blank?
-    attrs << options
-    standard_form(path_args(entry), *attrs, &block)
+    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 then
-      number_with_precision(value, precision: t('number.format.precision'),
-                                   delimiter: t('number.format.delimiter'))
-    when Integer then
-      number_with_delimiter(value, delimiter: t('number.format.delimiter'))
+    when Float, BigDecimal
+      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"))
     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
@@ -38,16 +37,16 @@ module FormatHelper
   # Renders a simple unordered list, which will
   # simply render all passed items or yield them
   # to your block.
-  def simple_list(items, ul_options = {})
-    content_tag_nested(:ul, items, ul_options) do |item|
-      content_tag(:li, block_given? ? yield(item) : f(item))
+  def simple_list(items, **ul_options)
+    content_tag_nested(:ul, items, **ul_options) do |item|
+      tag.li(block_given? ? yield(item) : f(item))
     end
   end
 
   # 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}"
 
@@ -119,11 +118,11 @@ module FormatHelper
     when :time    then l(val, format: :time)
     when :date    then f(val.to_date)
     when :datetime, :timestamp then f(val.time)
-    when :text    then simple_format(h(val))
-    when :decimal then
+    when :text then simple_format(h(val))
+    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}
@@ -12,11 +11,11 @@ module I18nHelper
   #  - {parent_controller}.global.{key}
   #  - ...
   #  - global.{key}
-  def translate_inheritable(key, variables = {})
-    partial = defined?(@virtual_path) ? @virtual_path.gsub(/.*\/_?/, '') : nil
+  def translate_inheritable(key, **variables)
+    partial = defined?(@virtual_path) ? @virtual_path.gsub(/.*\/_?/, "") : nil
     defaults = inheritable_translation_defaults(key, partial)
     variables[:default] ||= defaults
-    t(defaults.shift, variables)
+    t(defaults.shift, **variables)
   end
 
   alias ti translate_inheritable
@@ -28,13 +27,13 @@ module I18nHelper
   #  - activerecord.associations.models.{model_name}.{association_name}.{key}
   #  - activerecord.associations.{association_model_name}.{key}
   #  - global.associations.{key}
-  def translate_association(key, assoc = nil, variables = {})
+  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}"]
-      t(association_owner_key(assoc, key), variables)
+      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)
+      t("global.associations.#{key}", **variables)
     end
   end
 
@@ -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,17 +7,15 @@
 # * #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 = attrs.extract_options!
-    add_css_class(options, 'table table-striped table-hover')
+  def plain_table(entries, *attrs, **options)
+    add_css_class(options, "table table-striped table-hover")
     builder = options.delete(:builder) || DryCrud::Table::Builder
-    builder.table(entries, self, options) do |t|
+    builder.table(entries, self, **options) do |t|
       t.attrs(*attrs)
       yield t if block_given?
     end
@@ -25,21 +23,21 @@ module TableHelper
 
   # Renders a #plain_table for the given entries.
   # If entries is empty, an appropriate message is rendered.
-  def plain_table_or_message(entries, *attrs, &block)
+  def plain_table_or_message(entries, *attrs, **options, &block)
     entries.to_a # force evaluation of relations
     if entries.present?
-      plain_table(entries, *attrs, &block)
+      plain_table(entries, *attrs, **options, &block)
     else
-      content_tag(:div, ti(:no_list_entries), class: 'table')
+      tag.div(ti(:no_list_entries), class: "table")
     end
   end
 
   # Create a table of the +entries+ with the default or
   # the passed attributes in its columns. An options hash may be given
   # as the last argument.
-  def list_table(*attrs, &block)
-    attrs, options = explode_attrs_with_options(attrs, &block)
-    plain_table_or_message(entries, options) do |t|
+  def list_table(*attrs, **options, &block)
+    attrs = attrs_or_default(attrs, &block)
+    plain_table_or_message(entries, **options) do |t|
       t.sortable_attrs(*attrs)
       yield t if block_given?
     end
@@ -52,10 +50,10 @@ module TableHelper
   # If a block is given, the column defined there will be inserted
   # between the given attributes and the actions.
   # An options hash for the table builder may be given as the last argument.
-  def crud_table(*attrs, &block)
-    attrs, options = explode_attrs_with_options(attrs, &block)
+  def crud_table(*attrs, **options, &block)
+    attrs = attrs_or_default(attrs, &block)
     first = attrs.shift
-    plain_table_or_message(entries, options) do |t|
+    plain_table_or_message(entries, **options) do |t|
       t.attr_with_show_link(first) if first
       t.sortable_attrs(*attrs)
       yield t if block_given?
@@ -71,12 +69,11 @@ module TableHelper
 
   private
 
-  def explode_attrs_with_options(attrs)
-    options = attrs.extract_options!
+  def attrs_or_default(attrs)
     if !block_given? && attrs.blank?
-      attrs = default_crud_attrs
+      default_crud_attrs
+    else
+      attrs
     end
-    [attrs, options]
   end
-
 end

data/app/helpers/utility_helper.rb

@@ -1,15 +1,14 @@
-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.
-  def content_tag_nested(tag, collection, options = {}, &block)
-    content_tag(tag, safe_join(collection, &block), options)
+  def content_tag_nested(tag, collection, **options, &block)
+    content_tag(tag, safe_join(collection, &block), **options)
   end
 
   # Overridden method that takes a block that is executed for each item in
@@ -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
@@ -30,7 +29,7 @@ module UtilityHelper
   # Adds a class to the given options, even if there are already classes.
   def add_css_class(options, classes)
     if options[:class]
-      options[:class] += ' ' + classes if classes
+      options[:class] += " #{classes}" if classes
     else
       options[:class] = classes
     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/crud/new.html.erb

@@ -1,4 +1,4 @@
-<% @title ||= ti(:title, model: models_label(false)) -%>
+<% @title ||= ti(:title, model: models_label(plural: false)) -%>
 
 <% content_for(:actions, index_action_link) %>
 

data/app/views/crud/new.html.haml

@@ -1,4 +1,4 @@
-- @title ||= ti(:title, model: models_label(false))
+- @title ||= ti(:title, model: models_label(plural: false))
 
 - content_for(:actions, index_action_link)
 

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

@@ -5,31 +5,33 @@
   <meta charset="utf-8" />
   <title><%= strip_tags(@title) %> - MyApp</title>
 
-  <meta name="viewport" content="width=device-width, initial-scale=1.0">
+  <meta name="viewport" content="width=device-width,initial-scale=1">
   <%= csrf_meta_tag %>
   <%= csp_meta_tag %>
 
-  <%= stylesheet_link_tag 'application', media: 'all', 'data-turbolinks-track': 'reload' %>
-  <%= javascript_pack_tag 'application', 'data-turbolinks-track': 'reload' %>
+  <%= stylesheet_link_tag 'application', 'data-turbo-track': 'reload' %>
+  <%= javascript_include_tag 'application', 'data-turbo-track': 'reload', type: 'module', defer: true %>
 
   <%= yield :head %>
 </head>
 <body>
 
 <nav class="navbar navbar-expand-lg navbar-light bg-light mb-4">
-  <%= render 'layouts/nav' %>
+  <div class="container-fluid">
+    <%= render 'layouts/nav' %>
+  </div>
 </nav>
 
 <div class="container">
 
   <h1><%= @title %></h1>
 
-  <div class="row actions">
+  <div class="row actions mb-3">
     <div class="col-md-5">
         <%= yield :tools %>
     </div>
     <div class="col-md-7">
-      <div class="btn-toolbar float-right">
+      <div class="btn-toolbar float-end">
         <%= yield :actions %>
       </div>
     </div>

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

@@ -11,23 +11,24 @@
     = csrf_meta_tag
     = csp_meta_tag
 
-    = stylesheet_link_tag 'application', :media => 'all', 'data-turbolinks-track': 'reload'
-    = javascript_pack_tag 'application', 'data-turbolinks-track': 'reload'
+    = stylesheet_link_tag 'application', 'data-turbo-track': 'reload'
+    = javascript_include_tag 'application', 'data-turbo-track': 'reload', type: 'module', defer: true
 
     = yield :head
 
   %body
     %nav.navbar.navbar-expand-lg.navbar-light.bg-light.mb-4
-      = render 'layouts/nav'
+      .container-fluid
+        = render 'layouts/nav'
 
     .container
       %h1= @title
 
-      .row.actions
+      .row.actions.mb-3
         .col-md-5
           = yield :tools
         .col-md-7
-          .btn-toolbar.float-right
+          .btn-toolbar.float-end
             = yield :actions
 
       #flash= render partial: 'layouts/flash', collection: [:notice, :alert], as: :level

data/app/views/list/_search.html.erb

@@ -3,8 +3,6 @@
   <%= hidden_field_tag :page, 1 %>
   <div class="input-group">
     <%= search_field_tag :q, params[:q], class: 'form-control' %>
-    <span class="input-group-append">
-      <%= submit_tag ti(:"button.search"), class: 'btn btn-outline-secondary' %>
-    </span>
+    <%= submit_tag ti(:"button.search"), class: 'btn btn-outline-secondary' %>
   </div>
 <% end %>

data/app/views/list/_search.html.haml

@@ -3,5 +3,4 @@
   = hidden_field_tag :page, 1
   .input-group
     = search_field_tag :q, params[:q], class: 'form-control'
-    %span.input-group-append
-      = submit_tag ti(:"button.search"), class: 'btn btn-outline-secondary'
+    = submit_tag ti(:"button.search"), class: 'btn btn-outline-secondary'

data/app/views/shared/_error_messages.html.erb

@@ -1,8 +1,8 @@
 <% if errors.any? %>
   <div id='error_explanation' class='alert alert-danger'>
-      <h2>
+      <p>
       <%= ti(:"errors.header", count: errors.count, model: object.to_s) %>
-      </h2>
+      </p>
       <ul>
           <% errors.full_messages.each do |msg| %>
             <li><%= msg %></li>

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'
-rescue LoadError => _e # rubocop:disable Lint/HandleExceptions
+  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