dry_crud 2.1.2 → 3.0.0

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    MWE4YzQzMjYxYmZlZWExOWUzZjczNDE2OWRlMTQwZDM4NDU5OTNlMg==
-  data.tar.gz: !binary |-
-    OTUzZWFjODA5NzRlZTVlMGQzYzZiOTMzNGRkNjIxNDM4OWM0OTZlMw==
+SHA1:
+  metadata.gz: 664cf77c042838728de2d0abb74525808c496448
+  data.tar.gz: e12c82079d72d2f414cef3181d2fcd14e9f72552
 SHA512:
-  metadata.gz: !binary |-
-    MWY5NDJlYmQ2NjE1OGJlZjEzMGRlZmE1YmUzM2EzZDQ4Nzk3YjJhYzVhZWI5
-    OGQyNzI5OGJmMDgwYjU1N2Y3OTk5MjA2ZTgyNTU3OGI1NDhjODViNmJjZDVm
-    YWIyODY4YzIzODIxNDk2ZGQ4M2E2ODE4ZDQwOWQ2NmFjYTczYzE=
-  data.tar.gz: !binary |-
-    ODc3YTliNjQ5YzZhMGQwMjIxMTMwYzBlMDMzNDhjM2I5MDg0NzEwNGY0YTk0
-    NGRjN2Q2MWVkZjBhZjQzMmYzMTJhMDYyM2MwYzlkZGZmZTk0ZjY0NzVjMTE0
-    OTVmODcyNDNkNzUwNDJlNmIyN2E4NDFlZjhkZjIzZTY3NTRjYzM=
+  metadata.gz: fb4bd2d805c8bc9a0dfa4a3eb3cf25758d70abcde034b9380d6e181bb1a8918420be98c326d036926d30c92b56fe0a7d02d5232e30a0a72b704cc02d2c9fa660
+  data.tar.gz: 5851c097e6904e68f7abaec88d5c0bec6c651de07e482737f667dd7832f976a9bb5b390900669910e945e5fc33afae27359735f1ae3c2420f7f0309902135821

data/README.rdoc

@@ -33,7 +33,7 @@ To integrate dry_crud into your code, only a few additions are required:
 * Optionally define a +list+ scope in your models to be used in the +index+ action.
 * Optionally define a +options_list+ scope in your models to be used in select dropdowns.
 
-Version 2.0 and higher are compatible with Rails 4 and Rails 3.2. dry_crud is tested with Ruby 1.9.3, 2.0.0 and JRuby. If you are using Ruby 1.8.7, please refer to version 1.7.0.
+From version 3.0, only the latest released Rails version will be supported, which currently is 4.2. Version 2.0 and higher are compatible with Rails 4 and Rails 3.2. dry_crud is tested with Ruby 1.9.3, 2.1.5 and JRuby. If you are using Ruby 1.8.7, please refer to version 1.7.0.
 
 
 == Background
@@ -392,4 +392,3 @@ spec/support/crud_test_model.rb:: A dummy model to run CRUD tests against.
 spec/controllers/crud_test_models_controller_spec.rb:: Controller specs to test the basic CrudController functionality.
 
 spec/helpers/*_spec.rb:: The specs for all the helpers included in dry_crud and a great base to test your adaptions of the CRUD code.
-

data/VERSION

@@ -1 +1 @@
-2.1.2
+3.0.0

data/app/controllers/crud_controller.rb

@@ -11,11 +11,7 @@
 # action procedures without overriding the entire method.
 class CrudController < ListController
 
-  self.responder = DryCrud::Responder
-
-  if Rails.version >= '4.0'
-    class_attribute :permitted_attrs
-  end
+  class_attribute :permitted_attrs
 
   # Defines before and after callback hooks for create, update, save and
   # destroy actions.
@@ -28,79 +24,114 @@ class CrudController < ListController
 
   hide_action :run_callbacks
 
-  after_save :set_success_notice
-  after_destroy :set_success_notice
+  before_action :entry, only: [:show, :new, :edit, :update, :destroy]
 
   helper_method :entry, :full_entry_label
 
   ##############  ACTIONS  ############################################
 
-  # Show one entry of this model.
   #   GET /entries/1
   #   GET /entries/1.json
-  def show(&block)
-    respond_with(entry, &block)
+  #
+  # Show one entry of this model.
+  def show
   end
 
-  # Display a form to create a new entry of this model.
   #   GET /entries/new
   #   GET /entries/new.json
-  def new(&block)
+  #
+  # Display a form to create a new entry of this model.
+  def new
     assign_attributes if params[model_identifier]
-    respond_with(entry, &block)
   end
 
+  #   POST /entries
+  #   POST /entries.json
+  #
   # Create a new entry of this model from the passed params.
   # There are before and after create callbacks to hook into the action.
-  # To customize the response, you may overwrite this action and call
-  # super with a block that gets the format parameter.
+  #
+  # To customize the response for certain formats, you may overwrite
+  # this action and call super with a block that gets the format and
+  # success parameters. Calling a format action (e.g. format.html)
+  # in the given block will take precedence over the one defined here.
+  #
   # Specify a :location option if you wish to do a custom redirect.
-  #   POST /entries
-  #   POST /entries.json
   def create(options = {}, &block)
     assign_attributes
     created = with_callbacks(:create, :save) { entry.save }
-    respond_options = options.reverse_merge(success: created)
-    respond_with(entry, respond_options, &block)
+
+    respond_to do |format|
+      block.call(format, created) if block_given?
+      if created
+        format.html { redirect_on_success(options) }
+        format.json { render :show, status: :created, location: show_path }
+      else
+        format.html { render :new }
+        format.json { render json: entry.errors, status: :unprocessable_entity }
+      end
+    end
   end
 
-  # Display a form to edit an exisiting entry of this model.
   #   GET /entries/1/edit
-  def edit(&block)
-    respond_with(entry, &block)
+  #
+  # Display a form to edit an exisiting entry of this model.
+  def edit
   end
 
+  #   PUT /entries/1
+  #   PUT /entries/1.json
+  #
   # Update an existing entry of this model from the passed params.
   # There are before and after update callbacks to hook into the action.
-  # To customize the response, you may overwrite this action and call
-  # super with a block that gets the format parameter.
+  #
+  # To customize the response for certain formats, you may overwrite
+  # this action and call super with a block that gets the format and
+  # success parameters. Calling a format action (e.g. format.html)
+  # in the given block will take precedence over the one defined here.
+  #
   # Specify a :location option if you wish to do a custom redirect.
-  #   PUT /entries/1
-  #   PUT /entries/1.json
   def update(options = {}, &block)
     assign_attributes
     updated = with_callbacks(:update, :save) { entry.save }
-    respond_options = options.reverse_merge(success: updated)
-    respond_with(entry, respond_options, &block)
+
+    respond_to do |format|
+      block.call(format, updated) if block_given?
+      if updated
+        format.html { redirect_on_success(options) }
+        format.json { render :show, status: :ok, location: show_path }
+      else
+        format.html { render :edit }
+        format.json { render json: entry.errors, status: :unprocessable_entity }
+      end
+    end
   end
 
+  #   DELETE /entries/1
+  #   DELETE /entries/1.json
+  #
   # Destroy an existing entry of this model.
   # There are before and after destroy callbacks to hook into the action.
-  # To customize the response, you may overwrite this action and call
-  # super with a block that gets success and format parameters.
+  #
+  # To customize the response for certain formats, you may overwrite
+  # this action and call super with a block that gets format and
+  # success parameters. Calling a format action (e.g. format.html)
+  # in the given block will take precedence over the one defined here.
+  #
   # Specify a :location option if you wish to do a custom redirect.
-  #   DELETE /entries/1
-  #   DELETE /entries/1.json
   def destroy(options = {}, &block)
     destroyed = run_callbacks(:destroy) { entry.destroy }
-    unless destroyed
-      set_failure_notice
-      location = request.env['HTTP_REFERER'].presence
+
+    respond_to do |format|
+      block.call(format, destroyed) if block_given?
+      if destroyed
+        format.html { redirect_on_success(options) }
+        format.json { head :no_content }
+      else
+        format.html { redirect_on_failure(options) }
+        format.json { render json: entry.errors, status: :unprocessable_entity }
+      end
     end
-    location ||= index_url
-    respond_options = options.reverse_merge(success: destroyed,
-                                            location: location)
-    respond_with(entry, respond_options, &block)
   end
 
   private
@@ -129,35 +160,34 @@ class CrudController < ListController
 
   # The form params for this model.
   def model_params
-    if Rails.version < '4.0'
-      params[model_identifier]
-    else
-      params.require(model_identifier).permit(permitted_attrs)
-    end
+    params.require(model_identifier).permit(permitted_attrs)
   end
 
-  # Url of the index page to return to.
-  def index_url
-    polymorphic_url(path_args(model_class), returning: true)
+  # Path of the index page to return to.
+  def index_path
+    polymorphic_path(path_args(model_class), returning: true)
   end
 
-  # A label for the current entry, including the model name.
-  def full_entry_label
-    "#{models_label(false)} <i>#{ERB::Util.h(entry)}</i>".html_safe
+  # Path of the show page.
+  def show_path
+    path_args(entry)
   end
 
-  # Set a success flash notice when we got a HTML request.
-  def set_success_notice
-    if request.format == :html
-      flash[:notice] ||= flash_message(:success)
-    end
+  # Perform a redirect after a successfull operation and set a flash notice.
+  def redirect_on_success(options = {})
+    location = options[:location] ||
+               (entry.destroyed? ? index_path : show_path)
+    flash[:notice] ||= flash_message(:success)
+    redirect_to location
   end
 
-  # Set a failure flash notice when we got a HTML request.
-  def set_failure_notice
-    if request.format == :html
-      flash[:alert] ||= error_messages.presence || flash_message(:failure)
-    end
+  # Perform a redirect after a failed operation and set a flash alert.
+  def redirect_on_failure(options = {})
+    location = options[:location] ||
+               request.env['HTTP_REFERER'].presence ||
+               index_path
+    flash[:alert] ||= error_messages.presence || flash_message(:failure)
+    redirect_to location
   end
 
   # Get an I18n flash message.
@@ -169,7 +199,12 @@ class CrudController < ListController
             :"#{controller_name}.#{scope}",
             :"crud.#{scope}_html",
             :"crud.#{scope}"]
-    I18n.t(keys.shift, model: full_entry_label, default: keys).html_safe
+    I18n.t(keys.shift, model: full_entry_label, default: keys)
+  end
+
+  # A label for the current entry, including the model name.
+  def full_entry_label
+    "#{models_label(false)} <i>#{ERB::Util.h(entry)}</i>".html_safe
   end
 
   # Html safe error messages of the current entry.

data/app/controllers/dry_crud/generic_model.rb

@@ -24,11 +24,7 @@ module DryCrud
     # This is mainly used for nested models to provide the
     # required context.
     def model_scope
-      if Rails.version < '4.0'
-        model_class.scoped
-      else
-        model_class.all
-      end
+      model_class.all
     end
 
     # The path arguments to link to the given model entry.

data/app/controllers/dry_crud/rememberable.rb

@@ -16,7 +16,7 @@ module DryCrud
 
     included do
       class_attribute :remember_params
-      self.remember_params = [:q, :sort, :sort_dir, :page]
+      self.remember_params = %w(q sort sort_dir page)
 
       before_filter :handle_remember_params, only: [:index]
     end

data/app/controllers/dry_crud/render_callbacks.rb

@@ -37,10 +37,8 @@ module DryCrud
       # Defines before callbacks for the render actions.
       def define_render_callbacks(*actions)
         args = actions.map { |a| :"render_#{a}" }
-        # Rails 4.1 terminator:
-        # ->(ctrl, result) { result == false || ctrl.performed? }
-        args << { only: :before,
-                  terminator: 'result == false || performed?' }
+        terminator = ->(ctrl, result) { result == false || ctrl.performed? }
+        args << { only: :before, terminator: terminator }
         define_model_callbacks(*args)
       end
     end

data/app/controllers/list_controller.rb

@@ -15,19 +15,18 @@ class ListController < ApplicationController
   include DryCrud::Rememberable
   include DryCrud::RenderCallbacks
 
-  respond_to :html, :json
-
   define_render_callbacks :index
 
   helper_method :entries
 
   ##############  ACTIONS  ############################################
 
-  # List all entries of this model.
   #   GET /entries
   #   GET /entries.json
-  def index(&block)
-    respond_with(entries, &block)
+  #
+  # List all entries of this model.
+  def index
+    entries
   end
 
   private

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

@@ -83,7 +83,7 @@ module DryCrud
 
       # Add form-control class to all input fields.
       %w(text_field password_field email_field text_area
-         number_fielc date_field time_field datetime_field).each do |method|
+         number_field date_field time_field datetime_field).each do |method|
         define_method(method) do |attr, html_options = {}|
           add_css_class(html_options, 'form-control')
           super(attr, html_options)
@@ -101,27 +101,6 @@ module DryCrud
       alias_method :float_field, :number_field
       alias_method :decimal_field, :number_field
 
-      if Rails.version < '4.0'
-        # Render a field to select a date. You might want to customize this.
-        def date_field(attr, html_options = {})
-          html_options[:type] = 'date'
-          text_field(attr, html_options)
-        end
-
-        # Render a field to enter a time. You might want to customize this.
-        def time_field(attr, html_options = {})
-          html_options[:type] = 'time'
-          text_field(attr, html_options)
-        end
-
-        # Render a field to enter a date and time.
-        # You might want to customize this.
-        def datetime_field(attr, html_options = {})
-          html_options[:type] = 'datetime'
-          text_field(attr, html_options)
-        end
-      end
-
       # Render a select element for a :belongs_to association defined by attr.
       # Use additional html_options for the select element.
       # To pass a custom element list, specify the list with the :list key or
@@ -266,8 +245,8 @@ module DryCrud
       end
 
       # Overriden to fullfill contract with method_missing 'labeled_' methods.
-      def respond_to?(name)
-        labeled_field_method?(name).present? || super(name)
+      def respond_to?(name, include_private = false)
+        labeled_field_method?(name).present? || super(name, include_private)
       end
 
       private
@@ -309,12 +288,7 @@ module DryCrud
       # Automatically load the entries for the given association.
       def load_association_entries(assoc)
         klass = assoc.klass
-        list = if Rails.version >= '4.0'
-                 klass.all.merge(assoc.scope)
-               else
-                 klass.where(assoc.options[:conditions])
-                      .order(assoc.options[:order])
-               end
+        list = klass.all.merge(assoc.scope)
         # Use special scopes if they are defined
         if klass.respond_to?(:options_list)
           list.options_list

data/app/helpers/format_helper.rb

@@ -15,6 +15,8 @@ module FormatHelper
     when Float, BigDecimal then
       number_with_precision(value, precision: t('number.format.precision'),
                                    delimiter: t('number.format.delimiter'))
+    when Fixnum then
+      number_with_delimiter(value, delimiter: t('number.format.delimiter'))
     when Date   then l(value)
     when Time   then "#{l(value.to_date)} #{l(value, format: :time)}"
     when true   then t('global.yes')

data/app/helpers/utility_helper.rb

@@ -50,9 +50,8 @@ module UtilityHelper
 
   # Returns an ActiveRecord column property for the passed attr or nil
   def column_property(obj, attr, property)
-    if obj.respond_to?(:column_for_attribute)
-      column = obj.column_for_attribute(attr)
-      column.try(property)
+    if obj.respond_to?(:column_for_attribute) && obj.has_attribute?(attr)
+      obj.column_for_attribute(attr).send(property)
     end
   end
 

data/app/views/crud/show.json.jbuilder

@@ -0,0 +1 @@
+json.extract! entry, :id, *default_crud_attrs

data/app/views/layouts/_flash.html.erb

@@ -1,5 +1,5 @@
 <% if flash[level].present? %>
   <div class="alert alert-<%= flash_class(level) %>">
-    <%= flash[level] %>
+    <%= flash[level].html_safe %>
   </div>
 <% end %>

data/app/views/layouts/_flash.html.haml

@@ -1,2 +1,2 @@
 - if flash[level].present?
-  %div{class: "alert alert-#{flash_class(level)}"}= flash[level]
+  %div{class: "alert alert-#{flash_class(level)}"}= flash[level].html_safe

data/app/views/list/index.json.jbuilder

@@ -0,0 +1,4 @@
+json.array!(entries) do |entry|
+  json.extract! entry, :id, *default_crud_attrs
+  json.url polymorphic_url(path_args(entry), format: :json)
+end

data/config/locales/crud.de.yml

@@ -1,4 +1,4 @@
-# Translations of all crud strings. 
+# Translations of all crud strings.
 # See also I18nHelper#translate_inheritable and #translate_association.
 
 de:

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

@@ -1,5 +1,5 @@
 # encoding: UTF-8
-require 'spec_helper'
+require 'rails_helper'
 
 # Tests all actions of the CrudController based on a dummy model
 # (CrudTestModel). This is useful to test the general behavior
@@ -43,16 +43,16 @@ describe CrudTestModelsController do
   end
 
   describe 'setup' do
-    it 'model count should be correct' do
-      CrudTestModel.count.should == 6
+    it 'model count is correct' do
+      expect(CrudTestModel.count).to eq(6)
     end
 
     it 'has models_label' do
-      controller.models_label.should == 'Crud Test Models'
+      expect(controller.models_label).to eq('Crud Test Models')
     end
 
     it 'has models_label singular' do
-      controller.models_label(false).should == 'Crud Test Model'
+      expect(controller.models_label(false)).to eq('Crud Test Model')
     end
   end
 
@@ -60,16 +60,16 @@ describe CrudTestModelsController do
     context '.html', format: :html do
       context 'plain', combine: 'ihp' do
         it 'contains all entries' do
-          entries.size.should == 6
+          expect(entries.size).to eq(6)
         end
 
-        it 'session should have empty list_params' do
-          session[:list_params].should == Hash.new
+        it 'session has empty list_params' do
+          expect(session[:list_params]).to eq(Hash.new)
         end
 
         it 'provides entries helper method' do
-          should render_template('index')
-          entries.should be(controller.send(:entries))
+          is_expected.to render_template('index')
+          expect(entries).to be(controller.send(:entries))
         end
       end
 
@@ -77,28 +77,28 @@ describe CrudTestModelsController do
         let(:params) { { q: search_value } }
 
         context 'regular', combine: 'ihse' do
-          it 'entries should only contain test_entry' do
-            entries.should == [test_entry]
+          it 'entries only contain test_entry' do
+            expect(entries).to eq([test_entry])
           end
 
-          it 'session should have query list param' do
-            session[:list_params]['/crud_test_models.html'].should ==
-              { 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 } }
 
-          it_should_respond
+          it_is_expected_to_respond
 
-          it 'entries should have one item' do
-            entries.should == [CrudTestModel.find_by_name('BBBBB')]
+          it 'entries have one item' do
+            expect(entries).to eq([CrudTestModel.find_by_name('BBBBB')])
           end
 
-          it 'session should have query list param' do
-            session[:list_params]['/crud_test_models.html'].should ==
-              { q: 'DDD' }
+          it 'session has query list param' do
+            expect(session[:list_params]['/crud_test_models.html'])
+              .to eq('q' => 'DDD')
           end
         end
       end
@@ -107,24 +107,24 @@ describe CrudTestModelsController do
         context 'for given column', combine: 'ihsog' do
           let(:params) { { sort: 'children', sort_dir: 'asc' } }
 
-          it_should_respond
+          it_is_expected_to_respond
 
-          it 'entries should be in correct order' do
-            entries.should == CrudTestModel.all.sort_by(&:children)
+          it 'entries are in correct order' do
+            expect(entries).to eq(CrudTestModel.all.sort_by(&:children))
           end
 
-          it 'session should have sort list param' do
-            session[:list_params]['/crud_test_models.html'].should ==
-              { 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' } }
 
-          it_should_respond
+          it_is_expected_to_respond
 
-          it 'entries should be 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')
@@ -134,9 +134,9 @@ describe CrudTestModelsController do
             assert names.index('DDDDD') < names.index('CCCCC')
           end
 
-          it 'session should have sort list param' do
-            session[:list_params]['/crud_test_models.html'].should ==
-              { 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
 
@@ -145,15 +145,15 @@ describe CrudTestModelsController do
             { q: 'DDD', sort: 'chatty', sort_dir: 'asc' }
           end
 
-          it_should_respond
+          it_is_expected_to_respond
 
-          it 'entries should be in correct order' do
-            entries.map(&:name).should == %w(CCCCC DDDDD BBBBB)
+          it 'entries are in correct order' do
+            expect(entries.map(&:name)).to eq(%w(CCCCC DDDDD BBBBB))
           end
 
-          it 'session should have sort list param' do
-            session[:list_params]['/crud_test_models.html'].should ==
-              { 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
@@ -161,12 +161,12 @@ describe CrudTestModelsController do
       context 'with custom options', combine: 'ihsoco' do
         let(:params) { { filter: true } }
 
-        it_should_respond
+        it_is_expected_to_respond
 
         context 'entries' do
           subject { entries }
-          it { should have(2).items }
-          it { should == entries.sort_by(&:children).reverse }
+          it { expect(subject.size).to eq(2) }
+          it { is_expected.to eq(entries.sort_by(&:children).reverse) }
         end
       end
 
@@ -174,40 +174,40 @@ describe CrudTestModelsController do
         before do
           session[:list_params] = {}
           session[:list_params]['/crud_test_models'] =
-            { q: 'DDD', sort: 'chatty', sort_dir: 'desc' }
+            { 'q' => 'DDD', 'sort' => 'chatty', 'sort_dir' => 'desc' }
           get :index, returning: true
         end
 
-        it_should_respond
+        it_is_expected_to_respond
 
-        it 'entries should be in correct order' do
-          entries.map(&:name).should == %w(BBBBB DDDDD CCCCC)
+        it 'entries are in correct order' do
+          expect(entries.map(&:name)).to eq(%w(BBBBB DDDDD CCCCC))
         end
 
-        it 'params should be set' do
-          controller.params[:q].should == 'DDD'
-          controller.params[:sort].should == 'chatty'
-          controller.params[:sort_dir].should == '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
-      it_should_respond
-      it_should_assign_entries
-      it { response.body.should == 'index js' }
+      it_is_expected_to_respond
+      it_is_expected_to_assign_entries
+      it { expect(response.body).to eq('index js') }
     end
   end
 
   describe_action :get, :new do
     context 'plain', combine: 'new' do
-      it 'should assign companions' do
-        assigns(:companions).should be_present
+      it 'assigns companions' do
+        expect(assigns(:companions)).to be_present
       end
 
-      it 'should have called two render callbacks' do
-        controller.called_callbacks.should ==
-          [:before_render_new, :before_render_form]
+      it 'calls two render callbacks' do
+        expect(controller.called_callbacks).to eq(
+          [:before_render_new, :before_render_form])
       end
     end
 
@@ -218,10 +218,10 @@ describe CrudTestModelsController do
         get :new
       end
 
-      it { should redirect_to(crud_test_models_path) }
+      it { is_expected.to redirect_to(crud_test_models_path) }
 
-      it 'should not set companions' do
-        assigns(:companions).should be_nil
+      it 'does not set companions' do
+        expect(assigns(:companions)).to be_nil
       end
     end
   end
@@ -229,54 +229,54 @@ describe CrudTestModelsController do
   describe_action :post, :create do
     let(:params) { { model_identifier => new_entry_attrs } }
 
-    it 'should have called the correct callbacks' do
-      controller.called_callbacks.should ==
-        [:before_create, :before_save, :after_save, :after_create]
+    it 'calls the correct callbacks' do
+      expect(controller.called_callbacks).to eq(
+        [:before_create, :before_save, :after_save, :after_create])
     end
 
     context 'with before callback' do
       let(:params) do
         { crud_test_model: { name: 'illegal', children: 2 } }
       end
-      it 'should 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
-        it_should_respond
-        it_should_render('new')
-        it_should_persist_entry(false)
-        it_should_have_flash(:alert)
+        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)
 
-        it 'should set entry name' do
-          entry.name.should == 'illegal'
+        it 'sets entry name' do
+          expect(entry.name).to eq('illegal')
         end
 
-        it 'should assign companions' do
-          assigns(:companions).should be_present
+        it 'assigns companions' do
+          expect(assigns(:companions)).to be_present
         end
 
-        it 'should have called the correct callbacks' do
-          controller.called_callbacks.should ==
-            [:before_render_new, :before_render_form]
+        it 'calls the correct callbacks' do
+          expect(controller.called_callbacks).to eq(
+            [:before_render_new, :before_render_form])
         end
       end
 
       context 'redirect', perform_request: false do
         before { controller.should_redirect = true }
 
-        it 'should not create entry' do
+        it 'does not create entry' do
           expect { perform_request }.to change { CrudTestModel.count }.by(0)
         end
 
         it do
           perform_request
-          should redirect_to(crud_test_models_path)
+          is_expected.to redirect_to(crud_test_models_path)
         end
 
-        it 'should have called no callbacks' do
+        it 'calls no callbacks' do
           perform_request
-          controller.called_callbacks.should be_nil
+          expect(controller.called_callbacks).to be_nil
         end
       end
     end
@@ -285,48 +285,48 @@ describe CrudTestModelsController do
       let(:params) { { crud_test_model: { children: 2 } } }
 
       context '.html' do
-        it 'should 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: 'chip' do
-          it_should_respond
-          it_should_render('new')
-          it_should_persist_entry(false)
-          it_should_not_have_flash(:notice)
-          it_should_not_have_flash(:alert)
-
-          it 'should assign companions' do
-            assigns(:companions).should be_present
+          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
           end
 
-          it 'should have called the correct callbacks' do
-            controller.called_callbacks.should ==
+          it 'calls the correct callbacks' do
+            expect(controller.called_callbacks).to eq(
               [:before_create, :before_save,
-               :before_render_new, :before_render_form]
+               :before_render_new, :before_render_form])
           end
         end
       end
 
       context '.json', format: :json do
-        it 'should 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: 'cjcb' do
-          it_should_respond(422)
-          it_should_persist_entry(false)
-          it_should_not_have_flash(:notice)
-          it_should_not_have_flash(:alert)
-          it_should_render_error_json
-
-          it 'should not assign companions' do
-            assigns(:companions).should be_nil
+          it_is_expected_to_respond(422)
+          it_is_expected_to_persist_entry(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
+            expect(assigns(:companions)).to be_nil
           end
 
-          it 'should have called the correct callbacks' do
-            controller.called_callbacks.should ==
-              [:before_create, :before_save]
+          it 'calls the correct callbacks' do
+            expect(controller.called_callbacks).to eq(
+              [:before_create, :before_save])
           end
         end
       end
@@ -335,50 +335,51 @@ describe CrudTestModelsController do
   end
 
   describe_action :get, :edit, id: true do
-    it 'should have called the correct callbacks' do
-      controller.called_callbacks.should ==
-        [:before_render_edit, :before_render_form]
+    it 'calls the correct callbacks' do
+      expect(controller.called_callbacks).to eq(
+        [:before_render_edit, :before_render_form])
     end
   end
 
   describe_action :put, :update, id: true do
     let(:params) { { model_identifier => edit_entry_attrs } }
 
-    it 'should have called the correct callbacks' do
-      controller.called_callbacks.should ==
-        [:before_update, :before_save, :after_save, :after_update]
+    it 'calls the correct callbacks' do
+      expect(controller.called_callbacks).to eq(
+        [:before_update, :before_save, :after_save, :after_update])
     end
 
     context 'with invalid params' do
       let(:params) { { crud_test_model: { rating: 20 } } }
 
       context '.html', combine: 'uhivp' do
-        it_should_respond
-        it_should_render('edit')
-        it_should_not_have_flash(:notice)
+        it_is_expected_to_respond
+        it_is_expected_to_render('edit')
+        it_is_expected_to_not_have_flash(:notice)
 
-        it 'should change entry' do
-          entry.should be_changed
+        it 'changes entry' do
+          expect(entry).to be_changed
         end
 
-        it 'should set entry rating' do
-          entry.rating.should == 20
+        it 'sets entry rating' do
+          expect(entry.rating).to eq(20)
         end
 
-        it 'should have called the correct callbacks' do
-          controller.called_callbacks.should ==
+        it 'calls the correct callbacks' do
+          expect(controller.called_callbacks).to eq(
             [:before_update, :before_save,
-             :before_render_edit, :before_render_form]
+             :before_render_edit, :before_render_form])
         end
       end
 
       context '.json', format: :json, combine: 'ujivp' do
-        it_should_respond(422)
-        it_should_not_have_flash(:notice)
-        it_should_render_error_json
+        it_is_expected_to_respond(422)
+        it_is_expected_to_not_have_flash(:notice)
+        it_is_expected_to_render_json
 
-        it 'should have called the correct callbacks' do
-          controller.called_callbacks.should == [:before_update, :before_save]
+        it 'calls the correct callbacks' do
+          expect(controller.called_callbacks).to eq(
+            [:before_update, :before_save])
         end
       end
     end
@@ -386,33 +387,34 @@ describe CrudTestModelsController do
   end
 
   describe_action :delete, :destroy, id: true do
-    it 'should have called the correct callbacks' do
-      controller.called_callbacks.should == [:before_destroy, :after_destroy]
+    it 'calls the correct callbacks' do
+      expect(controller.called_callbacks).to eq(
+        [:before_destroy, :after_destroy])
     end
 
     context 'with failure' do
       let(:test_entry) { crud_test_models(:BBBBB) }
       context '.html' do
-        it 'should not delete entry from database',
+        it 'does not delete entry from database',
            perform_request: false do
           expect { perform_request }.not_to change { CrudTestModel.count }
         end
 
-        it 'should redirect to referer',
+        it 'redirects to referer',
            perform_request: false do
           ref = @request.env['HTTP_REFERER'] = crud_test_model_url(test_entry)
           perform_request
-          should redirect_to(ref)
+          is_expected.to redirect_to(ref)
         end
 
-        it_should_have_flash(:alert, /companion/)
-        it_should_not_have_flash(:notice)
+        it_is_expected_to_have_flash(:alert, /companion/)
+        it_is_expected_to_not_have_flash(:notice)
       end
 
       context '.json', format: :json, combine: 'djf' do
-        it_should_respond(422)
-        it_should_not_have_flash(:notice)
-        it_should_render_error_json
+        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
@@ -420,18 +422,18 @@ describe CrudTestModelsController do
           test_entry.update_attribute :name, 'illegal'
         end
 
-        it 'should not delete entry from database' do
+        it 'does not delete entry from database' do
           expect { perform_request }.not_to change { CrudTestModel.count }
         end
 
-        it 'should redirect to index' do
+        it 'redirects to index' do
           perform_request
-          should redirect_to(crud_test_models_path(returning: true))
+          is_expected.to redirect_to(crud_test_models_path(returning: true))
         end
 
-        it 'should have flash alert' do
+        it 'has flash alert' do
           perform_request
-          flash[:alert].should match(/illegal name/)
+          expect(flash[:alert]).to match(/illegal name/)
         end
       end
     end