dry_crud 1.2.0 → 1.2.5

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

@@ -1,4 +1,4 @@
-<% @title = "Edit #{full_entry_label}" -%>
+<% @title ||= "Edit #{full_entry_label}" -%>
 
 <%= render :partial => 'form' %>
 

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

@@ -1,4 +1,4 @@
-<% @title = "New #{models_label.singularize}" -%>
+<% @title ||= "New #{models_label.singularize}" -%>
 
 <%= render :partial => 'form' %>
 

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

@@ -1,4 +1,4 @@
-<% @title = full_entry_label -%>
+<% @title ||= full_entry_label -%>
 
 <%= render :partial => 'attrs' %>
 

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

@@ -13,7 +13,11 @@
 
 <h1><%= @title %></h1>
 
-<p id="flash_notice"><%= flash[:notice] %></p>
+<% if flash[:notice].present? %>
+    <div id="flash_notice"><%= flash[:notice] %></div>
+<% elsif flash[:alert].present? %>
+    <div id="flash_alert"><%= flash[:alert] %></div>
+<% end %>
 
 <%= yield %>
 

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

@@ -0,0 +1 @@
+<%= list_table %>

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

@@ -0,0 +1,7 @@
+<%= form_tag(nil, {:method => :get}) do %>
+  <%= hidden_field_tag :returning, true %>
+  <%= search_field_tag :q, params[:q] %>
+  <%= submit_tag 'Search' %>
+<% end %>
+
+<br/>

data/lib/generators/dry_crud/templates/app/views/{crud → list}/index.html.erb

@@ -1,4 +1,4 @@
-<% @title = "Listing #{models_label}" -%>
+<% @title ||= "Listing #{models_label}" -%>
 
 <%= render :partial => 'search' if search_support? %>
 

data/lib/generators/dry_crud/templates/public/stylesheets/crud.css

@@ -28,11 +28,11 @@ td p {
     margin: 0;
 }
 
-.right_align {
+.right {
 	text-align: right;
 }
 
-.center_align {
+.center {
 	text-align: center;
 }
 
@@ -72,18 +72,21 @@ a:visited.action {
 }
 
 #flash_notice {
-	color: #663333;
+    border: solid 2px #6a6;
+    background-color: #afa;
+    margin: 20pt;
+    padding: 5pt 10pt;
 }
 
 #error_explanation {
-	border: solid 1px #999999;
-	margin: 10pt;
-	padding: 5pt;
-	background-color: #FFBBBB;
+	border: solid 2pt #da9;
+	margin: 20pt;
+	padding: 5pt 10pt;
+	background-color: #fec;
 }
 
 #error_explanation h2 {
-	font-size: 12pt;
+	font-size: 11pt;
 	margin-top: 0pt;
 }
 
@@ -92,8 +95,8 @@ a:visited.action {
 }
 
 .value div.field_with_errors {
-	background-color: #FFBBBB;
+	background-color: #da9;
 	display: inline-block;
-	padding: 1px;
+	padding: 1px 1px;
 }
 

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

@@ -1,9 +1,10 @@
+# A dummy model used for general testing.
 class CrudTestModel < ActiveRecord::Base #:nodoc:
 
   validates :name, :presence => true
   validates :rating, :inclusion => { :in => 1..10 }
   
-  #default_scope :order => 'name' 
+  default_scope order('name') 
   
   belongs_to :companion, :class_name => 'CrudTestModel'
   
@@ -16,6 +17,7 @@ class CrudTestModel < ActiveRecord::Base #:nodoc:
   end
 end
 
+# Controller for the dummy model.
 class CrudTestModelsController < CrudController #:nodoc:
   HANDLE_PREFIX = 'handle_'
   
@@ -42,7 +44,7 @@ class CrudTestModelsController < CrudController #:nodoc:
   def list_entries
     entries = super
   	if params[:filter]
-  	  entries = entries.where(['rating < ?', 3]).order('children DESC')
+  	  entries = entries.where(['rating < ?', 3]).except(:order).order('children DESC')
     end
     entries
   end
@@ -95,6 +97,8 @@ class CrudTestModelsController < CrudController #:nodoc:
 end
 
 # A simple test helper to prepare the test database with a CrudTestModel model.
+# This helper is used to test the CrudController and various helpers
+# without the need for an application based model.
 module CrudTestHelper
 
   protected 
@@ -102,29 +106,34 @@ module CrudTestHelper
   # Sets up the test database with a crud_test_models table.
   # Look at the source to view the column definition.
   def setup_db    
-    silence_stream(STDOUT) do
-      ActiveRecord::Base.connection.create_table :crud_test_models, :force => true do |t|
-        t.string  :name, :null => false, :limit => 50
-        t.string  :whatever
-        t.integer :children
-        t.integer :companion_id
-        t.float   :rating
-        t.decimal :income, :precision => 14, :scale => 2
-        t.date    :birthdate
-        t.boolean :human, :default => true
-        t.text    :remarks
-        
-        t.timestamps
+    without_transaction do
+      silence_stream(STDOUT) do
+        ActiveRecord::Base.connection.create_table :crud_test_models, :force => true do |t|
+          t.string  :name, :null => false, :limit => 50
+          t.string  :whatever
+          t.integer :children
+          t.integer :companion_id
+          t.float   :rating
+          t.decimal :income, :precision => 14, :scale => 2
+          t.date    :birthdate
+          t.boolean :human, :default => true
+          t.text    :remarks
+          
+          t.timestamps
+        end
       end
+          
+      CrudTestModel.reset_column_information
     end
-    
-    CrudTestModel.reset_column_information
   end
   
   # Removes the crud_test_models table from the database.
   def reset_db
+    c = ActiveRecord::Base.connection
     [:crud_test_models].each do |table|            
-      ActiveRecord::Base.connection.drop_table(table) rescue nil
+      if c.table_exists?(table)
+        c.drop_table(table) rescue nil
+      end
     end
   end
   
@@ -137,6 +146,16 @@ module CrudTestHelper
   def crud_test_models(name)
     CrudTestModel.find_by_name(name.to_s)
   end
+    
+  def with_test_routing
+    with_routing do |set|
+      set.draw { resources :crud_test_models }
+      # used to define a controller in these tests
+      set.default_url_options = {:controller => 'crud_test_models'}
+      yield
+    end
+  end
+  
   
   private
   
@@ -156,13 +175,19 @@ module CrudTestHelper
      (index + 64).chr * 5
   end
   
-  def with_test_routing
-    with_routing do |set|
-      set.draw { resources :crud_test_models }
-      # used to define a controller in these tests
-      set.default_url_options = {:controller => 'crud_test_models'}
-      yield
+  # hack to avoid ddl in transaction issues with mysql.
+  def without_transaction
+    c = ActiveRecord::Base.connection
+    start_transaction = false
+    if c.adapter_name.downcase.include?('mysql') && c.open_transactions > 0
+      # in transactional tests, we may simply rollback
+      c.execute("ROLLBACK")
+      start_transaction = true
     end
+    
+    yield    
+    
+    c.execute("BEGIN") if start_transaction
   end
-  
+
 end

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

@@ -23,6 +23,14 @@ module CustomAssertions
     assert_block(full_message) { !collection.include?(element) }
   end
   
+  # Asserts that <regexp> occurs exactly <expected> times in <string>.
+  def assert_count(expected, regexp, string, message = "")
+    actual = string.scan(regexp).size
+    full_message = build_message(message, "<?> expected to occur ? time(s), but occured ? time(s) in \n<?>.", 
+                                 regexp, expected, actual, string)
+    assert_block(full_message) { expected == actual }
+  end
+  
   # Asserts that the given active model record is valid.
   # This method used to be part of Rails but was deprecated, no idea why.
   def assert_valid(record, message = "")

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

@@ -2,6 +2,9 @@ require 'test_helper'
 require 'crud_test_model'
 require File.join(File.dirname(__FILE__), 'crud_controller_test_helper')
 
+# Tests all actions of the CrudController based on a dummy model 
+# (CrudTestModel). This is useful to test the general behavior
+# of CrudController.
 class CrudTestModelsControllerTest < ActionController::TestCase
   
   include CrudControllerTestHelper
@@ -27,11 +30,13 @@ class CrudTestModelsControllerTest < ActionController::TestCase
     super
     assert_equal 6, assigns(:entries).size
     assert_equal assigns(:entries).sort_by(&:name), assigns(:entries)
+    assert_equal Hash.new, session[:list_params]
   end
   
   def test_index_search
   	super
   	assert_equal 1, assigns(:entries).size
+    assert_equal({:q => 'AAAA'}, session[:list_params]['/crud_test_models'])
   end
   
   def test_index_with_custom_options
@@ -50,6 +55,7 @@ class CrudTestModelsControllerTest < ActionController::TestCase
     assert_present assigns(:entries)
     assert_equal 1, assigns(:entries).size
     assert_equal [CrudTestModel.find_by_name('BBBBB')], assigns(:entries)
+    assert_equal({:q => 'DDD'}, session[:list_params]['/crud_test_models'])
   end
   
   def test_sort_given_column
@@ -58,7 +64,8 @@ class CrudTestModelsControllerTest < ActionController::TestCase
     assert_template 'index'
     assert_present assigns(:entries)
     assert_equal 6, assigns(:entries).size
-    assert_equal CrudTestModel.order(:children).all, assigns(:entries)
+    assert_equal CrudTestModel.all.sort_by(&:children), assigns(:entries)
+    assert_equal({:sort => 'children', :sort_dir => 'asc'}, session[:list_params]['/crud_test_models'])
   end
   
   def test_sort_virtual_column
@@ -67,8 +74,20 @@ class CrudTestModelsControllerTest < ActionController::TestCase
     assert_template 'index'
     assert_present assigns(:entries)
     assert_equal 6, assigns(:entries).size
-    sorted = CrudTestModel.all.sort_by &:chatty
-    assert_equal sorted.reverse.collect(&:name), assigns(:entries).collect(&:name)
+    assert_equal({:sort => 'chatty', :sort_dir => 'desc'}, session[:list_params]['/crud_test_models'])
+    
+    sorted = CrudTestModel.all.sort_by(&:chatty)
+    
+    # sort order is ambiguous, use index    
+    names = assigns(:entries).collect(&:name)
+    assert names.index('BBBBB') < names.index('AAAAA')
+    assert names.index('BBBBB') < names.index('DDDDD')
+    assert names.index('EEEEE') < names.index('AAAAA')
+    assert names.index('EEEEE') < names.index('DDDDD')
+    assert names.index('AAAAA') < names.index('CCCCC')
+    assert names.index('AAAAA') < names.index('FFFFF')
+    assert names.index('DDDDD') < names.index('CCCCC')
+    assert names.index('DDDDD') < names.index('FFFFF')
   end
   
   def test_sort_with_search
@@ -78,6 +97,7 @@ class CrudTestModelsControllerTest < ActionController::TestCase
     assert_present assigns(:entries)
     assert_equal 3, assigns(:entries).size
     assert_equal ['CCCCC', 'DDDDD', 'BBBBB'], assigns(:entries).collect(&:name)
+    assert_equal({:sort => 'chatty', :sort_dir => 'asc', :q => 'DDD'}, session[:list_params]['/crud_test_models'])
   end
   
   def test_new

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

@@ -41,6 +41,24 @@ class CustomAssertionsTest < ActiveSupport::TestCase
     end
   end
   
+  test "assert count succeeds if count matches" do
+    assert_nothing_raised do
+      assert_count 3, "ba", "barbabapa"
+    end
+  end
+  
+  test "assert count succeeds if count is zero" do
+    assert_nothing_raised do
+      assert_count 0, "bo", "barbabapa"
+    end
+  end
+  
+  test "assert count fails if count does not match" do
+    assert_raise(Test::Unit::AssertionFailedError) do
+      assert_count 2, "ba", "barbabapa"
+    end
+  end
+  
   test "assert valid record succeeds" do
     assert_nothing_raised do
       assert_valid crud_test_models("AAAAA")

data/lib/generators/dry_crud/templates/test/unit/helpers/crud_helper_test.rb

@@ -1,9 +1,17 @@
 require 'test_helper'
 require 'crud_test_model'
+require 'custom_assertions'
 
 class CrudHelperTest < ActionView::TestCase
   
+  REGEXP_ROWS = /<tr.+?<\/tr>/m
+  REGEXP_HEADERS = /<th.+?<\/th>/m
+  REGEXP_SORT_HEADERS = /<th><a .*?sort_dir=asc.*?>.*?<\/a><\/th>/m
+  REGEXP_ACTION_CELL = /<td class=\"center\"><a href.+?<\/a><\/td>/m
+  
+  include CustomAssertions
   include StandardHelper
+  include ListHelper
   include CrudTestHelper
   
   setup :reset_db, :setup_db, :create_test_data
@@ -16,9 +24,9 @@ class CrudHelperTest < ActionView::TestCase
       crud_table
     end
     
-    assert_match /(<tr.+?<\/tr>){7}/m, t
-    assert_match /(<th><a .*asc.*>.*<\/a><\/th>){4}/m, t
-    assert_match /(<td><a href.+?<\/a><\/td>.*?){18}/m, t  # show, edit, delete links
+    assert_count 7, REGEXP_ROWS, t
+    assert_count 11, REGEXP_SORT_HEADERS, t
+    assert_count 18, REGEXP_ACTION_CELL, t      # show, edit, delete links
   end
   
   test "custom crud table with attributes" do
@@ -28,9 +36,9 @@ class CrudHelperTest < ActionView::TestCase
       crud_table :name, :children, :companion_id
     end
         
-    assert_match /(<tr.+?<\/tr>){7}/m, t
-    assert_match /(<th.+?<\/th>){4}/m, t
-    assert_match /(<td><a href.+?<\/a><\/td>.*?){18}/m, t  # show, edit, delete links
+    assert_count 7, REGEXP_ROWS, t
+    assert_count 3, REGEXP_SORT_HEADERS, t
+    assert_count 18, REGEXP_ACTION_CELL, t      # show, edit, delete links
   end
     
   test "custom crud table with block" do
@@ -43,10 +51,10 @@ class CrudHelperTest < ActionView::TestCase
       end
     end
     
-    assert_match /(<tr.+?<\/tr>){7}/m, t
-    assert_match /(<th.+?<\/th>){4}/m, t
-    assert_match /(<span>.+?<\/span>.*?){6}/m, t
-    assert_no_match /(<td><a href.+?<\/a><\/td>.*?)/m, t
+    assert_count 7, REGEXP_ROWS, t
+    assert_count 4, REGEXP_HEADERS, t
+    assert_count 6, /<span>.+?<\/span>/m, t
+    assert_count 0, REGEXP_ACTION_CELL, t      # no show, edit, delete links
   end
   
   test "custom crud table with attributes and block" do
@@ -58,62 +66,12 @@ class CrudHelperTest < ActionView::TestCase
       end
     end
     
-    assert_match /(<tr.+?<\/tr>){7}/m, t
-    assert_match /(<th.+?<\/th>){4}/m, t
-    assert_match /(<span>.+?<\/span>.*?){6}/m, t
-    assert_no_match /(<td><a href.+?<\/a><\/td>.*?)/m, t
+    assert_count 7, REGEXP_ROWS, t
+    assert_count 4, REGEXP_HEADERS, t
+    assert_count 6, /<span>.+?<\/span>/m, t
+    assert_count 0, REGEXP_ACTION_CELL, t      # no show, edit, delete links
   end
-    
-  test "standard crud table with ascending sort params" do
-    def params
-      {:sort => 'children', :sort_dir => 'asc'}
-    end
   
-    @entries = CrudTestModel.all
-    
-    t = with_test_routing do 
-      crud_table
-    end
-    
-    assert_match /(<tr.+?<\/tr>){7}/m, t
-    assert_match /(<th><a .*desc.*>Children<\/a> &darr;<\/th>){1}/m, t
-    assert_match /(<th><a .*asc.*>.*<\/a><\/th>){3}/m, t
-    assert_match /(<td><a href.+?<\/a><\/td>.*?){18}/m, t
-  end
-  
-  test "standard crud table with descending sort params" do
-    def params
-      {:sort => 'children', :sort_dir => 'desc'}
-    end
-  
-    @entries = CrudTestModel.all
-    
-    t = with_test_routing do 
-      crud_table
-    end
-    
-    assert_match /(<tr.+?<\/tr>){7}/m, t
-    assert_match /(<th><a .*asc.*>Children<\/a> &uarr;<\/th>){1}/m, t
-    assert_match /(<th><a .*asc.*>.*<\/a><\/th>){4}/m, t
-    assert_match /(<td><a href.+?<\/a><\/td>.*?){18}/m, t
-  end
-    
-  test "crud table with custom column sort params" do
-    def params
-      {:sort => 'chatty', :sort_dir => 'asc'}
-    end
-  
-    @entries = CrudTestModel.all
-    
-    t = with_test_routing do 
-      crud_table :name, :children, :chatty
-    end
-    
-    assert_match /(<tr.+?<\/tr>){7}/m, t
-    assert_match /(<th><a .*desc.*>Chatty<\/a> &darr;<\/th>){1}/m, t
-    assert_match /(<th><a .*asc.*>.*<\/a><\/th>){2}/m, t
-    assert_match /(<td><a href.+?<\/a><\/td>.*?){18}/m, t
-  end
   
   test "crud form" do
     @entry = CrudTestModel.first
@@ -152,15 +110,4 @@ class CrudHelperTest < ActionView::TestCase
   	true
   end
 
-    
-  private
-  
-  def with_test_routing
-    with_routing do |set|
-      set.draw { resources :crud_test_models }
-      # used to define a controller in these tests
-      set.default_url_options = {:controller => 'crud_test_models'}
-      yield
-    end
-  end
 end

data/lib/generators/dry_crud/templates/test/unit/helpers/list_helper_test.rb

@@ -0,0 +1,139 @@
+require 'test_helper'
+require 'crud_test_model'
+require 'custom_assertions'
+
+class ListHelperTest < ActionView::TestCase
+  
+  REGEXP_ROWS = /<tr.+?<\/tr>/m
+  REGEXP_HEADERS = /<th.+?<\/th>/m
+  REGEXP_SORT_HEADERS = /<th><a .*?sort_dir=asc.*?>.*?<\/a><\/th>/m
+  
+  include StandardHelper
+  include CrudTestHelper
+  include CustomAssertions
+  
+  setup :reset_db, :setup_db, :create_test_data
+  teardown :reset_db
+  
+  test "standard list table" do
+    @entries = CrudTestModel.all
+    
+    t = with_test_routing do 
+      list_table
+    end
+    
+    assert_count 7, REGEXP_ROWS, t
+    assert_count 11, REGEXP_SORT_HEADERS, t
+  end
+  
+  test "custom list table with attributes" do
+    @entries = CrudTestModel.all
+    
+    t = with_test_routing do
+      list_table :name, :children, :companion_id
+    end
+        
+    assert_count 7, REGEXP_ROWS, t
+    assert_count 3, REGEXP_SORT_HEADERS, t
+  end
+    
+  test "custom list table with block" do
+    @entries = CrudTestModel.all
+    
+    t = with_test_routing do
+      list_table do |t|
+        t.attrs :name, :children, :companion_id
+        t.col("head") {|e| content_tag :span, e.income.to_s }
+      end
+    end
+    
+    assert_count 7, REGEXP_ROWS, t
+    assert_count 4, REGEXP_HEADERS, t
+    assert_count 0, REGEXP_SORT_HEADERS, t
+    assert_count 6, /<span>.+?<\/span>/, t
+  end
+  
+  test "custom list table with attributes and block" do
+    @entries = CrudTestModel.all
+    
+    t = with_test_routing do
+      list_table :name, :children, :companion_id do |t|
+        t.col("head") {|e| content_tag :span, e.income.to_s }
+      end
+    end
+    
+    assert_count 7, REGEXP_ROWS, t
+    assert_count 3, REGEXP_SORT_HEADERS, t
+    assert_count 4, REGEXP_HEADERS, t
+    assert_count 6, /<span>.+?<\/span>/, t
+  end
+    
+  test "standard list table with ascending sort params" do
+    def params
+      {:sort => 'children', :sort_dir => 'asc'}
+    end
+  
+    @entries = CrudTestModel.all
+    
+    t = with_test_routing do 
+      list_table
+    end
+    
+    assert_count 7, REGEXP_ROWS, t
+    assert_count 10, REGEXP_SORT_HEADERS, t
+    assert_count 1, /<th><a .*?sort_dir=desc.*?>Children<\/a> &darr;<\/th>/, t
+  end
+  
+  test "standard list table with descending sort params" do
+    def params
+      {:sort => 'children', :sort_dir => 'desc'}
+    end
+  
+    @entries = CrudTestModel.all
+    
+    t = with_test_routing do 
+      list_table
+    end
+    
+    assert_count 7, REGEXP_ROWS, t
+    assert_count 10, REGEXP_SORT_HEADERS, t
+    assert_count 1, /<th><a .*?sort_dir=asc.*?>Children<\/a> &uarr;<\/th>/, t
+  end
+    
+  test "list table with custom column sort params" do
+    def params
+      {:sort => 'chatty', :sort_dir => 'asc'}
+    end
+  
+    @entries = CrudTestModel.all
+    
+    t = with_test_routing do 
+      list_table :name, :children, :chatty
+    end
+    
+    assert_count 7, REGEXP_ROWS, t
+    assert_count 2, REGEXP_SORT_HEADERS, t
+    assert_count 1, /<th><a .*?sort_dir=desc.*?>Chatty<\/a> &darr;<\/th>/, t
+  end
+  
+  test "default attributes do not include id" do 
+    assert_equal [:name, :whatever, :children, :companion_id, :rating, :income, 
+                  :birthdate, :human, :remarks, :created_at, :updated_at], default_attrs
+  end
+  
+  # Controller helper methods for the tests
+  
+  def model_class
+    CrudTestModel
+  end
+  
+  def params
+  	{}
+  end
+  
+  def sortable?(attr)
+  	true
+  end
+
+    
+end

data/lib/generators/dry_crud/templates/test/unit/helpers/standard_form_builder_test.rb

@@ -58,30 +58,27 @@ class StandardFormBuilderTest < ActionView::TestCase
   
   test "belongs_to_field has all options by default" do
     f = form.belongs_to_field(:companion_id)
-    assert_match /(\<option .*?){7}/m, f
-    assert_no_match /(\<option .*?){8}/m, f
+    assert_equal 7, f.scan('</option>').size
   end
     
   test "belongs_to_field with :list option" do
     list = CrudTestModel.all
     f = form.belongs_to_field(:companion_id, :list => [list.first, list.second])
-    assert_match /(\<option .*?){3}/m, f
-    assert_no_match /(\<option .*?){4}/m, f
+    assert_equal 3, f.scan('</option>').size
   end
   
   test "belongs_to_field with instance variable" do
     list = CrudTestModel.all
     @companions = [list.first, list.second]
     f = form.belongs_to_field(:companion_id)
-    assert_match /(\<option .*?){3}/m, f
-    assert_no_match /(\<option .*?){4}/m, f
+    assert_equal 3, f.scan('</option>').size
   end
   
   test "belongs_to_field with empty list" do
     @companions = []
     f = form.belongs_to_field(:companion_id)
     assert_match /none available/m, f
-    assert_no_match /(\<option .*?)/m, f
+    assert_equal 0, f.scan('</option>').size
   end
   
   test "string_field sets maxlength attribute if limit" do