dry_crud 1.2.7 → 1.3.0

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

@@ -6,24 +6,25 @@
 #     t.attrs :name, :city
 #   end
 class StandardTableBuilder
-  attr_reader :entries, :cols, :template
-  
+  attr_reader :entries, :cols, :options, :template
+
   # Delegate called methods to template.
   # including StandardHelper would lead to problems with indirectly called methods.
-  delegate :content_tag, :format_attr, :column_type, :association, 
+  delegate :content_tag, :format_attr, :column_type, :association,
            :captionize, :tr_alt, :to => :template
 
-  def initialize(entries, template)
+  def initialize(entries, template, options = {})
     @entries = entries
     @template = template
+    @options = options
     @cols = []
   end
 
   # Convenience method to directly generate a table. Renders a row for each entry in entries.
   # Takes a block that gets the table object as parameter for configuration.
   # Returns the generated html for the table.
-  def self.table(entries, template)
-    t = new(entries, template)
+  def self.table(entries, template, options = {})
+    t = new(entries, template, options)
     yield t
     t.to_html
   end
@@ -34,7 +35,7 @@ class StandardTableBuilder
   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.
@@ -43,7 +44,7 @@ class StandardTableBuilder
       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.
@@ -51,41 +52,42 @@ class StandardTableBuilder
     header ||= attr_header(a)
     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
-      html_header + entries.collect { |e| html_row(e) }.join.html_safe
+      content_tag(:thead, html_header) + 
+      content_tag(:tbody, safe_join(entries) { |e| html_row(e) })
     end
   end
-  
+
   # Returns css classes used for alignment of the cell data.
   # Based on the column type of the attribute.
   def align_class(attr)
     entry = entries.first
     case column_type(entry, attr)
-      when :integer, :float, :decimal 
+      when :integer, :float, :decimal
         'right' unless association(entry, attr, :belongs_to)
-      when :boolean  
+      when :boolean
         'center'
     end
   end
-  
+
   def attr_header(attr)
     captionize(attr, entry_class)
   end
-  
-  private 
-  
+
+  private
+
   def html_header
     content_tag :tr do
-      cols.collect { |c| c.html_header }.join.html_safe
+      safe_join(cols) { |c| c.html_header }
     end
   end
 
   def html_row(entry)
     tr_alt do
-      cols.collect { |c| c.html_cell(entry) }.join.html_safe
+      safe_join(cols) { |c| c.html_cell(entry) }
     end
   end
 
@@ -93,26 +95,30 @@ class StandardTableBuilder
     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:
-  
+
     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
-  
-  # Provides headers with sort links. Expects a method :sortable?(attr) 
+
+  # Provides headers with sort links. Expects a method :sortable?(attr)
   # in the template/controller to tell if an attribute is sortable or not.
   # Extracted into an own module for convenience.
   module Sorting
@@ -121,7 +127,7 @@ class StandardTableBuilder
       label ||= attr_header(attr)
       template.link_to(label, sort_params(attr)) + current_mark(attr)
     end
-    
+
     # Same as :attrs, except that it renders a sort link in the header
     # if an attr is sortable.
     def sortable_attrs(*attrs)
@@ -129,44 +135,44 @@ class StandardTableBuilder
         template.sortable?(a) ? sortable_attr(a) : attr(a)
       end
     end
-    
+
     # Renders a sort link header, otherwise similar to :attr.
     def sortable_attr(a, header = nil)
       attr(a, sort_header(a, header))
     end
-    
+
     private
-    
+
     # Request params for the sort link.
     def sort_params(attr)
       params.merge({:sort => attr, :sort_dir => sort_dir(attr)})
     end
-    
+
     # The sort mark, if any, for the given attribute.
     def current_mark(attr)
-      if current_sort?(attr) 
+      if current_sort?(attr)
         (sort_dir(attr) == 'asc' ? ' &uarr;' : ' &darr;').html_safe
       else
         ''
       end
     end
-    
+
     # Returns true if the given attribute is the current sort column.
     def current_sort?(attr)
       params[:sort] == attr.to_s
     end
-    
+
     # The sort direction to use in the sort link for the given attribute.
     def sort_dir(attr)
       current_sort?(attr) && params[:sort_dir] == 'asc' ? 'desc' : 'asc'
     end
-    
+
     # Delegate to template.
     def params
       template.params
     end
   end
-  
+
   include Sorting
 
 end

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

@@ -1,2 +1,3 @@
+<%= link_action_index %>
 <%= link_action_show @entry %>
 <%= link_action_destroy @entry %>

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

@@ -1,7 +1,7 @@
-<% @title ||= "Edit #{full_entry_label}" -%>
+<% @title ||= ti(:title, :model => full_entry_label).html_safe -%>
 
-<% content_for(:actions, render(:partial => 'actions_edit')) %>
+<% content_for(:actions, render('actions_edit')) %>
 
 <%= clear %>
 
-<%= render :partial => 'form' %>
+<%= render 'form' %>

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

@@ -1,7 +1,7 @@
-<% @title ||= "New #{models_label.singularize}" -%>
+<% @title ||= ti(:title, :model => models_label.singularize) -%>
 
 <% content_for(:actions, link_action_index) %>
 
 <%= clear %>
 
-<%= render :partial => 'form' %>
+<%= render 'form' %>

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

@@ -1,9 +1,9 @@
-<% @title ||= full_entry_label -%>
+<% @title ||= ti(:title, :model => full_entry_label).html_safe -%>
 
-<% content_for(:actions, render(:partial => 'actions_show')) %>
+<% content_for(:actions, render('actions_show')) %>
 
 <%= clear %>
 
-<%= render :partial => 'attrs' %>
+<%= render 'attrs' %>
 
 

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

@@ -4,29 +4,28 @@
 <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>
+  <title><%= strip_tags(@title) %></title>
   <%= stylesheet_link_tag 'crud' %>
-  <%= javascript_include_tag :all %>
   <%= csrf_meta_tag %>
-  <%= yield :head %> 
+  <%= yield :head %>
 </head>
 <body>
 
 <div id="container">
 	<ul id="menu">
-		<%= render :partial => 'layouts/menu' %>
+		<%= render 'layouts/menu' %>
 	</ul>
 	
 	<h1><%= @title %></h1>
 	
 	<% if flash.notice.present? %>
-		<div id="flash_notice"><%= flash.notice %></div>
+		<div id="flash_notice"><%= raw(flash.notice) %></div>
 	<% elsif flash.alert.present? %>
-		<div id="flash_alert"><%= flash.alert %></div>
+		<div id="flash_alert"><%= raw(flash.alert) %></div>
 	<% end %>
 	
 	<div class="actions">
-		<%= yield :actions %> 
+		<%= yield :actions %>
 	</div>
 	
 	<div id="content">
@@ -34,5 +33,8 @@
 	</div>
 </div>
 
+<%= javascript_include_tag :defaults, :cache => 'all' %>
+<%= javascript_tag content_tag_for(:javascripts) if content_for?(:javascripts) %>
+
 </body>
 </html>

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

@@ -1,5 +1,5 @@
 <%= form_tag(nil, {:method => :get, :class => 'search'}) do %>
   <%= hidden_field_tag :returning, true %>
   <%= search_field_tag :q, params[:q] %>
-  <%= submit_tag 'Search' %>
+  <%= submit_tag ti(:"button.search") %>
 <% end %>

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

@@ -1,9 +1,9 @@
-<% @title ||= "Listing #{models_label}" -%>
+<% @title ||= ti(:title, :models => models_label) -%>
 
-<% content_for(:actions, render(:partial => 'actions_index')) %>
+<% content_for(:actions, render('actions_index')) %>
 
-<%= render :partial => 'search' if search_support? %>
+<%= render 'search' if search_support? %>
 
 <%= clear %>
 
-<%= render :partial => 'list' %>
+<%= render 'list' %>

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

@@ -1,6 +1,8 @@
 <% if errors.any? %>
 	<div id="error_explanation">
-	    <h2><%= pluralize(errors.count, "error") %> prohibited this entry from being saved:</h2>
+	    <h2>
+	    <%= ti(:"errors.header", :count => errors.count, :model => object.to_s) %>
+	    </h2>
 	    <ul>
 	        <% errors.full_messages.each do |msg| %>
 		        <li><%= msg %></li>

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

@@ -0,0 +1,63 @@
+# Translations of all crud strings. 
+# See also StandardHelper#translate_inheritable and #translate_association.
+
+en:
+  # global scope
+  global:
+    "yes": "yes"
+    "no": "no"
+    no_list_entries: No entries found.
+    confirm_delete: Do you really want to delete this entry?
+
+    associations:
+      # association keys may be customized per model with the prefix
+      # 'activerecord.associations.{model}.' or even per actual association with
+      # 'activerecord.associations.models.{holder_model}.{assoc_name}.'
+      no_entry: (none)
+      none_available: (none available)
+      please_select: Please select
+
+    button:
+      save: Save
+      cancel: Cancel
+      search: Search
+
+    link:
+      show: Show
+      edit: Edit
+      add: Add
+      delete: Delete
+      list: List
+      
+    errors:
+      header:
+        one: "1 error prohibited this entry from being saved:"
+        other: "%{count} errors prohibited this entry from being saved:"
+
+  # formats
+  time:
+    formats:
+      time: "%H:%M"
+
+  # list controller
+  list:
+    index:
+      title: Listing %{models}
+
+  # crud controller
+  crud:
+    show:
+      title: %{model}
+    new:
+      title: New %{model}
+    edit:
+      title: Edit %{model}
+    create:
+      flash:
+        success: %{model} was successfully created.
+    update:
+      flash:
+        success: %{model} was successfully updated.
+    destroy:
+      flash:
+        success: %{model} was successfully deleted.

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

@@ -2,55 +2,62 @@
 class CrudTestModel < ActiveRecord::Base #:nodoc:
 
   belongs_to :companion, :class_name => 'CrudTestModel'
-  
+
   validates :name, :presence => true
   validates :rating, :inclusion => { :in => 1..10 }
-  
-  default_scope order('name') 
-  
-  def label
+
+  default_scope order('name')
+
+  def to_s
     name
   end
-  
+
   def chatty
-  	remarks.size
+    remarks.size
   end
+  
 end
 
 # Controller for the dummy model.
 class CrudTestModelsController < CrudController #:nodoc:
   HANDLE_PREFIX = 'handle_'
-  
+
   self.search_columns = [:name, :whatever, :remarks]
   self.sort_mappings = {:chatty => 'length(remarks)'}
-  
+
   before_create :possibly_redirect
   before_create :handle_name
-  
+
   before_render_new :possibly_redirect
   before_render_new :set_companions
-  
+
   attr_reader :called_callbacks
   attr_accessor :should_redirect
-  
+
   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
   
+  def destroy
+    super do |success, format|
+      format.html { redirect_to_index :notice => 'model is gone' } if success
+    end
+  end
+
   protected
-  
+
   def list_entries
     entries = super
-  	if params[:filter]
-  	  entries = entries.where(['rating < ?', 3]).except(:order).order('children DESC')
+    if params[:filter]
+      entries = entries.where(['rating < ?', 3]).except(:order).order('children DESC')
     end
     entries
   end
-  
+
   private
-  
+
   # custom callback
   def handle_name
     if @entry.name == 'illegal'
@@ -58,7 +65,7 @@ class CrudTestModelsController < CrudController #:nodoc:
       return false
     end
   end
-  
+
   # create callback methods that record the before/after callbacks
   [:create, :update, :save, :destroy].each do |a|
     callback = "before_#{a.to_s}"
@@ -66,34 +73,34 @@ class CrudTestModelsController < CrudController #:nodoc:
     callback = "after_#{a.to_s}"
     send(callback.to_sym, :"#{HANDLE_PREFIX}#{callback}")
   end
-  
+
   # create callback methods that record the before_render callbacks
   [:index, :show, :new, :edit, :form].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
   end
-  
+
   def set_companions
     @companions = CrudTestModel.all :conditions => {:human => true}
   end
-  
+
   # records a callback
   def called_callback(callback)
     @called_callbacks ||= []
     @called_callbacks << callback
   end
-  
+
 end
 
 # A simple test helper to prepare the test database with a CrudTestModel model.
@@ -101,53 +108,77 @@ end
 # without the need for an application based model.
 module CrudTestHelper
 
-  protected 
+  # Controller helper methods for the tests
+
+  def model_class
+    CrudTestModel
+  end
+  
+  def controller_name
+    'crud_test_models'
+  end
+  
+  def action_name
+    'index'
+  end
+
+  def params
+    {}
+  end
+
+  def sortable?(attr)
+    true
+  end
   
+  protected
+
   # Sets up the test database with a crud_test_models table.
   # Look at the source to view the column definition.
-  def setup_db    
+  def setup_db
     without_transaction do
       silence_stream(STDOUT) do
         ActiveRecord::Base.connection.create_table :crud_test_models, :force => true do |t|
-          t.string  :name, :null => false, :limit => 50
-          t.string  :password
-          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.string   :name, :null => false, :limit => 50
+          t.string   :password
+          t.string   :whatever
+          t.integer  :children
+          t.integer  :companion_id
+          t.float    :rating
+          t.decimal  :income, :precision => 14, :scale => 2
+          t.date     :birthdate
+          t.time     :gets_up_at
+          t.datetime :last_seen
+          t.boolean  :human, :default => true
+          t.text     :remarks
+
           t.timestamps
         end
       end
-          
+
       CrudTestModel.reset_column_information
     end
   end
-  
+
   # 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].each do |table|
       if c.table_exists?(table)
         c.drop_table(table) rescue nil
       end
     end
   end
-  
+
   # Creates 6 dummy entries for the crud_test_models table.
   def create_test_data
     (1..6).inject(nil) {|prev, i| create(i, prev) }
   end
-  
+
   # Fixture-style accessor method to get CrudTestModel instances by name
   def crud_test_models(name)
     CrudTestModel.find_by_name(name.to_s)
   end
-    
+
   def with_test_routing
     with_routing do |set|
       set.draw { resources :crud_test_models }
@@ -156,26 +187,30 @@ module CrudTestHelper
       yield
     end
   end
-  
-  
+
   private
-  
+
   def create(index, companion)
     c = str(index)
-    CrudTestModel.create!(:name => c, 
-                          :children => 10 - index, 
+    CrudTestModel.create!(:name => c,
+                          :children => 10 - index,
                           :companion => companion,
-                          :rating => "#{index}.#{index}".to_f, 
-                          :income => 10000000 * index + 0.1 * index, 
-                          :birthdate => "#{1900 + 10 * index}-#{index}-#{index}", 
+                          :rating => "#{index}.#{index}".to_f,
+                          :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.') ? 
+                                            Time.local(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 str(index)
      (index + 64).chr * 5
   end
-  
+
   # hack to avoid ddl in transaction issues with mysql.
   def without_transaction
     c = ActiveRecord::Base.connection
@@ -185,10 +220,10 @@ module CrudTestHelper
       c.execute("ROLLBACK")
       start_transaction = true
     end
-    
-    yield    
-    
+
+    yield
+
     c.execute("BEGIN") if start_transaction
   end
-
+  
 end