dry_crud 6.0.0 → 7.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3ff2a042dc7c846957d5e17001f9a538df726084e3695988d68066849938d544
-  data.tar.gz: 504a97b4e2b0769cb260790725bb1a59aaffe33a16a093556d9462dd2403794f
+  metadata.gz: cf13269261b9cbae5f96418d05f9032805c3a50e1f1e7c02b79d71bfbf6c89c1
+  data.tar.gz: e28764d18296115dcae6119a97ed282d1d4da809585791333c0e6c328634d140
 SHA512:
-  metadata.gz: 9808508def34a37d4d7bea43c5e7d810a4ac57d09c36ceadf8ee0fbf5bba3650611c5e3c5b010f5aa015666076ac3971fe824f2d6deeb17d913cc4404d2261bd
-  data.tar.gz: c9b52ac7b06f5ab74f4fc3b8b0f340f1e3e5f35296296d109585dcb51906b46eb9615c393865cdde30aefb096dabf41dac197a24dc8e364d57e071551fbb0e5e
+  metadata.gz: a767e47df9be1a264bafa9af864278546e14fcfdf5bf728686c01bdf76d52823a73a215177a136a8c696c15898a82da899b88a2fc3252977d88c16a9da811436
+  data.tar.gz: d899147d340aae9dc0e75a64f718b3ada4debdd84a5d77970d2b6284cb9690f2f43877fe77319c900cb524a6da57a79be5c155098114d298cc040c09b6e3353b

data/MIT-LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2010-2013 Pascal Zumkehr
+Copyright (c) 2010-2023 Pascal Zumkehr
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -16,4 +16,4 @@ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
 AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
+THE SOFTWARE.

data/README.rdoc

@@ -1,6 +1,8 @@
 = DRY CRUD
 
-{<img src="https://travis-ci.org/codez/dry_crud.svg?branch=master" />}[http://travis-ci.org/codez/dry_crud]
+{rdoc-image:https://github.com/codez/dry_crud/actions/workflows/build.yml/badge.svg}[https://github.com/codez/dry_crud/actions/workflows/build.yml]
+{rdoc-image:https://api.codeclimate.com/v1/badges/ef7488764a0d9805b37d/maintainability}[https://codeclimate.com/github/codez/dry_crud/maintainability]
+{rdoc-image:https://api.codeclimate.com/v1/badges/ef7488764a0d9805b37d/test_coverage}[https://codeclimate.com/github/codez/dry_crud/test_coverage]
 
 dry_crud generates simple and extendable controllers, views and helpers that support you to DRY up the CRUD code in your Rails projects. List, search, sort, show, create, edit and destroy any model entries in just 5 minutes. Start with these artifacts and build a clean base to efficiently develop your application upon.
 
@@ -33,12 +35,11 @@ To integrate dry_crud into your code, only a few additions are required:
 * Optionally define a +list+ scope in your models to be used in the +index+ action.
 * Optionally define a +options_list+ scope in your models to be used in select dropdowns.
 
-From version 5.0 onwards, the major and minor version numbers will be kept in sync with Rails, and only the matching Rails version is supported. Version 3.0 is compatible 4.2, Version 2.0 and higher are compatible with Rails 4 and Rails 3.2. dry_crud is tested with Ruby 2.5. If you are using Ruby 1.9.3, please refer to version 3.0.0.
-
+From version 5.0 onwards, the major and minor version numbers will be kept in sync with Rails, and only the matching Rails version is supported.
 
 == Background
 
-In most Rails applications, you have some models that require basic CRUD (create, read, update, delete) functionality. There are various possibilities like Rails scaffolding, {Inherited Resources}[https://github.com/activeadmin/inherited_resources] or {Rails Admin}[https://github.com/sferik/rails_admin]. Still, various parts in your application remain duplicated. While you might pull up common methods into a common superclass controller, most views still contain very similar code. And then you also have to remember the entire API of these frameworks.
+In most Rails applications, you have some models that require basic CRUD (create, read, update, delete) functionality. There are various possibilities like Rails scaffolding, {Inherited Resources}[https://github.com/activeadmin/inherited_resources] or {Rails Admin}[https://github.com/railsadminteam/rails_admin]. Still, various parts in your application remain duplicated. While you might pull up common methods into a common superclass controller, most views still contain very similar code. And then you also have to remember the entire API of these frameworks.
 
 Enter dry_crud.
 
@@ -50,7 +51,7 @@ dry_crud is a Rails generator. All code resides in your application and is open
 
 dry_crud does not depend on any other gems, but easily allows you to integrate them in order to unify the behavior of your CRUD controllers. You might even use the gems mentioned above to adapt your generated CrudController base class. All classes come with thorough tests that provide you with a solid foundation for implementing your own adaptions.
 
-A basic CSS gets you started with your application's layout. For advanced needs, dry_crud supports the styles and classes used in {Bootstrap 4}[http://getbootstrap.com]. A great design never was so close.
+A basic CSS gets you started with your application's layout. For advanced needs, dry_crud supports the styles and classes used in {Bootstrap}[http://getbootstrap.com]. As the views are generated into your application code, you are free to change the styling to your needs.
 
 If you find yourself adapting the same parts of dry_crud for your applications over and over, please feel free to {fork me on Github}[http://github.com/codez/dry_crud].
 
@@ -161,7 +162,7 @@ To render custom columns, use the +col+ method with an appropriate block:
         t.sortable_attrs(:lastname, :firstname)
         t.col('', class: 'center') { |entry| image_tag(entry.picture) }
         t.attr(:street)
-        t.col('Map') { |entry| link_to(entry.city, "http://maps.google.com/?q=#{entry.city}" }
+        t.col('Map') { |entry| link_to(entry.city, "http://maps.google.com/?q=#{entry.city}") }
       end %>
 
 For views of subclasses of ListController, you can directly use the +crud_table+ helper method, where you do not have to pass the <tt>@people</tt> list explicitly and actions are added automatically.

data/VERSION

@@ -1 +1 @@
-6.0.0
+7.1.0

data/app/assets/stylesheets/sample.scss

@@ -1,8 +1,12 @@
 $container_width: 1000px;
 $theme_color: #2580a2;
 
-body, div, p, td, th {
-  font-family: "Helvetica Neue",Helvetica,Arial,sans-serif;
+body,
+div,
+p,
+td,
+th {
+  font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
   font-size: 14px;
   line-height: 1.42857;
 }
@@ -101,7 +105,8 @@ table.table {
 }
 
 /* div rendered if no entries available for list */
-div.table {}
+div.table {
+}
 
 table.table th {
   background-color: $theme_color;
@@ -119,20 +124,21 @@ table.table td {
   padding: 4px 4px;
 }
 
-.table-striped thead tr:nth-child(odd), .table thead tr:nth-child(even) {
-  background-color: #D0D0D0;
+.table-striped thead tr:nth-child(odd),
+.table thead tr:nth-child(even) {
+  background-color: #d0d0d0;
 }
 
 .table-striped tr:nth-child(odd) {
-  background-color: #F8F8F8;
+  background-color: #f8f8f8;
 }
 
 .table-striped tr:nth-child(even) {
-  background-color: #F0F0F0;
+  background-color: #f0f0f0;
 }
 
 .table-hover tr:hover {
-  background-color: #FFFFE0;
+  background-color: #ffffe0;
 }
 
 td {
@@ -153,7 +159,7 @@ a:hover {
 }
 
 a:visited {
-  color:  #2580a2;
+  color: #2580a2;
 }
 
 a img {
@@ -213,11 +219,21 @@ a.icon img {
   vertical-align: top;
 }
 
-.icon-plus { background-image: image-url('actions/add.png'); }
-.icon-remove { background-image: image-url('actions/delete.png'); }
-.icon-pencil { background-image: image-url('actions/edit.png'); }
-.icon-list { background-image: image-url('actions/list.png'); }
-.icon-zoom-in { background-image: image-url('actions/show.png'); }
+.icon-plus {
+  background-image: image-url("actions/add.png");
+}
+.icon-trash {
+  background-image: image-url("actions/delete.png");
+}
+.icon-pencil {
+  background-image: image-url("actions/edit.png");
+}
+.icon-list {
+  background-image: image-url("actions/list.png");
+}
+.icon-zoom-in {
+  background-image: image-url("actions/show.png");
+}
 
 .form-group {
   clear: both;
@@ -231,34 +247,39 @@ a.icon img {
   padding-top: 3px;
 }
 
-input, textarea, select {
+input,
+textarea,
+select {
   font-family: Verdana, Geneva, Helvetica, Arial, sans-serif;
   font-size: 14px;
 }
 
-input[type=text], input[type=password], input[type=email] {
+input[type="text"],
+input[type="password"],
+input[type="email"] {
   width: 300px;
 }
 
-input[type=number] {
+input[type="number"] {
   width: 100px;
 }
 
-textarea, select[multiple] {
+textarea,
+select[multiple] {
   width: 300px;
   height: 80px;
 }
 
-[role=search] [type=search] {
+[role="search"] [type="search"] {
   width: 220px;
 }
 
 .has-error .control-label {
-  color: #D88;
+  color: #d88;
 }
 
 .has-error .form-control {
-  border-color: #D88;
+  border-color: #d88;
 }
 
 .input-group-append {
@@ -284,7 +305,7 @@ textarea, select[multiple] {
 }
 
 .alert-danger {
-  border: solid 2px #D88;
+  border: solid 2px #d88;
   background-color: #fec;
 }
 
@@ -292,11 +313,11 @@ textarea, select[multiple] {
   float: right;
 }
 
-.float-right {
+.float-end {
   float: right;
 }
 
-.float-left {
+.float-start {
   float: left;
 }
 

data/app/controllers/crud_controller.rb

@@ -40,6 +40,11 @@ class CrudController < ListController
     assign_attributes if params[model_identifier]
   end
 
+  #   GET /entries/1/edit
+  #
+  # Display a form to edit an exisiting entry of this model.
+  def edit; end
+
   #   POST /entries
   #   POST /entries.json
   #
@@ -52,22 +57,17 @@ class CrudController < ListController
   # in the given block will take precedence over the one defined here.
   #
   # Specify a :location option if you wish to do a custom redirect.
-  def create(options = {}, &block)
+  def create(**options, &block)
     model_class.transaction do
       assign_attributes
       created = with_callbacks(:create, :save) { entry.save }
       respond(created,
-              options.merge(status: :created, render_on_failure: :new),
+              **options.merge(status: :created, render_on_failure: :new),
               &block)
       raise ActiveRecord::Rollback unless created
     end
   end
 
-  #   GET /entries/1/edit
-  #
-  # Display a form to edit an exisiting entry of this model.
-  def edit; end
-
   #   PUT /entries/1
   #   PUT /entries/1.json
   #
@@ -80,12 +80,12 @@ class CrudController < ListController
   # in the given block will take precedence over the one defined here.
   #
   # Specify a :location option if you wish to do a custom redirect.
-  def update(options = {}, &block)
+  def update(**options, &block)
     model_class.transaction do
       assign_attributes
       updated = with_callbacks(:update, :save) { entry.save }
       respond(updated,
-              options.merge(status: :ok, render_on_failure: :edit),
+              **options.merge(status: :ok, render_on_failure: :edit),
               &block)
       raise ActiveRecord::Rollback unless updated
     end
@@ -103,11 +103,11 @@ class CrudController < ListController
   # in the given block will take precedence over the one defined here.
   #
   # Specify a :location option if you wish to do a custom redirect.
-  def destroy(options = {}, &block)
+  def destroy(**options, &block)
     model_class.transaction do
       destroyed = run_callbacks(:destroy) { entry.destroy }
       respond(destroyed,
-              options.merge(status: :no_content),
+              **options.merge(status: :no_content),
               &block)
       raise ActiveRecord::Rollback unless destroyed
     end
@@ -152,14 +152,14 @@ class CrudController < ListController
     path_args(entry)
   end
 
-  def respond(success, options)
+  def respond(success, **options)
     respond_to do |format|
       yield(format, success) if block_given?
       if success
-        format.html { redirect_on_success(options) }
+        format.html { redirect_on_success(**options) }
         format.json { render_success_json(options[:status]) }
       else
-        format.html { render_or_redirect_on_failure(options) }
+        format.html { render_or_redirect_on_failure(**options) }
         format.json { render_failure_json }
       end
     end
@@ -167,16 +167,16 @@ class CrudController < ListController
 
   # If the option :render_on_failure is given, render the corresponding
   # template, otherwise redirect.
-  def render_or_redirect_on_failure(options)
+  def render_or_redirect_on_failure(**options)
     if options[:render_on_failure]
       render options[:render_on_failure]
     else
-      redirect_on_failure(options)
+      redirect_on_failure(**options)
     end
   end
 
   # Perform a redirect after a successfull operation and set a flash notice.
-  def redirect_on_success(options = {})
+  def redirect_on_success(**options)
     location = options[:location] ||
                (entry.destroyed? ? index_path : show_path)
     flash[:notice] ||= flash_message(:success)
@@ -184,7 +184,7 @@ class CrudController < ListController
   end
 
   # Perform a redirect after a failed operation and set a flash alert.
-  def redirect_on_failure(options = {})
+  def redirect_on_failure(**options)
     location = options[:location] ||
                request.env['HTTP_REFERER'].presence ||
                index_path
@@ -221,7 +221,7 @@ class CrudController < ListController
   # A label for the current entry, including the model name.
   def full_entry_label
     # rubocop:disable Rails/OutputSafety
-    "#{models_label(false)} <i>#{ERB::Util.h(entry)}</i>".html_safe
+    "#{models_label(plural: false)} <i>#{ERB::Util.h(entry)}</i>".html_safe
     # rubocop:enable Rails/OutputSafety
   end
 

data/app/controllers/dry_crud/generic_model.rb

@@ -13,8 +13,6 @@ module DryCrud
     included do
       helper_method :model_class, :models_label, :path_args
 
-      private
-
       delegate :model_class, :models_label, :model_identifier, to: 'self.class'
     end
 
@@ -33,7 +31,7 @@ module DryCrud
 
     # Get the instance variable named after the +model_class+.
     # If the collection variable is required, pass true as the second argument.
-    def model_ivar_get(plural = false)
+    def model_ivar_get(plural: false)
       name = ivar_name(model_class)
       name = name.pluralize if plural
       name = :"@#{name}"
@@ -72,7 +70,7 @@ module DryCrud
       end
 
       # A human readable plural name of the model.
-      def models_label(plural = true)
+      def models_label(plural: true)
         opts = { count: (plural ? 3 : 1) }
         opts[:default] = model_class.model_name.human.titleize
         opts[:default] = opts[:default].pluralize if plural

data/app/controllers/dry_crud/render_callbacks.rb

@@ -15,13 +15,13 @@ module DryCrud
 
       # Helper method to run +before_render+ callbacks and render the action.
       # If a callback renders or redirects, the action is not rendered.
-      def render(*args, &block)
-        options = _normalize_render(*args, &block)
+      def render(...)
+        options = _normalize_render(...)
         callback = "render_#{options[:template]}"
 
         run_callbacks(callback) if respond_to?(:"_#{callback}_callbacks", true)
 
-        super(*args, &block) unless performed?
+        super(...) unless performed?
       end
 
       private

data/app/controllers/list_controller.rb

@@ -32,7 +32,7 @@ class ListController < ApplicationController
   # Helper method to access the entries to be displayed in the current index
   # page in an uniform way.
   def entries
-    model_ivar_get(true) || model_ivar_set(list_entries)
+    model_ivar_get(plural: true) || model_ivar_set(list_entries)
   end
 
   # The base relation used to filter the entries.

data/app/helpers/actions_helper.rb

@@ -14,7 +14,7 @@ module ActionsHelper
 
   # Outputs an icon for an action with an optional label.
   def action_icon(icon, label = nil)
-    html = content_tag(:span, '', class: "icon icon-#{icon}")
+    html = tag.i('', class: "bi-#{icon}")
     html << ' ' << label if label
     html
   end
@@ -30,7 +30,7 @@ module ActionsHelper
   # Uses the current +entry+ if no path is given.
   def edit_action_link(path = nil)
     path ||= path_args(entry)
-    path = path.is_a?(String) ? path : edit_polymorphic_path(path)
+    path = edit_polymorphic_path(path) unless path.is_a?(String)
     action_link(ti('link.edit'), 'pencil', path)
   end
 
@@ -38,16 +38,16 @@ module ActionsHelper
   # Uses the current +entry+ if no path is given.
   def destroy_action_link(path = nil)
     path ||= path_args(entry)
-    action_link(ti('link.delete'), 'remove', path,
-                data: { confirm: ti(:confirm_delete),
-                        method: :delete })
+    action_link(ti('link.delete'), 'trash', path,
+                data: { 'turbo-confirm': ti(:confirm_delete),
+                        'turbo-method': :delete })
   end
 
   # Standard list action to the given path.
   # Uses the current +model_class+ if no path is given.
   def index_action_link(path = nil, url_options = { returning: true })
     path ||= path_args(model_class)
-    path = path.is_a?(String) ? path : polymorphic_path(path, url_options)
+    path = polymorphic_path(path, url_options) unless path.is_a?(String)
     action_link(ti('link.list'), 'list', path)
   end
 
@@ -55,7 +55,7 @@ module ActionsHelper
   # Uses the current +model_class+ if no path is given.
   def add_action_link(path = nil, url_options = {})
     path ||= path_args(model_class)
-    path = path.is_a?(String) ? path : new_polymorphic_path(path, url_options)
+    path = new_polymorphic_path(path, url_options) unless path.is_a?(String)
     action_link(ti('link.add'), 'plus', path)
   end
 

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

@@ -21,7 +21,7 @@ module DryCrud
       attr_reader :template
 
       delegate :association, :column_type, :column_property, :captionize,
-               :ti, :ta, :link_to, :content_tag, :safe_join, :capture,
+               :ti, :ta, :link_to, :tag, :safe_join, :capture,
                :add_css_class, :assoc_and_id_attr,
                to: :template
 
@@ -29,9 +29,8 @@ module DryCrud
 
       # Render multiple input controls together with a label for the given
       # attributes.
-      def labeled_input_fields(*attrs)
-        options = attrs.extract_options!
-        safe_join(attrs) { |a| labeled_input_field(a, options.dup) }
+      def labeled_input_fields(*attrs, **options)
+        safe_join(attrs) { |a| labeled_input_field(a, **options.dup) }
       end
 
       # Render a corresponding input control and label for the given attribute.
@@ -45,8 +44,8 @@ module DryCrud
       # * <tt>:field_method</tt> - Different method to create the input field.
       #
       # Use additional html_options for the input element.
-      def labeled_input_field(attr, html_options = {})
-        control_class.new(self, attr, html_options).render_labeled
+      def labeled_input_field(attr, **html_options)
+        control_class.new(self, attr, **html_options).render_labeled
       end
 
       # Render a corresponding input control for the given attribute.
@@ -59,20 +58,20 @@ module DryCrud
       # * <tt>:field_method</tt> - Different method to create the input field.
       #
       # Use additional html_options for the input element.
-      def input_field(attr, html_options = {})
-        control_class.new(self, attr, html_options).render_content
+      def input_field(attr, **html_options)
+        control_class.new(self, attr, **html_options).render_content
       end
 
       # Render a standard string field with column contraints.
-      def string_field(attr, html_options = {})
+      def string_field(attr, **html_options)
         html_options[:maxlength] ||= column_property(@object, attr, :limit)
-        text_field(attr, html_options)
+        text_field(attr, **html_options)
       end
 
       # Render a boolean field.
-      def boolean_field(attr, html_options = {})
-        content_tag(:div, class: 'checkbox') do
-          content_tag(:label) do
+      def boolean_field(attr, **html_options)
+        tag.div(class: 'checkbox') do
+          tag.label do
             detail = html_options.delete(:detail) || '&nbsp;'.html_safe
             safe_join([check_box(attr, html_options), ' ', detail])
           end
@@ -82,33 +81,33 @@ module DryCrud
       # Add form-control class to all input fields.
       %w[text_field password_field email_field
          number_field date_field time_field datetime_field].each do |method|
-        define_method(method) do |attr, html_options = {}|
+        define_method(method) do |attr, **html_options|
           add_css_class(html_options, 'form-control')
           super(attr, html_options)
         end
       end
 
-      def integer_field(attr, html_options = {})
+      def integer_field(attr, **html_options)
         html_options[:step] ||= 1
-        number_field(attr, html_options)
+        number_field(attr, **html_options)
       end
 
-      def float_field(attr, html_options = {})
+      def float_field(attr, **html_options)
         html_options[:step] ||= 'any'
-        number_field(attr, html_options)
+        number_field(attr, **html_options)
       end
 
-      def decimal_field(attr, html_options = {})
+      def decimal_field(attr, **html_options)
         html_options[:step] ||=
           (10**-column_property(object, attr, :scale)).to_f
-        number_field(attr, html_options)
+        number_field(attr, **html_options)
       end
 
       # Customize the standard text area to have 5 rows by default.
-      def text_area(attr, html_options = {})
+      def text_area(attr, **html_options)
         add_css_class(html_options, 'form-control')
         html_options[:rows] ||= 5
-        super(attr, html_options)
+        super(attr, **html_options)
       end
 
       # Render a select element for a :belongs_to association defined by attr.
@@ -116,13 +115,13 @@ module DryCrud
       # To pass a custom element list, specify the list with the :list key or
       # define an instance variable with the pluralized name of the
       # association.
-      def belongs_to_field(attr, html_options = {})
-        list = association_entries(attr, html_options).to_a
+      def belongs_to_field(attr, **html_options)
+        list = association_entries(attr, **html_options).to_a
         if list.present?
           add_css_class(html_options, 'form-control')
           collection_select(attr, list, :id, :to_s,
-                            select_options(attr, html_options),
-                            html_options)
+                            select_options(attr, **html_options),
+                            **html_options)
         else
           # rubocop:disable Rails/OutputSafety
           none = ta(:none_available, association(@object, attr)).html_safe
@@ -131,7 +130,7 @@ module DryCrud
         end
       end
 
-      # rubocop:disable PredicateName
+      # rubocop:disable Naming/PredicateName
 
       # Render a multi select element for a :has_many or
       # :has_and_belongs_to_many association defined by attr.
@@ -139,12 +138,12 @@ module DryCrud
       # To pass a custom element list, specify the list with the :list key or
       # define an instance variable with the pluralized name of the
       # association.
-      def has_many_field(attr, html_options = {})
+      def has_many_field(attr, **html_options)
         html_options[:multiple] = true
         add_css_class(html_options, 'multiselect')
-        belongs_to_field(attr, html_options)
+        belongs_to_field(attr, **html_options)
       end
-      # rubocop:enable PredicateName
+      # rubocop:enable Naming/PredicateName
 
       ### VARIOUS FORM ELEMENTS
 
@@ -157,25 +156,24 @@ module DryCrud
 
       # Renders the given content with an addon.
       def with_addon(content, addon)
-        content_tag(:div, class: 'input-group') do
-          html = content_tag(:span, addon, class: 'input-group-text')
-          content + content_tag(:div, html, class: 'input-group-append')
+        tag.div(class: 'input-group') do
+          content + tag.span(addon, class: 'input-group-text')
         end
       end
 
       # Renders a static text where otherwise form inputs appear.
       def static_text(text)
-        content_tag(:p, text, class: 'form-control-static')
+        tag.p(text, class: 'form-control-static')
       end
 
       # Generates a help block for fields
       def help_block(text)
-        content_tag(:p, text, class: 'help-block')
+        tag.p(text, class: 'help-block')
       end
 
       # Render a submit button and a cancel link for this form.
       def standard_actions(submit_label = ti('button.save'), cancel_url = nil)
-        content_tag(:div, class: 'col-md-offset-2 col-md-8') do
+        tag.div(class: 'col-md-offset-2 col-md-8') do
           safe_join([submit_button(submit_label),
                      cancel_link(cancel_url)],
                     ' ')
@@ -195,7 +193,7 @@ module DryCrud
 
       # Depending if the given attribute must be present, return
       # only an initial selection prompt or a blank option, respectively.
-      def select_options(attr, options = {})
+      def select_options(attr, **options)
         prompt = options.delete(:prompt)
         blank = options.delete(:include_blank)
         if options[:multiple]
@@ -239,7 +237,7 @@ module DryCrud
           options = content
           content = capture(&block)
         end
-        control = control_class.new(self, attr, options)
+        control = control_class.new(self, attr, **options)
         control.render_labeled(content)
       end
 
@@ -269,17 +267,16 @@ module DryCrud
       def labeled_field_method?(name)
         prefix = 'labeled_'
         if name.to_s.start_with?(prefix)
-          field_method = name.to_s[prefix.size..-1]
+          field_method = name.to_s[prefix.size..]
           field_method if respond_to?(field_method)
         end
       end
 
       # Renders the corresponding field together with a label, required mark
       # and an optional help block.
-      def build_labeled_field(field_method, *args)
-        options = args.extract_options!
+      def build_labeled_field(field_method, *args, **options)
         options[:field_method] = field_method
-        control_class.new(self, *(args << options)).render_labeled
+        control_class.new(self, *args, **options).render_labeled
       end
 
       # Returns the list of association entries, either from options[:list] or
@@ -287,7 +284,7 @@ module DryCrud
       # Otherwise, if the association defines a #options_list or #list scope,
       # this is used to load the entries.
       # As a last resort, all entries from the association class are returned.
-      def association_entries(attr, options)
+      def association_entries(attr, **options)
         list = options.delete(:list)
         unless list
           assoc = association(@object, attr)