dry_crud 6.0.0 → 8.0.0

data/lib/generators/dry_crud/templates/test/support/crud_controller_test_helper.rb

@@ -3,7 +3,6 @@
 # #test_entry_attrs to test the basic crud functionality. Override the test
 # methods if you changed the behaviour in your subclass controller.
 module CrudControllerTestHelper # rubocop:disable Metrics/ModuleLength
-
   def test_index # :nodoc:
     get :index, params: test_params
     assert_response :success
@@ -11,13 +10,13 @@ module CrudControllerTestHelper # rubocop:disable Metrics/ModuleLength
   end
 
   def test_index_json # :nodoc:
-    get :index, params: test_params(format: 'json')
+    get :index, params: test_params(format: "json")
     assert_response :success
     assert entries.present?
-    assert @response.body.starts_with?('[{'), @response.body
+    assert @response.body.starts_with?("[{"), @response.body
   end
 
-  def test_index_search # rubocop:disable Metrics/AbcSize :nodoc:
+  def test_index_search # rubocop:disable Metrics/AbcSize -- :nodoc:
     field = @controller.search_columns.first
     val = field && test_entry[field].to_s
     return if val.blank? # does not support search or no value in this field
@@ -30,7 +29,7 @@ module CrudControllerTestHelper # rubocop:disable Metrics/ModuleLength
 
   def test_index_sort_asc # :nodoc:
     col = model_class.column_names.first
-    get :index, params: test_params(sort: col, sort_dir: 'asc')
+    get :index, params: test_params(sort: col, sort_dir: "asc")
     assert_response :success
     assert entries.present?
     sorted = entries.sort_by(&col.to_sym)
@@ -39,7 +38,7 @@ module CrudControllerTestHelper # rubocop:disable Metrics/ModuleLength
 
   def test_index_sort_desc # :nodoc:
     col = model_class.column_names.first
-    get :index, params: test_params(sort: col, sort_dir: 'desc')
+    get :index, params: test_params(sort: col, sort_dir: "desc")
     assert_response :success
     assert entries.present?
     sorted = entries.to_a.sort_by(&col.to_sym)
@@ -53,10 +52,10 @@ module CrudControllerTestHelper # rubocop:disable Metrics/ModuleLength
   end
 
   def test_show_json # :nodoc:
-    get :show, params: test_params(id: test_entry.id, format: 'json')
+    get :show, params: test_params(id: test_entry.id, format: "json")
     assert_response :success
     assert_equal test_entry, entry
-    assert @response.body.starts_with?('{')
+    assert @response.body.starts_with?("{")
   end
 
   def test_show_with_non_existing_id_raises_record_not_found # :nodoc:
@@ -83,7 +82,7 @@ module CrudControllerTestHelper # rubocop:disable Metrics/ModuleLength
   def test_create_json # :nodoc:
     assert_difference("#{model_class.name}.count") do
       post :create, params: test_params(model_identifier => new_entry_attrs,
-                                        format: 'json')
+                                        format: "json")
     end
     assert_response :success
     assert @response.body.starts_with?('{"id":')
@@ -108,7 +107,7 @@ module CrudControllerTestHelper # rubocop:disable Metrics/ModuleLength
     assert_no_difference("#{model_class.name}.count") do
       put :update, params: test_params(id: test_entry.id,
                                        model_identifier => edit_entry_attrs,
-                                       format: 'json')
+                                       format: "json")
     end
     assert_response :success
     assert @response.body.starts_with?('{"id":')
@@ -124,22 +123,22 @@ module CrudControllerTestHelper # rubocop:disable Metrics/ModuleLength
   def test_destroy_json # :nodoc:
     assert_difference("#{model_class.name}.count", -1) do
       delete :destroy, params: test_params(id: test_entry.id,
-                                           format: 'json')
+                                           format: "json")
     end
     assert_response :success
-    assert_equal '', @response.body.strip
+    assert_equal "", @response.body.strip
   end
 
   private
 
   def assert_redirected_to_index # :nodoc:
-    assert_redirected_to test_params(action: 'index',
+    assert_redirected_to test_params(action: "index",
                                      id: nil,
                                      returning: true)
   end
 
   def assert_redirected_to_show(entry) # :nodoc:
-    assert_redirected_to test_params(action: 'show',
+    assert_redirected_to test_params(action: "show",
                                      id: entry.id)
   end
 
@@ -212,5 +211,4 @@ module CrudControllerTestHelper # rubocop:disable Metrics/ModuleLength
     end
     params
   end
-
 end

data/lib/generators/dry_crud/templates/test/support/crud_test_helper.rb

@@ -1,14 +1,13 @@
-#:nodoc:
+# :nodoc:
 REGEXP_ROWS = /<tr.+?<\/tr>/m.freeze
 REGEXP_HEADERS = /<th.+?<\/th>/m.freeze
 REGEXP_SORT_HEADERS = /<th.*?><a .*?sort_dir=asc.*?>.*?<\/a><\/th>/m.freeze
-REGEXP_ACTION_CELL = /<td class=\"action\"><a .*?href.+?<\/a><\/td>/m.freeze
+REGEXP_ACTION_CELL = /<td class="action"><a .*?href.+?<\/a><\/td>/m.freeze
 
 # A simple test helper to prepare the test database with a CrudTestModel model.
 # This helper is used to test the CrudController and various helpers
 # without the need for an application based model.
 module CrudTestHelper
-
   # Controller helper methods for the tests
 
   def model_class
@@ -16,11 +15,11 @@ module CrudTestHelper
   end
 
   def controller_name
-    'crud_test_models'
+    "crud_test_models"
   end
 
   def action_name
-    'index'
+    "index"
   end
 
   def params
@@ -35,9 +34,7 @@ module CrudTestHelper
     true
   end
 
-  def h(text)
-    ERB::Util.h(text)
-  end
+  delegate :h, to: :'ERB::Util'
 
   private
 
@@ -85,8 +82,8 @@ module CrudTestHelper
   def create_crud_test_models_other_crud_test_models(connection)
     connection.create_table :crud_test_models_other_crud_test_models,
                             force: true do |t|
-      t.belongs_to :crud_test_model, index: { name: 'parent' }
-      t.belongs_to :other_crud_test_model, index: { name: 'other' }
+      t.belongs_to :crud_test_model, index: { name: "parent" }
+      t.belongs_to :other_crud_test_model, index: { name: "other" }
     end
   end
 
@@ -116,7 +113,7 @@ module CrudTestHelper
     with_routing do |set|
       set.draw { resources :crud_test_models }
       # used to define a controller in these tests
-      set.default_url_options = { controller: 'crud_test_models' }
+      set.default_url_options = { controller: "crud_test_models" }
       yield
     end
   end
@@ -150,15 +147,15 @@ module CrudTestHelper
       name: c,
       children: 10 - index,
       rating: "#{index}.#{index}".to_f,
-      income: 10_000_000 * index + 0.1111 * index,
-      birthdate: "#{1900 + 10 * index}-#{index}-#{index}",
+      income: (10_000_000 * index) + (0.1111 * index),
+      birthdate: "#{1900 + (10 * index)}-#{index}-#{index}",
       # store entire date to avoid time zone issues
       gets_up_at: Time.zone.local(2000, 1, 1, index, index),
-      last_seen: "#{2000 + 10 * index}-#{index}-#{index} " \
+      last_seen: "#{2000 + (10 * index)}-#{index}-#{index} " \
                  "1#{index}:2#{index}",
       human: index.even?,
       remarks: "#{c} #{str(index + 1)} #{str(index + 2)}\n" *
-                  (index % 3 + 1)
+                  ((index % 3) + 1)
     )
     m.companion = companion
     m.save!
@@ -181,16 +178,15 @@ module CrudTestHelper
   def without_transaction
     c = ActiveRecord::Base.connection
     start_transaction = false
-    if c.adapter_name.downcase.include?('mysql') &&
+    if c.adapter_name.downcase.include?("mysql") &&
        c.open_transactions.positive?
       # in transactional tests, we may simply rollback
-      c.execute('ROLLBACK')
+      c.execute("ROLLBACK")
       start_transaction = true
     end
 
     yield
 
-    c.execute('BEGIN') if start_transaction
+    c.execute("BEGIN") if start_transaction
   end
-
 end

data/lib/generators/dry_crud/templates/test/support/crud_test_model.rb

@@ -1,12 +1,11 @@
 # A dummy model used for general testing.
-class CrudTestModel < ApplicationRecord #:nodoc:
-
-  belongs_to :companion, class_name: 'CrudTestModel', optional: true
-  has_and_belongs_to_many :others, class_name: 'OtherCrudTestModel'
-  has_many :mores, class_name: 'OtherCrudTestModel',
+class CrudTestModel < ApplicationRecord # :nodoc:
+  belongs_to :companion, class_name: "CrudTestModel", optional: true
+  has_and_belongs_to_many :others, class_name: "OtherCrudTestModel"
+  has_many :mores, class_name: "OtherCrudTestModel",
                    foreign_key: :more_id
 
-  has_one :comrad, class_name: 'CrudTestModel', foreign_key: :companion_id
+  has_one :comrad, class_name: "CrudTestModel", foreign_key: :companion_id
 
   before_destroy :protect_if_companion
 
@@ -25,24 +24,20 @@ class CrudTestModel < ApplicationRecord #:nodoc:
 
   def protect_if_companion
     if companion.present?
-      errors.add(:base, 'Cannot destroy model with companion')
+      errors.add(:base, "Cannot destroy model with companion")
       throw :abort
     end
   end
-
 end
 
 # Second dummy model to test associations.
-class OtherCrudTestModel < ApplicationRecord #:nodoc:
-
-  has_and_belongs_to_many :others, class_name: 'CrudTestModel'
+class OtherCrudTestModel < ApplicationRecord # :nodoc:
+  has_and_belongs_to_many :others, class_name: "CrudTestModel"
   belongs_to :more,
-             foreign_key: :more_id,
-             class_name: 'CrudTestModel',
+             class_name: "CrudTestModel",
              optional: true
 
   def to_s
     name
   end
-
 end

data/lib/generators/dry_crud/templates/test/support/crud_test_models_controller.rb

@@ -1,15 +1,14 @@
 # Controller for the dummy model.
-class CrudTestModelsController < CrudController #:nodoc:
-
-  HANDLE_PREFIX = 'handle_'.freeze
+class CrudTestModelsController < CrudController # :nodoc:
+  HANDLE_PREFIX = "handle_".freeze
 
   self.search_columns = %i[name whatever remarks]
-  self.sort_mappings = { chatty: 'length(remarks)' }
-  self.default_sort = 'name'
-  self.permitted_attrs = [:name, :email, :password, :whatever, :children,
+  self.sort_mappings = { chatty: "length(remarks)" }
+  self.default_sort = "name"
+  self.permitted_attrs = [ :name, :email, :password, :whatever, :children,
                           :companion_id, :rating, :income, :birthdate,
                           :gets_up_at, :last_seen, :human, :remarks,
-                          other_ids: []]
+                          { other_ids: [] } ]
 
   before_create :possibly_redirect
   before_create :handle_name
@@ -27,16 +26,16 @@ class CrudTestModelsController < CrudController #:nodoc:
 
   def index
     entries
-    render plain: 'index js' if request.format.js?
+    render plain: "index js" if request.format.js?
   end
 
   def show
-    render html: 'custom html' if entry.name == 'BBBBB'
+    render html: "custom html" if entry.name == "BBBBB"
   end
 
   def create
     super do |_format, success|
-      flash[:notice] = 'model got created' if success
+      flash[:notice] = "model got created" if success
     end
   end
 
@@ -45,32 +44,30 @@ class CrudTestModelsController < CrudController #:nodoc:
   def list_entries
     entries = super
     if params[:filter]
-      entries = entries.where(['rating < ?', 3])
+      entries = entries.where(rating: ...3)
                        .except(:order)
-                       .order('children DESC')
+                       .order("children DESC")
     end
     entries
   end
 
   def build_entry
     entry = super
-    if params[model_identifier]
-      entry.companion_id = model_params.delete(:companion_id)
-    end
+    entry.companion_id = model_params.delete(:companion_id) if params[model_identifier]
     entry
   end
 
   # custom callback
   def handle_name
-    if entry.name == 'illegal'
-      flash[:alert] = 'illegal name'
+    if entry.name == "illegal"
+      flash[:alert] = "illegal name"
       throw :abort
     end
   end
 
   # callback to redirect if @should_redirect is set
   def possibly_redirect
-    redirect_to action: 'index' if should_redirect && !performed?
+    redirect_to action: "index" if should_redirect && !performed?
   end
 
   def set_companions
@@ -94,7 +91,7 @@ class CrudTestModelsController < CrudController #:nodoc:
   # handle the called callbacks
   def method_missing(sym, *_args)
     if sym.to_s.starts_with?(HANDLE_PREFIX)
-      called_callback(sym.to_s[HANDLE_PREFIX.size..-1].to_sym)
+      called_callback(sym.to_s[HANDLE_PREFIX.size..].to_sym)
     else
       super
     end
@@ -109,5 +106,4 @@ class CrudTestModelsController < CrudController #:nodoc:
     @called_callbacks ||= []
     @called_callbacks << callback
   end
-
 end

data/lib/generators/dry_crud/templates/test/support/custom_assertions.rb

@@ -8,20 +8,19 @@
 #  # inside the class definition:
 #  include CustomAssertions
 module CustomAssertions
-
   # Asserts that regexp occurs exactly expected times in string.
-  def assert_count(expected, regexp, string, msg = '')
+  def assert_count(expected, regexp, string, msg = "")
     actual = string.scan(regexp).size
     msg = message(msg) do
       "Expected #{mu_pp(regexp)} to occur #{expected} time(s), " \
-      "but occured #{actual} time(s) in \n#{mu_pp(string)}"
+        "but occured #{actual} time(s) in \n#{mu_pp(string)}"
     end
     assert expected == actual, msg
   end
 
   # Asserts that the given active model record is valid.
   # This method used to be part of Rails but was deprecated, no idea why.
-  def assert_valid(record, msg = '')
+  def assert_valid(record, msg = "")
     record.valid?
     msg = message(msg) do
       "Expected #{mu_pp(record)} to be valid, " \
@@ -50,7 +49,7 @@ module CustomAssertions
   # The method used to by Test::Unit to format arguments.
   # Prints ActiveRecord objects in a simpler format.
   def mu_pp(obj)
-    if obj.is_a?(ActiveRecord::Base) #:nodoc:
+    if obj.is_a?(ActiveRecord::Base) # :nodoc:
       obj.to_s
     else
       super
@@ -69,13 +68,12 @@ module CustomAssertions
   end
 
   def assert_other_attrs_have_no_errors(record, *invalid_attrs)
-    record.errors.each do |a, error|
+    record.errors.each do |error|
       msg = message do
-        "Attribute #{mu_pp(a)} not declared as invalid attribute, " \
-        "but has the following error(s):\n#{mu_pp(error)}"
+        "Attribute #{mu_pp(error.attribute)} not declared as invalid attribute, " \
+          "but has the following error(s):\n#{mu_pp(error.message)}"
       end
-      assert invalid_attrs.include?(a), msg
+      assert invalid_attrs.include?(error.attribute), msg
     end
   end
-
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dry_crud
 version: !ruby/object:Gem::Version
-  version: 6.0.0
+  version: 8.0.0
 platform: ruby
 authors:
 - Pascal Zumkehr
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-09-08 00:00:00.000000000 Z
+date: 2025-04-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -16,19 +16,19 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '8.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '8.0'
 description: |
   Generates simple and extendable controller, views and helpers that support you
   to DRY up the CRUD code in your Rails project. Start with these elements and
   build a clean base to efficiently develop your application upon.
-email: spam@codez.ch
+email: pascal+github@codez.ch
 executables: []
 extensions: []
 extra_rdoc_files:
@@ -142,7 +142,7 @@ files:
 homepage: http://github.com/codez/dry_crud
 licenses: []
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options:
 - "--title"
 - '"Dry Crud"'
@@ -162,9 +162,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
-signing_key: 
+rubygems_version: 3.4.19
+signing_key:
 specification_version: 4
 summary: Generates DRY and specifically extendable CRUD controller, views and helpers
   for Rails applications.