dry_crud 1.5.0 → 1.6.0

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

@@ -22,7 +22,7 @@ module StandardHelper
   end
 
   # Formats an arbitrary attribute of the given ActiveRecord object.
-  # If no specific format_{type}_{attr} or format_{attr} method is found, 
+  # If no specific format_{type}_{attr} or format_{attr} method is found,
   # formats the value as follows:
   # If the value is an associated model, renders the label of this object.
   # Otherwise, calls format_type.
@@ -35,6 +35,8 @@ module StandardHelper
       send(format_attr_method, obj)
     elsif assoc = association(obj, attr, :belongs_to)
       format_assoc(obj, assoc)
+    elsif assoc = association(obj, attr, :has_many, :has_and_belongs_to_many)
+      format_many_assoc(obj, assoc)
     else
       format_type(obj, attr)
     end
@@ -52,17 +54,18 @@ module StandardHelper
 
   # Transform the given text into a form as used by labels or table headers.
   def captionize(text, clazz = nil)
+    text = text.to_s
     if clazz.respond_to?(:human_attribute_name)
-      clazz.human_attribute_name(text)
+      clazz.human_attribute_name(text.end_with?('_ids') ? text[0..-5].pluralize : text)
     else
-      text.to_s.humanize.titleize
+      text.humanize.titleize
     end
   end
 
   # Renders a list of attributes with label and value for a given object.
   # Optionally surrounded with a div.
   def render_attrs(obj, *attrs)
-    attrs.collect { |a| labeled_attr(obj, a) }.join("\n").html_safe
+    safe_join(attrs) { |a| labeled_attr(obj, a) }
   end
 
   # Renders the formatted content of the given attribute with a label.
@@ -95,7 +98,7 @@ module StandardHelper
     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)
@@ -106,19 +109,39 @@ module StandardHelper
         form.labeled_input_fields(*attrs)
       end
 
-      content << content_tag(:div, 
-                             form.button(ti(:"button.save"), :class => 'btn btn-primary') + 
-                             ' ' + 
-                             cancel_link(object),
-                             :class => 'form-actions')
+      content << content_tag(:div, :class => 'form-actions') do
+        form.button(ti(:"button.save"), :class => 'btn btn-primary') +
+        ' ' +
+        cancel_link(object)
+      end
       content.html_safe
     end
   end
 
   def cancel_link(object)
-    link_to(ti(:"button.cancel"), polymorphic_path(object), :class => 'cancel')
+    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.
+  def simple_list(items,ul_options={},&blk)
+    content_tag_nested(:ul, items, ul_options) do |item|
+      content_tag(:li, block_given? ? yield(item) : f(item))
+    end
+  end
+
+  # render a content tag with the collected contents rendered
+  # by &block for each item in collection.
+  def content_tag_nested(tag, collection, options = {}, &block)
+    content_tag(tag, safe_join(collection, &block), options)
   end
 
+  # Overridden method that takes a block that is executed for each item in array
+  # before appending the results.
+  def safe_join(array, sep = $,, &block)
+    super(block_given? ? array.collect(&block) : array, sep)
+  end
 
   ######## ACTION LINKS ###################################################### :nodoc:
 
@@ -136,8 +159,8 @@ module StandardHelper
     html << ' ' << label if label
     html
   end
-  
-  # Translates the passed key by looking it up over the controller hierarchy. 
+
+  # Translates the passed key by looking it up over the controller hierarchy.
   # The key is searched in the following order:
   #  - {controller}.{current_partial}.{key}
   #  - {controller}.{current_action}.{key}
@@ -161,15 +184,15 @@ module StandardHelper
       current = current.superclass
     end
     defaults << :"global.#{key}"
-    
+
     variables[:default] ||= defaults
     t(defaults.shift, variables)
   end
-  
+
   alias_method :ti, :translate_inheritable
 
   # Translates the passed key for an active record association. This helper is used
-  # for rendering association dependent keys in forms like :no_entry, :none_available or 
+  # for rendering association dependent keys in forms like :no_entry, :none_available or
   # :please_select.
   # The key is looked up in the following order:
   #  - activerecord.associations.models.{model_name}.{association_name}.{key}
@@ -185,19 +208,19 @@ module StandardHelper
     end
     t(primary, variables)
   end
-  
+
   alias_method :ta, :translate_association
-  
-  
+
+
   # Returns the css class for the given flash level.
   def flash_class(level)
     case level
     when :notice then 'success'
-    when :error then 'error'
     when :alert then 'error'
+    else level.to_s
     end
   end
-  
+
   # Adds a class to the given options, even if there are already classes.
   def add_css_class(options, classes)
     if options[:class]
@@ -206,7 +229,7 @@ module StandardHelper
       options[:class] = classes
     end
   end
-  
+
   protected
 
   # Helper methods that are not directly called from templates.
@@ -220,7 +243,7 @@ module StandardHelper
     case column_type(obj, attr)
       when :time    then f(val.to_time)
       when :date    then f(val.to_date)
-      when :datetime, :timestamp then "#{f(val.to_date)} #{f(val.to_time)}"
+      when :datetime, :timestamp then "#{f(val.to_date)} #{f(val.time)}"
       when :text    then val.present? ? simple_format(h(val)) : EMPTY_STRING
       when :decimal then f(val.to_s.to_f)
       else f(val)
@@ -240,15 +263,33 @@ module StandardHelper
     end
   end
 
-  # Formats an active record association
+  # Formats an active record belongs_to association
   def format_assoc(obj, assoc)
-    if assoc_val = obj.send(assoc.name)
-      link_to_unless(no_assoc_link?(assoc, assoc_val), assoc_val, assoc_val)
+    if val = obj.send(assoc.name)
+      assoc_link(assoc, val)
+    else
+      ta(:no_entry, assoc)
+    end
+  end
+
+  # Formats an active record has_and_belongs_to_many or
+  # has_many association.
+  def format_many_assoc(obj, assoc)
+    values = obj.send(assoc.name)
+    if values.size == 1
+      assoc_link(assoc, values.first)
+    elsif values.present?
+      simple_list(values) { |val| assoc_link(assoc, val) }
     else
       ta(:no_entry, assoc)
     end
   end
 
+  # Renders a link to the given association entry.
+  def assoc_link(assoc, val)
+    link_to_unless(no_assoc_link?(assoc, val), val.to_s, val)
+  end
+
   # Returns true if no link should be created when formatting the given association.
   def no_assoc_link?(assoc, val)
     !respond_to?("#{val.class.model_name.underscore}_path".to_sym)
@@ -259,12 +300,24 @@ module StandardHelper
   # 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)
+  def association(obj, attr, *macros)
     if obj.class.respond_to?(:reflect_on_association)
-      name = attr.to_s =~ /_id$/ ? attr.to_s[0..-4].to_sym : attr
+      name = assoc_and_id_attr(attr).first.to_sym
       assoc = obj.class.reflect_on_association(name)
-      assoc if assoc && (macro.nil? || assoc.macro == macro)
+      assoc if assoc && (macros.blank? || macros.include?(assoc.macro))
+    end
+  end
+
+  # Returns the name of the attr and it's corresponding field
+  def assoc_and_id_attr(attr)
+    attr = attr.to_s
+    attr, attr_id = if attr.end_with?('_id')
+      [attr[0..-4], attr]
+    elsif attr.end_with?('_ids')
+      [attr[0..-5].pluralize, attr]
+    else
+      [attr, "#{attr}_id"]
     end
   end
 
-end
+end

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

@@ -11,7 +11,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, :association,
-           :captionize, :add_css_class, :to => :template
+           :captionize, :add_css_class, :content_tag_nested, :to => :template
 
   def initialize(entries, template, options = {})
     @entries = entries
@@ -57,8 +57,8 @@ class StandardTableBuilder
   def to_html
     add_css_class options, 'table'
     content_tag :table, options do
-      content_tag(:thead, html_header) + 
-      content_tag(:tbody, safe_join(entries) { |e| html_row(e) })
+      content_tag(:thead, html_header) +
+      content_tag_nested(:tbody, entries) { |e| html_row(e) }
     end
   end
 
@@ -81,24 +81,16 @@ class StandardTableBuilder
   private
 
   def html_header
-    content_tag :tr do
-      safe_join(cols) { |c| c.html_header }
-    end
+    content_tag_nested(:tr, cols) { |c| c.html_header }
   end
 
   def html_row(entry)
-    content_tag :tr do
-      safe_join(cols) { |c| c.html_cell(entry) }
-    end
+    content_tag_nested(:tr, cols) { |c| c.html_cell(entry) }
   end
 
   def entry_class
     entries.first.class
   end
-  
-  def safe_join(collection, &block)
-    collection.collect(&block).join.html_safe
-  end
 
   # Helper class to store column information.
   class Col < Struct.new(:header, :html_options, :template, :block) #:nodoc:

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

@@ -1,8 +1,5 @@
 <% if flash[level].present? %>
   <div class="alert alert-<%= flash_class(level) %>">
-    <a class="close" href="#" data-dismiss="alert">&times;</a>
-    <div>
-    <%= raw flash[level] %>
-    </div>
+    <%= flash[level] %>
   </div>
 <% end %>

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

@@ -1,4 +1,2 @@
 - if flash[level].present?
-  %div{:class => "alert alert-#{flash_class(level)}"}
-    %a.close{:'data-dismiss' => 'alert'} ×
-    %div= raw(flash[level])
+  %div{:class => "alert alert-#{flash_class(level)}"}= flash[level]

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

@@ -1,6 +1,6 @@
-<div class="navbar">
-  <%= link_to 'MyApp', root_path, :class => 'brand' %>
-  <ul class="nav">
-    <%= render 'layouts/menu' %>
-  </ul>
-</div>
+<%= link_to 'MyApp', root_path, :class => 'brand' %>
+<ul class="nav">
+  <li><%= link_to "Link1", "/path1"  %></li>
+  <li><%= link_to "Link2", "/path2"  %></li>
+  <li><%= link_to "Link3", "/path3"  %></li>
+</ul>

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

@@ -1,3 +1,5 @@
-.navbar
-  = link_to 'MyApp', root_path, :class => 'brand'
-  %ul.nav= render 'layouts/menu'
+= link_to 'MyApp', root_path, :class => 'brand'
+%ul.nav
+  %li= link_to "Link1", "/path1"
+  %li= link_to "Link2", "/path2"
+  %li= link_to "Link3", "/path3"

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

@@ -12,44 +12,46 @@
   <![endif]-->
 
   <%= stylesheet_link_tag 'application', :media => 'all' %>
-  
+
   <!-- fav and touch icons -->
   <link href="images/favicon.ico" rel="shortcut icon">
   <link href="images/apple-touch-icon.png" rel="apple-touch-icon">
   <link href="images/apple-touch-icon-72x72.png" rel="apple-touch-icon" sizes="72x72">
   <link href="images/apple-touch-icon-114x114.png" rel="apple-touch-icon" sizes="114x114">
-  
+
   <%= yield :head %>
 </head>
 <body>
-  
+
 
 <div class="container">
-  <%= render 'layouts/nav' %>
-  
+  <div class="navbar">
+    <%= render 'layouts/nav' %>
+  </div>
+
   <h1><%= @title %></h1>
 
   <%= render :partial => 'layouts/flash', :collection => [:notice, :alert], :as => :level %>
 
   <div class="actions btn-toolbar">
-    <div class="pull-left">
-      <%= yield :tools %>
-    </div>
     <div class="pull-right">
       <%= yield :actions %>
     </div>
+    <div class="pull-left">
+      <%= yield :tools %>
+    </div>
   </div>
 
   <div id="content">
     <%= yield %>
   </div>
-  
+
 </div>
 
 <footer>
-  <p>&copy; Company <%= Time.now.year %></p>
+  <p>&copy; code!z <%= Time.zone.now.year %></p>
 </footer>
-  
+
 <!-- Javascript placed at the end of the document so the pages load faster -->
 <%= javascript_include_tag 'application' %>
 <%= javascript_tag yield(:javascripts) if content_for?(:javascripts) %>

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

@@ -5,38 +5,38 @@
     %meta{:charset => 'utf-8'}
     %title= strip_tags(@title)
     = csrf_meta_tag
-    
+
     <!-- HTML5 shim, for IE6-8 support of HTML elements -->
     <!--[if lt IE 9]>
     <script src="http://html5shim.googlecode.com/svn/trunk/html5.js" type="text/javascript"></script>
     <![endif]-->
-  
+
     = stylesheet_link_tag 'application', :media => 'all'
-      
+
     %link{:href => "images/favicon.ico", :rel => "shortcut icon"}
     %link{:href => "images/apple-touch-icon.png", :rel => "apple-touch-icon"}
     %link{:href => "images/apple-touch-icon-72x72.png", :rel => "apple-touch-icon", :sizes => "72x72"}
     %link{:href => "images/apple-touch-icon-114x114.png", :rel => "apple-touch-icon", :sizes => "114x114"}
-  
+
     = yield :head
-    
+
   %body
     .container
-      = render 'layouts/nav'
-    
+      .navbar= render 'layouts/nav'
+
       %h1= @title
-      
+
       = render :partial => 'layouts/flash', :collection => [:notice, :alert], :as => :level
-      
-      .actions.btn-toolbar.clearfix
-        .pull-left=yield :tools
+
+      .actions.btn-toolbar
         .pull-right= yield :actions
-      
+        .pull-left= yield :tools
+
       #content= yield
-      
+
     %footer
       %p
-        &copy; MyCompany #{Time.now.year}
-          
+        &copy; code!z #{Time.zone.now.year}
+
   = javascript_include_tag 'application'
   = javascript_tag yield(:javascripts) if content_for?(:javascripts)

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

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

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

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

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

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

@@ -0,0 +1 @@
+ActionView::Base.field_error_proc = Proc.new {|html_tag, instance| html_tag }

data/lib/generators/dry_crud/templates/config/locales/en_crud.yml

@@ -61,3 +61,4 @@ en:
     destroy:
       flash:
         success: "%{model} was successfully deleted."
+        failure: "%{model} could not be deleted."

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

@@ -1,7 +1,13 @@
 # A dummy model used for general testing.
 class CrudTestModel < ActiveRecord::Base #:nodoc:
 
+  attr_protected nil
+
   belongs_to :companion, :class_name => 'CrudTestModel'
+  has_and_belongs_to_many :others, :class_name => 'OtherCrudTestModel'
+  has_many :mores, :class_name => 'OtherCrudTestModel', :foreign_key => :more_id
+
+  before_destroy :protect_if_companion
 
   validates :name, :presence => true
   validates :rating, :inclusion => { :in => 1..10 }
@@ -15,7 +21,28 @@ class CrudTestModel < ActiveRecord::Base #:nodoc:
   def chatty
     remarks.size
   end
-  
+
+  private
+
+  def protect_if_companion
+    if companion.present?
+      errors.add(:base, 'Cannot destroy model with companion')
+      false
+    end
+  end
+
+end
+
+class OtherCrudTestModel < ActiveRecord::Base #:nodoc:
+
+  attr_protected nil
+
+  has_and_belongs_to_many :others, :class_name => 'CrudTestModel'
+  belongs_to :more, :foreign_key => :more_id, :class_name => 'CrudTestModel'
+
+  def to_s
+    name
+  end
 end
 
 # Controller for the dummy model.
@@ -27,6 +54,7 @@ class CrudTestModelsController < CrudController #:nodoc:
 
   before_create :possibly_redirect
   before_create :handle_name
+  before_destroy :handle_name
 
   before_render_new :possibly_redirect
   before_render_new :set_companions
@@ -39,10 +67,22 @@ class CrudTestModelsController < CrudController #:nodoc:
   # don't use the standard layout as it may require different routes
   # than just the test route for this controller
   layout false
-  
-  def destroy
-    super do |success, format|
-      format.html { redirect_to_index :notice => 'model is gone' } if success
+
+  def index
+    super do |format|
+      format.js { render :text => 'index js'}
+    end
+  end
+
+  def show
+    super do |format|
+      format.html { render :text => 'custom html' } if entry.name == 'BBBBB'
+    end
+  end
+
+  def create
+    super do |format|
+      flash[:notice] = 'model got created' if entry.persisted?
     end
   end
 
@@ -60,9 +100,9 @@ class CrudTestModelsController < CrudController #:nodoc:
 
   # custom callback
   def handle_name
-    if @entry.name == 'illegal'
-      flash[:error] = "illegal name"
-      return false
+    if entry.name == 'illegal'
+      flash[:alert] = "illegal name"
+      false
     end
   end
 
@@ -113,11 +153,11 @@ module CrudTestHelper
   def model_class
     CrudTestModel
   end
-  
+
   def controller_name
     'crud_test_models'
   end
-  
+
   def action_name
     'index'
   end
@@ -125,7 +165,7 @@ module CrudTestHelper
   def params
     {}
   end
-  
+
   def path_args(entry)
     entry
   end
@@ -133,11 +173,11 @@ module CrudTestHelper
   def sortable?(attr)
     true
   end
-  
+
   def h(text)
     ERB::Util.h(text)
   end
-  
+
   protected
 
   # Sets up the test database with a crud_test_models table.
@@ -162,6 +202,14 @@ module CrudTestHelper
           t.timestamps
         end
       end
+      ActiveRecord::Base.connection.create_table :other_crud_test_models, :force => true do |t|
+        t.string   :name, :null => false, :limit => 50
+        t.integer  :more_id
+      end
+      ActiveRecord::Base.connection.create_table :crud_test_models_other_crud_test_models, :force => true do |t|
+        t.belongs_to :crud_test_model
+        t.belongs_to :other_crud_test_model
+      end
 
       CrudTestModel.reset_column_information
     end
@@ -170,7 +218,7 @@ module CrudTestHelper
   # Removes the crud_test_models table from the database.
   def reset_db
     c = ActiveRecord::Base.connection
-    [:crud_test_models].each do |table|
+    [:crud_test_models, :other_crud_test_models, :crud_test_models_other_crud_test_models].each do |table|
       if c.table_exists?(table)
         c.drop_table(table) rescue nil
       end
@@ -180,6 +228,7 @@ module CrudTestHelper
   # Creates 6 dummy entries for the crud_test_models table.
   def create_test_data
     (1..6).inject(nil) {|prev, i| create(i, prev) }
+    (1..6).each {|i| create_other(i) }
   end
 
   # Fixture-style accessor method to get CrudTestModel instances by name
@@ -207,14 +256,20 @@ module CrudTestHelper
                           :income => 10000000 * index + 0.1 * index,
                           :birthdate => "#{1900 + 10 * index}-#{index}-#{index}",
                           # store entire date to avoid time zone issues
-                          :gets_up_at => RUBY_VERSION.include?('1.9.') ? 
+                          :gets_up_at => RUBY_VERSION.include?('1.9.') ?
                                             Time.local(2000,1,1,index,index) :
-                                            Time.utc(2000,1,1,index,index),  
+                                            Time.utc(2000,1,1,index,index),
                           :last_seen => "#{2000 + 10 * index}-#{index}-#{index} 1#{index}:2#{index}",
                           :human => index % 2 == 0,
                           :remarks => "#{c} #{str(index + 1)} #{str(index + 2)}\n" * (index % 3 + 1))
   end
 
+  def create_other(index)
+    c = str(index)
+    others = CrudTestModel.all[index..(index+2)]
+    OtherCrudTestModel.create!(:name => c, :other_ids => others.collect(&:id), :more_id => others.first.try(:id))
+  end
+
   def str(index)
      (index + 64).chr * 5
   end
@@ -233,5 +288,5 @@ module CrudTestHelper
 
     c.execute("BEGIN") if start_transaction
   end
-  
+
 end

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

@@ -63,7 +63,7 @@ module CustomAssertions
       end
     end
   end
-  
+
   # The method used to by Test::Unit to format arguments in
   # #build_message. Prints ActiveRecord objects in a simpler format.
   # Only works for Ruby 1.9