dry_crud 0.6.0 → 1.0.0

data/{rails_generators → lib/generators}/dry_crud/templates/app/helpers/standard_helper.rb

@@ -45,66 +45,6 @@ module StandardHelper
     end
   end
   
-  # 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)
-    else
-			'(none)'
-    end
-  end
-  
-  # Returns true if no link should be created when formatting the given association.
-  def no_assoc_link?(assoc)
-    (respond_to?(:no_assoc_links) && no_assoc_links.to_a.include?(assoc.name.to_sym)) || 
-    !respond_to?("#{assoc.klass.name.underscore}_path".to_sym)
-  end
-  
-  # Formats an arbitrary attribute of the given object depending on its data type.
-  # For ActiveRecords, take the defined data type into account for special types
-  # that have no own object class.
-  def format_type(obj, attr)
-    val = obj.send(attr)
-    return EMPTY_STRING if val.nil?
-    case column_type(obj, attr)
-      when :time    then val.strftime(TIME_FORMAT)
-      when :date    then val.to_date.to_s
-      when :text    then simple_format(h(val))
-      when :decimal then f(val.to_s.to_f)
-    else f(val)
-    end
-  end
-  
-  # Returns the ActiveRecord column type or nil.
-  def column_type(obj, attr)
-    column_property(obj, attr, :type)
-  end
-  
-  # Returns an ActiveRecord column property for the passed attr or nil
-  def column_property(obj, attr, property)
-    if obj.respond_to?(:column_for_attribute)
-      column = obj.column_for_attribute(attr)
-      column.try(property)
-    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)
-    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)
-    end
-  end
-  
   
   ##############  STANDARD HTML SECTIONS  ############################
   
@@ -113,8 +53,7 @@ module StandardHelper
   # 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?
-    html = render(:partial => 'shared/labeled', :locals => { :label => label, :content => content})
-    block_given? ? concat(html) : html  
+    render(:partial => 'shared/labeled', :locals => { :label => label, :content => content}) 
   end
   
   # Transform the given text into a form as used by labels or table headers.
@@ -131,16 +70,20 @@ module StandardHelper
   def render_attrs(obj, attrs, div = true)
     html = attrs.collect do |a| 
       labeled(captionize(a, obj.class), format_attr(obj, a))
-    end.join
+    end.join.html_safe
     
     div ? content_tag(:div, html, :class => 'attributes') : html
   end
   
-  # Renders a table for the given entries as defined by the following block.
-  # If entries are empty, an appropriate message is rendered.
-  def table(entries, &block)
+  # 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.
+  def table(entries, *attrs, &block)
     if entries.present?
-      StandardTableBuilder.table(entries, self, &block)
+      StandardTableBuilder.table(entries, self) do |t|
+        t.attrs(*attrs)
+        yield t if block_given?
+      end
     else
       content_tag(:div, NO_LIST_ENTRIES_MESSAGE, :class => 'list')
     end
@@ -150,20 +93,18 @@ module StandardHelper
   # 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.
-  #
-  # The form is always directly printed into the erb, so the call must
-  # go within a normal <% form(...) %> section, not in a <%= output section
-  def standard_form(object, attrs = [], options = {})
+  def standard_form(object, attrs = [], options = {}, &block)
     form_for(object, {:builder => StandardFormBuilder}.merge(options)) do |form|
-      concat form.error_messages
+      content = ""
+      content << render(:partial => 'shared/error_messages', :locals => {:errors => object.errors})
       
-      if block_given? 
-        yield(form)
+      content << if block_given? 
+        capture(form, &block) 
       else
-        concat form.labeled_input_fields(*attrs)
+        form.labeled_input_fields(*attrs)
       end
       
-      concat labeled(EMPTY_STRING, form.submit("Save"))
+      content << labeled(nil, form.submit("Save"))
     end
   end
   
@@ -206,4 +147,68 @@ module StandardHelper
     link_to("[#{label}]", options, {:class => 'action'}.merge(html_options))
   end
   
+  protected
+  
+  # Helper methods that are not necessarely 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)
+    else
+      '(none)'
+    end
+  end
+  
+  # Returns true if no link should be created when formatting the given association.
+  def no_assoc_link?(assoc)
+    (respond_to?(:no_assoc_links) && no_assoc_links.to_a.include?(assoc.name.to_sym)) || 
+    !respond_to?("#{assoc.klass.name.underscore}_path".to_sym)
+  end
+  
+  # Formats an arbitrary attribute of the given object depending on its data type.
+  # For ActiveRecords, take the defined data type into account for special types
+  # that have no own object class.
+  def format_type(obj, attr)
+    val = obj.send(attr)
+    return EMPTY_STRING if val.nil?
+    case column_type(obj, attr)
+      when :time    then val.strftime(TIME_FORMAT)
+      when :date    then val.to_date.to_s
+      when :text    then simple_format(h(val))
+      when :decimal then f(val.to_s.to_f)
+    else f(val)
+    end
+  end
+  
+  # Returns the ActiveRecord column type or nil.
+  def column_type(obj, attr)
+    column_property(obj, attr, :type)
+  end
+  
+  # Returns an ActiveRecord column property for the passed attr or nil
+  def column_property(obj, attr, property)
+    if obj.respond_to?(:column_for_attribute)
+      column = obj.column_for_attribute(attr)
+      column.try(property)
+    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)
+    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)
+    end
+  end
+  
 end

data/{rails_generators/dry_crud/templates/lib → lib/generators/dry_crud/templates/app/helpers}/standard_table_builder.rb

@@ -6,17 +6,17 @@
 #     t.attrs :name, :city
 #   end
 class StandardTableBuilder
-	attr_reader :entries, :cols, :template
+  attr_reader :entries, :cols, :template
   
   # 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, :belongs_to_association, 
            :captionize, :tr_alt, :to => :template
 
-	def initialize(entries, template)
-		@entries = entries
-		@template = template
-		@cols = []
+  def initialize(entries, template)
+    @entries = entries
+    @template = template
+    @cols = []
   end
 
   # Convenience method to directly generate a table. Renders a row for each entry in entries.
@@ -31,26 +31,25 @@ class StandardTableBuilder
   # Define a column for the table with the given header, the html_options used for
   # each td and a block rendering the contents of a cell for the current entry.
   # The columns appear in the order they are defined.
-	def col(header = '', html_options = {}, &block)
-		@cols << Col.new(header, html_options, @template, block)
-	end
-	
+  def col(header = '', html_options = {}, &block)
+    @cols << Col.new(header, html_options, @template, block)
+  end
+  
   # Convenience method to add one or more attribute columns.
   # The attribute name will become the header, the cells will contain
   # 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) }
-		end
-	end	
-	
+  def attrs(*attrs)
+    attrs.each do |a|
+      col(captionize(a, entry_class), :class => align_class(a)) { |e| format_attr(e, a) }
+    end
+  end  
+  
   # Renders the table as HTML.
-	def to_html
-		content_tag :table, :class => 'list' do
-			[html_header] + 
-			entries.collect { |e| html_row(e) }
-		end
-	end
+  def to_html
+    content_tag :table, :class => 'list' do
+        html_header + entries.collect { |e| html_row(e) }.join.html_safe
+    end
+  end
     
   # Returns css classes used for alignment of the cell data.
   # Based on the column type of the attribute.
@@ -66,38 +65,38 @@ class StandardTableBuilder
   
   private 
   
-	def html_header
-		content_tag :tr do
-			cols.collect { |c| c.html_header }
-		end
+  def html_header
+    content_tag :tr do
+      cols.collect { |c| c.html_header }.join
+    end
   end
 
-	def html_row(entry)
-		tr_alt do
-			cols.collect { |c| c.html_cell(entry) }
-		end
+  def html_row(entry)
+    tr_alt do
+      cols.collect { |c| c.html_cell(entry) }.join
+    end
   end
 
   def entry_class
     entries.first.class
   end
-	
+  
   # Helper class to store column information.
-	class Col < Struct.new(:header, :html_options, :template, :block) #:nodoc:
-	
-		delegate :content_tag, :to => :template
-	
-		def content(entry)
-			block.call(entry)
-		end
-		
-		def html_header
-			content_tag :th, header
-		end
-		
-		def html_cell(entry)
-			content_tag :td, content(entry), html_options
-		end
+  class Col < Struct.new(:header, :html_options, :template, :block) #:nodoc:
+  
+    delegate :content_tag, :to => :template
+  
+    def content(entry)
+      block.call(entry)
+    end
+    
+    def html_header
+      content_tag :th, header
+    end
+    
+    def html_cell(entry)
+      content_tag :td, content(entry), html_options
+    end
 
   end
 

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

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

data/{rails_generators → lib/generators}/dry_crud/templates/app/views/crud/edit.html.erb

@@ -1,6 +1,6 @@
 <% @title = "Edit #{full_entry_label}" -%>
 
-<%= render_inheritable :partial => 'form' %>
+<%= render :partial => 'form' %>
 
 <br/>
 

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

@@ -1,6 +1,6 @@
 <% @title = "Listing #{models_label}" -%>
 
-<%= render_inheritable :partial => 'list' %>
+<%= render :partial => 'list' %>
 
 <br/>
 

data/{rails_generators → lib/generators}/dry_crud/templates/app/views/crud/new.html.erb

@@ -1,6 +1,6 @@
 <% @title = "New #{models_label.singularize}" -%>
 
-<%= render_inheritable :partial => 'form' %>
+<%= render :partial => 'form' %>
 
 <br/>
 

data/{rails_generators → lib/generators}/dry_crud/templates/app/views/crud/show.html.erb

@@ -1,6 +1,6 @@
 <% @title = full_entry_label -%>
 
-<%= render_inheritable :partial => 'attrs' %>
+<%= render :partial => 'attrs' %>
 
 <br/>
 

data/{rails_generators → lib/generators}/dry_crud/templates/app/views/layouts/crud.html.erb

@@ -7,6 +7,7 @@
   <title><%= @title %></title>
   <%= stylesheet_link_tag 'crud' %>
   <%= javascript_include_tag :all %>
+  <%= csrf_meta_tag %>
 </head>
 <body>
 

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

@@ -0,0 +1,10 @@
+<% if errors.any? %>
+	<div id="error_explanation">
+	    <h2><%= pluralize(errors.count, "error") %> prohibited this entry from being saved:</h2>
+	    <ul>
+	        <% errors.full_messages.each do |msg| %>
+		        <li><%= msg %></li>
+	        <% end %>
+	    </ul>
+	</div>
+<% end -%>

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

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

data/{rails_generators → lib/generators}/dry_crud/templates/public/stylesheets/crud.css

@@ -67,25 +67,25 @@ a:visited.action {
 	color: #663333;
 }
 
-div.errorExplanation {
+#error_explanation {
 	border: solid 1px #999999;
 	margin: 10pt;
 	padding: 5pt;
 	background-color: #FFBBBB;
 }
 
-.errorExplanation h2 {
+#error_explanation h2 {
 	font-size: 12pt;
 	margin-top: 0pt;
 }
 
-.errorExplanation ul {
+#error_explanation ul {
 	margin-bottom: 5pt;
 }
 
-div.fieldWithErrors {
+.value div.field_with_errors {
 	background-color: #FFBBBB;
 	display: inline-block;
-	padding: 2px;
+	padding: 1px;
 }
 

data/{rails_generators → lib/generators}/dry_crud/templates/test/crud_test_model.rb

@@ -34,6 +34,7 @@ class CrudTestModelsController < CrudController #:nodoc:
     end
   end
   
+  # create callback methods that record the before/after callbacks
   [:create, :update, :save, :destroy].each do |a|
     callback = "before_#{a.to_s}"
     send(callback.to_sym, :"#{HANDLE_PREFIX}#{callback}")
@@ -41,10 +42,18 @@ class CrudTestModelsController < CrudController #:nodoc:
     send(callback.to_sym, :"#{HANDLE_PREFIX}#{callback}")
   end
   
+  # create callback methods that record the before_render callbacks
+  [:index, :show, :new, :edit].each do |a|
+    callback = "before_render_#{a.to_s}"
+    send(callback.to_sym, :"#{HANDLE_PREFIX}#{callback}")
+  end
+  
+  # handle the called callbacks
   def method_missing(sym, *args)
     called_callback(sym.to_s[HANDLE_PREFIX.size..-1].to_sym) if sym.to_s.starts_with?(HANDLE_PREFIX)
   end
   
+  # callback to redirect if @should_redirect is set
   def possibly_redirect
     redirect_to :action => 'index' if should_redirect && !performed?
     !should_redirect
@@ -54,6 +63,7 @@ class CrudTestModelsController < CrudController #:nodoc:
     @companions = CrudTestModel.all :conditions => {:human => true}
   end
   
+  # records a callback
   def called_callback(callback)
     @called_callbacks ||= []
     @called_callbacks << callback
@@ -61,10 +71,6 @@ class CrudTestModelsController < CrudController #:nodoc:
   
 end
 
-ActionController::Routing::Routes.draw do |map|
-  map.resources :crud_test_models
-end
-
 # A simple test helper to prepare the test database with a CrudTestModel model.
 module CrudTestHelper
 
@@ -74,20 +80,22 @@ module CrudTestHelper
   # 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
+      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
   
   # Removes the crud_test_models table from the database.
@@ -121,4 +129,4 @@ module CrudTestHelper
                           :remarks => "#{c} #{c} #{c}\n" * 3)
   end
   
-end
+end

data/{rails_generators → lib/generators}/dry_crud/templates/test/functional/crud_controller_test_helper.rb

@@ -39,8 +39,9 @@ module CrudControllerTestHelper
   end
     
   def test_show_without_id_redirects_to_index
-    get :show
-    assert_redirected_to_index  
+    assert_raise(ActionController::RoutingError) do
+      get :show
+    end
   end
     
   def test_new
@@ -59,17 +60,6 @@ module CrudControllerTestHelper
     assert_test_attrs_equal
   end
   
-  def test_create_with_wrong_http_method_redirects
-    get :create, model_identifier => test_entry_attrs
-    assert_redirected_to_index
-    
-    put :create, model_identifier => test_entry_attrs
-    assert_redirected_to_index
-    
-    delete :create, model_identifier => test_entry_attrs
-    assert_redirected_to_index
-  end
-    
   def test_create_xml
     assert_difference("#{model_class.name}.count") do
       post :create, model_identifier => test_entry_attrs, :format => 'xml'
@@ -86,7 +76,7 @@ module CrudControllerTestHelper
   end
   
   def test_edit_without_id_raises_RecordNotFound
-    assert_raise(ActiveRecord::RecordNotFound) do
+    assert_raise(ActionController::RoutingError) do
       get :edit
     end
   end
@@ -98,15 +88,7 @@ module CrudControllerTestHelper
     assert_test_attrs_equal
     assert_redirected_to assigns(:entry)
   end
-    
-  def test_update_with_wrong_http_method_redirects
-    get :update, :id => test_entry.id, model_identifier => test_entry_attrs
-    assert_redirected_to_index
-    
-    delete :update, :id => test_entry.id, model_identifier => test_entry_attrs
-    assert_redirected_to_index
-  end
-  
+
   def test_update_xml
     assert_no_difference("#{model_class.name}.count") do
       put :update, :id => test_entry.id, model_identifier => test_entry_attrs, :format => 'xml'
@@ -121,15 +103,7 @@ module CrudControllerTestHelper
     end
     assert_redirected_to_index
   end
-  
-  def test_destroy_with_wrong_http_method_redirects
-    get :destroy, :id => test_entry.id
-    assert_redirected_to_index
-    
-    put :destroy, :id => test_entry.id
-    assert_redirected_to_index
-  end
-  
+
   def test_destroy_xml
     assert_difference("#{model_class.name}.count", -1) do
       delete :destroy, :id => test_entry.id, :format => 'xml'
@@ -138,6 +112,36 @@ module CrudControllerTestHelper
     assert_equal "", @response.body.strip
   end
   
+  # no need to test http methods for pure restfull controllers
+  def ignore_test_create_with_wrong_http_method_redirects
+    get :create, model_identifier => test_entry_attrs
+    assert_redirected_to_index
+    
+    put :create, model_identifier => test_entry_attrs
+    assert_redirected_to_index
+    
+    delete :create, model_identifier => test_entry_attrs
+    assert_redirected_to_index
+  end
+
+  # no need to test http methods for pure restfull controllers
+  def ignore_test_update_with_wrong_http_method_redirects
+    get :update, :id => test_entry.id, model_identifier => test_entry_attrs
+    assert_redirected_to_index
+    
+    delete :update, :id => test_entry.id, model_identifier => test_entry_attrs
+    assert_redirected_to_index
+  end
+  
+  # no need to test http methods for pure restfull controllers
+  def ignore_test_destroy_with_wrong_http_method_redirects
+    get :destroy, :id => test_entry.id
+    assert_redirected_to_index
+    
+    put :destroy, :id => test_entry.id
+    assert_redirected_to_index
+  end
+
   protected 
   
   def assert_redirected_to_index

data/{rails_generators → lib/generators}/dry_crud/templates/test/functional/crud_test_models_controller_test.rb

@@ -9,16 +9,18 @@ class CrudTestModelsControllerTest < ActionController::TestCase
   
   attr_accessor :models
   
-  setup :reset_db, :setup_db, :create_test_data
+  setup :reset_db, :setup_db, :create_test_data, :special_routing
   
   teardown :reset_db
+
   
   def test_setup
     assert_equal 6, CrudTestModel.count
     assert_equal CrudTestModelsController, @controller.class
     assert_recognizes({:controller => 'crud_test_models', :action => 'index'}, '/crud_test_models')
     assert_recognizes({:controller => 'crud_test_models', :action => 'show', :id => '1'}, '/crud_test_models/1')
-    assert_equal %w(index show new create edit update destroy).to_set, CrudTestModelsController.send(:action_methods)
+    # no need to hide actions for pure restful controllers
+    #assert_equal %w(index show new create edit update destroy).to_set, CrudTestModelsController.send(:action_methods)
   end
   
   def test_index
@@ -56,7 +58,7 @@ class CrudTestModelsControllerTest < ActionController::TestCase
     assert assigns(:companions)
     assert flash[:error].present?
     assert_equal 'illegal', assigns(:entry).name
-    assert_nil @controller.called_callbacks
+    assert_equal [:before_render_new], @controller.called_callbacks
   end
     
   def test_create_with_before_callback_redirect
@@ -75,9 +77,20 @@ class CrudTestModelsControllerTest < ActionController::TestCase
     assert_nil assigns(:companions)
   end
   
-  
   protected 
   
+  def special_routing
+    @routes = ActionDispatch::Routing::RouteSet.new
+    _routes = @routes
+    
+    @controller.singleton_class.send(:include, _routes.url_helpers)
+    @controller.view_context_class = Class.new(@controller.view_context_class) do
+      include _routes.url_helpers
+    end
+    
+    @routes.draw { resources :crud_test_models }
+  end
+  
   def test_entry
     crud_test_models(:AAAAA)
   end