dry_crud 1.6.0 → 1.7.0

data/README.rdoc

@@ -1,18 +1,18 @@
 = DRY CRUD
 
+{<img src="https://secure.travis-ci.org/codez/dry_crud.png" />}[http://travis-ci.org/codez/dry_crud]
+
 DRY CRUD generates simple and extendable controller, views and helpers that support you to DRY up the CRUD code in your Rails project. Start with these elements and build a clean base to efficiently develop your application upon. 
 
 Create your Rails application directly with the DRY CRUD application template:
 
-  rails new [APP_NAME] -m https://raw.github.com/codez/dry_crud/master/template.rb
+  rails new APP_NAME -m https://raw.github.com/codez/dry_crud/master/template.rb
   
 If your application already exists or you prefer the DIY way, then install the Gem (<tt>gem install dry_crud</tt>), add it to your Gemfile and run the generator. You may remove the Gemfile entry again afterwards, it is not required anymore.
 
-  rails generate dry_crud
+  rails generate dry_crud [--templates haml] [--tests rspec]
   
-If you prefer HAML templates instead of ERB, run
-
-  rails generate dry_crud -t haml
+By default, DRY CRUD generates ERB templates and Test::Unit tests. Pass the options above to generate HAML templates and/or RSpec examples instead.
 
 To integrate DRY CRUD into your code, only a few additions are required:
 
@@ -162,10 +162,10 @@ 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:
 
-  <%= standard_form(@person, :firstname, :lastname, :age, :city) -%>
+  <%= crud_form(@person, :firstname, :lastname, :age, :city) -%>
 
 Of course, custom input fields may be defined as well:
-  <%= standard_form(@person, :url => custom_update_person_path(@person.id)) do |f| %>
+  <%= crud_form(@person, :url => custom_update_person_path(@person.id)) do |f| %>
     <%= f.labeled_input_fields :firstname, :lastname %>
     <%= f.labeled(:sex) do %>
       <%= f.radio_button :sex, true %> female
@@ -286,7 +286,9 @@ views/shared/_error_messages.html.erb:: Partial to display the validation errors
 
 views/layouts/crud.html.erb:: An example layout showing how to use the <tt>@title</tt> and +flash+. Most probably you want to merge this with your <tt>application.html.erb</tt> or adapt the main CRUD templates, so you wont need this file.
 
-views/layouts/_menu.html.erb:: An empty file to put your menu items into. Included from <tt>crud.html.erb</tt>.
+views/layouts/_flash.html.erb:: An simple partial to display the various flash messages. Included from <tt>crud.html.erb</tt>.
+
+views/layouts/_nav.html.erb:: An empty file to put your navigation into. Included from <tt>crud.html.erb</tt>.
 
 app/assets/stylesheets/crud.scss:: A simple SCSS with all the classes and ids used in the CRUD code. 
 
@@ -299,9 +301,22 @@ app/assets/images/action/*.png:: Some sample action icons from the {Open Icon Li
 
 {test/custom_assertions.rb}[http://codez.ch/dry_crud/CustomAssertions.html]:: 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/CrudControllerTestHelper.html]:: 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.
+{test/functional/crud_controller_test_helper.rb}[http://codez.ch/dry_crud/CrudControllerTestHelper.html]:: 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.
+
+test/functional/crud_test_models_controller_test.rb:: Functional tests for the basic +CrudController+ functionality.
 
 test/several other tests:: Testing the provided implementation and a great base to test your adaptions of the CRUD code.
 
 
-{<img src="https://secure.travis-ci.org/codez/dry_crud.png" />}[http://travis-ci.org/codez/dry_crud]
+=== Specs:
+
+spec/support/crud_controller_examples.rb:: A whole set of shared exampled to include into your controller specs. See <tt>spec/controllers/crud_test_models_controller_spec.rb</tt> for usage. So for each new CRUD controller, you get all the basic specs for free.
+
+spec/support/crud_controller_test_helper.rb:: Convenience methods used by the crud controller examples.
+
+{spec/support/crud_test_model.rb}[http://codez.ch/dry_crud/CrudTestHelper.html]:: A dummy model to run CRUD tests against.
+
+spec/controllers/crud_test_models_controller_spec.rb:: Controller specs to test the basic +CrudController+ functionality.
+
+spec/helpers/*_spec.rb:: The specs for all the helpers included in DRY CRUD.
+

data/Rakefile

@@ -1,5 +1,6 @@
 require 'rubygems'
 require 'rake/testtask'
+require 'rspec/core/rake_task'
 require 'rubygems/package_task' 
 require 'rdoc/task' 
 
@@ -11,15 +12,25 @@ GENERATOR_ROOT = File.join(File.dirname(__FILE__), 'lib', 'generators', 'dry_cru
 task :default => :test
 
 desc "Run all tests"
-task :test => ['test:app:init'] do
-  Rake::TestTask.new do |test| 
+task :test => ['test:unit', 'test:spec']
+
+
+namespace :test do
+
+  desc "Run Test::Unit tests"
+  Rake::TestTask.new(:unit => 'test:app:init') do |test| 
     test.libs << "test/test_app/test" 
     test.test_files = Dir[ "test/test_app/test/**/*_test.rb" ] 
     test.verbose = true
   end
-end
+  
+  desc "Run RSpec tests"
+  RSpec::Core::RakeTask.new(:spec => 'test:app:init') do |t|
+    t.ruby_opts = "-I test/test_app/spec"
+    t.pattern = "test/test_app/spec/**/*_spec.rb"
+  end
+
 
-namespace :test do
   namespace :app do
     task :environment do
       ENV['RAILS_ROOT'] = TEST_APP_ROOT
@@ -33,7 +44,8 @@ namespace :test do
       unless File.exist?(TEST_APP_ROOT)
         sh "rails new #{TEST_APP_ROOT} --skip-bundle"
         FileUtils.cp(File.join(File.dirname(__FILE__), 'test', 'templates', 'Gemfile'), TEST_APP_ROOT)
-        sh "cd #{TEST_APP_ROOT}; bundle install" # update Gemfile.lock
+        sh "cd #{TEST_APP_ROOT}; bundle install --local" # update Gemfile.lock
+        sh "cd #{TEST_APP_ROOT}; rails g rspec:install"
         FileUtils.rm_f(File.join(TEST_APP_ROOT, 'test', 'performance', 'browsing_test.rb'))
       end
     end
@@ -42,7 +54,10 @@ namespace :test do
     task :generate_crud => [:create, :environment] do
       require File.join(GENERATOR_ROOT, 'dry_crud_generator')
     
-      DryCrudGenerator.new('', {:force => true, :templates => ENV['HAML'] ? 'haml' : 'erb'}, :destination_root => TEST_APP_ROOT).invoke_all
+      DryCrudGenerator.new([], {:force => true, 
+                                :templates => ENV['HAML'] ? 'haml' : 'erb', 
+                                :tests => 'all'},
+                               :destination_root => TEST_APP_ROOT).invoke_all
     end
    
     desc "Populates the test application with some models and controllers"
@@ -50,6 +65,10 @@ namespace :test do
       # copy test app templates
       FileUtils.cp_r(File.join(File.dirname(__FILE__), 'test', 'templates', '.'), TEST_APP_ROOT)
       
+      # copy shared fixtures
+      FileUtils.cp_r(File.join(File.dirname(__FILE__), 'test', 'templates', 'test', 'fixtures'),
+                     File.join(TEST_APP_ROOT, 'spec'))
+      
       # replace some unused files
       FileUtils.rm_f(File.join(TEST_APP_ROOT, 'public', 'index.html'))
       layouts = File.join(TEST_APP_ROOT, 'app', 'views', 'layouts')
@@ -65,7 +84,10 @@ namespace :test do
       Dir.glob(File.join(TEST_APP_ROOT, 'app', 'views', '**', "*.#{exclude}")).each do |f|
         FileUtils.rm(f)
       end
-      
+    end
+    
+    desc "Insert seed data into the test database"
+    task :seed => :populate do
       # migrate the database
       FileUtils.cd(TEST_APP_ROOT) do
         sh "rake db:migrate db:seed RAILS_ENV=development --trace"
@@ -74,7 +96,7 @@ namespace :test do
     end
    
     desc "Initializes the test application with a couple of classes"
-    task :init => [:populate, 
+    task :init => [:seed, 
                    :customize]
                    
     desc "Customize some of the functionality provided by dry_crud"

data/VERSION

@@ -1 +1 @@
-1.6.0
+1.7.0

data/lib/generators/dry_crud/dry_crud_generator.rb

@@ -3,6 +3,7 @@ require 'rails/generators'
 class DryCrudGenerator < Rails::Generators::Base
 
   class_options %w(templates -t) => 'erb'
+  class_options %w(tests) => 'testunit'
 
 
   def self.source_root
@@ -11,16 +12,28 @@ class DryCrudGenerator < Rails::Generators::Base
 
   def install_dry_crud
     # copy everything in template subfolders
-    exclude = options[:templates].downcase == 'haml' ? '.erb' : '.haml'
+    exclude_template = options[:templates].downcase == 'haml' ? '.erb' : '.haml'
+    
+    exclude_test_dir = case options[:tests].downcase 
+      when 'rspec' then 'test'
+      when 'all' then 'exclude_nothing'
+      else 'spec'
+    end
 
     Dir.chdir(self.class.source_root) do
       Dir.glob(File.join('**', '**')).sort.each do |file_source|
         if !File.directory?(file_source) &&
-           !file_source.end_with?(exclude) &&
+           !file_source.end_with?(exclude_template) &&
+           !file_source.start_with?(exclude_test_dir) &&
            file_source != 'INSTALL'
           copy_file(file_source)
         end
       end
+      
+      unless exclude_test_dir == 'spec'
+        copy_file(File.join('test', 'crud_test_model.rb'), 
+                  File.join('spec', 'support', 'crud_test_model.rb'))
+      end
     end
 
     readme "INSTALL"

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

@@ -48,12 +48,13 @@ class CrudController < ListController
   # There are before and after create callbacks to hook into the action.
   # To customize the response, you may overwrite this action and call
   # super with a block that gets the format parameter.
+  # Specify a :location option if you wish to do a custom redirect.
   #   POST /entries
   #   POST /entries.json
-  def create(&block)
+  def create(options = {}, &block)
     assign_attributes
     created = with_callbacks(:create, :save) { entry.save }
-    respond_with(entry, :success => created, &block)
+    respond_with(entry, options.reverse_merge(:success => created), &block)
   end
 
   # Display a form to edit an exisiting entry of this model.
@@ -66,28 +67,30 @@ class CrudController < ListController
   # There are before and after update callbacks to hook into the action.
   # To customize the response, you may overwrite this action and call
   # super with a block that gets the format parameter.
+  # Specify a :location option if you wish to do a custom redirect.
   #   PUT /entries/1
   #   PUT /entries/1.json
-  def update(&block)
+  def update(options = {}, &block)
     assign_attributes
     updated = with_callbacks(:update, :save) { entry.save }
-    respond_with(entry, :success => updated, &block)
+    respond_with(entry, options.reverse_merge(:success => updated), &block)
   end
 
   # Destroy an existing entry of this model.
   # There are before and after destroy callbacks to hook into the action.
   # To customize the response, you may overwrite this action and call
   # super with a block that gets success and format parameters.
+  # Specify a :location option if you wish to do a custom redirect.
   #   DELETE /entries/1
   #   DELETE /entries/1.json
-  def destroy(&block)
+  def destroy(options = {}, &block)
     destroyed = run_callbacks(:destroy) { entry.destroy }
     flash[:alert] ||= error_messages.presence || flash_message(:failure) if !destroyed && request.format == :html
     location = !destroyed && request.env["HTTP_REFERER"].presence || index_url
-    respond_with(entry, :success => destroyed, :location => location, &block)
+    respond_with(entry, options.reverse_merge(:success => destroyed, :location => location), &block)
   end
 
-  protected
+  private
 
   #############  CUSTOMIZABLE HELPER METHODS  ##############################
 
@@ -108,7 +111,7 @@ class CrudController < ListController
 
   # Assigns the attributes from the params to the model entry.
   def assign_attributes
-    entry.attributes = params[model_identifier]
+    entry.attributes = model_params
   end
 
   # A label for the current entry, including the model name.
@@ -144,13 +147,18 @@ class CrudController < ListController
   def error_messages
     @@helper.safe_join(entry.errors.full_messages, '<br/>'.html_safe)
   end
+  
+  # The form params for this model.
+  def model_params
+    params[model_identifier]
+  end
 
 
   class << self
     # The identifier of the model used for form parameters.
     # I.e., the symbol of the underscored model name.
     def model_identifier
-      @model_identifier ||= model_class.name.underscore.to_sym
+      @model_identifier ||= model_class.model_name.param_key
     end
 
     # Convenience callback to apply a callback on both form actions (new and edit).
@@ -168,7 +176,7 @@ class CrudController < ListController
       super(controller, with_path_args(resources, controller), options)
     end
 
-    protected
+    private
 
     # Check whether the resource has errors. Additionally checks the :success option.
     def has_errors?

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

@@ -23,7 +23,7 @@ class ListController < ApplicationController
     respond_with(entries, &block)
   end
 
-  protected
+  private
 
   # Helper method to access the entries to be displayed in the current index page in an uniform way.
   def entries
@@ -52,7 +52,7 @@ class ListController < ApplicationController
   # Get the instance variable named after the model_class.
   # If the collection variable is required, pass true as the second argument.
   def get_model_ivar(plural = false)
-    name = model_class.name.underscore
+    name = ivar_name(model_class)
     name = name.pluralize if plural
     instance_variable_get(:"@#{name}")
   end
@@ -61,13 +61,17 @@ class ListController < ApplicationController
   # If the value is a collection, sets the plural name.
   def set_model_ivar(value)
     name = if value.respond_to?(:klass) # ActiveRecord::Relation
-      value.klass.name.pluralize
+      ivar_name(value.klass).pluralize
     elsif value.respond_to?(:each) # Array
-      value.first.klass.name.pluralize
+      ivar_name(value.first.klass).pluralize
     else
-      value.class.name
+      ivar_name(value.class)
     end
-    instance_variable_set(:"@#{name.underscore}", value)
+    instance_variable_set(:"@#{name}", value)
+  end
+  
+  def ivar_name(klass) 
+    klass.model_name.param_key
   end
 
   class << self
@@ -102,14 +106,13 @@ class ListController < ApplicationController
     # If a callback renders or redirects, the action is not rendered.
     def render_with_callbacks(*args, &block)
       options = _normalize_render(*args, &block)
-      p options if options[:location] == :back
       callback = "render_#{options[:template]}"
       run_callbacks(callback) if respond_to?(:"_run_#{callback}_callbacks", true)
 
       render_without_callbacks(*args, &block) unless performed?
     end
 
-    protected
+    private
 
     # Helper method the run the given block in between the before and after
     # callbacks of the given kinds.
@@ -145,7 +148,7 @@ class ListController < ApplicationController
       controller.alias_method_chain :list_entries, :search
     end
 
-    protected
+    private
 
     # Enhance the list entries with an optional search criteria
     def list_entries_with_search
@@ -192,7 +195,7 @@ class ListController < ApplicationController
       controller.alias_method_chain :list_entries, :sort
     end
 
-    protected
+    private
 
     # Enhance the list entries with an optional sort order.
     def list_entries_with_sort
@@ -302,7 +305,7 @@ class ListController < ApplicationController
       controller.alias_method_chain :path_args, :nesting
     end
 
-    protected
+    private
 
     # Returns the direct parent ActiveRecord of the current request, if any.
     def parent

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

@@ -3,40 +3,76 @@
 # is included in CrudController.
 module CrudHelper
 
-  # Renders a generic form for the current entry with :default_attrs or the
-  # given attribute array, using the StandardFormBuilder. An options hash
-  # may be given as the last argument.
+  # Renders a crud form for the current entry with default_attrs or the
+  # given attribute array. An options hash may be given as the last argument.
   # If a block is given, a custom form may be rendered and attrs is ignored.
-  def crud_form(*attrs, &block)
-    attrs = attrs_or_default(attrs) { default_attrs - [:created_at, :updated_at] }
-    standard_form(path_args(entry), *attrs, &block)
+  def entry_form(*attrs, &block)
+    options = attrs.extract_options!
+    attrs = default_attrs - [:created_at, :updated_at] if attrs.blank?
+    attrs << options
+    crud_form(path_args(entry), *attrs, &block)
   end
 
-  # Create a table of the entries with the default or
-  # the passed attributes in its columns. An options hash may be given
-  # as the last argument.
-  def crud_table(*attrs, &block)
-    if block_given?
-      list_table(*attrs, &block)
-    else
-      attrs = attrs_or_default(attrs) { default_attrs }
-      list_table(*attrs) do |t|
-         add_table_actions(t)
+  # Renders a standard form for the given entry and attributes.
+  # The form is rendered with a basic save and cancel button.
+  # If a block is given, custom input fields may be rendered and attrs is ignored. 
+  # An options hash may be given as the last argument.
+  def crud_form(object, *attrs, &block)
+    options = attrs.extract_options!
+    cancel_url = get_cancel_url(object, options)
+    
+    standard_form(object, options) do |form|
+      content = if block_given?
+        capture(form, &block)
+      else
+        form.labeled_input_fields(*attrs)
       end
+
+      content << form.standard_actions(cancel_url)
+      content.html_safe
+    end
+  end
+
+  # Create a table of the current entries with the default or the passed 
+  # attributes in its columns. 
+  # If attrs are present, the first column will link to the show
+  # action. Edit and destroy actions are appended to the end of each row.
+  # If a block is given, the column defined there will be inserted
+  # between the given attributes and the actions.
+  # An options hash for the table builder may be given as the last argument.
+  def crud_table(*attrs, &block)
+    options = attrs.extract_options!
+    attributes = (block_given? || attrs.present?) ? attrs : default_attrs
+    first = attributes.shift
+    table(entries, options) do |t|
+       col_show(t, first) if first
+       t.sortable_attrs(*attributes)
+       yield t if block_given?
+       add_table_actions(t)
     end
   end
 
   # Adds a set of standard action link column (show, edit, destroy) to the given table.
   def add_table_actions(table)
-    action_col_show(table)
     action_col_edit(table)
     action_col_destroy(table)
   end
+  
+  # Renders the passed attr with a link to the show action for
+  # the current entry.
+  # A block may be given to define the link path for the row entry.
+  def col_show(table, attr, &block)
+    table.attr(attr, table.sort_header(attr)) do |e| 
+      link_to(format_attr(e, attr), action_path(e, &block))
+    end
+  end
 
   # Action link to show the row entry inside a table.
   # A block may be given to define the link path for the row entry.
   def action_col_show(table, &block)
-    action_col(table) { |e| link_table_action('zoom-in', action_path(e, &block)) }
+    action_col(table) do |e| 
+      link_table_action('zoom-in', action_path(e, &block))
+    end
   end
 
   # Action link to edit inside a table.
@@ -53,8 +89,8 @@ module CrudHelper
   def action_col_destroy(table, &block)
     action_col(table) do |e|
       link_table_action('remove', action_path(e, &block),
-                        :confirm => ti(:confirm_delete),
-                        :method => :delete)
+                        :data => { :confirm => ti(:confirm_delete),
+                                   :method => :delete })
     end
   end
 
@@ -90,8 +126,8 @@ module CrudHelper
   def link_action_destroy(path = nil)
     path ||= path_args(entry)
     link_action ti(:"link.delete"), 'remove', path,
-                :confirm => ti(:confirm_delete),
-                :method => :delete
+                :data => { :confirm => ti(:confirm_delete),
+                           :method => :delete }
   end
 
   # Standard link action to the list page.
@@ -110,17 +146,23 @@ module CrudHelper
 
   private
 
+  # Get the cancel url for the given object considering options:
+  # 1. Use :cancel_url_new or :cancel_url_edit option, if present
+  # 2. Use :cancel_url option, if present
+  # 3. Use polymorphic_path(object)
+  def get_cancel_url(object, options)
+    record = Array(object).last
+    cancel_url = options.delete(:cancel_url)
+    cancel_url_new = options.delete(:cancel_url_new)
+    cancel_url_edit = options.delete(:cancel_url_edit)
+    url = record.new_record? ? cancel_url_new : cancel_url_edit
+    url || cancel_url || polymorphic_path(object, :returning => true)
+  end
+
   # If a block is given, call it to get the path for the current row entry.
   # Otherwise, return the standard path args.
   def action_path(e, &block)
     block_given? ? yield(e) : path_args(e)
   end
 
-  # Returns default attrs for a crud table if no others are passed.
-  def attrs_or_default(attrs)
-    options = attrs.extract_options!
-    attrs = yield if attrs.blank?
-    attrs << options
-  end
-
 end

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

@@ -9,7 +9,7 @@ class StandardFormBuilder < ActionView::Helpers::FormBuilder
 
   attr_reader :template
 
-  delegate :association, :column_type, :column_property, :captionize, :ta,
+  delegate :association, :column_type, :column_property, :captionize, :ti, :ta, :link_to,
            :content_tag, :safe_join, :capture, :add_css_class, :assoc_and_id_attr,
            :to => :template
 
@@ -121,6 +121,28 @@ class StandardFormBuilder < ActionView::Helpers::FormBuilder
     add_css_class(html_options, 'multiselect')
     belongs_to_field(attr, html_options)
   end
+  
+  # Render the error messages for the current form.
+  def error_messages
+    @template.render('shared/error_messages', :errors => @object.errors, :object => @object)
+  end
+  
+  # Render a submit button and a cancel link for this form.
+  def standard_actions(cancel_url, submit_label = ti(:"button.save"))
+    content_tag(:div, :class => 'form-actions') do
+      safe_join([submit_button(submit_label), cancel_link(cancel_url)], ' ')
+    end
+  end
+  
+  # Render a standard submit button with the given label.
+  def submit_button(label = ti(:"button.save"))
+    button(label, :class => 'btn btn-primary')
+  end
+  
+  # Render a cancel link pointing to the given url.
+  def cancel_link(url)
+    link_to(ti(:"button.cancel"), url, :class => 'cancel')
+  end
 
   # Renders a marker if the given attr has to be present.
   def required_mark(attr)
@@ -158,9 +180,11 @@ class StandardFormBuilder < ActionView::Helpers::FormBuilder
 
   # Dispatch methods starting with 'labeled_' to render a label and the corresponding
   # input field. E.g. labeled_boolean_field(:checked, :class => 'bold')
+  # To add an additional help text, use the help option.
+  # E.g. labeled_boolean_field(:checked, :help => 'Some Help')
   def method_missing(name, *args)
     if field_method = labeled_field_method?(name)
-      labeled(args.first, send(field_method, *args) + required_mark(args.first))
+      build_labeled_field(field_method, *args)
     else
       super(name, *args)
     end
@@ -171,7 +195,12 @@ class StandardFormBuilder < ActionView::Helpers::FormBuilder
     labeled_field_method?(name).present? || super(name)
   end
 
-  protected
+  # Generates a help block for fields
+  def help_block(text)
+    content_tag(:p, text, :class => 'help-block')
+  end
+
+  private
 
   # Returns true if attr is a non-polymorphic association.
   # If one or more macros are given, the association must be of this kind.
@@ -221,4 +250,12 @@ class StandardFormBuilder < ActionView::Helpers::FormBuilder
     end
   end
 
+ def build_labeled_field(field_method, *args)
+    options = args.extract_options!
+    help = options.delete(:help)
+    text = send(field_method, *(args<<options)) + required_mark(args.first)
+    text << help_block(help) if help.present?
+    labeled(args.first, text)
+  end
+
 end

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

@@ -11,7 +11,8 @@ module StandardHelper
   def f(value)
     case value
       when Fixnum then number_with_delimiter(value)
-      when Float, BigDecimal then number_with_precision(value, :precision => 2)
+      when Float, BigDecimal then number_with_precision(value, :precision => t('number.format.precision'), 
+                                                               :delimiter => t('number.format.delimiter'))
       when Date   then l(value)
       when Time   then l(value, :format => :time)
       when true   then t(:"global.yes")
@@ -78,6 +79,7 @@ module StandardHelper
   # If entries is empty, an appropriate message is rendered.
   # An options hash may be given as the last argument.
   def table(entries, *attrs, &block)
+    entries.inspect # force evaluation of relations
     if entries.present?
       StandardTableBuilder.table(entries, self, attrs.extract_options!) do |t|
         t.attrs(*attrs)
@@ -88,40 +90,19 @@ module StandardHelper
     end
   end
 
-  # Renders a generic form for all given attributes using StandardFormBuilder.
+  # Renders a standard form using StandardFormBuilder.
   # Before the input fields, the error messages are rendered, if present.
-  # The form is rendered with a basic save button.
-  # If a block is given, custom input fields may be rendered and attrs is ignored.
-  # An options hash may be given as the last argument.
-  def standard_form(object, *attrs, &block)
-    options = attrs.extract_options!
+  def standard_form(object, options = {}, &block)
     options[:builder] ||= StandardFormBuilder
     options[:html] ||= {}
     add_css_class options[:html], 'form-horizontal'
 
     form_for(object, options) do |form|
-      record = object.is_a?(Array) ? object.last : object
-      content = render('shared/error_messages', :errors => record.errors, :object => record)
-
-      content << if block_given?
-        capture(form, &block)
-      else
-        form.labeled_input_fields(*attrs)
-      end
-
-      content << content_tag(:div, :class => 'form-actions') do
-        form.button(ti(:"button.save"), :class => 'btn btn-primary') +
-        ' ' +
-        cancel_link(object)
-      end
-      content.html_safe
+      content = form.error_messages
+      content << capture(form, &block)
     end
   end
 
-  def cancel_link(object)
-    link_to(ti(:"button.cancel"), polymorphic_path(object, :returning => true), :class => 'cancel')
-  end
-
   # Renders a simple unordered list, which will
   # simply render all passed items or yield them
   # to your block.
@@ -230,7 +211,7 @@ module StandardHelper
     end
   end
 
-  protected
+  private
 
   # Helper methods that are not directly called from templates.