dry_crud 1.0.0 → 1.1.0

data/README.rdoc

@@ -6,7 +6,7 @@ DRY CRUD generates simple and extendable controller, views and helpers that supp
 
 In order to use the generator, you have to register the gem in your Rails application's +Gemfile+. Add the following lines:
 
-  group :development, :test do
+  group :development do
     gem 'dry_crud'
   end
 
@@ -98,6 +98,16 @@ In <tt>app/helpers/people.rb</tt>:
 By the way: The method +:f+ in +StandardHelper+ uniformly formats arbitrary values according to their class.  
 
 
+==== Filtering the index list
+
+There is a simple search functionality (based on SQL LIKE queries) implemented in the +CrudController+. Define an array of columns in your controller's +search_columns+ class variable to make the entries searchable by these fields:
+
+In <tt>app/controllers/people_controller.rb</tt>:
+  self.search_columns = [:firstname, :lastname]
+
+If you have columns defined, a search box will be displayed in the index view that let's you filter the displayed entries.
+
+
 ==== CRUD controller callbacks
 
 As a last example, let's say we have added a custom input field that must specially processed. Instead of overwriting the entire update action, it is possible to register callbacks for the +create+, +update+, +save+ (= +create+ and +update+) and +destroy+ actions. They work very similarliy like the callbacks on ActiveRecord. For each action, before and after callbacks are run. Before callbacks may also prevent the action from being executed when returning false. Here is some code:
@@ -112,7 +122,7 @@ In <tt>app/controllers/people_controller.rb</tt>:
   
   def delete_picture
     if !perform_delete_picture(@entry.picture)
-      flash[:error] = 'Could not delete picture' 
+      flash[:alert] = 'Could not delete picture' 
       false
     end
   end
@@ -120,7 +130,7 @@ In <tt>app/controllers/people_controller.rb</tt>:
 
 === Standard Tables and Forms
 
-DRY CRUD also provides two builder classes for update/create forms and tables for displaying entries of one model. They may be used all over your application to DRY up the form and table code. Normally, they are used with the corresponding methods from +StandardHelper+.
+DRY CRUD also provides two builder classes for update/create forms and tables for displaying entries of one model. They may be used all over your application to DRY up the form and table code. Normally, they are used with the corresponding methods from +StandardHelper+. When you define a view for a subclass of +CrudController+, you may also use the slightly enhanced +crud_table+ and +crud_form+ methods from +CrudHelper+.
 
 ==== Tables
 
@@ -129,13 +139,13 @@ This is the code to define a table with some attribute columns for a list of sam
         t.attrs :lastname, :firstname
       end %>
 
-If entries is empty, a basic 'No entries available' message is rendered instead of the table.
+If entries is empty, a basic 'No entries found' message is rendered instead of the table.
 
 To render custom columns, use the :col method:
   <%= table(@people) do |t|
         t.attrs :lastname, :firstname
         t.col('', :class => 'center') {|entry| image_tag(entry.picture) }
-        t.attrs :street        
+        t.attrs :street
         t.col('Map') {|entry| link_to(entry.city, "http://maps.google.com/?q=#{entry.city}" }
       end %>
 
@@ -143,18 +153,23 @@ To render custom columns, use the :col method:
 
 Forms work very similar. In the most simple case, you just have to specify which attributes of a model to create input fields for, and you get a complete form with error messages, labeled input fields according the column types and a save button:
 
-  <% form(@person, [:firstname, :lastname, :age, :city] -%>
+  <%= standard_form(@person, [:firstname, :lastname, :age, :city] -%>
 
 Of course, custom input fields may be defined as well:
-  <% form(@person, [], :url => {:action => 'custom_update', :id => @person.id}) do |f| -%>
+  <%= standard_form(@person, [], :url => {:action => 'custom_update', :id => @person.id}) do |f| %>
     <%= f.labeled_input_fields :firstname, :lastname %>
-    <% f.labeled(:sex) do %>
+    <%= f.labeled(:sex) do %>
       <%= f.radio_button :sex, true %> female
       <%= f.radio_button :sex, false %> male
-    <% end -%>
+    <% end %>
     <%= f.labeled_integer_field :age %>
     <%= f.labeled_file_field :picture %>
-  <% end -%>
+  <% end %>
+
+Even +belongs_to+ associations are automatically rendered with a select field. By default, all entries from the associated model are used as options. To customize this, either define an instance variable with the same name as the association in your controller, or pass a <tt>:list</tt> option:
+  <%= f.belongs_to_field :hometown, :list => City.where('country = ?', @person.country) %>
+
+Yes, it's bad practice to use finder logic in your views! Define the variable <tt>@hometowns</tt> in your controller instead, and you do not even have to specify the <tt>:list</tt> option.
 
 == Generated Files
 
@@ -180,10 +195,12 @@ All generated files are supposed to provide a reasonable foundation for the CRUD
 
 === Views:
 
-views/crud/index.html.erb:: The index view displaying a table with all entries and an action link to add new ones.
+views/crud/index.html.erb:: The index view displaying a table with all entries and an action link to add new ones. If you have +search_columns+ defined for your controller, then a search box is rendered as well.
 
 views/crud/_list.html.erb:: A partial defining the table in the index view. To change the displayed attributes in your CRUD model, just create an own _list.html.erb in your models view directory.
 
+views/crud/_search.html.erb:: A partial defining a simple search form that is displayed when +search_columns+ are defined in a subclassing controller.
+
 views/crud/show.html.erb:: The show view displaying all the attributes of one entry and the various actions to perform on it.
 
 views/crud/_attrs.html.erb:: A partial defining the attributes to be displayed in the show view. 
@@ -203,7 +220,9 @@ public/stylesheets/crud.css:: A simple CSS with all the classes and ids used in
 
 === Tests:
 
-test/crud_test_model.rb:: A dummy model to run CRUD tests against.
+{test/crud_test_model.rb}[http://codez.ch/dry_crud/?q=CrudTestHelper]:: A dummy model to run CRUD tests against.
+
+{test/custom_assertions.rb}[http://codez.ch/dry_crud/?q=CustomAssertions]:: A handful of convenient assertions. Include this module into your <tt>test_helper.rb</tt> file.
 
 {test/functionals/crud_controller_test_helper.rb}[http://codez.ch/dry_crud/?q=CrudControllerTestHelper]:: A module to include into the functional tests for your CrudController subclasses. Contains a handful of CRUD functionality tests for the provided implementation. So for each new CRUD controller, you get 20 tests for free.
 

data/Rakefile

@@ -67,15 +67,15 @@ desc "Install dry_crud as a local gem."
 task :install => [:package] do
   sudo = RUBY_PLATFORM =~ /win32/ ? '' : 'sudo' 
   gem = RUBY_PLATFORM =~ /java/ ? 'jgem' : 'gem' 
-  sh %{#{sudo} #{gem} install --no-ri pkg/dry_crud-#{File.read('VERSION').strip}}
+  sh %{#{sudo} #{gem} install --no-ri pkg/dry_crud-#{File.read('VERSION').strip}.gem}
 end
 
 desc "Deploy rdoc to website"
 task :site => :rdoc do
   if ENV['DEST']
-  	sh "rsync -rzv rdoc/ #{ENV['DEST']}"
+    sh "rsync -rzv rdoc/ #{ENV['DEST']}"
   else
-  	puts "Please specify a destination with DEST=user@server:/deploy/dir"
+    puts "Please specify a destination with DEST=user@server:/deploy/dir"
   end
 end
 
@@ -100,10 +100,20 @@ Rake::RDocTask.new do |rdoc|
     list.exclude(/(^|[^.a-z])[a-z]+/)
     list.exclude('TODO') 
     end.to_a)
-  rdoc.rdoc_files.include('generators/dry_crud/templates/**/*.rb') 
-  rdoc.rdoc_files.exclude('generators/dry_crud/templates/**/*_test.rb') 
+  rdoc.rdoc_files.include('lib/generators/dry_crud/templates/**/*.rb') 
+  rdoc.rdoc_files.exclude('lib/generators/dry_crud/templates/**/*_test.rb') 
   rdoc.rdoc_files.exclude('TODO') 
     
   rdoc.rdoc_dir = 'rdoc'
   rdoc.main = 'README.rdoc' 
 end
+
+desc "Outputs the commands required for a release. Does not perform any other actions"
+task :release do
+  version = File.read('VERSION').strip
+  puts "Issue the following commands to perform a release:"
+  puts " $ git tag version-#{version}"
+  puts " $ git push --tags"
+  puts " $ rake repackage"
+  puts " $ gem push pkg/dry_crud-#{version}.gem"
+end

data/VERSION

@@ -1 +1 @@
-1.0.0
+1.1.0

data/lib/generators/dry_crud/templates/app/controllers/crud_controller.rb

@@ -8,6 +8,22 @@ class CrudController < ApplicationController
   
   include RenderInheritable 
   
+  # Set up entry object to use in the various actions.
+  before_filter :build_entry, :only => [:new, :create]
+  before_filter :set_entry,   :only => [:show, :edit, :update, :destroy]
+  
+  helper :standard
+  helper_method :model_class, :models_label, :full_entry_label, :search_support?
+  
+  delegate :model_class, :model_identifier, :models_label, :to => 'self.class'  
+  
+  hide_action :model_class, :models_label, :model_identifier, :run_callbacks, :inheritable_root_controller
+  
+  # Define an array of searchable columns in your subclassing controllers.
+  class_attribute :search_columns
+  self.search_columns = []
+  
+  # Callbacks
   extend ActiveModel::Callbacks
    
   # Defines before and after callback hooks for create, update, save and destroy.
@@ -20,9 +36,7 @@ class CrudController < ApplicationController
                          :render_edit, 
                          :only => :before,
                          :terminator => "result == false || performed?"
-  
-  delegate :model_class, :model_identifier, :models_label, :to => 'self.class'  
-
+                         
   # Verify that required :id param is present and only allow good http methods.
   # Uncomment if you have the Rails verification plugin installed.
   #verify :params => :id, :only => :show, :redirect_to => { :action => 'index' }
@@ -30,15 +44,6 @@ class CrudController < ApplicationController
   #verify :method => [:put, :post], :params => :id, :only => :update,  :redirect_to => { :action => 'index' }  
   #verify :method => [:delete, :post], :params => :id, :only => :destroy, :redirect_to => { :action => 'index' }  
   
-  # Set up entry object to use in the various actions.
-  before_filter :build_entry, :only => [:new, :create]
-  before_filter :set_entry,   :only => [:show, :edit, :update, :destroy]
-  
-  helper :standard
-  helper_method :model_class, :models_label, :full_entry_label
-  
-  hide_action :model_class, :models_label, :model_identifier, :run_callbacks, :inheritable_root_controller
-  
    
   ##############  ACTIONS  ############################################
   
@@ -143,16 +148,28 @@ class CrudController < ApplicationController
   # Sets an existing model entry from the given id.
   def set_entry
     @entry = model_class.find(params[:id])
-  end     
+  end
   
   # A label for the current entry, including the model name.
-  def full_entry_label        
-	  "#{models_label.singularize} '#{@entry.label}'"
-  end    
+  def full_entry_label
+    "#{models_label.singularize} '#{@entry.label}'"
+  end
   
   # Find options used in the index action.
   def find_all_options
-    {}
+    { :conditions => search_condition }
+  end
+  
+  def search_condition
+    if search_support? && params[:q].present?
+      clause = search_columns.collect {|f| "#{f} LIKE ?" }.join(" OR ")
+      param = "%#{params[:q]}%"
+      ["(#{clause})"] + [param] * search_columns.size
+    end
+  end
+  
+  def search_support?
+    search_columns.present?
   end
   
   # Redirects to the show action of a single entry.
@@ -162,7 +179,7 @@ class CrudController < ApplicationController
   
   # Redirects to the main action of this controller.
   def redirect_to_index
-    redirect_to :action => 'index'
+    redirect_to polymorphic_path(model_class)
   end
    
   # Helper method to run before_render callbacks and render the action.
@@ -173,9 +190,9 @@ class CrudController < ApplicationController
   end
   
   # Saves the current entry with callbacks.
-  def save_entry       
+  def save_entry
     with_callbacks(:save) { @entry.save }
-  end   
+  end
   
   # Helper method the run the given block in between the before and after
   # callbacks of the given kind.

data/lib/generators/dry_crud/templates/app/helpers/standard_form_builder.rb

@@ -9,12 +9,12 @@ class StandardFormBuilder < ActionView::Helpers::FormBuilder
   
   attr_reader :template 
   
-  delegate :association, :belongs_to_association, :column_type, :column_property, :captionize, 
+  delegate :association, :column_type, :column_property, :captionize, 
            :to => :template
   
   # Render multiple input fields together with a label for the given attributes.
   def labeled_input_fields(*attrs)
-    attrs.collect {|a| labeled_input_field(a) }.join("\n")
+    attrs.collect {|a| labeled_input_field(a) }.join("\n").html_safe
   end
   
   # Render a standartized label.
@@ -126,17 +126,11 @@ class StandardFormBuilder < ActionView::Helpers::FormBuilder
   
   protected
   
-  def labeled_field_method?(name)
-    prefix = 'labeled_'
-    if name.to_s.start_with?(prefix)
-      field_method = name.to_s[prefix.size..-1]
-      field_method if respond_to?(field_method)
-    end
-  end
-  
+  # Returns true if attr is a non-polymorphic belongs_to association,
+  # for which an input field may be automatically rendered.
   def belongs_to_association?(attr, type)
     if type == :integer || type == nil
-      assoc = belongs_to_association(@object, attr)
+      assoc = association(@object, attr, :belongs_to)
       assoc.present? && assoc.options[:polymorphic].nil?
     else
       false
@@ -152,10 +146,21 @@ class StandardFormBuilder < ActionView::Helpers::FormBuilder
       assoc = association(@object, attr)
       list = @template.send(:instance_variable_get, :"@#{assoc.name.to_s.pluralize}")
       unless list
-        list = assoc.klass.find(:all, :conditions => assoc.options[:conditions],
+        list = assoc.klass.all(:conditions => assoc.options[:conditions],
                                :order => assoc.options[:order])
       end
     end
     list
   end
+  
+  private
+  
+  def labeled_field_method?(name)
+    prefix = 'labeled_'
+    if name.to_s.start_with?(prefix)
+      field_method = name.to_s[prefix.size..-1]
+      field_method if respond_to?(field_method)
+    end
+  end
+  
 end

data/lib/generators/dry_crud/templates/app/helpers/standard_helper.rb

@@ -3,12 +3,12 @@
 # ApplicationController.
 module StandardHelper
   
-  NO_LIST_ENTRIES_MESSAGE = "No entries available"
+  NO_LIST_ENTRIES_MESSAGE = "No entries found"
   CONFIRM_DELETE_MESSAGE  = 'Do you really want to delete this entry?'
   
   FLOAT_FORMAT = "%.2f"
   TIME_FORMAT  = "%H:%M"
-  EMPTY_STRING = " "   # non-breaking space asserts better css styling.
+  EMPTY_STRING = " ".html_safe   # non-breaking space asserts better css styling.
   
   ################  FORMATTING HELPERS  ##################################
 
@@ -20,13 +20,13 @@ module StandardHelper
     case value
       when Fixnum then number_with_delimiter(value)
       when Float  then FLOAT_FORMAT % value
-			when Date	  then value.to_s
+      when Date	  then value.to_s
       when Time   then value.strftime(TIME_FORMAT)   
       when true   then 'yes'
       when false  then 'no'
       when nil    then EMPTY_STRING
     else 
-      value.respond_to?(:label) ? h(value.label) : h(value.to_s)
+      value.respond_to?(:label) ? value.label : value.to_s
     end
   end
   
@@ -38,7 +38,7 @@ module StandardHelper
     format_attr_method = :"format_#{attr.to_s}"
     if respond_to?(format_attr_method)
       send(format_attr_method, obj)
-    elsif assoc = belongs_to_association(obj, attr)
+    elsif assoc = association(obj, attr, :belongs_to)
       format_assoc(obj, assoc)
     else
       format_type(obj, attr)
@@ -50,7 +50,6 @@ module StandardHelper
   
   
   # Renders an arbitrary content with the given label. Used for uniform presentation.
-  # Without block, this may be used in the form <%= labeled(...) %>, with like <% labeled(..) do %>
   def labeled(label, content = nil, &block)
     content = capture(&block) if block_given?
     render(:partial => 'shared/labeled', :locals => { :label => label, :content => content}) 
@@ -69,12 +68,17 @@ module StandardHelper
   # Optionally surrounded with a div.
   def render_attrs(obj, attrs, div = true)
     html = attrs.collect do |a| 
-      labeled(captionize(a, obj.class), format_attr(obj, a))
-    end.join.html_safe
+      labeled_attr(obj, a)
+    end.join("\n").html_safe
     
     div ? content_tag(:div, html, :class => 'attributes') : html
   end
   
+  # Renders the formatted content of the given attribute with a label.
+  def labeled_attr(obj, attr)
+  	labeled(captionize(attr, obj.class), format_attr(obj, attr))
+  end
+  
   # Renders a table for the given entries. One column is rendered for each attribute passed. 
   # If a block is given, the columns defined therein are appended to the attribute columns.
   # If entries is empty, an appropriate message is rendered.
@@ -142,19 +146,19 @@ module StandardHelper
   end
   
   # A generic helper method to create action links.
-  # These link may be styled to look like buttons, for example.
+  # These link could be styled to look like buttons, for example.
   def link_action(label, options = {}, html_options = {})
     link_to("[#{label}]", options, {:class => 'action'}.merge(html_options))
   end
   
   protected
   
-  # Helper methods that are not necessarely called from templates.
+  # Helper methods that are not directly called from templates.
   
   # Formats an active record association
   def format_assoc(obj, assoc)
     if assoc_val = obj.send(assoc.name)
-      link_to_unless(no_assoc_link?(assoc), h(assoc_val.label), assoc_val)
+      link_to_unless(no_assoc_link?(assoc), assoc_val.label, assoc_val)
     else
       '(none)'
     end
@@ -194,20 +198,16 @@ module StandardHelper
     end  
   end
   
-  # Returns the :belongs_to association for the given attribute or nil if there is none.
-  def belongs_to_association(obj, attr)
-    if assoc = association(obj, attr)
-      assoc if assoc.macro == :belongs_to
-    end
-  end
-  
   # Returns the association proxy for the given attribute. The attr parameter
-  # may be the _id column or the association name. Returns nil if no association
-  # was found.
-  def association(obj, attr)
+  # may be the _id column or the association name. If a macro (e.g. :belongs_to)
+  # is given, the association must be of this type, otherwise, any association
+  # is returned. Returns nil if no association (or not of the given macro) was 
+  # found.
+  def association(obj, attr, macro = nil)
     if obj.class.respond_to?(:reflect_on_association)
-      assoc = attr.to_s =~ /_id$/ ? attr.to_s[0..-4].to_sym : attr
-      obj.class.reflect_on_association(assoc)
+      name = attr.to_s =~ /_id$/ ? attr.to_s[0..-4].to_sym : attr
+      assoc = obj.class.reflect_on_association(name)
+      assoc if assoc && (macro.nil? || assoc.macro == macro)
     end
   end
   

data/lib/generators/dry_crud/templates/app/helpers/standard_table_builder.rb

@@ -10,7 +10,7 @@ class StandardTableBuilder
   
   # Delegate called methods to template.
   # including StandardHelper would lead to problems with indirectly called methods.
-  delegate :content_tag, :format_attr, :column_type, :belongs_to_association, 
+  delegate :content_tag, :format_attr, :column_type, :association, 
            :captionize, :tr_alt, :to => :template
 
   def initialize(entries, template)
@@ -40,10 +40,18 @@ class StandardTableBuilder
   # the formatted attribute value for the current entry.
   def attrs(*attrs)
     attrs.each do |a|
-      col(captionize(a, entry_class), :class => align_class(a)) { |e| format_attr(e, a) }
+      attr(a)
     end
   end  
   
+  # Define a column for the given attribute and an optional header.
+  # If no header is given, the attribute name is used. The cell will
+  # contain the formatted attribute value for the current entry.
+  def attr(a, header = nil)
+      header ||= captionize(a, entry_class)
+      col(header, :class => align_class(a)) { |e| format_attr(e, a) }
+  end
+  
   # Renders the table as HTML.
   def to_html
     content_tag :table, :class => 'list' do
@@ -57,7 +65,7 @@ class StandardTableBuilder
     entry = entries.first
     case column_type(entry, attr)
       when :integer, :float, :decimal 
-        'right_align' unless belongs_to_association(entry, attr)
+        'right_align' unless association(entry, attr, :belongs_to)
       when :boolean  
         'center_align'
     end

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

@@ -0,0 +1,6 @@
+<%= form_tag(polymorphic_path(model_class), {:method => :get}) do %>
+  <%= text_field_tag :q, params[:q] %>
+  <%= submit_tag 'Search' %>
+<% end %>
+
+<br/>

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

@@ -1,5 +1,7 @@
 <% @title = "Listing #{models_label}" -%>
 
+<%= render :partial => 'search' if search_support? %>
+
 <%= render :partial => 'list' %>
 
 <br/>

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

@@ -1,7 +1,9 @@
 class CrudTestModel < ActiveRecord::Base #:nodoc:
-  validates_presence_of :name
+
+  validates :name, :presence => true
+  validates :rating, :inclusion => { :in => 1..10 }
   
-  default_scope :order => 'name'
+  default_scope order('name')
   
   belongs_to :companion, :class_name => 'CrudTestModel'
   
@@ -13,6 +15,8 @@ end
 class CrudTestModelsController < CrudController #:nodoc:
   HANDLE_PREFIX = 'handle_'
   
+  self.search_columns = [:name, :whatever, :remarks]
+  
   before_create :possibly_redirect
   before_create :handle_name
   
@@ -24,6 +28,10 @@ class CrudTestModelsController < CrudController #:nodoc:
   
   hide_action :called_callbacks, :should_redirect, :should_redirect=
   
+  # don't use the standard layout as it may require different routes
+  # than just the test route for this controller
+  layout nil
+  
   private
   
   # custom callback

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

@@ -0,0 +1,59 @@
+# A handful of convenient assertions. The aim of custom assertions is to
+# provide more specific error messages and to perform complex checks.
+#
+# Ideally, include this module into your test_helper.rb file:
+#  # at the beginning of the file:
+#  require 'custom_assertions'
+#  
+#  # inside the class definition:
+#  include CustomAssertions
+module CustomAssertions
+  
+  # Asserts that the element is included in the collection.
+  def assert_include(collection, element, message = "")
+    full_message = build_message(message, "<?> expected to be included in \n<?>.", 
+                                 element, collection)
+    assert_block(full_message) { collection.include?(element) }
+  end
+    
+  # Asserts that the element is not included in the collection.
+  def assert_not_include(collection, element, message = "")
+    full_message = build_message(message, "<?> expected not to be included in \n<?>.", 
+                                 element, collection)
+    assert_block(full_message) { !collection.include?(element) }
+  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 = "")
+    record.valid?
+    full_message = build_message(message, 
+        "? expected to be valid, but has the following errors: \n ?.", 
+       record, record.errors.full_messages.join("\n"))
+    assert_block(full_message) { record.valid? }
+  end
+  
+  # Asserts that the given active model record is not valid.
+  # If you provide a set of invalid attribute symbols, all of and only these
+  # attributes are expected to have errors. If no invalid attributes are
+  # specified, only the invalidity of the record is asserted.
+  def assert_not_valid(record, *invalid_attrs)
+    message = build_message("", "? expected to be invalid, but is valid.", record)
+    assert_block(message) { !record.valid? }
+    
+    # assert that the given attributes have errors.
+    invalid_attrs.each do |a|
+      message = build_message("", "Attribute <?> expected to be invalid, but is valid.", a)
+      assert_block(message) { record.errors[a].present? }
+    end
+    
+    if invalid_attrs.present?
+      # assert that no other than the invalid attributes have errors.
+      record.errors.each do |a, error|
+        message = build_message("", "Attribute <?> not declared as invalid attribute, but has the following error: \n?.", a, error)
+        assert_block(message) { invalid_attrs.include?(a) }
+      end
+    end
+  end
+  
+end

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

@@ -8,20 +8,31 @@ module CrudControllerTestHelper
     get :index
     assert_response :success
     assert_template 'index'
-    assert_not_nil assigns(:entries)
+    assert_present assigns(:entries)
   end
   
   def test_index_xml
     get :index, :format => 'xml'
     assert_response :success
-    assert_not_nil assigns(:entries)
+    assert_present assigns(:entries)
     assert @response.body.starts_with?("<?xml")
   end
   
+  def test_index_search
+    field = @controller.search_columns.first
+    val = field && test_entry[field].to_s
+    return if val.blank?   # does not support search or no value in this field
+ 
+    get :index, :q => val[0..((val.size + 1)/ 2)]
+    assert_response :success
+    assert_present assigns(:entries)
+    assert assigns(:entries).include?(test_entry)
+  end
+  
   def test_show
     get :show, :id => test_entry.id
     assert_response :success
-    assert_template 'show'  
+    assert_template 'show'
     assert_equal test_entry, assigns(:entry)
   end
   
@@ -37,13 +48,13 @@ module CrudControllerTestHelper
       get :show, :id => 9999
     end
   end
-    
+  
   def test_show_without_id_redirects_to_index
     assert_raise(ActionController::RoutingError) do
       get :show
     end
   end
-    
+  
   def test_new
     get :new
     assert_response :success
@@ -156,11 +167,11 @@ module CrudControllerTestHelper
   end
   
   def model_class
-    @controller.controller_name.classify.constantize
+    @controller.model_class
   end
   
   def model_identifier
-    @controller.controller_name.singularize.to_sym
+    @controller.model_identifier
   end
   
   # Test object used in several tests

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

@@ -29,6 +29,11 @@ class CrudTestModelsControllerTest < ActionController::TestCase
     assert_equal assigns(:entries).sort_by {|a| a.name }, assigns(:entries)
   end
   
+  def test_index_search
+  	super
+  	assert_equal 1, assigns(:entries).size
+  end
+  
   def test_new
     super
     assert assigns(:companions)
@@ -99,7 +104,7 @@ class CrudTestModelsControllerTest < ActionController::TestCase
     {:name => 'foo', 
      :children => 42, 
      :companion_id => 3,
-     :rating => 99.99, 
+     :rating => 8.5, 
      :income => 2.42, 
      :birthdate => '31-12-1999'.to_date,
      :human => true,

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

@@ -0,0 +1,95 @@
+require 'test_helper'
+require 'custom_assertions'
+require 'crud_test_model'
+
+class CustomAssertionsTest < ActiveSupport::TestCase
+
+  include CustomAssertions
+
+  include CrudTestHelper
+  
+  setup :reset_db, :setup_db, :create_test_data
+  teardown :reset_db
+  
+  test "assert include succeeds if included" do
+    assert_nothing_raised do
+      assert_include [1,2,3], 2
+    end
+  end
+  
+  test "assert include succeeds if record included" do
+    assert_nothing_raised do
+      assert_include CrudTestModel.all, crud_test_models("AAAAA")
+    end
+  end
+  
+  test "assert include fails if not included" do
+    assert_raise(Test::Unit::AssertionFailedError) do
+      assert_include [1,2,3], 5
+    end
+  end
+  
+  test "assert not include succeeds if not included" do
+    assert_nothing_raised do
+      assert_not_include [1,2,3], 5
+    end
+  end
+  
+  test "assert not include fails if included" do
+    assert_raise(Test::Unit::AssertionFailedError) do
+      assert_not_include [1,2,3], 3
+    end
+  end
+  
+  test "assert valid record succeeds" do
+    assert_nothing_raised do
+      assert_valid crud_test_models("AAAAA")
+    end
+  end
+
+  test "assert valid record fails for invalid" do
+    assert_raise(Test::Unit::AssertionFailedError) do
+      assert_valid invalid_record
+    end
+  end
+  
+  test "assert not valid succeeds if record invalid" do
+    assert_nothing_raised do
+      assert_not_valid invalid_record
+    end
+  end
+  
+  test "assert not valid succeds if record invalid and invalid attrs given" do
+    assert_nothing_raised do
+      assert_not_valid invalid_record, :name, :rating
+    end
+  end
+  
+  test "assert not valid fails if record valid" do
+    assert_raise(Test::Unit::AssertionFailedError) do
+      assert_not_valid crud_test_models("AAAAA")
+    end
+  end
+  
+  test "assert not valid fails if record invalid and valid attrs given" do
+    assert_raise(Test::Unit::AssertionFailedError) do
+      assert_not_valid invalid_record, :name, :rating, :children
+    end
+  end
+  
+  test "assert not valid fails if record invalid and not all invalid attrs given" do
+    assert_raise(Test::Unit::AssertionFailedError) do
+      assert_not_valid invalid_record, :name
+    end
+  end
+  
+  private
+  
+  def invalid_record
+    m = crud_test_models("AAAAA")
+    m.name = nil
+    m.rating = 42
+    m
+  end
+  
+end

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

@@ -20,26 +20,40 @@ class StandardFormBuilderTest < ActionView::TestCase
   
   test "input_field dispatches string attr to string_field" do
     assert_equal form.string_field(:name), form.input_field(:name)
+    assert form.string_field(:name).html_safe?
   end
     
   test "input_field dispatches text attr to text_area" do
     assert_equal form.text_area(:remarks), form.input_field(:remarks)
+    assert form.text_area(:remarks).html_safe?
   end
   
   test "input_field dispatches integer attr to integer_field" do
     assert_equal form.integer_field(:children), form.input_field(:children)
+    assert form.integer_field(:children).html_safe?
   end
   
   test "input_field dispatches boolean attr to boolean_field" do
     assert_equal form.boolean_field(:human), form.input_field(:human)
+    assert form.boolean_field(:human).html_safe?
   end  
   
   test "input_field dispatches date attr to date_field" do
     assert_equal form.date_field(:birthdate), form.input_field(:birthdate)
+    assert form.date_field(:birthdate).html_safe?
   end
     
   test "input_field dispatches belongs_to attr to select field" do
     assert_equal form.belongs_to_field(:companion_id), form.input_field(:companion_id)
+    assert form.belongs_to_field(:companion_id).html_safe?
+  end
+  
+  test "input_fields concats multiple fields" do
+  	result = form.labeled_input_fields(:name, :remarks, :children)
+  	assert result.html_safe?
+  	assert result.include?(form.input_field(:name))
+  	assert result.include?(form.input_field(:remarks))
+  	assert result.include?(form.input_field(:children))
   end
   
   test "belongs_to_field has all options by default" do
@@ -70,14 +84,29 @@ class StandardFormBuilderTest < ActionView::TestCase
     assert_no_match /(\<option .*?)/m, f
   end
   
-  
   test "string_field sets maxlength attribute if limit" do
     assert_match /maxlength="50"/, form.string_field(:name)
   end
   
-  test "labeld_text_field create label" do
+  test "label creates captionized label" do
+  	assert_match /label for.+Gugus dada/, form.label(:gugus_dada)
+  	assert form.label(:gugus_dada).html_safe?
+  end
+  
+  test "classic label still works" do
+  	assert_match /label for.+hoho/, form.label(:gugus_dada, "hoho")
+  	assert form.label(:gugus_dada, "hoho").html_safe?
+  end
+  
+  test "labeled_text_field create label" do
     assert_match /label for.+input/m, form.labeled_string_field(:name)
+    assert form.labeled_string_field(:name).html_safe?
   end
   
+  test "labeled field creates label" do
+  	result = form.labeled("gugus", "<input type='text' name='gugus' />")
+  	assert result.html_safe?
+  	assert_match /label for.+input/m, result
+  end
   
 end

data/lib/generators/dry_crud/templates/test/unit/{standard_helper_test.rb → helpers/standard_helper_test.rb}

@@ -16,25 +16,36 @@ class StandardHelperTest < ActionView::TestCase
   test "labeled text as block" do
     result = labeled("label") { "value" }
     
+    assert result.html_safe?
     assert_dom_equal "<div class='labeled'> <div class='caption'>label</div> <div class='value'>value</div> </div>", result.squish
   end
 
   test "labeled text empty" do
     result = labeled("label", "")
     
+    assert result.html_safe?
     assert_dom_equal "<div class='labeled'> <div class='caption'>label</div> <div class='value'>#{EMPTY_STRING}</div> </div>", result.squish
   end
 
   test "labeled text as content" do
-    result = labeled("label", "value")
+    result = labeled("label", "value <unsafe>")
     
-    assert_dom_equal "<div class='labeled'> <div class='caption'>label</div> <div class='value'>value</div> </div>", result.squish
+    assert result.html_safe?
+    assert_dom_equal "<div class='labeled'> <div class='caption'>label</div> <div class='value'>value &lt;unsafe&gt;</div> </div>", result.squish
+  end
+  
+  test "labeled attr" do
+  	result = labeled_attr('foo', :size)
+  	assert result.html_safe?
+  	assert_dom_equal "<div class='labeled'> <div class='caption'>Size</div> <div class='value'>3 chars</div> </div>", result.squish
   end
   
   test "alternate row" do
     result_1 = tr_alt { "(test row content)" }
     result_2 = tr_alt { "(test row content)" }
 
+    assert result_1.html_safe?
+    assert result_2.html_safe?
     assert_dom_equal "<tr class='even'>(test row content)</tr>", result_1
     assert_dom_equal "<tr class='odd'>(test row content)</tr>", result_2
   end
@@ -57,12 +68,14 @@ class StandardHelperTest < ActionView::TestCase
   end
   
   test "format nil" do
+    assert EMPTY_STRING.html_safe?
     assert_equal EMPTY_STRING, f(nil)
   end
   
   test "format Strings" do
     assert_equal "blah blah", f("blah blah")
-     assert_equal "&lt;injection&gt;", f("<injection>")
+    assert_equal "<injection>", f("<injection>")
+    assert !f("<injection>").html_safe?
   end
 
   test "format attr with fallthrough to f" do
@@ -115,19 +128,25 @@ class StandardHelperTest < ActionView::TestCase
   test "format text column" do
     m = crud_test_models(:AAAAA)
     assert_equal "<p>AAAAA AAAAA AAAAA\n<br />AAAAA AAAAA AAAAA\n<br />AAAAA AAAAA AAAAA\n</p>", format_type(m, :remarks)
+    assert format_type(m, :remarks).html_safe?
   end
   
   test "empty table should render message" do
-    assert_dom_equal "<div class='list'>#{NO_LIST_ENTRIES_MESSAGE}</div>", table([]) { }
+    result = table([]) { }
+    assert result.html_safe?
+    assert_dom_equal "<div class='list'>#{NO_LIST_ENTRIES_MESSAGE}</div>", result
   end  
   
   test "non empty table should render table" do
-    assert_match(/^\<table.*\<\/table\>$/, table(['foo', 'bar']) {|t| t.attrs :size, :upcase })
+    result = table(['foo', 'bar']) {|t| t.attrs :size, :upcase }
+    assert result.html_safe?
+    assert_match(/^\<table.*\<\/table\>$/, result)
   end
   
   test "table with attrs" do
     expected = StandardTableBuilder.table(['foo', 'bar'], self) { |t| t.attrs :size, :upcase }
     actual = table(['foo', 'bar'], :size, :upcase)
+    assert actual.html_safe?
     assert_equal expected, actual
   end
   
@@ -135,6 +154,7 @@ class StandardHelperTest < ActionView::TestCase
     assert_equal "Camel Case", captionize(:camel_case)
     assert_equal "All Upper Case", captionize("all upper case")
     assert_equal "With Object", captionize("With object", Object.new)
+    assert !captionize('bad <title>').html_safe?
   end
   
   test "standard form for existing entry" do
@@ -155,7 +175,6 @@ class StandardHelperTest < ActionView::TestCase
     assert_match /input .*?type="submit" .*?value="Save"/, f
   end
   
-  
   test "standard form for new entry" do
     e = CrudTestModel.new
     f = with_test_routing do 

data/test/templates/app/controllers/people_controller.rb

@@ -1,5 +1,9 @@
 class PeopleController < AjaxController
   
+  self.search_columns = [:name, :children, :rating, :income, :birthdate, :remarks]
+  
+  protected
+  
   def fetch_all_options
     {:include => :city, :order => 'people.name, cities.country_code, cities.name'}
   end

data/test/templates/app/helpers/people_helper.rb

@@ -1,7 +1,8 @@
 module PeopleHelper
   
   def format_income(person)
-    "#{f(person.income)} $"
+    income = person.income
+    income.present? ? "#{f(income)} $" : StandardHelper::EMPTY_STRING
   end
   
 end

data/test/templates/app/views/ajax/index.html.erb

@@ -1,9 +1,4 @@
-<% @title = "Listing #{models_label}" -%>
+<%= render :file => 'crud/index' %> 
 
-<%= render :partial => 'list' %>
-
-<br/>
-
-<%= link_action_add %>
 <%= link_to 'Ajahx', {:action => 'ajax'}, :method => :get, :remote => true %>
 <div id="response"></div>

data/test/templates/app/views/layouts/crud.html.erb

@@ -0,0 +1,26 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+       "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<head>
+  <meta http-equiv="content-type" content="text/html;charset=UTF-8" />
+  <title><%= @title %></title>
+  <%= stylesheet_link_tag 'crud' %>
+  <%= javascript_include_tag :all %>
+  <%= csrf_meta_tag %>
+</head>
+<body>
+
+<ul id="menu">
+	<li><%= link_to 'People', people_path %></li>
+	<li><%= link_to 'Cities', cities_path %></li>
+</ul>
+
+<h1><%= @title %></h1>
+
+<p id="flash_notice"><%= flash[:notice] %></p>
+
+<%= yield %>
+
+</body>
+</html>

data/test/templates/app/views/people/_attrs.html.erb

@@ -0,0 +1,7 @@
+<div class="attributes">
+	<%= render_attrs @entry, default_attrs, false %>
+	<%= labeled("I thinks its", "nice") %>
+	<%= labeled("Check google") do %>
+		<%= link_to "Maps", "http://map.google.com/?q=#{@entry.name}" %>
+	<% end %>
+</div>

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: dry_crud
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 19
   prerelease: false
   segments: 
   - 1
+  - 1
   - 0
-  - 0
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors: 
 - Pascal Zumkehr
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-31 00:00:00 +02:00
+date: 2010-09-24 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -56,6 +56,7 @@ files:
 - lib/generators/dry_crud/templates/app/views/crud/_attrs.html.erb
 - lib/generators/dry_crud/templates/app/views/crud/_form.html.erb
 - lib/generators/dry_crud/templates/app/views/crud/_list.html.erb
+- lib/generators/dry_crud/templates/app/views/crud/_search.html.erb
 - lib/generators/dry_crud/templates/app/views/crud/edit.html.erb
 - lib/generators/dry_crud/templates/app/views/crud/index.html.erb
 - lib/generators/dry_crud/templates/app/views/crud/new.html.erb
@@ -66,13 +67,15 @@ files:
 - lib/generators/dry_crud/templates/INSTALL
 - lib/generators/dry_crud/templates/public/stylesheets/crud.css
 - lib/generators/dry_crud/templates/test/crud_test_model.rb
+- lib/generators/dry_crud/templates/test/custom_assertions.rb
 - lib/generators/dry_crud/templates/test/functional/crud_controller_test_helper.rb
 - lib/generators/dry_crud/templates/test/functional/crud_test_models_controller_test.rb
-- lib/generators/dry_crud/templates/test/unit/crud_helper_test.rb
-- lib/generators/dry_crud/templates/test/unit/render_inheritable_test.rb
-- lib/generators/dry_crud/templates/test/unit/standard_form_builder_test.rb
-- lib/generators/dry_crud/templates/test/unit/standard_helper_test.rb
-- lib/generators/dry_crud/templates/test/unit/standard_table_builder_test.rb
+- lib/generators/dry_crud/templates/test/unit/custom_assertions_test.rb
+- lib/generators/dry_crud/templates/test/unit/helpers/crud_helper_test.rb
+- lib/generators/dry_crud/templates/test/unit/helpers/render_inheritable_test.rb
+- lib/generators/dry_crud/templates/test/unit/helpers/standard_form_builder_test.rb
+- lib/generators/dry_crud/templates/test/unit/helpers/standard_helper_test.rb
+- lib/generators/dry_crud/templates/test/unit/helpers/standard_table_builder_test.rb
 - lib/generators/dry_crud/USAGE
 - test/templates/app/controllers/ajax_controller.rb
 - test/templates/app/controllers/application_controller.rb
@@ -84,10 +87,11 @@ files:
 - test/templates/app/views/ajax/_hello.html.erb
 - test/templates/app/views/ajax/ajax.js.rjs
 - test/templates/app/views/ajax/index.html.erb
-- test/templates/app/views/cities/_attrs.html.erb
 - test/templates/app/views/cities/_form.html.erb
 - test/templates/app/views/cities/_hello.html.erb
 - test/templates/app/views/cities/_list.html.erb
+- test/templates/app/views/layouts/crud.html.erb
+- test/templates/app/views/people/_attrs.html.erb
 - test/templates/config/routes.rb
 - test/templates/db/migrate/20100511174904_create_people_and_cities.rb
 - test/templates/test/fixtures/cities.yml

data/test/templates/app/views/cities/_attrs.html.erb

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