dry_crud 6.0.0 → 8.0.0

data/lib/generators/dry_crud/dry_crud_generator_base.rb

@@ -1,31 +1,31 @@
-require 'rails/generators'
+require "rails/generators"
 
 # Generates all dry crud files
 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
-    [gem_root,
-     template_root]
+    [ gem_root,
+     template_root ]
   end
 
   private
 
   def all_template_files
     { self.class.gem_root =>
-        template_files(self.class.gem_root, 'app', 'config'),
+        template_files(self.class.gem_root, "app", "config"),
       self.class.template_root =>
         template_files(self.class.template_root) }
   end
 
   def template_files(root, *folders)
-    pattern = File.join('**', '**')
+    pattern = File.join("**", "**")
     pattern = File.join("{#{folders.join(',')}}", pattern) if folders.present?
     Dir.chdir(root) do
       Dir.glob(pattern).sort.reject { |f| File.directory?(f) }
@@ -47,7 +47,7 @@ class DryCrudGeneratorBase < Rails::Generators::Base
   end
 
   def copy_file_source(file_source)
-    if file_source.end_with?('.erb')
+    if file_source.end_with?(".erb")
       copy_file(file_source)
     else
       template(file_source)

data/lib/generators/dry_crud/file_generator.rb

@@ -1,16 +1,16 @@
-require 'generators/dry_crud/dry_crud_generator_base'
+require "generators/dry_crud/dry_crud_generator_base"
 
 module DryCrud
   # Copies one file of dry_crud to the rails application.
   class FileGenerator < ::DryCrudGeneratorBase
     desc "Copy one file from dry_crud to the application.\n" \
-         'FILENAME is a part of the name of the file to copy. ' \
-         'Must match exactly one file.'
+         "FILENAME is a part of the name of the file to copy. " \
+         "Must match exactly one file."
 
     argument :filename,
              type: :string,
-             desc: 'Name or part of the filename to copy. ' \
-                   'Must match exactly one file.'
+             desc: "Name or part of the filename to copy. " \
+                   "Must match exactly one file."
 
     # rubocop:disable Rails/Output
     def copy_matching_file
@@ -21,7 +21,7 @@ module DryCrud
       when 0
         puts "No file containing '#{filename}' found in dry_crud."
       else
-        puts 'Please be more specific. ' \
+        puts "Please be more specific. " \
              "All the following files match '#{filename}':"
         files.each do |f|
           puts " * #{f}"

data/lib/generators/dry_crud/templates/config/initializers/field_error_proc.rb

@@ -2,4 +2,4 @@
 
 # Fields with errors are directly styled in Crud::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 }

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

@@ -1,4 +1,4 @@
-require 'rails_helper'
+require "rails_helper"
 
 # Tests all actions of the CrudController based on a dummy model
 # (CrudTestModel). This is useful to test the general behavior
@@ -17,201 +17,201 @@ describe CrudTestModelsController do
 
   before { special_routing }
 
-  include_examples 'crud controller', {}
+  include_examples "crud controller", {}
 
   let(:test_entry) { crud_test_models(:AAAAA) }
   let(:new_entry_attrs) do
-    { name: 'foo',
+    { name: "foo",
       children: 42,
       companion_id: 3,
       rating: 8.5,
       income: 2.42,
-      birthdate: '31-12-1999'.to_date,
+      birthdate: "31-12-1999".to_date,
       human: true,
       remarks: "some custom\n\tremarks" }
   end
   let(:edit_entry_attrs) do
-    { name: 'foo',
+    { name: "foo",
       children: 42,
       rating: 8.5,
       income: 2.42,
-      birthdate: '31-12-1999'.to_date,
+      birthdate: "31-12-1999".to_date,
       human: true,
       remarks: "some custom\n\tremarks" }
   end
 
-  describe 'setup' do
-    it 'model count is correct' do
+  describe "setup" do
+    it "model count is correct" do
       expect(CrudTestModel.count).to eq(6)
     end
 
-    it 'has models_label' do
-      expect(controller.models_label).to eq('Crud Test Models')
+    it "has models_label" do
+      expect(controller.models_label).to eq("Crud Test Models")
     end
 
-    it 'has models_label singular' do
-      expect(controller.models_label(false)).to eq('Crud Test Model')
+    it "has models_label singular" do
+      expect(controller.models_label(plural: false)).to eq("Crud Test Model")
     end
   end
 
   describe_action :get, :index do
-    context '.html', format: :html do
-      context 'plain', combine: 'ihp' do
-        it 'contains all entries' do
+    context ".html", format: :html do
+      context "plain", combine: "ihp" do
+        it "contains all entries" do
           expect(entries.size).to eq(6)
         end
 
-        it 'session has empty list_params' do
+        it "session has empty list_params" do
           expect(session[:list_params]).to eq({})
         end
 
-        it 'provides entries helper method' do
+        it "provides entries helper method" do
           expect(entries).to be(controller.send(:entries))
         end
       end
 
-      context 'search' do
+      context "search" do
         let(:params) { { q: search_value } }
 
-        context 'regular', combine: 'ihse' do
-          it 'entries only contain test_entry' do
-            expect(entries).to eq([test_entry])
+        context "regular", combine: "ihse" do
+          it "entries only contain test_entry" do
+            expect(entries).to eq([ test_entry ])
           end
 
-          it 'session has query list param' do
-            expect(session[:list_params]['/crud_test_models.html'])
-              .to eq('q' => 'AAAA')
+          it "session has query list param" do
+            expect(session[:list_params]["/crud_test_models.html"])
+              .to eq("q" => "AAAA")
           end
         end
 
-        context 'with custom options', combine: 'ihsec' do
-          let(:params) { { q: 'DDD', filter: true } }
+        context "with custom options", combine: "ihsec" do
+          let(:params) { { q: "DDD", filter: true } }
 
           it_is_expected_to_respond
 
-          it 'entries have one item' do
-            expect(entries).to eq([CrudTestModel.find_by(name: 'BBBBB')])
+          it "entries have one item" do
+            expect(entries).to eq([ CrudTestModel.find_by(name: "BBBBB") ])
           end
 
-          it 'session has query list param' do
-            expect(session[:list_params]['/crud_test_models.html'])
-              .to eq('q' => 'DDD')
+          it "session has query list param" do
+            expect(session[:list_params]["/crud_test_models.html"])
+              .to eq("q" => "DDD")
           end
         end
       end
 
-      context 'sort' do
-        context 'for given column', combine: 'ihsog' do
-          let(:params) { { sort: 'children', sort_dir: 'asc' } }
+      context "sort" do
+        context "for given column", combine: "ihsog" do
+          let(:params) { { sort: "children", sort_dir: "asc" } }
 
           it_is_expected_to_respond
 
-          it 'entries are in correct order' do
+          it "entries are in correct order" do
             expect(entries).to eq(CrudTestModel.all.sort_by(&:children))
           end
 
-          it 'session has sort list param' do
-            expect(session[:list_params]['/crud_test_models.html']).to eq(
-              'sort' => 'children', 'sort_dir' => 'asc'
+          it "session has sort list param" do
+            expect(session[:list_params]["/crud_test_models.html"]).to eq(
+              "sort" => "children", "sort_dir" => "asc"
             )
           end
         end
 
-        context 'for virtual column', combine: 'ihsov' do
-          let(:params) { { sort: 'chatty', sort_dir: 'desc' } }
+        context "for virtual column", combine: "ihsov" do
+          let(:params) { { sort: "chatty", sort_dir: "desc" } }
 
           it_is_expected_to_respond
 
-          it 'entries are in correct order' do
+          it "entries are in correct order" do
             names = entries.map(&:name)
-            assert names.index('BBBBB') < names.index('AAAAA')
-            assert names.index('BBBBB') < names.index('DDDDD')
-            assert names.index('EEEEE') < names.index('AAAAA')
-            assert names.index('EEEEE') < names.index('DDDDD')
-            assert names.index('AAAAA') < names.index('CCCCC')
-            assert names.index('DDDDD') < names.index('CCCCC')
+            assert names.index("BBBBB") < names.index("AAAAA")
+            assert names.index("BBBBB") < names.index("DDDDD")
+            assert names.index("EEEEE") < names.index("AAAAA")
+            assert names.index("EEEEE") < names.index("DDDDD")
+            assert names.index("AAAAA") < names.index("CCCCC")
+            assert names.index("DDDDD") < names.index("CCCCC")
           end
 
-          it 'session has sort list param' do
-            expect(session[:list_params]['/crud_test_models.html']).to eq(
-              'sort' => 'chatty', 'sort_dir' => 'desc'
+          it "session has sort list param" do
+            expect(session[:list_params]["/crud_test_models.html"]).to eq(
+              "sort" => "chatty", "sort_dir" => "desc"
             )
           end
         end
 
-        context 'with search', combine: 'ihsose' do
+        context "with search", combine: "ihsose" do
           let(:params) do
-            { q: 'DDD', sort: 'chatty', sort_dir: 'asc' }
+            { q: "DDD", sort: "chatty", sort_dir: "asc" }
           end
 
           it_is_expected_to_respond
 
-          it 'entries are in correct order' do
+          it "entries are in correct order" do
             expect(entries.map(&:name)).to eq(%w[CCCCC DDDDD BBBBB])
           end
 
-          it 'session has sort list param' do
-            expect(session[:list_params]['/crud_test_models.html']).to eq(
-              'q' => 'DDD', 'sort' => 'chatty', 'sort_dir' => 'asc'
+          it "session has sort list param" do
+            expect(session[:list_params]["/crud_test_models.html"]).to eq(
+              "q" => "DDD", "sort" => "chatty", "sort_dir" => "asc"
             )
           end
         end
       end
 
-      context 'with custom options', combine: 'ihsoco' do
+      context "with custom options", combine: "ihsoco" do
         let(:params) { { filter: true } }
 
         it_is_expected_to_respond
 
-        context 'entries' do
+        context "entries" do
           subject { entries }
           it { expect(subject.size).to eq(2) }
           it { is_expected.to eq(entries.sort_by(&:children).reverse) }
         end
       end
 
-      context 'returning', perform_request: false do
+      context "returning", perform_request: false do
         before do
           session[:list_params] = {}
-          session[:list_params]['/crud_test_models'] =
-            { 'q' => 'DDD', 'sort' => 'chatty', 'sort_dir' => 'desc' }
+          session[:list_params]["/crud_test_models"] =
+            { "q" => "DDD", "sort" => "chatty", "sort_dir" => "desc" }
           get :index, params: { returning: true }
         end
 
         it_is_expected_to_respond
 
-        it 'entries are in correct order' do
+        it "entries are in correct order" do
           expect(entries.map(&:name)).to eq(%w[BBBBB DDDDD CCCCC])
         end
 
-        it 'params are set' do
-          expect(controller.params[:q]).to eq('DDD')
-          expect(controller.params[:sort]).to eq('chatty')
-          expect(controller.params[:sort_dir]).to eq('desc')
+        it "params are set" do
+          expect(controller.params[:q]).to eq("DDD")
+          expect(controller.params[:sort]).to eq("chatty")
+          expect(controller.params[:sort_dir]).to eq("desc")
         end
       end
     end
 
-    context '.js', format: :js, combine: 'ijs' do
+    context ".js", format: :js, combine: "ijs" do
       it_is_expected_to_respond
-      it { expect(response.body).to eq('index js') }
+      it { expect(response.body).to eq("index js") }
     end
   end
 
   describe_action :get, :new do
-    context 'plain', combine: 'new' do
-      it 'assigns companions' do
+    context "plain", combine: "new" do
+      it "assigns companions" do
         expect(ivar(:companions)).to be_present
       end
 
-      it 'calls two render callbacks' do
+      it "calls two render callbacks" do
         expect(controller.called_callbacks).to eq(
           %i[before_render_new before_render_form]
         )
       end
     end
 
-    context 'with before_render callback redirect',
+    context "with before_render callback redirect",
             perform_request: false do
       before do
         controller.should_redirect = true
@@ -220,7 +220,7 @@ describe CrudTestModelsController do
 
       it { is_expected.to redirect_to(crud_test_models_path) }
 
-      it 'does not set companions' do
+      it "does not set companions" do
         expect(ivar(:companions)).to be_nil
       end
     end
@@ -229,44 +229,44 @@ describe CrudTestModelsController do
   describe_action :post, :create do
     let(:params) { { model_identifier => new_entry_attrs } }
 
-    it 'calls the correct callbacks' do
+    it "calls the correct callbacks" do
       expect(controller.called_callbacks).to eq(
         %i[before_create before_save after_save after_create]
       )
     end
 
-    context 'with before callback' do
+    context "with before callback" do
       let(:params) do
-        { crud_test_model: { name: 'illegal', children: 2 } }
+        { crud_test_model: { name: "illegal", children: 2 } }
       end
-      it 'does not create entry', perform_request: false do
+      it "does not create entry", perform_request: false do
         expect { perform_request }.to change { CrudTestModel.count }.by(0)
       end
 
-      context 'plain', combine: 'chcp' 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
-          expect(entry.name).to eq('illegal')
+        it "sets entry name" do
+          expect(entry.name).to eq("illegal")
         end
 
-        it 'assigns companions' do
+        it "assigns companions" do
           expect(ivar(:companions)).to be_present
         end
 
-        it 'calls the correct callbacks' do
+        it "calls the correct callbacks" do
           expect(controller.called_callbacks).to eq(
             %i[before_render_new before_render_form]
           )
         end
       end
 
-      context 'redirect', perform_request: false do
+      context "redirect", perform_request: false do
         before { controller.should_redirect = true }
 
-        it 'does not create entry' do
+        it "does not create entry" do
           expect { perform_request }.to change { CrudTestModel.count }.by(0)
         end
 
@@ -275,32 +275,32 @@ describe CrudTestModelsController do
           is_expected.to redirect_to(crud_test_models_path)
         end
 
-        it 'calls no callbacks' do
+        it "calls no callbacks" do
           perform_request
           expect(controller.called_callbacks).to be_nil
         end
       end
     end
 
-    context 'with invalid params' do
+    context "with invalid params" do
       let(:params) { { crud_test_model: { children: 2 } } }
 
-      context '.html' do
-        it 'does not create entry', perform_request: false do
+      context ".html" do
+        it "does not create entry", perform_request: false do
           expect { perform_request }.to change { CrudTestModel.count }.by(0)
         end
 
-        context 'plain', combine: 'chip' 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)
 
-          it 'assigns companions' do
+          it "assigns companions" do
             expect(ivar(:companions)).to be_present
           end
 
-          it 'calls the correct callbacks' do
+          it "calls the correct callbacks" do
             expect(controller.called_callbacks).to eq(
               %i[before_create before_save
                  before_render_new before_render_form]
@@ -309,23 +309,23 @@ describe CrudTestModelsController do
         end
       end
 
-      context '.json', format: :json do
-        it 'does not create entry', perform_request: false do
+      context ".json", format: :json do
+        it "does not create entry", perform_request: false do
           expect { perform_request }.to change { CrudTestModel.count }.by(0)
         end
 
-        context 'plain', combine: 'cjcb' 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
 
-          it 'does not assign companions' do
+          it "does not assign companions" do
             expect(ivar(:companions)).to be_nil
           end
 
-          it 'calls the correct callbacks' do
+          it "calls the correct callbacks" do
             expect(controller.called_callbacks).to eq(
               %i[before_create before_save]
             )
@@ -336,7 +336,7 @@ describe CrudTestModelsController do
   end
 
   describe_action :get, :edit, id: true do
-    it 'calls the correct callbacks' do
+    it "calls the correct callbacks" do
       expect(controller.called_callbacks).to eq(
         %i[before_render_edit before_render_form]
       )
@@ -346,52 +346,52 @@ describe CrudTestModelsController do
   describe_action :put, :update, id: true do
     let(:params) { { model_identifier => edit_entry_attrs } }
 
-    it 'calls the correct callbacks' do
+    it "calls the correct callbacks" do
       expect(controller.called_callbacks).to eq(
         %i[before_update before_save after_save after_update]
       )
     end
 
-    context 'with invalid params' do
+    context "with invalid params" do
       let(:params) do
         {
           crud_test_model: {
             rating: 20,
-            other_ids: [OtherCrudTestModel.first.id]
+            other_ids: [ OtherCrudTestModel.first.id ]
           }
         }
       end
 
-      context '.html', combine: 'uhivp' do
+      context ".html", combine: "uhivp" do
         it_is_expected_to_respond
         it_is_expected_to_not_have_flash(:notice)
 
-        it 'changes entry' do
+        it "changes entry" do
           expect(entry).to be_changed
         end
 
-        it 'sets entry rating' do
+        it "sets entry rating" do
           expect(entry.rating).to eq(20)
         end
 
-        it 'calls the correct callbacks' do
+        it "calls the correct callbacks" do
           expect(controller.called_callbacks).to eq(
             %i[before_update before_save
                before_render_edit before_render_form]
           )
         end
 
-        it 'does not update has_many ids' do
+        it "does not update has_many ids" do
           expect(test_entry.reload.other_ids).to eq([])
         end
       end
 
-      context '.json', format: :json, combine: 'ujivp' do
+      context ".json", format: :json, combine: "ujivp" do
         it_is_expected_to_respond(422)
         it_is_expected_to_not_have_flash(:notice)
         it_is_expected_to_render_json
 
-        it 'calls the correct callbacks' do
+        it "calls the correct callbacks" do
           expect(controller.called_callbacks).to eq(
             %i[before_update before_save]
           )
@@ -401,23 +401,23 @@ describe CrudTestModelsController do
   end
 
   describe_action :delete, :destroy, id: true do
-    it 'calls the correct callbacks' do
+    it "calls the correct callbacks" do
       expect(controller.called_callbacks).to eq(
         %i[before_destroy after_destroy]
       )
     end
 
-    context 'with failure' do
+    context "with failure" do
       let(:test_entry) { crud_test_models(:BBBBB) }
-      context '.html' do
-        it 'does not delete entry from database',
+      context ".html" do
+        it "does not delete entry from database",
            perform_request: false do
           expect { perform_request }.not_to(change { CrudTestModel.count })
         end
 
-        it 'redirects to referer',
+        it "redirects to referer",
            perform_request: false do
-          ref = @request.env['HTTP_REFERER'] = crud_test_model_url(test_entry)
+          ref = @request.env["HTTP_REFERER"] = crud_test_model_url(test_entry)
           perform_request
           is_expected.to redirect_to(ref)
         end
@@ -426,29 +426,29 @@ describe CrudTestModelsController do
         it_is_expected_to_not_have_flash(:notice)
       end
 
-      context '.json', format: :json, combine: 'djf' do
+      context ".json", format: :json, combine: "djf" do
         it_is_expected_to_respond(422)
         it_is_expected_to_not_have_flash(:notice)
         it_is_expected_to_render_json
       end
 
-      context 'callback', perform_request: false do
+      context "callback", perform_request: false do
         before do
           # rubocop:disable Rails/SkipsModelValidations
-          test_entry.update_attribute(:name, 'illegal')
+          test_entry.update_attribute(:name, "illegal")
           # rubocop:enable Rails/SkipsModelValidations
         end
 
-        it 'does not delete entry from database' do
+        it "does not delete entry from database" do
           expect { perform_request }.not_to(change { CrudTestModel.count })
         end
 
-        it 'redirects to index' do
+        it "redirects to index" do
           perform_request
           is_expected.to redirect_to(crud_test_models_path(returning: true))
         end
 
-        it 'has flash alert' do
+        it "has flash alert" do
           perform_request
           expect(flash[:alert]).to match(/illegal name/)
         end