dry_crud 3.0.0 → 5.0.0

data/app/controllers/list_controller.rb

@@ -11,9 +11,9 @@
 class ListController < ApplicationController
 
   include DryCrud::GenericModel
-  include DryCrud::Nestable
-  include DryCrud::Rememberable
+  prepend DryCrud::Nestable
   include DryCrud::RenderCallbacks
+  include DryCrud::Rememberable
 
   define_render_callbacks :index
 

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

@@ -75,7 +75,9 @@ module DryCrud
       def boolean_field(attr, html_options = {})
         content_tag(:div, class: 'checkbox') do
           content_tag(:label) do
+            # rubocop:disable Rails/OutputSafety
             detail = html_options.delete(:detail) || ' '.html_safe
+            # rubocop:enable Rails/OutputSafety
             safe_join([check_box(attr, html_options), ' ', detail])
           end
         end
@@ -97,9 +99,9 @@ module DryCrud
         super(attr, html_options)
       end
 
-      alias_method :integer_field, :number_field
-      alias_method :float_field, :number_field
-      alias_method :decimal_field, :number_field
+      alias integer_field number_field
+      alias float_field number_field
+      alias decimal_field number_field
 
       # Render a select element for a :belongs_to association defined by attr.
       # Use additional html_options for the select element.
@@ -114,8 +116,10 @@ module DryCrud
                             select_options(attr, html_options),
                             html_options)
         else
-          static_text(
-            ta(:none_available, association(@object, attr)).html_safe)
+          # rubocop:disable Rails/OutputSafety
+          none = ta(:none_available, association(@object, attr)).html_safe
+          # rubocop:enable Rails/OutputSafety
+          static_text(none)
         end
       end
 
@@ -208,8 +212,8 @@ module DryCrud
                      @object.class.validators_on(attr_id)
         validators.any? do |v|
           v.kind == :presence &&
-          !v.options.key?(:if) &&
-          !v.options.key?(:unless)
+            !v.options.key?(:if) &&
+            !v.options.key?(:unless)
         end
       end
 
@@ -278,8 +282,9 @@ module DryCrud
         list = options.delete(:list)
         unless list
           assoc = association(@object, attr)
-          list = @template.send(:instance_variable_get,
-                                :"@#{assoc.name.to_s.pluralize}")
+          ivar = :"@#{assoc.name.to_s.pluralize}"
+          list = @template.send(:instance_variable_defined?, ivar) &&
+                 @template.send(:instance_variable_get, ivar)
           list ||= load_association_entries(assoc)
         end
         list
@@ -288,7 +293,8 @@ module DryCrud
       # Automatically load the entries for the given association.
       def load_association_entries(assoc)
         klass = assoc.klass
-        list = klass.all.merge(assoc.scope)
+        list = klass.all
+        list = list.merge(assoc.scope) if assoc.scope
         # Use special scopes if they are defined
         if klass.respond_to?(:options_list)
           list.options_list
@@ -303,9 +309,11 @@ module DryCrud
       # 1. Use :cancel_url_new or :cancel_url_edit option, if present
       # 2. Use :cancel_url option, if present
       def cancel_url
-        url = @object.new_record? ? options[:cancel_url_new] :
-                                    options[:cancel_url_edit]
-        url || options[:cancel_url]
+        if @object.new_record?
+          options[:cancel_url_new] || options[:cancel_url]
+        else
+          options[:cancel_url_edit] || options[:cancel_url]
+        end
       end
 
     end

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

@@ -14,15 +14,15 @@ module DryCrud
                to: :builder
 
       # Html displayed to mark an input as required.
-      REQUIRED_MARK = '*'
+      REQUIRED_MARK = '*'.freeze
 
       # Number of default input field span columns depending
       # on the #field_method.
       INPUT_SPANS = Hash.new(8)
       INPUT_SPANS[:number_field] =
         INPUT_SPANS[:integer_field] =
-        INPUT_SPANS[:float_field]   =
-        INPUT_SPANS[:decimal_field] = 2
+          INPUT_SPANS[:float_field] =
+            INPUT_SPANS[:decimal_field] = 2
       INPUT_SPANS[:date_field] =
         INPUT_SPANS[:time_field] = 3
 
@@ -76,7 +76,7 @@ module DryCrud
 
         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}")
+            content_tag(:div, content, class: "col-md-#{span}")
         end
       end
 
@@ -133,11 +133,8 @@ module DryCrud
       # association.
       def errors?
         attr_plain, attr_id = builder.assoc_and_id_attr(attr)
-        # errors aint a Hash
-        # rubocop:disable DeprecatedHashMethods
-        object.errors.has_key?(attr_plain.to_sym) ||
-        object.errors.has_key?(attr_id.to_sym)
-        # rubocop:enable DeprecatedHashMethods
+        object.errors.key?(attr_plain.to_sym) ||
+          object.errors.key?(attr_id.to_sym)
       end
 
       # Defines the field method to use based on the attribute
@@ -178,6 +175,8 @@ module DryCrud
           false
         end
       end
+
     end
+
   end
 end

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

@@ -2,11 +2,13 @@
 
 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
@@ -61,7 +63,8 @@ module DryCrud
                               path,
                               html_options.merge(
                                 data: { confirm: ti(:confirm_delete),
-                                        method: :delete }))
+                                        method: :delete }
+                              ))
           end
         end
       end
@@ -85,6 +88,8 @@ module DryCrud
       def action_path(e)
         block_given? ? yield(e) : path_args(e)
       end
+
     end
+
   end
 end

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

@@ -2,6 +2,7 @@
 
 module DryCrud
   module Table
+
     # A simple helper to easily define tables listing several rows of the same
     # data type.
     #
@@ -67,7 +68,7 @@ module DryCrud
       def to_html
         content_tag :table, options do
           content_tag(:thead, html_header) +
-          content_tag_nested(:tbody, entries) { |e| html_row(e) }
+            content_tag_nested(:tbody, entries) { |e| html_row(e) }
         end
       end
 
@@ -92,7 +93,7 @@ module DryCrud
 
       # Renders the header row of the table.
       def html_header
-        content_tag_nested(:tr, cols) { |c| c.html_header }
+        content_tag_nested(:tr, cols, &:html_header)
       end
 
       # Renders a table row for the given entry.
@@ -111,6 +112,7 @@ module DryCrud
           entries.first.class
         end
       end
+
     end
   end
 end

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

@@ -2,11 +2,21 @@
 
 module DryCrud
   module Table
+
     # Helper class to store column information.
-    class Col < Struct.new(:header, :html_options, :template, :block) #:nodoc:
+    class Col #:nodoc:
 
       delegate :content_tag, :capture, to: :template
 
+      attr_reader :header, :html_options, :template, :block
+
+      def initialize(header, html_options, template, block)
+        @header = header
+        @html_options = html_options
+        @template = template
+        @block = block
+      end
+
       # Runs the Col block for the given entry.
       def content(entry)
         entry.nil? ? '' : capture(entry, &block)
@@ -21,6 +31,7 @@ module DryCrud
       def html_cell(entry)
         content_tag(:td, content(entry), html_options)
       end
+
     end
   end
 end

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

@@ -2,10 +2,12 @@
 
 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)
@@ -32,13 +34,16 @@ module DryCrud
 
       # Request params for the sort link.
       def sort_params(attr)
-        params.merge(sort: attr, sort_dir: sort_dir(attr))
+        result = params.respond_to?(:to_unsafe_h) ? params.to_unsafe_h : params
+        result.merge(sort: attr, sort_dir: sort_dir(attr), only_path: true)
       end
 
       # The sort mark, if any, for the given attribute.
       def current_mark(attr)
         if current_sort?(attr)
+          # rubocop:disable Rails/OutputSafety
           (sort_dir(attr) == 'asc' ? ' ↑' : ' ↓').html_safe
+          # rubocop:enable Rails/OutputSafety
         else
           ''
         end
@@ -58,6 +63,7 @@ module DryCrud
       def params
         template.params
       end
+
     end
   end
 end

data/app/helpers/form_helper.rb

@@ -27,16 +27,16 @@ module FormHelper
   # 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
+      content = [form.error_messages]
 
-      if block_given?
-        content << capture(form, &block)
-      else
-        content << form.labeled_input_fields(*attrs)
-      end
+      content << if block_given?
+                   capture(form, &block)
+                 else
+                   form.labeled_input_fields(*attrs)
+                 end
 
       content << form.standard_actions
-      content.html_safe
+      safe_join(content)
     end
   end
 

data/app/helpers/format_helper.rb

@@ -33,8 +33,8 @@ module FormatHelper
   # Otherwise, calls format_type.
   def format_attr(obj, attr)
     format_with_helper(obj, attr) ||
-    format_association(obj, attr) ||
-    format_type(obj, attr)
+      format_association(obj, attr) ||
+      format_type(obj, attr)
   end
 
   # Renders a simple unordered list, which will
@@ -82,7 +82,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.gsub('/', '_')
+    class_name = obj.class.name.underscore.tr('/', '_')
     format_type_attr_method = :"format_#{class_name}_#{attr}"
     format_attr_method = :"format_#{attr}"
 

data/app/helpers/i18n_helper.rb

@@ -15,13 +15,13 @@ module I18nHelper
   #  - ...
   #  - global.{key}
   def translate_inheritable(key, variables = {})
-    partial = @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)
   end
 
-  alias_method :ti, :translate_inheritable
+  alias ti translate_inheritable
 
   # Translates the passed key for an active record association. This helper is
   # used for rendering association dependent keys in forms like :no_entry,
@@ -40,7 +40,7 @@ module I18nHelper
     end
   end
 
-  alias_method :ta, :translate_association
+  alias ta translate_association
 
   private
 

data/app/helpers/utility_helper.rb

@@ -1,9 +1,12 @@
 # encoding: UTF-8
+require 'English'
 
 # View helpers for basic functions used in various other helpers.
 module UtilityHelper
 
-  EMPTY_STRING = ' '.html_safe   # non-breaking space asserts better css.
+  # rubocop:disable Rails/OutputSafety
+  EMPTY_STRING = ' '.html_safe # non-breaking space asserts better css.
+  # rubocop:enable Rails/OutputSafety
 
   # Render a content tag with the collected contents rendered
   # by &block for each item in collection.

data/lib/dry_crud.rb

@@ -1,5 +1,4 @@
 require 'dry_crud/engine'
 
 module DryCrud
-
-end
+end

data/lib/dry_crud/engine.rb

@@ -1,18 +1,16 @@
 module DryCrud
   class Engine < Rails::Engine
-    
-    
-    initializer "dry_crud.field_error_proc" do |app|
+    initializer 'dry_crud.field_error_proc' do |_app|
       # Fields with errors are directly styled in DryCrud::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 }
+
       # Load dry_crud engine helpers first so that the application may override them.
       paths = ApplicationController.helpers_path
-      if dry_crud_helpers = paths.detect {|p| p =~ /dry_crud(-\d+\.\d+\.\d+)?#{File::SEPARATOR}app#{File::SEPARATOR}helpers\z/ }
+      if dry_crud_helpers = paths.detect { |p| p =~ /dry_crud(-\d+\.\d+\.\d+)?#{File::SEPARATOR}app#{File::SEPARATOR}helpers\z/ }
         paths.delete(dry_crud_helpers)
         paths.prepend(dry_crud_helpers)
       end
     end
   end
-end
+end

data/lib/generators/dry_crud/dry_crud_generator.rb

@@ -8,7 +8,6 @@ end
 
 # Copies all dry_crud files to the rails application.
 class DryCrudGenerator < DryCrudGeneratorBase
-
   desc 'Copy all dry_crud files to the application.'
 
   class_options %w(templates -t) => 'erb'
@@ -29,8 +28,8 @@ 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.start_with?(exclude_test_dir) &&
+      file_source != 'INSTALL'
   end
 
   def copy_crud_test_model
@@ -45,7 +44,7 @@ class DryCrudGenerator < DryCrudGeneratorBase
   end
 
   def exclude_template
-    options[:templates].downcase == 'haml' ? '.erb' : '.haml'
+    options[:templates].casecmp('haml').zero? ? '.erb' : '.haml'
   end
 
   def exclude_test_dir

data/lib/generators/dry_crud/dry_crud_generator_base.rb

@@ -3,18 +3,17 @@
 require 'rails/generators'
 
 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
-    [self.gem_root,
-     self.template_root]
+    [gem_root,
+     template_root]
   end
 
   private
@@ -42,7 +41,7 @@ class DryCrudGeneratorBase < Rails::Generators::Base
     end
   end
 
-  def should_copy?(file_source)
+  def should_copy?(_file_source)
     true
   end
 
@@ -53,5 +52,4 @@ class DryCrudGeneratorBase < Rails::Generators::Base
       template(file_source)
     end
   end
-  
-end
+end