dry_crud 6.0.0 → 7.1.0

data/app/helpers/dry_crud/form/control.rb

@@ -8,7 +8,7 @@ module DryCrud
 
       attr_reader :builder, :attr, :args, :options, :addon, :help
 
-      delegate :content_tag, :object,
+      delegate :tag, :object, :add_css_class,
                to: :builder
 
       # Html displayed to mark an input as required.
@@ -39,10 +39,10 @@ module DryCrud
       #   (The value for this option usually is 'required').
       #
       # All the other options will go to the field_method.
-      def initialize(builder, attr, *args)
+      def initialize(builder, attr, *args, **options)
         @builder = builder
         @attr = attr
-        @options = args.extract_options!
+        @options = options
         @args = args
 
         @addon = options.delete(:addon)
@@ -70,11 +70,9 @@ module DryCrud
 
       # Create the HTML markup for any labeled content.
       def labeled
-        errors = errors? ? ' has-error' : ''
-
-        content_tag(:div, class: "form-group#{errors}") do
-          builder.label(attr, caption, class: 'col-md-2 control-label') +
-            content_tag(:div, content, class: "col-md-#{span}")
+        tag.div(class: 'row mb-3') do
+          builder.label(attr, caption, class: 'col-md-2 col-form-label') +
+            tag.div(content, class: "col-md-#{span}")
         end
       end
 
@@ -101,7 +99,8 @@ module DryCrud
       def input
         @input ||= begin
           options[:required] = 'required' if required
-          builder.send(field_method, attr, *(args << options))
+          add_css_class(options, 'is-invalid') if errors?
+          builder.send(field_method, attr, *args, **options)
         end
       end
 
@@ -137,7 +136,6 @@ module DryCrud
 
       # Defines the field method to use based on the attribute
       # type, association or name.
-      # rubocop:disable PerceivedComplexity
       def detect_field_method
         if type == :text
           :text_area
@@ -155,7 +153,6 @@ module DryCrud
           :text_field
         end
       end
-      # rubocop:enable PerceivedComplexity
 
       # The column type of the attribute.
       def type

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

@@ -26,13 +26,13 @@ module DryCrud
       # Action column to show the row entry.
       # A block may be given to define the link path for the row entry.
       # If the block returns nil, no link is rendered.
-      def show_action_col(html_options = {}, &block)
+      def show_action_col(**html_options, &block)
         action_col do |entry|
           path = action_path(entry, &block)
           if path
             table_action_link('zoom-in',
                               path,
-                              html_options.clone)
+                              **html_options.clone)
           end
         end
       end
@@ -40,12 +40,12 @@ module DryCrud
       # Action column to edit the row entry.
       # A block may be given to define the link path for the row entry.
       # If the block returns nil, no link is rendered.
-      def edit_action_col(html_options = {}, &block)
+      def edit_action_col(**html_options, &block)
         action_col do |entry|
           path = action_path(entry, &block)
           if path
-            path = path.is_a?(String) ? path : edit_polymorphic_path(path)
-            table_action_link('pencil', path, html_options.clone)
+            path = edit_polymorphic_path(path) unless path.is_a?(String)
+            table_action_link('pencil', path, **html_options.clone)
           end
         end
       end
@@ -53,15 +53,15 @@ module DryCrud
       # Action column to destroy the row entry.
       # A block may be given to define the link path for the row entry.
       # If the block returns nil, no link is rendered.
-      def destroy_action_col(html_options = {}, &block)
+      def destroy_action_col(**html_options, &block)
         action_col do |entry|
           path = action_path(entry, &block)
           if path
-            table_action_link('remove',
+            table_action_link('trash',
                               path,
-                              html_options.merge(
-                                data: { confirm: ti(:confirm_delete),
-                                        method: :delete }
+                              **html_options.merge(
+                                data: { 'turbo-confirm': ti(:confirm_delete),
+                                        'turbo-method': :delete }
                               ))
           end
         end
@@ -74,8 +74,8 @@ module DryCrud
       end
 
       # Generic action link inside a table.
-      def table_action_link(icon, url, html_options = {})
-        add_css_class(html_options, "icon icon-#{icon}")
+      def table_action_link(icon, url, **html_options)
+        add_css_class(html_options, "bi-#{icon}")
         link_to('', url, html_options)
       end
 

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

@@ -16,11 +16,11 @@ module DryCrud
 
       attr_reader :entries, :cols, :options, :template
 
-      delegate :content_tag, :format_attr, :column_type, :association, :dom_id,
+      delegate :tag, :format_attr, :column_type, :association, :dom_id,
                :captionize, :add_css_class, :content_tag_nested,
                to: :template
 
-      def initialize(entries, template, options = {})
+      def initialize(entries, template, **options)
         @entries = entries
         @template = template
         @options = options
@@ -30,8 +30,8 @@ module DryCrud
       # Convenience method to directly generate a table. Renders a row for each
       # entry in entries. Takes a block that gets the table object as parameter
       # for configuration. Returns the generated html for the table.
-      def self.table(entries, template, options = {})
-        t = new(entries, template, options)
+      def self.table(entries, template, **options)
+        t = new(entries, template, **options)
         yield t
         t.to_html
       end
@@ -39,7 +39,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
 
@@ -55,17 +55,17 @@ module DryCrud
       # Define a column for the given attribute and an optional header.
       # If no header is given, the attribute name is used. The cell will
       # contain the formatted attribute value for the current entry.
-      def attr(attr, header = nil, html_options = {}, &block)
+      def attr(attr, header = nil, **html_options, &block)
         header ||= attr_header(attr)
         block ||= ->(e) { format_attr(e, attr) }
         add_css_class(html_options, align_class(attr))
-        col(header, html_options, &block)
+        col(header, **html_options, &block)
       end
 
       # Renders the table as HTML.
       def to_html
-        content_tag :table, options do
-          content_tag(:thead, html_header) +
+        tag.table(**options) do
+          tag.thead(html_header) +
             content_tag_nested(:tbody, entries) { |e| html_row(e) }
         end
       end
@@ -98,7 +98,7 @@ module DryCrud
       def html_row(entry)
         attrs = {}
         attrs[:id] = dom_id(entry) if entry.respond_to?(:to_key)
-        content_tag_nested(:tr, cols, attrs) { |c| c.html_cell(entry) }
+        content_tag_nested(:tr, cols, **attrs) { |c| c.html_cell(entry) }
       end
 
       # Determines the class of the table entries.

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

@@ -2,9 +2,9 @@ module DryCrud
   module Table
 
     # Helper class to store column information.
-    class Col #:nodoc:
+    class Col # :nodoc:
 
-      delegate :content_tag, :capture, to: :template
+      delegate :tag, :capture, to: :template
 
       attr_reader :header, :html_options, :template, :block
 
@@ -22,12 +22,12 @@ module DryCrud
 
       # 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

data/app/helpers/form_helper.rb

@@ -8,14 +8,14 @@
 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'
     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,8 +23,8 @@ 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|
+  def standard_form(object, *attrs, **options, &block)
+    plain_form(object, **options) do |form|
       content = [form.error_messages]
 
       content << if block_given?
@@ -41,11 +41,9 @@ 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

@@ -10,10 +10,10 @@ module FormatHelper
   # Formats a basic value based on its Ruby class.
   def f(value)
     case value
-    when Float, BigDecimal then
+    when Float, BigDecimal
       number_with_precision(value, precision: t('number.format.precision'),
                                    delimiter: t('number.format.delimiter'))
-    when Integer then
+    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)}"
@@ -38,9 +38,9 @@ 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
 
@@ -119,8 +119,8 @@ 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'))

data/app/helpers/i18n_helper.rb

@@ -12,11 +12,11 @@ module I18nHelper
   #  - {parent_controller}.global.{key}
   #  - ...
   #  - global.{key}
-  def translate_inheritable(key, variables = {})
+  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 +28,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)
+      t(association_owner_key(assoc, key), **variables)
     else
-      t("global.associations.#{key}", variables)
+      t("global.associations.#{key}", **variables)
     end
   end
 

data/app/helpers/table_helper.rb

@@ -13,11 +13,10 @@ module TableHelper
   # 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!
+  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 +24,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 +51,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 +70,12 @@ 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

@@ -8,8 +8,8 @@ module UtilityHelper
 
   # 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
@@ -30,7 +30,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

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', 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', 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/generators/dry_crud/dry_crud_generator.rb

@@ -1,6 +1,6 @@
 begin
   require 'generators/dry_crud/dry_crud_generator_base'
-rescue LoadError => _e # rubocop:disable Lint/HandleExceptions
+rescue LoadError => _e
   # ok, we are in the rake task
 end
 

data/lib/generators/dry_crud/templates/spec/controllers/crud_test_models_controller_spec.rb

@@ -50,7 +50,7 @@ describe CrudTestModelsController do
     end
 
     it 'has models_label singular' do
-      expect(controller.models_label(false)).to eq('Crud Test Model')
+      expect(controller.models_label(plural: false)).to eq('Crud Test Model')
     end
   end
 
@@ -245,7 +245,7 @@ describe CrudTestModelsController do
 
       context 'plain', combine: 'chcp' do
         it_is_expected_to_respond
-        it_is_expected_to_persist_entry(false)
+        it_is_expected_to_persist_entry(persist: false)
         it_is_expected_to_have_flash(:alert)
 
         it 'sets entry name' do
@@ -292,7 +292,7 @@ describe CrudTestModelsController do
 
         context 'plain', combine: 'chip' do
           it_is_expected_to_respond
-          it_is_expected_to_persist_entry(false)
+          it_is_expected_to_persist_entry(persist: false)
           it_is_expected_to_not_have_flash(:notice)
           it_is_expected_to_not_have_flash(:alert)
 
@@ -316,7 +316,7 @@ describe CrudTestModelsController do
 
         context 'plain', combine: 'cjcb' do
           it_is_expected_to_respond(422)
-          it_is_expected_to_persist_entry(false)
+          it_is_expected_to_persist_entry(persist: false)
           it_is_expected_to_not_have_flash(:notice)
           it_is_expected_to_not_have_flash(:alert)
           it_is_expected_to_render_json

data/lib/generators/dry_crud/templates/spec/helpers/dry_crud/form/builder_spec.rb

@@ -42,7 +42,7 @@ describe 'DryCrud::Form::Builder' do
       other_ids: :has_many_field,
       more_ids: :has_many_field }.each do |attr, method|
       it "dispatches #{attr} attr to #{method}" do
-        expect(form).to receive(method).with(attr, {})
+        expect(form).to receive(method).with(attr)
         form.input_field(attr)
       end
 
@@ -63,12 +63,12 @@ describe 'DryCrud::Form::Builder' do
   describe '#labeled_input_field' do
     context 'when required' do
       subject { form.labeled_input_field(:name) }
-      it { is_expected.to include('input-group-append') }
+      it { is_expected.to include('input-group-text') }
     end
 
     context 'when not required' do
       subject { form.labeled_input_field(:remarks) }
-      it { is_expected.not_to include('input-group-append') }
+      it { is_expected.not_to include('input-group-text') }
     end
 
     context 'with help text' do

data/lib/generators/dry_crud/templates/spec/helpers/dry_crud/table/builder_spec.rb

@@ -8,7 +8,7 @@ describe 'DryCrud::Table::Builder' do
   let(:entries) { %w[foo bahr] }
   let(:table)   { DryCrud::Table::Builder.new(entries, self) }
 
-  def format_size(obj) #:nodoc:
+  def format_size(obj) # :nodoc:
     "#{obj.size} chars"
   end
 

data/lib/generators/dry_crud/templates/spec/helpers/form_helper_spec.rb

@@ -97,7 +97,7 @@ describe FormHelper do
 
       it do
         is_expected.to match(/input .*?type="number"
-                                    .*?value=\"9\"
+                                    .*?value="9"
                                     .*?name="crud_test_model\[children\]"/x)
       end
 
@@ -132,9 +132,10 @@ describe FormHelper do
       end
 
       it do
-        is_expected.to match(/div\ class="form-group\ has-error"\>.*?
-                              \<input .*?type="text"
-                                      .*?name="crud_test_model\[name\]"/x)
+        is_expected.to match(/div\ class="row\ mb-3">.*?
+                              <input .*?class="is-invalid\ form-control"
+                                     .*?type="text"
+                                     .*?name="crud_test_model\[name\]"/x)
       end
 
       it do
@@ -191,7 +192,7 @@ describe FormHelper do
     end
 
     it do
-      is_expected.to match(/input .*?type="datetime\-local"
+      is_expected.to match(/input .*?type="datetime-local"
                                   .*?name="crud_test_model\[last_seen\]"/x)
     end