dry_crud 6.0.0 → 7.1.0

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

@@ -15,11 +15,11 @@ describe FormatHelper do
   after(:all) { reset_db }
 
   # define some test format_ methods
-  def format_size(obj) #:nodoc:
+  def format_size(obj) # :nodoc:
     "#{f(obj.size)} items"
   end
 
-  def format_string_size(obj) #:nodoc:
+  def format_string_size(obj) # :nodoc:
     "#{f(obj.size)} chars"
   end
 

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

@@ -34,7 +34,7 @@ describe TableHelper do
       it { is_expected.to be_html_safe }
 
       it 'handles empty data' do
-        is_expected.to match(/div class=.table.\>.+\<\/div\>/)
+        is_expected.to match(/div class=.table.>.+<\/div>/)
       end
     end
 
@@ -46,7 +46,7 @@ describe TableHelper do
       it { is_expected.to be_html_safe }
 
       it 'renders table' do
-        is_expected.to match(/^\<table.*\<\/table\>$/)
+        is_expected.to match(/^<table.*<\/table>$/)
       end
     end
   end
@@ -87,7 +87,7 @@ describe TableHelper do
         with_test_routing do
           list_table do |t|
             t.attrs :name, :children, :companion_id
-            t.col('head') { |e| content_tag(:span, e.income.to_s) }
+            t.col('head') { |e| tag.span(e.income.to_s) }
           end
         end
       end
@@ -113,7 +113,7 @@ describe TableHelper do
       subject do
         with_test_routing do
           list_table(:name, :children, :companion_id) do |t|
-            t.col('head') { |e| content_tag(:span, e.income.to_s) }
+            t.col('head') { |e| tag.span(e.income.to_s) }
           end
         end
       end
@@ -223,7 +223,7 @@ describe TableHelper do
         with_test_routing do
           crud_table do |t|
             t.attrs :name, :children, :companion_id
-            t.col('head') { |e| content_tag(:span, e.income.to_s) }
+            t.col('head') { |e| tag.span(e.income.to_s) }
           end
         end
       end
@@ -245,7 +245,7 @@ describe TableHelper do
       subject do
         with_test_routing do
           crud_table(:name, :children, :companion_id) do |t|
-            t.col('head') { |e| content_tag(:span, e.income.to_s) }
+            t.col('head') { |e| tag.span(e.income.to_s) }
           end
         end
       end

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

@@ -33,7 +33,7 @@ describe UtilityHelper do
   describe '#content_tag_nested' do
 
     it 'escapes safe content' do
-      html = content_tag_nested(:div, %w[a b]) { |e| content_tag(:span, e) }
+      html = content_tag_nested(:div, %w[a b]) { |e| tag.span(e) }
       expect(html).to be_html_safe
       expect(html).to eq('<div><span>a</span><span>b</span></div>')
     end
@@ -56,7 +56,7 @@ describe UtilityHelper do
     end
 
     it 'collects contents for array' do
-      html = safe_join(%w[a b]) { |e| content_tag(:span, e) }
+      html = safe_join(%w[a b]) { |e| tag.span(e) }
       expect(html).to eq('<span>a</span><span>b</span>')
     end
   end

data/lib/generators/dry_crud/templates/spec/support/crud_controller_examples.rb

@@ -36,9 +36,7 @@ shared_examples 'crud controller' do |options|
 
   before do
     m = RSpec.current_example.metadata
-    if m[:perform_request] != false && m[:action] && m[:method]
-      perform_combined_request
-    end
+    perform_combined_request if m[:perform_request] != false && m[:action] && m[:method]
   end
 
   describe_action :get, :index,
@@ -144,7 +142,7 @@ shared_examples 'crud controller' do |options|
             unless: skip?(options, %w[new plain]),
             combine: 'new' do
       it_is_expected_to_respond
-      it_is_expected_to_persist_entry(false)
+      it_is_expected_to_persist_entry(persist: false)
     end
 
     context 'with params',
@@ -179,7 +177,7 @@ shared_examples 'crud controller' do |options|
               failing: true,
               unless: skip?(options, %w[create html invalid]),
               combine: 'chi' do
-        it_is_expected_to_persist_entry(false)
+        it_is_expected_to_persist_entry(persist: false)
         it_is_expected_to_set_attrs(:new)
         it_is_expected_to_not_have_flash(:notice)
       end
@@ -205,7 +203,7 @@ shared_examples 'crud controller' do |options|
         it_is_expected_to_respond(422)
         it_is_expected_to_set_attrs(:new)
         it_is_expected_to_render_json
-        it_is_expected_to_persist_entry(false)
+        it_is_expected_to_persist_entry(persist: false)
       end
     end
   end

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

@@ -117,7 +117,7 @@ module CrudControllerTestHelper
       it 'sets params as entry attributes' do
         attrs = send("#{action}_entry_attrs")
         actual = {}
-        attrs.keys.each do |key|
+        attrs.each_key do |key|
           actual[key] = entry.attributes[key.to_s]
         end
         expect(actual).to eq(attrs)
@@ -156,11 +156,11 @@ module CrudControllerTestHelper
     end
 
     # Test that the current entry is persistend and valid, or not.
-    def it_is_expected_to_persist_entry(bool = true)
+    def it_is_expected_to_persist_entry(persist: true)
       context 'entry' do
         subject { entry }
 
-        if bool
+        if persist
           it { is_expected.not_to be_new_record }
           it { is_expected.to be_valid }
         else

data/lib/generators/dry_crud/templates/test/controllers/crud_test_models_controller_test.rb

@@ -295,7 +295,7 @@ class CrudTestModelsControllerTest < ActionController::TestCase
 
   def test_models_label
     assert_equal 'Crud Test Models', @controller.models_label
-    assert_equal 'Crud Test Model', @controller.models_label(false)
+    assert_equal 'Crud Test Model', @controller.models_label(plural: false)
   end
 
   private

data/lib/generators/dry_crud/templates/test/helpers/custom_assertions_test.rb

@@ -25,7 +25,7 @@ class CustomAssertionsTest < ActiveSupport::TestCase
   end
 
   test 'assert count fails if count does not match' do
-    assert_raise(MiniTest::Assertion) do
+    assert_raise(Minitest::Assertion) do
       assert_count 2, 'ba', 'barbabapa'
     end
   end
@@ -37,7 +37,7 @@ class CustomAssertionsTest < ActiveSupport::TestCase
   end
 
   test 'assert valid record fails for invalid' do
-    assert_raise(MiniTest::Assertion) do
+    assert_raise(Minitest::Assertion) do
       assert_valid invalid_record
     end
   end
@@ -55,19 +55,19 @@ class CustomAssertionsTest < ActiveSupport::TestCase
   end
 
   test 'assert not valid fails if record valid' do
-    assert_raise(MiniTest::Assertion) do
+    assert_raise(Minitest::Assertion) do
       assert_not_valid crud_test_models('AAAAA')
     end
   end
 
   test 'assert not valid fails if record invalid and valid attrs given' do
-    assert_raise(MiniTest::Assertion) do
+    assert_raise(Minitest::Assertion) do
       assert_not_valid invalid_record, :name, :rating, :children
     end
   end
 
   test 'assert not valid fails if not all invalid attrs given' do
-    assert_raise(MiniTest::Assertion) do
+    assert_raise(Minitest::Assertion) do
       assert_not_valid invalid_record, :name
     end
   end

data/lib/generators/dry_crud/templates/test/helpers/dry_crud/form/builder_test.rb

@@ -97,15 +97,15 @@ module DryCrud
 
       test 'labeld_input_field adds required mark' do
         result = form.labeled_input_field(:name)
-        assert result.include?('input-group-append')
+        assert result.include?('input-group-text')
         result = form.labeled_input_field(:remarks)
-        assert_not result.include?('input-group-append')
+        assert_not result.include?('input-group-text')
       end
 
       test 'labeld_input_field adds help text' do
         result = form.labeled_input_field(:name, help: 'Some Help')
         assert result.include?(form.help_block('Some Help'))
-        assert result.include?('input-group-append')
+        assert result.include?('input-group-text')
       end
 
       test 'belongs_to_field has all options by default' do

data/lib/generators/dry_crud/templates/test/helpers/form_helper_test.rb

@@ -57,16 +57,16 @@ class FormHelperTest < ActionView::TestCase
     assert_match(/input .*?type="date"
                         .*?name="crud_test_model\[birthdate\]"/x, f)
     assert_match(/input .*?type="number"
-                        .*?value=\"9\"
+                        .*?value="9"
                         .*?name="crud_test_model\[children\]"/x, f)
     assert_match(/input .*?type="checkbox"
                         .*?name="crud_test_model\[human\]"/x, f)
-    assert_match(/button\ .*?type="submit".*\>
+    assert_match(/button\ .*?type="submit".*>
                   #{t('global.button.save')}
-                  \<\/button\>/x, f)
-    assert_match(/\<a\ .*href="\/somewhere".*\>
+                  <\/button>/x, f)
+    assert_match(/<a\ .*href="\/somewhere".*>
                   #{t('global.button.cancel')}
-                  \<\/a\>/x, f)
+                  <\/a>/x, f)
   end
 
   test 'standard form with errors' do
@@ -88,9 +88,9 @@ class FormHelperTest < ActionView::TestCase
                         .*?name="_method"
                         .*?value="(patch|put)"/x, f)
     assert_match(/div[^>]* id='error_explanation'/, f)
-    assert_match(/div\ class="form-group\ has-error"\>.*?
-                  \<input .*?type="text"
-                          .*?name="crud_test_model\[name\]"/x, f)
+    assert_match(/input .*?class="is-invalid\ form-control"
+                         .*?type="text"
+                         .*?name="crud_test_model\[name\]"/x, f)
     assert_match(/input .*?value="1910-01-01"
                         .*?type="date"
                         .*?name="crud_test_model\[birthdate\]"/x, f)

data/lib/generators/dry_crud/templates/test/helpers/table_helper_test.rb

@@ -31,9 +31,9 @@ class TableHelperTest < ActionView::TestCase
   end
 
   test 'empty table renders message' do
-    result = plain_table_or_message([]) {}
+    result = plain_table_or_message([])
     assert result.html_safe?
-    assert_match(/\<div class=["']table["']\>.*\<\/div\>/, result)
+    assert_match(/<div class=["']table["']>.*<\/div>/, result)
   end
 
   test 'non empty table renders table' do
@@ -41,7 +41,7 @@ class TableHelperTest < ActionView::TestCase
       t.attrs :size, :upcase
     end
     assert result.html_safe?
-    assert_match(/^\<table.*\<\/table\>$/, result)
+    assert_match(/^<table.*<\/table>$/, result)
   end
 
   test 'table with attrs' do
@@ -84,7 +84,7 @@ class TableHelperTest < ActionView::TestCase
     table = with_test_routing do
       list_table do |t|
         t.attrs :name, :children, :companion_id
-        t.col('head') { |e| content_tag :span, e.income.to_s }
+        t.col('head') { |e| tag.span(e.income.to_s) }
       end
     end
 
@@ -99,7 +99,7 @@ class TableHelperTest < ActionView::TestCase
 
     table = with_test_routing do
       list_table :name, :children, :companion_id do |t|
-        t.col('head') { |e| content_tag :span, e.income.to_s }
+        t.col('head') { |e| tag.span(e.income.to_s) }
       end
     end
 
@@ -181,7 +181,7 @@ class TableHelperTest < ActionView::TestCase
     table = with_test_routing do
       crud_table do |t|
         t.attrs :name, :children, :companion_id
-        t.col('head') { |e| content_tag :span, e.income.to_s }
+        t.col('head') { |e| tag.span(e.income.to_s) }
       end
     end
 
@@ -196,7 +196,7 @@ class TableHelperTest < ActionView::TestCase
 
     table = with_test_routing do
       crud_table :name, :children, :companion_id do |t|
-        t.col('head') { |e| content_tag :span, e.income.to_s }
+        t.col('head') { |e| tag.span(e.income.to_s) }
       end
     end
 

data/lib/generators/dry_crud/templates/test/helpers/utility_helper_test.rb

@@ -10,7 +10,7 @@ class UtilityHelperTest < ActionView::TestCase
   teardown :reset_db
 
   test 'content_tag_nested escapes safe correctly' do
-    html = content_tag_nested(:div, %w[a b]) { |e| content_tag(:span, e) }
+    html = content_tag_nested(:div, %w[a b]) { |e| tag.span(e) }
     assert_equal '<div><span>a</span><span>b</span></div>', html
   end
 
@@ -30,7 +30,7 @@ class UtilityHelperTest < ActionView::TestCase
   end
 
   test 'safe_join with block' do
-    html = safe_join(%w[a b]) { |e| content_tag(:span, e) }
+    html = safe_join(%w[a b]) { |e| tag.span(e) }
     assert_equal '<span>a</span><span>b</span>', html
   end
 

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

@@ -1,8 +1,8 @@
-#: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
@@ -150,15 +150,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!

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

@@ -1,5 +1,5 @@
 # A dummy model used for general testing.
-class CrudTestModel < ApplicationRecord #:nodoc:
+class CrudTestModel < ApplicationRecord # :nodoc:
 
   belongs_to :companion, class_name: 'CrudTestModel', optional: true
   has_and_belongs_to_many :others, class_name: 'OtherCrudTestModel'
@@ -33,11 +33,10 @@ class CrudTestModel < ApplicationRecord #:nodoc:
 end
 
 # Second dummy model to test associations.
-class OtherCrudTestModel < ApplicationRecord #:nodoc:
+class OtherCrudTestModel < ApplicationRecord # :nodoc:
 
   has_and_belongs_to_many :others, class_name: 'CrudTestModel'
   belongs_to :more,
-             foreign_key: :more_id,
              class_name: 'CrudTestModel',
              optional: true
 

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

@@ -1,5 +1,5 @@
 # Controller for the dummy model.
-class CrudTestModelsController < CrudController #:nodoc:
+class CrudTestModelsController < CrudController # :nodoc:
 
   HANDLE_PREFIX = 'handle_'.freeze
 
@@ -9,7 +9,7 @@ class CrudTestModelsController < CrudController #:nodoc:
   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
@@ -54,9 +54,7 @@ class CrudTestModelsController < CrudController #:nodoc:
 
   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
 
@@ -94,7 +92,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

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

@@ -14,7 +14,7 @@ module CustomAssertions
     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
@@ -50,7 +50,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,12 +69,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
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dry_crud
 version: !ruby/object:Gem::Version
-  version: 6.0.0
+  version: 7.1.0
 platform: ruby
 authors:
 - Pascal Zumkehr
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-09-08 00:00:00.000000000 Z
+date: 2023-12-06 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: '7.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '7.1'
 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.3.26
+signing_key:
 specification_version: 4
 summary: Generates DRY and specifically extendable CRUD controller, views and helpers
   for Rails applications.