dry_crud 3.0.0 → 5.0.0

data/lib/generators/dry_crud/file_generator.rb

@@ -5,7 +5,6 @@ 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.\nFILENAME 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.'
@@ -36,6 +35,5 @@ module DryCrud
         end
       end.flatten
     end
-
   end
-end
+end

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

@@ -6,7 +6,6 @@ require 'rails_helper'
 # of CrudController.
 
 describe CrudTestModelsController do
-
   include CrudTestHelper
 
   before(:all) do
@@ -64,11 +63,10 @@ describe CrudTestModelsController do
         end
 
         it 'session has empty list_params' do
-          expect(session[:list_params]).to eq(Hash.new)
+          expect(session[:list_params]).to eq({})
         end
 
         it 'provides entries helper method' do
-          is_expected.to render_template('index')
           expect(entries).to be(controller.send(:entries))
         end
       end
@@ -83,7 +81,7 @@ describe CrudTestModelsController do
 
           it 'session has query list param' do
             expect(session[:list_params]['/crud_test_models.html'])
-              .to eq('q' =>  'AAAA')
+              .to eq('q' => 'AAAA')
           end
         end
 
@@ -175,7 +173,7 @@ describe CrudTestModelsController do
           session[:list_params] = {}
           session[:list_params]['/crud_test_models'] =
             { 'q' => 'DDD', 'sort' => 'chatty', 'sort_dir' => 'desc' }
-          get :index, returning: true
+          get :index, params: { returning: true }
         end
 
         it_is_expected_to_respond
@@ -194,7 +192,6 @@ describe CrudTestModelsController do
 
     context '.js', format: :js, combine: 'ijs' do
       it_is_expected_to_respond
-      it_is_expected_to_assign_entries
       it { expect(response.body).to eq('index js') }
     end
   end
@@ -202,7 +199,7 @@ describe CrudTestModelsController do
   describe_action :get, :new do
     context 'plain', combine: 'new' do
       it 'assigns companions' do
-        expect(assigns(:companions)).to be_present
+        expect(ivar(:companions)).to be_present
       end
 
       it 'calls two render callbacks' do
@@ -221,7 +218,7 @@ describe CrudTestModelsController do
       it { is_expected.to redirect_to(crud_test_models_path) }
 
       it 'does not set companions' do
-        expect(assigns(:companions)).to be_nil
+        expect(ivar(:companions)).to be_nil
       end
     end
   end
@@ -244,7 +241,6 @@ describe CrudTestModelsController do
 
       context 'plain', combine: 'chcp' do
         it_is_expected_to_respond
-        it_is_expected_to_render('new')
         it_is_expected_to_persist_entry(false)
         it_is_expected_to_have_flash(:alert)
 
@@ -253,7 +249,7 @@ describe CrudTestModelsController do
         end
 
         it 'assigns companions' do
-          expect(assigns(:companions)).to be_present
+          expect(ivar(:companions)).to be_present
         end
 
         it 'calls the correct callbacks' do
@@ -291,13 +287,12 @@ describe CrudTestModelsController do
 
         context 'plain', combine: 'chip' do
           it_is_expected_to_respond
-          it_is_expected_to_render('new')
           it_is_expected_to_persist_entry(false)
           it_is_expected_to_not_have_flash(:notice)
           it_is_expected_to_not_have_flash(:alert)
 
           it 'assigns companions' do
-            expect(assigns(:companions)).to be_present
+            expect(ivar(:companions)).to be_present
           end
 
           it 'calls the correct callbacks' do
@@ -321,7 +316,7 @@ describe CrudTestModelsController do
           it_is_expected_to_render_json
 
           it 'does not assign companions' do
-            expect(assigns(:companions)).to be_nil
+            expect(ivar(:companions)).to be_nil
           end
 
           it 'calls the correct callbacks' do
@@ -331,7 +326,6 @@ describe CrudTestModelsController do
         end
       end
     end
-
   end
 
   describe_action :get, :edit, id: true do
@@ -354,7 +348,6 @@ describe CrudTestModelsController do
 
       context '.html', combine: 'uhivp' do
         it_is_expected_to_respond
-        it_is_expected_to_render('edit')
         it_is_expected_to_not_have_flash(:notice)
 
         it 'changes entry' do
@@ -383,7 +376,6 @@ describe CrudTestModelsController do
         end
       end
     end
-
   end
 
   describe_action :delete, :destroy, id: true do
@@ -437,7 +429,5 @@ describe CrudTestModelsController do
         end
       end
     end
-
   end
-
 end

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

@@ -192,7 +192,7 @@ describe FormHelper do
     end
 
     it do
-      is_expected.to match(/input .*?type="datetime"
+      is_expected.to match(/input .*?type="datetime\-local"
                                   .*?name="crud_test_model\[last_seen\]"/x)
     end
 

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

@@ -64,10 +64,10 @@ describe UtilityHelper do
 
   describe '#default_crud_attrs' do
     it 'do not contain id and password' do
-      expect(default_crud_attrs).to eq([
-        :name, :email, :whatever, :children, :companion_id, :rating, :income,
-        :birthdate, :gets_up_at, :last_seen, :human, :remarks,
-        :created_at, :updated_at])
+      expect(default_crud_attrs).to eq(
+        [:name, :email, :whatever, :children, :companion_id, :rating, :income,
+         :birthdate, :gets_up_at, :last_seen, :human, :remarks,
+         :created_at, :updated_at])
     end
   end
 

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

@@ -27,8 +27,9 @@ shared_examples 'crud controller' do |options|
   let(:model_identifier) { controller.model_identifier }
   let(:test_params)      { scope_params }
   let(:sort_column)      { model_class.column_names.first }
-  let(:entry)            { assigns(controller.send(:ivar_name, model_class)) }
-  let(:entries) { assigns(controller.send(:ivar_name, model_class).pluralize) }
+  let(:ivar_name)        { controller.send(:ivar_name, model_class) }
+  let(:entry)            { ivar(ivar_name) }
+  let(:entries)          { ivar(ivar_name.pluralize) }
   let(:search_value) do
     field = controller.search_columns.first
     val = test_entry[field].to_s
@@ -53,8 +54,6 @@ shared_examples 'crud controller' do |options|
               unless: skip?(options, %w(index html plain)),
               combine: 'ihp' do
         it_is_expected_to_respond
-        it_is_expected_to_assign_entries
-        it_is_expected_to_render
       end
 
       context 'search',
@@ -81,7 +80,7 @@ shared_examples 'crud controller' do |options|
           it_is_expected_to_respond
 
           it 'has sorted entries' do
-            sorted = entries.sort_by(&(sort_column.to_sym))
+            sorted = entries.sort_by(&sort_column.to_sym)
             expect(entries).to eq(sorted)
           end
         end
@@ -94,7 +93,7 @@ shared_examples 'crud controller' do |options|
           it_is_expected_to_respond
 
           it 'has sorted entries' do
-            sorted = entries.sort_by(&(sort_column.to_sym))
+            sorted = entries.sort_by(&sort_column.to_sym)
             expect(entries).to eq(sorted.reverse)
           end
         end
@@ -106,7 +105,6 @@ shared_examples 'crud controller' do |options|
             unless: skip?(options, %w(index json)),
             combine: 'ij' do
       it_is_expected_to_respond
-      it_is_expected_to_assign_entries
       it { expect(response.body).to start_with('[{') }
     end
   end
@@ -123,8 +121,6 @@ shared_examples 'crud controller' do |options|
               unless: skip?(options, %w(show html plain)),
               combine: 'sh' do
         it_is_expected_to_respond
-        it_is_expected_to_assign_entry
-        it_is_expected_to_render
       end
 
       context 'with non-existing id',
@@ -134,7 +130,7 @@ shared_examples 'crud controller' do |options|
 
         it 'raises RecordNotFound', perform_request: false do
           expect { perform_request }
-          .to raise_error(ActiveRecord::RecordNotFound)
+            .to raise_error(ActiveRecord::RecordNotFound)
         end
       end
     end
@@ -144,7 +140,6 @@ shared_examples 'crud controller' do |options|
             unless: skip?(options, %w(show json)),
             combine: 'sj' do
       it_is_expected_to_respond
-      it_is_expected_to_assign_entry
       it_is_expected_to_render_json
     end
   end
@@ -155,7 +150,6 @@ shared_examples 'crud controller' do |options|
             unless: skip?(options, %w(new plain)),
             combine: 'new' do
       it_is_expected_to_respond
-      it_is_expected_to_render
       it_is_expected_to_persist_entry(false)
     end
 
@@ -191,7 +185,6 @@ shared_examples 'crud controller' do |options|
               failing: true,
               unless: skip?(options, %w(create html invalid)),
               combine: 'chi' do
-        it_is_expected_to_render('new')
         it_is_expected_to_persist_entry(false)
         it_is_expected_to_set_attrs(:new)
         it_is_expected_to_not_have_flash(:notice)
@@ -228,8 +221,6 @@ shared_examples 'crud controller' do |options|
                   unless: skip?(options, %w(edit)),
                   combine: 'edit' do
     it_is_expected_to_respond
-    it_is_expected_to_render
-    it_is_expected_to_assign_entry
   end
 
   describe_action :put, :update,
@@ -257,7 +248,6 @@ shared_examples 'crud controller' do |options|
               failing: true,
               unless: skip?(options, %w(update html invalid)),
               combine: 'uhi' do
-        it_is_expected_to_render('edit')
         it_is_expected_to_set_attrs(:edit)
         it_is_expected_to_not_have_flash(:notice)
       end
@@ -291,7 +281,7 @@ shared_examples 'crud controller' do |options|
                   id: true,
                   unless: skip?(options, %w(destroy)) do
 
-    it 'removes entry from database', perform_request: false  do
+    it 'removes entry from database', perform_request: false do
       expect { perform_request }.to change { model_class.count }.by(-1)
     end
 

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

@@ -9,13 +9,14 @@ module CrudControllerTestHelper
   def perform_request
     m = RSpec.current_example.metadata
     example_params = respond_to?(:params) ? send(:params) : {}
-    params = scope_params.merge(format: m[:format])
-    params.merge!(id: test_entry.id) if m[:id]
+    params = scope_params.dup
+    params[:format] = m[:format] if m[:format]
+    params[:id] = test_entry.id if m[:id]
     params.merge!(example_params)
     if m[:method] == :get && m[:format] == :js
-      xhr(:get, m[:action], params)
+      get m[:action], params: params, xhr: true
     else
-      send(m[:method], m[:action], params)
+      send(m[:method], m[:action], params: params)
     end
   end
 
@@ -56,6 +57,10 @@ module CrudControllerTestHelper
     @request = @@current_request
   end
 
+  def ivar(name)
+    controller.instance_variable_get("@#{name}")
+  end
+
   # The params defining the nesting of the test entry.
   def scope_params
     params = {}
@@ -79,7 +84,8 @@ module CrudControllerTestHelper
     # Tests whether this action is configured to be skipped.
     def describe_action(method, action, metadata = {}, &block)
       action_defined = described_class.instance_methods
-                         .map(&:to_s).include?(action.to_s)
+                                      .map(&:to_s)
+                                      .include?(action.to_s)
       describe("#{method.to_s.upcase} #{action}",
                { if: action_defined,
                  method: method,
@@ -95,7 +101,7 @@ module CrudControllerTestHelper
       skips = [skips] if skips.blank? || !skips.first.is_a?(Array)
 
       skips.flatten.present? &&
-      skips.any? { |skip| skip == contexts.take(skip.size) }
+        skips.any? { |skip| skip == contexts.take(skip.size) }
     end
 
     # Test the response status, default 200.
@@ -103,29 +109,6 @@ module CrudControllerTestHelper
       it { expect(response.status).to eq(status) }
     end
 
-    # Test that entries are assigned.
-    def it_is_expected_to_assign_entries
-      it 'assigns entries' do
-        expect(entries).to be_present
-      end
-    end
-
-    # Test that entry is assigned.
-    def it_is_expected_to_assign_entry
-      it 'assigns entry' do
-        expect(entry).to eq(test_entry)
-      end
-    end
-
-    # Test that the given template or the main template of the action under
-    # test is rendered.
-    def it_is_expected_to_render(template = nil)
-      it do
-        template ||= RSpec.current_example.metadata[:action]
-        is_expected.to render_template(template)
-      end
-    end
-
     # Test that a json response is rendered.
     def it_is_expected_to_render_json
       it { expect(response.body).to start_with('{') }
@@ -147,6 +130,7 @@ module CrudControllerTestHelper
     def it_is_expected_to_redirect_to_index
       it do
         is_expected.to redirect_to scope_params.merge(action: 'index',
+                                                      id: nil,
                                                       returning: true)
       end
     end

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

@@ -35,12 +35,10 @@ class CrudTestModelsControllerTest < ActionController::TestCase
     assert_equal 6, entries.size
     assert_equal entries.sort_by(&:name), entries
     assert_equal({}, session[:list_params])
-    assert_equal entries, assigns(:crud_test_models)
-    assert_respond_to assigns(:crud_test_models), :klass
   end
 
   def test_index_js
-    xhr :get, :index, test_params
+    get :index, params: test_params, xhr: true
     assert_response :success
     assert_equal 'index js', @response.body
     assert entries.present?
@@ -53,18 +51,16 @@ class CrudTestModelsControllerTest < ActionController::TestCase
   end
 
   def test_index_with_custom_options
-    get :index, filter: true
+    get :index, params: { filter: true }
     assert_response :success
-    assert_template 'index'
     assert entries.present?
     assert_equal 2, entries.size
     assert_equal entries.sort_by(&:children).reverse, entries
   end
 
   def test_index_search_with_custom_options
-    get :index, q: 'DDD', filter: true
+    get :index, params: { q: 'DDD', filter: true }
     assert_response :success
-    assert_template 'index'
     assert entries.present?
     assert_equal 1, entries.size
     assert_equal [CrudTestModel.find_by_name('BBBBB')], entries
@@ -72,9 +68,8 @@ class CrudTestModelsControllerTest < ActionController::TestCase
   end
 
   def test_sort_given_column
-    get :index, sort: 'children', sort_dir: 'asc'
+    get :index, params: { sort: 'children', sort_dir: 'asc' }
     assert_response :success
-    assert_template 'index'
     assert entries.present?
     assert_equal 6, entries.size
     assert_equal CrudTestModel.all.sort_by(&:children), entries
@@ -83,9 +78,8 @@ class CrudTestModelsControllerTest < ActionController::TestCase
   end
 
   def test_sort_virtual_column
-    get :index, sort: 'chatty', sort_dir: 'desc'
+    get :index, params: { sort: 'chatty', sort_dir: 'desc' }
     assert_response :success
-    assert_template 'index'
     assert entries.present?
     assert_equal 6, entries.size
     assert_equal({ 'sort' => 'chatty', 'sort_dir' => 'desc' },
@@ -102,9 +96,8 @@ class CrudTestModelsControllerTest < ActionController::TestCase
   end
 
   def test_sort_with_search
-    get :index, q: 'DDD', sort: 'chatty', sort_dir: 'asc'
+    get :index, params: { q: 'DDD', sort: 'chatty', sort_dir: 'asc' }
     assert_response :success
-    assert_template 'index'
     assert entries.present?
     assert_equal 3, entries.size
     assert_equal %w(CCCCC DDDDD BBBBB), entries.map(&:name)
@@ -117,9 +110,8 @@ class CrudTestModelsControllerTest < ActionController::TestCase
     session[:list_params]['/crud_test_models'] = { 'q' => 'DDD',
                                                    'sort' => 'chatty',
                                                    'sort_dir' => 'desc' }
-    get :index, returning: true
+    get :index, params: { returning: true }
     assert_response :success
-    assert_template 'index'
     assert entries.present?
     assert_equal 3, entries.size
     assert_equal %w(BBBBB DDDDD CCCCC), entries.map(&:name)
@@ -130,19 +122,12 @@ class CrudTestModelsControllerTest < ActionController::TestCase
 
   def test_new
     super
-    assert assigns(:companions)
-    assert_equal @controller.send(:entry), assigns(:crud_test_model)
     assert_equal [:before_render_new, :before_render_form],
                  @controller.called_callbacks
   end
 
-  def test_show
-    super
-    assert_equal @controller.send(:entry), assigns(:crud_test_model)
-  end
-
   def test_show_with_custom
-    get :show, test_params(id: crud_test_models(:BBBBB).id)
+    get :show, params: test_params(id: crud_test_models(:BBBBB).id)
     assert_response :success
     assert_equal 'custom html', @response.body
   end
@@ -157,7 +142,6 @@ class CrudTestModelsControllerTest < ActionController::TestCase
 
   def test_edit
     super
-    assert_equal @controller.send(:entry), assigns(:crud_test_model)
     assert_equal [:before_render_edit, :before_render_form],
                  @controller.called_callbacks
   end
@@ -168,7 +152,6 @@ class CrudTestModelsControllerTest < ActionController::TestCase
                         model: 'Crud Test Model <i>foo</i>'),
                  flash[:notice]
     assert flash[:alert].blank?
-    assert_equal @controller.send(:entry), assigns(:crud_test_model)
     assert_equal [:before_update, :before_save, :after_save, :after_update],
                  @controller.called_callbacks
   end
@@ -178,18 +161,17 @@ class CrudTestModelsControllerTest < ActionController::TestCase
     assert_equal [:before_destroy, :after_destroy],
                  @controller.called_callbacks
     assert_equal I18n.t('crud.destroy.flash.success',
-                         model: 'Crud Test Model <i>AAAAA</i>'),
+                        model: 'Crud Test Model <i>AAAAA</i>'),
                  flash[:notice]
   end
 
   def test_create_with_before_callback
     assert_no_difference('CrudTestModel.count') do
-      post :create, crud_test_model: { name: 'illegal', children: 2 }
+      post :create,
+           params: { crud_test_model: { name: 'illegal', children: 2 } }
     end
     assert_response :success
-    assert_template 'new'
     assert entry.new_record?
-    assert assigns(:companions).present?
     assert flash[:alert].present?
     assert_equal 'illegal', entry.name
     assert_equal [:before_render_new, :before_render_form],
@@ -199,7 +181,8 @@ class CrudTestModelsControllerTest < ActionController::TestCase
   def test_create_with_before_callback_redirect
     @controller.should_redirect = true
     assert_no_difference('CrudTestModel.count') do
-      post :create, crud_test_model: { name: 'illegal', children: 2 }
+      post :create,
+           params: { crud_test_model: { name: 'illegal', children: 2 } }
     end
     assert_redirected_to action: 'index'
     assert_nil @controller.called_callbacks
@@ -209,17 +192,14 @@ class CrudTestModelsControllerTest < ActionController::TestCase
     @controller.should_redirect = true
     get :new
     assert_redirected_to action: 'index'
-    assert_nil assigns(:companions)
   end
 
   def test_create_with_failure
     assert_no_difference('CrudTestModel.count') do
-      post :create, crud_test_model: { children: 2 }
+      post :create, params: { crud_test_model: { children: 2 } }
     end
     assert_response :success
-    assert_template 'new'
     assert entry.new_record?
-    assert assigns(:companions)
     assert flash[:notice].blank?, flash[:notice].to_s
     assert flash[:alert].blank?, flash[:alert].to_s
     assert entry.name.blank?
@@ -230,7 +210,7 @@ class CrudTestModelsControllerTest < ActionController::TestCase
 
   def test_create_with_failure_json
     assert_no_difference('CrudTestModel.count') do
-      post :create, crud_test_model: { children: 2 }, format: 'json'
+      post :create, params: { crud_test_model: { children: 2 }, format: 'json' }
     end
     assert_response :unprocessable_entity
     assert entry.new_record?
@@ -238,9 +218,8 @@ class CrudTestModelsControllerTest < ActionController::TestCase
   end
 
   def test_update_with_failure
-    put :update, id: test_entry.id, crud_test_model: { rating: 20 }
+    put :update, params: { id: test_entry.id, crud_test_model: { rating: 20 } }
     assert_response :success
-    assert_template 'edit'
     assert entry.changed?
     assert flash[:notice].blank?
     assert flash[:alert].blank?
@@ -251,9 +230,10 @@ class CrudTestModelsControllerTest < ActionController::TestCase
   end
 
   def test_update_with_failure_json
-    put :update, id: test_entry.id,
-                 crud_test_model: { rating: 20 },
-                 format: 'json'
+    put :update,
+        params: { id: test_entry.id,
+                  crud_test_model: { rating: 20 },
+                  format: 'json' }
     assert_response :unprocessable_entity
     assert entry.changed?
     assert flash[:notice].blank?
@@ -265,7 +245,7 @@ class CrudTestModelsControllerTest < ActionController::TestCase
     assert_no_difference("#{model_class.name}.count") do
       @request.env['HTTP_REFERER'] =
         crud_test_model_url(crud_test_models(:BBBBB))
-      delete :destroy, test_params(id: crud_test_models(:BBBBB).id)
+      delete :destroy, params: test_params(id: crud_test_models(:BBBBB).id)
     end
     assert_redirected_to_show(entry)
     assert_match(/companion/, flash[:alert])
@@ -276,7 +256,7 @@ class CrudTestModelsControllerTest < ActionController::TestCase
     e = crud_test_models(:AAAAA)
     e.update_attribute :name, 'illegal'
     assert_no_difference("#{model_class.name}.count") do
-      delete :destroy, test_params(id: e.id)
+      delete :destroy, params: test_params(id: e.id)
     end
     assert_redirected_to_index
     assert_match(/illegal name/, flash[:alert])
@@ -285,8 +265,8 @@ class CrudTestModelsControllerTest < ActionController::TestCase
 
   def test_destroy_failure_json
     assert_no_difference("#{model_class.name}.count") do
-      delete :destroy, test_params(id: crud_test_models(:BBBBB).id,
-                                   format: 'json')
+      delete :destroy, params: test_params(id: crud_test_models(:BBBBB).id,
+                                           format: 'json')
     end
     assert_response :unprocessable_entity
     assert flash[:notice].blank?
@@ -323,4 +303,5 @@ class CrudTestModelsControllerTest < ActionController::TestCase
       human: true,
       remarks: "some custom\n\tremarks" }
   end
+
 end