dry_crud 1.7.0 → 2.0.0

data/lib/generators/dry_crud/templates/app/views/crud/_actions_edit.html.erb

@@ -1,3 +1,3 @@
-<%= link_action_index %>
-<%= link_action_show %>
-<%= link_action_destroy %>
+<%= index_action_link %>
+<%= show_action_link %>
+<%= destroy_action_link %>

data/lib/generators/dry_crud/templates/app/views/crud/_actions_edit.html.haml

@@ -1,3 +1,3 @@
-= link_action_index
-= link_action_show
-= link_action_destroy
+= index_action_link
+= show_action_link
+= destroy_action_link

data/lib/generators/dry_crud/templates/app/views/crud/_actions_index.html.erb

@@ -1 +1 @@
-<%= link_action_add %>
+<%= add_action_link %>

data/lib/generators/dry_crud/templates/app/views/crud/_actions_index.html.haml

@@ -1 +1 @@
-= link_action_add
+= add_action_link

data/lib/generators/dry_crud/templates/app/views/crud/_actions_show.html.erb

@@ -1,3 +1,3 @@
-<%= link_action_index %>
-<%= link_action_edit %>
-<%= link_action_destroy %>
+<%= index_action_link %>
+<%= edit_action_link %>
+<%= destroy_action_link %>

data/lib/generators/dry_crud/templates/app/views/crud/_actions_show.html.haml

@@ -1,3 +1,3 @@
-= link_action_index
-= link_action_edit
-= link_action_destroy
+= index_action_link
+= edit_action_link
+= destroy_action_link

data/lib/generators/dry_crud/templates/app/views/crud/_attrs.html.erb

@@ -1 +1 @@
-<%= render_attrs entry, *default_attrs %>
+<%= render_attrs entry, *default_crud_attrs %>

data/lib/generators/dry_crud/templates/app/views/crud/_attrs.html.haml

@@ -1 +1 @@
-= render_attrs entry, *default_attrs
+= render_attrs entry, *default_crud_attrs

data/lib/generators/dry_crud/templates/app/views/crud/_form.html.erb

@@ -1 +1 @@
-<%= entry_form %>
+<%= crud_form %>

data/lib/generators/dry_crud/templates/app/views/crud/_form.html.haml

@@ -1 +1 @@
-= entry_form
+= crud_form

data/lib/generators/dry_crud/templates/app/views/crud/edit.html.erb

@@ -1,4 +1,4 @@
-<% @title ||= ti(:title, :model => full_entry_label).html_safe -%>
+<% @title ||= ti(:title, model: full_entry_label).html_safe -%>
 
 <% content_for(:actions, render('actions_edit')) %>
 

data/lib/generators/dry_crud/templates/app/views/crud/edit.html.haml

@@ -1,4 +1,4 @@
-- @title ||= ti(:title, :model => full_entry_label).html_safe
+- @title ||= ti(:title, model: full_entry_label).html_safe
 
 - content_for(:actions, render('actions_edit'))
 

data/lib/generators/dry_crud/templates/app/views/crud/new.html.erb

@@ -1,5 +1,5 @@
-<% @title ||= ti(:title, :model => models_label.singularize) -%>
+<% @title ||= ti(:title, model: models_label(false)) -%>
 
-<% content_for(:actions, link_action_index) %>
+<% content_for(:actions, index_action_link) %>
 
 <%= render 'form' %>

data/lib/generators/dry_crud/templates/app/views/crud/new.html.haml

@@ -1,5 +1,5 @@
-- @title ||= ti(:title, :model => models_label.singularize)
+- @title ||= ti(:title, model: models_label(false))
 
-- content_for(:actions, link_action_index)
+- content_for(:actions, index_action_link)
 
 = render 'form'

data/lib/generators/dry_crud/templates/app/views/crud/show.html.erb

@@ -1,4 +1,4 @@
-<% @title ||= ti(:title, :model => full_entry_label).html_safe -%>
+<% @title ||= ti(:title, model: full_entry_label).html_safe -%>
 
 <% content_for(:actions, render('actions_show')) %>
 

data/lib/generators/dry_crud/templates/app/views/crud/show.html.haml

@@ -1,4 +1,4 @@
-- @title ||= ti(:title, :model => full_entry_label).html_safe
+- @title ||= ti(:title, model: full_entry_label).html_safe
 
 - content_for(:actions, render('actions_show'))
 

data/lib/generators/dry_crud/templates/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]

data/lib/generators/dry_crud/templates/app/views/layouts/_nav.html.erb

@@ -1,4 +1,4 @@
-<%= link_to 'MyApp', root_path, :class => 'brand' %>
+<%= link_to 'MyApp', root_path, class: 'brand' %>
 <ul class="nav">
   <li><%= link_to "Link1", "/path1"  %></li>
   <li><%= link_to "Link2", "/path2"  %></li>

data/lib/generators/dry_crud/templates/app/views/layouts/_nav.html.haml

@@ -1,4 +1,4 @@
-= link_to 'MyApp', root_path, :class => 'brand'
+= link_to 'MyApp', root_path, class: 'brand'
 %ul.nav
   %li= link_to "Link1", "/path1"
   %li= link_to "Link2", "/path2"

data/lib/generators/dry_crud/templates/app/views/layouts/crud.html.erb

@@ -3,7 +3,7 @@
 <html lang="en">
 <head>
   <meta charset="utf-8" />
-  <title><%= strip_tags(@title) %></title>
+  <title><%= strip_tags(@title) %> - MyApp</title>
   <%= csrf_meta_tag %>
 
   <!-- HTML5 shim, for IE6-8 support of HTML elements -->
@@ -11,13 +11,22 @@
     <script src="http://html5shim.googlecode.com/svn/trunk/html5.js" type="text/javascript"></script>
   <![endif]-->
 
-  <%= stylesheet_link_tag 'application', :media => 'all' %>
+  <%= stylesheet_link_tag 'application', media: 'all', 'data-turbolinks-track' => true %>
+  <%= javascript_include_tag 'application', 'data-turbolinks-track' => true %>
 
   <!-- fav and touch icons -->
   <%= favicon_link_tag %>
-  <%= favicon_link_tag '/apple-touch-icon.png', :rel => 'apple-touch-icon', :type => 'image/png' %>
-  <%= favicon_link_tag '/apple-touch-icon-72x72.png', :rel => 'apple-touch-icon', :type => 'image/png', :sizes => "72x72" %>
-  <%= favicon_link_tag '/apple-touch-icon-114x114.png', :rel => 'apple-touch-icon', :type => 'image/png', :sizes => "114x114" %>
+  <%= favicon_link_tag '/apple-touch-icon.png',
+                       rel: 'apple-touch-icon',
+                       type: 'image/png' %>
+  <%= favicon_link_tag '/apple-touch-icon-72x72.png',
+                       rel: 'apple-touch-icon',
+                       type: 'image/png',
+                       sizes: "72x72" %>
+  <%= favicon_link_tag '/apple-touch-icon-114x114.png',
+                       rel: 'apple-touch-icon',
+                       type: 'image/png',
+                       sizes: "114x114" %>
 
   <%= yield :head %>
 </head>
@@ -31,7 +40,7 @@
 
   <h1><%= @title %></h1>
 
-  <%= render :partial => 'layouts/flash', :collection => [:notice, :alert], :as => :level %>
+  <%= render partial: 'layouts/flash', collection: [:notice, :alert], as: :level %>
 
   <div class="actions btn-toolbar">
     <div class="pull-right">
@@ -53,7 +62,6 @@
 </footer>
 
 <!-- Javascript placed at the end of the document so the pages load faster -->
-<%= javascript_include_tag 'application' %>
 <%= javascript_tag yield(:javascripts) if content_for?(:javascripts) %>
 
 </body>

data/lib/generators/dry_crud/templates/app/views/layouts/crud.html.haml

@@ -3,7 +3,9 @@
 %html
   %head
     %meta{:charset => 'utf-8'}
-    %title= strip_tags(@title)
+    %title
+      = strip_tags(@title)
+      \- MyApp
     = csrf_meta_tag
 
     <!-- HTML5 shim, for IE6-8 support of HTML elements -->
@@ -11,12 +13,21 @@
     <script src="http://html5shim.googlecode.com/svn/trunk/html5.js" type="text/javascript"></script>
     <![endif]-->
 
-    = stylesheet_link_tag 'application', :media => 'all'
-    
+    = stylesheet_link_tag 'application', :media => 'all', 'data-turbolinks-track' => true
+    = javascript_include_tag 'application', 'data-turbolinks-track' => true
+
     = favicon_link_tag
-    = favicon_link_tag '/apple-touch-icon.png', :rel => 'apple-touch-icon', :type => 'image/png'
-    = favicon_link_tag '/apple-touch-icon-72x72.png', :rel => 'apple-touch-icon', :type => 'image/png', :sizes => "72x72"
-    = favicon_link_tag '/apple-touch-icon-114x114.png', :rel => 'apple-touch-icon', :type => 'image/png', :sizes => "114x114"
+    = favicon_link_tag '/apple-touch-icon.png',
+                       rel: 'apple-touch-icon',
+                       type: 'image/png'
+    = favicon_link_tag '/apple-touch-icon-72x72.png',
+                       rel: 'apple-touch-icon',
+                       type: 'image/png',
+                       sizes: "72x72"
+    = favicon_link_tag '/apple-touch-icon-114x114.png',
+                       rel: 'apple-touch-icon',
+                       type: 'image/png',
+                       sizes: "114x114"
 
     = yield :head
 
@@ -26,7 +37,7 @@
 
       %h1= @title
 
-      = render :partial => 'layouts/flash', :collection => [:notice, :alert], :as => :level
+      = render partial: 'layouts/flash', collection: [:notice, :alert], as: :level
 
       .actions.btn-toolbar
         .pull-right= yield :actions
@@ -38,5 +49,4 @@
       %p
         &copy; code!z #{Time.zone.now.year}
 
-  = javascript_include_tag 'application'
   = javascript_tag yield(:javascripts) if content_for?(:javascripts)

data/lib/generators/dry_crud/templates/app/views/list/_search.html.erb

@@ -1,6 +1,6 @@
-<%= form_tag(nil, {:method => :get, :class => 'form-search'}) do %>
+<%= form_tag(nil, { method: :get, class: 'form-search' }) do %>
   <%= hidden_field_tag :returning, true %>
   <%= hidden_field_tag :page, 1 %>
-  <%= search_field_tag :q, params[:q], :class => 'search-query' %>
-  <%= submit_tag ti(:"button.search"), :class => 'btn' %>
+  <%= search_field_tag :q, params[:q], class: 'search-query' %>
+  <%= submit_tag ti(:"button.search"), class: 'btn' %>
 <% end %>

data/lib/generators/dry_crud/templates/app/views/list/_search.html.haml

@@ -1,5 +1,5 @@
-= form_tag(nil, {:method => :get, :class => 'form-search'}) do
+= form_tag(nil, { method: :get, class: 'form-search' }) do
   = hidden_field_tag :returning, true
   = hidden_field_tag :page, 1
-  = search_field_tag :q, params[:q], :class => 'search-query'
-  = submit_tag ti(:"button.search"), :class => 'btn'
+  = search_field_tag :q, params[:q], class: 'search-query'
+  = submit_tag ti(:"button.search"), class: 'btn'

data/lib/generators/dry_crud/templates/app/views/list/index.html.erb

@@ -1,4 +1,4 @@
-<% @title ||= ti(:title, :models => models_label) -%>
+<% @title ||= ti(:title, models: models_label) -%>
 
 <% content_for(:tools, render('search')) if search_support? %>
 

data/lib/generators/dry_crud/templates/app/views/list/index.html.haml

@@ -1,4 +1,4 @@
-- @title ||= ti(:title, :models => models_label)
+- @title ||= ti(:title, models: models_label)
 
 - content_for(:tools, render('search')) if search_support?
 

data/lib/generators/dry_crud/templates/app/views/shared/_error_messages.html.erb

@@ -1,7 +1,7 @@
 <% if errors.any? %>
   <div id='error_explanation' class='alert alert-error'>
       <h2>
-      <%= ti(:"errors.header", :count => errors.count, :model => object.to_s) %>
+      <%= ti(:"errors.header", count: errors.count, model: object.to_s) %>
       </h2>
       <ul>
           <% errors.full_messages.each do |msg| %>

data/lib/generators/dry_crud/templates/app/views/shared/_error_messages.html.haml

@@ -1,6 +1,6 @@
 - if errors.any?
   #error_explanation.alert.alert-error
-    %h2= ti(:"errors.header", :count => errors.count, :model => object.to_s)
+    %h2= ti(:"errors.header", count: errors.count, model: object.to_s)
     %ul
       - errors.full_messages.each do |msg|
         %li= msg

data/lib/generators/dry_crud/templates/app/views/shared/_labeled.html.erb

@@ -1,4 +1,2 @@
-<div class="labeled">
-  <label><%= label.presence || raw(StandardHelper::EMPTY_STRING) %></label>
-  <div class="value"><%= content.presence || raw(StandardHelper::EMPTY_STRING) %></div>
-</div>
+<dt><%= label.presence || raw(UtilityHelper::EMPTY_STRING) %></dt>
+<dd class="value"><%= content.presence || raw(UtilityHelper::EMPTY_STRING) %></dd>

data/lib/generators/dry_crud/templates/app/views/shared/_labeled.html.haml

@@ -1,3 +1,2 @@
-.labeled
-  %label= label.presence || raw(StandardHelper::EMPTY_STRING)
-  .value= content.presence || raw(StandardHelper::EMPTY_STRING)
+%dt= label.presence || raw(UtilityHelper::EMPTY_STRING)
+%dd.value= content.presence || raw(UtilityHelper::EMPTY_STRING)

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

@@ -1 +1,5 @@
-ActionView::Base.field_error_proc = Proc.new {|html_tag, instance| html_tag }
+# encoding: UTF-8
+
+# 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 }

data/lib/generators/dry_crud/templates/config/locales/crud.de.yml

@@ -0,0 +1,64 @@
+# Translations of all crud strings. 
+# See also I18nHelper#translate_inheritable and #translate_association.
+
+de:
+  # global scope
+  global:
+    "yes": "ja"
+    "no": "nein"
+    no_list_entries: Keine Einträge gefunden.
+    confirm_delete: Wollen Sie diesen Eintrag wirklich löschen?
+
+    associations:
+      # association keys may be customized per model with the prefix
+      # 'activerecord.associations.{model}.' or even per actual association with
+      # 'activerecord.associations.models.{holder_model}.{assoc_name}.'
+      no_entry: (keine)
+      none_available: (keine verfügbar)
+      please_select: Bitte auswählen
+
+    button:
+      save: Speichern
+      cancel: Abbrechen
+      search: Suchen
+
+    link:
+      show: Anzeigen
+      edit: Bearbeiten
+      add: Erstellen
+      delete: Löschen
+      list: Liste
+
+    errors:
+      header:
+        one: "Ein Fehler verhinderte das Speichern dieses Eintrages:"
+        other: "%{count} Fehler verhinderten das Speichern dieses Eintrages:"
+
+  # formats
+  time:
+    formats:
+      time: "%H:%M"
+
+  # list controller
+  list:
+    index:
+      title: "%{models}"
+
+  # crud controller
+  crud:
+    show:
+      title: "%{model}"
+    new:
+      title: "%{model} erstellen"
+    edit:
+      title: "%{model} bearbeiten"
+    create:
+      flash:
+        success: "%{model} wurde erfolgreich erstellt."
+    update:
+      flash:
+        success: "%{model} wurde erfolgreich aktualisiert."
+    destroy:
+      flash:
+        success: "%{model} wurde erfolgreich gelöscht."
+        failure: "%{model} konnte nicht gelöscht werden."

data/lib/generators/dry_crud/templates/config/locales/{en_crud.yml → crud.en.yml}

@@ -1,4 +1,4 @@
-# Translations of all crud strings. 
+# Translations of all crud strings.
 # See also StandardHelper#translate_inheritable and #translate_association.
 
 en:
@@ -28,7 +28,7 @@ en:
       add: Add
       delete: Delete
       list: List
-      
+
     errors:
       header:
         one: "1 error prohibited this entry from being saved:"

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

@@ -1,3 +1,4 @@
+# encoding: UTF-8
 require 'spec_helper'
 
 # Tests all actions of the CrudController based on a dummy model
@@ -8,137 +9,123 @@ describe CrudTestModelsController do
 
   include CrudTestHelper
 
-  before(:all) do 
+  before(:all) do
     reset_db
     setup_db
     create_test_data
   end
-  
+
   after(:all) { reset_db }
-  
+
   before { special_routing }
-  
-  
+
   include_examples 'crud controller', {}
 
-  let(:test_entry) { crud_test_models(:AAAAA) } 
+  let(:test_entry) { crud_test_models(:AAAAA) }
   let(:new_entry_attrs) do
-    {:name => 'foo',
-     :children => 42,
-     :companion_id => 3,
-     :rating => 8.5,
-     :income => 2.42,
-     :birthdate => '31-12-1999'.to_date,
-     :human => true,
-     :remarks => "some custom\n\tremarks"}
+    { name: 'foo',
+      children: 42,
+      companion_id: 3,
+      rating: 8.5,
+      income: 2.42,
+      birthdate: '31-12-1999'.to_date,
+      human: true,
+      remarks: "some custom\n\tremarks" }
   end
   let(:edit_entry_attrs) do
-    {:name => 'foo',
-     :children => 42,
-     :rating => 8.5,
-     :income => 2.42,
-     :birthdate => '31-12-1999'.to_date,
-     :human => true,
-     :remarks => "some custom\n\tremarks"}
+    { name: 'foo',
+      children: 42,
+      rating: 8.5,
+      income: 2.42,
+      birthdate: '31-12-1999'.to_date,
+      human: true,
+      remarks: "some custom\n\tremarks" }
   end
-  
-  
-  describe "setup" do
-    it "model count should be correct" do
+
+  describe 'setup' do
+    it 'model count should be correct' do
       CrudTestModel.count.should == 6
     end
-    
-    it "should have models_label" do
+
+    it 'has models_label' do
       controller.models_label.should == 'Crud Test Models'
     end
-    
-    it "should have models_label singular" do
+
+    it 'has models_label singular' do
       controller.models_label(false).should == 'Crud Test Model'
     end
-    
-    it "should route index" do
-      { :get => "/crud_test_models" }.should route_to(
-        :controller => "crud_test_models",
-        :action => "index"
-      )
-    end
-    
-    it "should route show" do
-      { :get => "/crud_test_models/1" }.should route_to(
-        :controller => "crud_test_models",
-        :action => "show",
-        :id => '1'
-      )
-    end
   end
-  
+
   describe_action :get, :index do
-    context '.html', :format => :html do
-      context 'plain', :combine => 'ihp' do
-        it "should contain all entries" do
+    context '.html', format: :html do
+      context 'plain', combine: 'ihp' do
+        it 'contains all entries' do
           entries.size.should == 6
         end
-        
-        it "session should have empty list_params" do
+
+        it 'session should have empty list_params' do
           session[:list_params].should == Hash.new
         end
-        
-        it "should provide entries helper method" do
+
+        it 'provides entries helper method' do
         should render_template('index')
           entries.should be(controller.send(:entries))
         end
       end
-      
-      context "search" do
-        let(:params) { {:q => search_value} }
-      
-        context "regular", :combine => 'ihse' do
-          it "entries should only contain test_entry" do
+
+      context 'search' do
+        let(:params) { { q: search_value } }
+
+        context 'regular', combine: 'ihse' do
+          it 'entries should only contain test_entry' do
             entries.should == [test_entry]
           end
-          
-          it "session should have query list param" do
-            session[:list_params]['/crud_test_models.html'].should == {:q => 'AAAA'}
+
+          it 'session should have query list param' do
+            session[:list_params]['/crud_test_models.html'].should ==
+              { 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_should_respond
-          
-          it "entries should have one item" do
+
+          it 'entries should have one item' do
             entries.should == [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 should have query list param' do
+            session[:list_params]['/crud_test_models.html'].should ==
+              { 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_should_respond
-          
-          it "entries should be in correct order" do
+
+          it 'entries should be in correct order' do
             entries.should == 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 should have sort list param' do
+            session[:list_params]['/crud_test_models.html'].should ==
+              { 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_should_respond
-          
-          it "entries should be in correct order" do
-            names = entries.collect(&:name)
+
+          it 'entries should be 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')
@@ -146,288 +133,311 @@ describe CrudTestModelsController do
             assert names.index('AAAAA') < names.index('CCCCC')
             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 should have sort list param' do
+            session[:list_params]['/crud_test_models.html'].should ==
+              { sort: 'chatty', sort_dir: 'desc' }
           end
         end
-        
-        context "with search", :combine => 'ihsose' do
-          let(:params) { {:q => 'DDD', :sort => 'chatty', :sort_dir => 'asc'} }
-        
+
+        context 'with search', combine: 'ihsose' do
+          let(:params) do
+            { q: 'DDD', sort: 'chatty', sort_dir: 'asc' }
+          end
+
           it_should_respond
-          
-          it "entries should be in correct order" do
-            entries.collect(&:name).should == ['CCCCC', 'DDDDD', 'BBBBB']
+
+          it 'entries should be in correct order' do
+            entries.map(&:name).should == %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 should have sort list param' do
+            session[:list_params]['/crud_test_models.html'].should ==
+              { q: 'DDD', sort: 'chatty', sort_dir: 'asc' }
           end
         end
       end
-            
-      context "with custom options", :combine => 'ihsoco' do
-        let(:params) { {:filter => true} }
-        
+
+      context 'with custom options', combine: 'ihsoco' do
+        let(:params) { { filter: true } }
+
         it_should_respond
-        
-        context "entries" do
+
+        context 'entries' do
           subject { entries }
           it { should have(2).items }
           it { should == 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'}
-          get :index, :returning => true
+          session[:list_params]['/crud_test_models'] =
+            { q: 'DDD', sort: 'chatty', sort_dir: 'desc' }
+          get :index, returning: true
         end
-        
+
         it_should_respond
-        
-        it "entries should be in correct order" do
-          entries.collect(&:name).should == ['BBBBB', 'DDDDD', 'CCCCC']
+
+        it 'entries should be in correct order' do
+          entries.map(&:name).should == %w(BBBBB DDDDD CCCCC)
         end
-      
-        it "params should be set" do
+
+        it 'params should be set' do
           controller.params[:q].should == 'DDD'
           controller.params[:sort].should == 'chatty'
           controller.params[:sort_dir].should == 'desc'
         end
       end
     end
-    
-    context ".js", :format => :js, :combine => 'ijs' do
+
+    context '.js', format: :js, combine: 'ijs' do
       it_should_respond
       it_should_assign_entries
       its(:body) { should == 'index js' }
     end
   end
-  
+
   describe_action :get, :new do
-    context "plain", :combine => 'new' do
-      it "should assign companions" do
+    context 'plain', combine: 'new' do
+      it 'should assign companions' do
         assigns(:companions).should be_present
       end
-      
-      it "should have called two render callbacks" do
-        controller.called_callbacks.should == [:before_render_new, :before_render_form]
+
+      it 'should have called two render callbacks' do
+        controller.called_callbacks.should ==
+          [:before_render_new, :before_render_form]
       end
     end
-    
-    context "with before_render callback redirect", :perform_request => false do
+
+    context 'with before_render callback redirect',
+            perform_request: false do
       before do
         controller.should_redirect = true
         get :new
       end
-      
+
       it { should redirect_to(crud_test_models_path) }
-      
-      it "should not set companions" do
+
+      it 'should not set companions' do
         assigns(:companions).should be_nil
       end
     end
   end
-  
+
   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]
+    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]
     end
-    
-    context "with before callback" do
-      let(:params) { {:crud_test_model => {:name => 'illegal', :children => 2}} }
-      it "should not create entry", :perform_request => false do
+
+    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
         expect { perform_request }.to change { CrudTestModel.count }.by(0)
       end
-      
-      context "plain", :combine => 'chcp' do
+
+      context 'plain', combine: 'chcp' do
         it_should_respond
         it_should_render('new')
         it_should_persist_entry(false)
         it_should_have_flash(:alert)
-        
-        it "should set entry name" do
+
+        it 'should set entry name' do
           entry.name.should == 'illegal'
         end
-        
-        it "should assign companions" do
+
+        it 'should assign companions' do
           assigns(:companions).should be_present
         end
-        
-        it "should have called the correct callbacks" do
-          controller.called_callbacks.should == [:before_render_new, :before_render_form]
+
+        it 'should have called the correct callbacks' do
+          controller.called_callbacks.should ==
+            [: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 "should not create entry" do
+
+        it 'should not create entry' do
           expect { perform_request }.to change { CrudTestModel.count }.by(0)
         end
-        
-        it { perform_request; should redirect_to(crud_test_models_path) }
-        
-        it "should have called no callbacks" do
+
+        it do
+          perform_request
+          should redirect_to(crud_test_models_path)
+        end
+
+        it 'should have called no callbacks' do
           perform_request
           controller.called_callbacks.should be_nil
         end
       end
     end
-    
-    context "with invalid params" do
-      let(:params) { {:crud_test_model => {:children => 2}} }
-      
-      context ".html" do
-        it "should not create entry", :perform_request => false do
+
+    context 'with invalid params' do
+      let(:params) { { crud_test_model: { children: 2 } } }
+
+      context '.html' do
+        it 'should 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_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
+
+          it 'should assign companions' do
             assigns(:companions).should be_present
           end
-          
-          it "should have called the correct callbacks" do
-            controller.called_callbacks.should == [:before_create, :before_save, :before_render_new, :before_render_form]
+
+          it 'should have called the correct callbacks' do
+            controller.called_callbacks.should ==
+              [:before_create, :before_save,
+               :before_render_new, :before_render_form]
           end
         end
       end
-      
-      context ".json", :format => :json do
-        it "should not create entry", :perform_request => false do
+
+      context '.json', format: :json do
+        it 'should 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_should_respond(422)
           it_should_persist_entry(false)
           it_should_not_have_flash(:notice)
           it_should_not_have_flash(:alert)
-                
-          it "should not assign companions" do
+
+          it 'should not assign companions' do
             assigns(:companions).should be_nil
           end
-          
-          it "should have called the correct callbacks" do
-            controller.called_callbacks.should == [:before_create, :before_save]
+
+          it 'should have called the correct callbacks' do
+            controller.called_callbacks.should ==
+              [:before_create, :before_save]
           end
-          
+
           its(:body) { should match(/errors/) }
         end
       end
     end
-    
+
   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]
+  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]
     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]
+  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]
     end
-    
-    context "with invalid params" do
-      let(:params) { {:crud_test_model => {:rating => 20}} }
-      
-      context ".html", :combine => 'uhivp' do
+
+    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 "should change entry" do
+
+        it 'should change entry' do
           entry.should be_changed
         end
-        
-        it "should set entry rating" do
+
+        it 'should set entry rating' do
           entry.rating.should == 20
         end
-        
-        it "should have called the correct callbacks" do
-          controller.called_callbacks.should == [:before_update, :before_save, :before_render_edit, :before_render_form]
+
+        it 'should have called the correct callbacks' do
+          controller.called_callbacks.should ==
+            [:before_update, :before_save,
+             :before_render_edit, :before_render_form]
         end
       end
-      
-      context ".json", :format => :json, :combine => 'ujivp' do
+
+      context '.json', format: :json, combine: 'ujivp' do
         it_should_respond(422)
         it_should_not_have_flash(:notice)
-        
-        it "should have called the correct callbacks" do
+
+        it 'should have called the correct callbacks' do
           controller.called_callbacks.should == [:before_update, :before_save]
         end
-        
+
         its(:body) { should match(/errors/) }
       end
     end
-    
+
   end
-  
-  describe_action :delete, :destroy, :id => true do
-    it "should have called the correct callbacks" do
+
+  describe_action :delete, :destroy, id: true do
+    it 'should have called the correct callbacks' do
       controller.called_callbacks.should == [:before_destroy, :after_destroy]
     end
-    
-    context "with failure" do
+
+    context 'with failure' do
       let(:test_entry) { crud_test_models(:BBBBB) }
-      context ".html" do
-        it "should not delete entry from database", :perform_request => false do
-          expect { perform_request }.to change { CrudTestModel.count }.by(0)
+      context '.html' do
+        it 'should not delete entry from database',
+           perform_request: false do
+          expect { perform_request }.not_to change { CrudTestModel.count }
         end
-        
-        it "should redirect to referer", :perform_request => false do
+
+        it 'should redirect to referer',
+           perform_request: false do
           ref = @request.env['HTTP_REFERER'] = crud_test_model_url(test_entry)
           perform_request
           should redirect_to(ref)
         end
-        
+
         it_should_have_flash(:alert, /companion/)
         it_should_not_have_flash(:notice)
       end
-      
-      context ".json", :format => :json, :combine => 'djf' do
+
+      context '.json', format: :json, combine: 'djf' do
         it_should_respond(422)
         it_should_not_have_flash(:notice)
         its(:body) { should match(/errors/) }
       end
-      
-      context "callback", :perform_request => false do
+
+      context 'callback', perform_request: false do
         before do
           test_entry.update_attribute :name, 'illegal'
         end
-        
-        it "should not delete entry from database" do
-          expect { perform_request }.to change { CrudTestModel.count }.by(0)
+
+        it 'should not delete entry from database' do
+          expect { perform_request }.not_to change { CrudTestModel.count }
         end
-        
-        it "should redirect to index" do
+
+        it 'should redirect to index' do
           perform_request
-          should redirect_to(crud_test_models_path(:returning => true))
+          should redirect_to(crud_test_models_path(returning: true))
         end
-        
-        it "should have flash alert" do
+
+        it 'should have flash alert' do
           perform_request
           flash[:alert].should match(/illegal name/)
         end
       end
     end
-    
+
   end
-  
+
 end