dry_crud 1.3.0 → 1.3.1

data/README.rdoc

@@ -17,8 +17,7 @@ Don't worry, it's a simple development dependency. You may even savely remove it
 To integrate DRY CRUD into your code, only a few additions are required:
 
 * For uniform CRUD functionality, just subclass your controllers from +CrudController+. 
-* To use standard formatting, tables and forms throughout your application, add <tt>helper :standard</tt> to your +ApplicationController+ and benefit everywhere from these little helper methods. 
-* Overwrite the <tt>:to_s</tt> method of your models for a human-friendly representation.
+* Overwrite the <tt>:to_s</tt> method of your models for a human-friendly representation in captions.
 
 Version 1.0 and higher are built for Rails 3. If you need a version for Rails 2.3, please get version 0.6.0 of the gem or go to the rails-2.3 branch on Github. DRY CRUD 1.3 is fully compatible with Ruby 1.8.7, Ruby 1.9.2 and JRuby.
 
@@ -38,6 +37,8 @@ DRY CRUD is a Rails generator. All code resides in your application and is open
 
 DRY CRUD does not depend on any other plugins, but easily allows you to integrate them in order to unify the behavior of your CRUD controllers. You might even use the plugins mentioned above to adapt your generated +CrudController+ base class. All classes come with thorough tests that provide you with a solid foundation for implementing your own adaptions.
 
+If you find yourself adapting the same parts of DRY CRUD for your applications over and over, please feel free to {fork me on Github}[http://github.com/codez/dry_crud].
+
 See the Examples section for some use cases and the Generated Files section below for details on the single classes and templates.
 
 == Examples
@@ -93,12 +94,14 @@ In this case, you should also pass the parameter <tt>page=1</tt> with a hidden f
 
 ==== Special formatting for selected attributes
 
-Sometimes, the default formatting provided by <tt>:format_attr</tt> will not be sufficient. We have a boolean column +sex+ in our model, but would like to display 'male' or 'female' for it (instead of 'no' or 'yes', which is a bit cryptic). Just define a method in your view helper starting with <tt>format_</tt>, followed by the attribute name:
+Sometimes, the default formatting provided by <tt>:format_attr</tt> will not be sufficient. We have a boolean column +sex+ in our model, but would like to display 'male' or 'female' for it (instead of 'no' or 'yes', which is a bit cryptic). Just define a method in your view helper starting with <tt>format_</tt>, followed by the class and attribute name:
 
 In <tt>app/helpers/people.rb</tt>:
-  def format_sex(person)
+  def format_person_sex(person)
     person.sex ? 'female' : 'male'
   end
+  
+Should you have attributes with the same name for multiple models that you want to be formatted the same way, you may define a helper method <tt>format_{attr}</tt> for these attributes.
 
 By the way: The method <tt>:f</tt> in +StandardHelper+ uniformly formats arbitrary values according to their class.  
 

data/VERSION

@@ -1 +1 @@
-1.3.0
+1.3.1

data/lib/generators/dry_crud/templates/INSTALL

@@ -5,9 +5,6 @@ required:
 
  * For uniform CRUD functionallity, just subclass your controllers from 
    CrudController. 
- * To use standard formatting, tables and forms throughout your
-   application, add 'helper :standard' to your ApplicationController and 
-   benefit everywhere from these little helper methods. 
  * Overwrite the :to_s method of your models for a human-friendly
    representation.
 

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

@@ -8,9 +8,6 @@ class ListController < ApplicationController
 
   include RenderInheritable
 
-  # Move this declaration to the application controller.
-  helper :standard
-
   helper_method :model_class, :models_label
 
   delegate :model_class, :models_label, :to => 'self.class'

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

@@ -14,16 +14,10 @@ class StandardFormBuilder < ActionView::Helpers::FormBuilder
 
   # 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").html_safe
-  end
-
-  # Render a standartized label.
-  def label(attr, text = nil, options = {})
-    if attr.is_a?(Symbol) && text.nil? && options.blank?
-      super(attr, captionize(attr, @object.class))
-    else
-      super(attr, text, options)
-    end
+    options = attrs.extract_options!
+    attrs.collect do |a|
+      labeled_input_field(a, options.clone)
+    end.join("\n").html_safe
   end
 
   # Render a corresponding input field for the given attribute.
@@ -47,45 +41,34 @@ class StandardFormBuilder < ActionView::Helpers::FormBuilder
     end
   end
 
-  # Render a standard text field.
-  def text_field(attr, html_options = {})
-    super(attr, {:size => 30}.merge(html_options))
-  end
-
-  # Render a standard password field.
-  def password_field(attr, html_options = {})
-    super(attr, {:size => 30}.merge(html_options))
-  end
-
-  # Render a standard text area.
-  def text_area(attr, html_options = {})
-    super(attr, {:rows => 5, :cols => 30}.merge(html_options))
+  # Render a number field.
+  def number_field(attr, html_options = {})
+    html_options[:size] ||= 10
+    super(attr, html_options)
   end
-
+  
   # Render a standard string field with column contraints.
   def string_field(attr, html_options = {})
-    limit = column_property(@object, attr, :limit)
-    html_options = {:maxlength => limit}.merge(html_options) if limit
+    html_options[:maxlength] ||= column_property(@object, attr, :limit)
+    html_options[:size] ||= 30
     text_field(attr, html_options)
   end
 
-  # Render a standard number field.
-  def number_field(attr, html_options = {})
-    super(attr, {:size => 15}.merge(html_options))
-  end
-
   # Render an integer field.
   def integer_field(attr, html_options = {})
+    html_options[:step] ||= 1
     number_field(attr, html_options)
   end
 
   # Render a float field.
   def float_field(attr, html_options = {})
+    html_options[:step] ||= 'any'
     number_field(attr, html_options)
   end
 
   # Render a decimal field.
   def decimal_field(attr, html_options = {})
+    html_options[:step] ||= 'any'
     number_field(attr, html_options)
   end
 
@@ -141,7 +124,7 @@ class StandardFormBuilder < ActionView::Helpers::FormBuilder
   end
   
   # Dispatch methods starting with 'labeled_' to render a label and the corresponding
-  # input field. E.g. labeled_boolean_field(:checked, {:class => 'bold'})
+  # input field. E.g. labeled_boolean_field(:checked, :class => 'bold')
   def method_missing(name, *args)
     if field_method = labeled_field_method?(name)
       labeled(args.first, send(field_method, *args) + required_mark(args.first))
@@ -150,9 +133,11 @@ class StandardFormBuilder < ActionView::Helpers::FormBuilder
     end
   end
 
+  # Overriden to fullfill contract with method_missing 'labeled_' methods.
   def respond_to?(name)
     labeled_field_method?(name).present? || super(name)
   end
+
   protected
 
   # Returns true if attr is a non-polymorphic belongs_to association,

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

@@ -7,14 +7,11 @@ module StandardHelper
 
   ################  FORMATTING HELPERS  ##################################
 
-  # Define an array of associations symbols in your helper that should not get automatically linked.
-  #def no_assoc_links = [:city]
-
   # Formats a single value
   def f(value)
     case value
       when Fixnum then number_with_delimiter(value)
-      when Float  then number_with_precision(value, :precision => 2)
+      when Float, BigDecimal then number_with_precision(value, :precision => 2)
       when Date   then l(value)
       when Time   then l(value, :format => :time)
       when true   then t(:"global.yes")
@@ -25,12 +22,16 @@ module StandardHelper
   end
 
   # Formats an arbitrary attribute of the given ActiveRecord object.
-  # If no specific format_{attr} method is found, formats the value as follows:
+  # 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.
   def format_attr(obj, attr)
+    format_type_attr_method = :"format_#{obj.class.name.underscore}_#{attr.to_s}"
     format_attr_method = :"format_#{attr.to_s}"
-    if respond_to?(format_attr_method)
+    if respond_to?(format_type_attr_method)
+      send(format_type_attr_method, obj)
+    elsif respond_to?(format_attr_method)
       send(format_attr_method, obj)
     elsif assoc = association(obj, attr, :belongs_to)
       format_assoc(obj, assoc)
@@ -61,9 +62,7 @@ module StandardHelper
   # 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 do |a|
-      labeled_attr(obj, a)
-    end.join("\n").html_safe
+    attrs.collect { |a| labeled_attr(obj, a) }.join("\n").html_safe
   end
 
   # Renders the formatted content of the given attribute with a label.
@@ -262,7 +261,6 @@ module StandardHelper
 
   # Returns true if no link should be created when formatting the given association.
   def no_assoc_link?(assoc, val)
-    (respond_to?(:no_assoc_links) && no_assoc_links.to_a.include?(assoc.name.to_sym)) ||
     !respond_to?("#{val.class.name.underscore}_path".to_sym)
   end
 

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

@@ -1,9 +1,8 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-       "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<!DOCTYPE html>
 
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<html lang="en">
 <head>
-  <meta http-equiv="content-type" content="text/html;charset=UTF-8" />
+  <meta charset="utf-8" />
   <title><%= strip_tags(@title) %></title>
   <%= stylesheet_link_tag 'crud' %>
   <%= csrf_meta_tag %>
@@ -34,7 +33,7 @@
 </div>
 
 <%= javascript_include_tag :defaults, :cache => 'all' %>
-<%= javascript_tag content_tag_for(:javascripts) if content_for?(:javascripts) %>
+<%= javascript_tag yield(:javascripts) if content_for?(:javascripts) %>
 
 </body>
 </html>

data/lib/generators/dry_crud/templates/public/stylesheets/crud.css

@@ -137,6 +137,24 @@ a.action img {
 	vertical-align: text-top;
 }
 
+input, textarea {
+	font-family: Verdana, Geneva, Helvetica, Arial, sans-serif;
+	font-size: 10pt;
+}
+
+input[type=text], input[type=password] {
+  	width: 180pt;
+}
+
+input[type=number] {
+  	width: 80pt;
+}
+
+textarea {
+	width: 180pt;
+	height: 80pt;
+}
+
 .cancel {
     font-size: 80%;
     margin-left: 7pt;

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

@@ -10,6 +10,10 @@ class StandardHelperTest < ActionView::TestCase
   teardown :reset_db
 
   def format_size(obj)
+    "#{f(obj.size)} items"
+  end
+  
+  def format_string_size(obj)
     "#{f(obj.size)} chars"
   end
 
@@ -82,9 +86,13 @@ class StandardHelperTest < ActionView::TestCase
     assert_equal "12.23", format_attr("12.23424", :to_f)
   end
 
-  test "format attr with custom format_size method" do
+  test "format attr with custom format_string_size method" do
     assert_equal "4 chars", format_attr("abcd", :size)
   end
+  
+  test "format attr with custom format_size method" do
+    assert_equal "2 items", format_attr([1,2], :size)
+  end
 
   test "column types" do
     m = crud_test_models(:AAAAA)

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

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

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

@@ -2,3 +2,7 @@
 
 <%= link_action ti(:'link.ajax'), nil, {:action => 'ajax'}, :method => :get, :remote => true %>
 <div id="response"></div>
+
+<% content_for :javascripts do %>
+  var sayHello = function() { alert('Hello'); };
+<% end %>

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: dry_crud
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: 
   segments: 
   - 1
   - 3
-  - 0
-  version: 1.3.0
+  - 1
+  version: 1.3.1
 platform: ruby
 authors: 
 - Pascal Zumkehr
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-28 00:00:00 +02:00
+date: 2011-04-26 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -93,7 +93,6 @@ files:
 - 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
 - test/templates/app/controllers/cities_controller.rb
 - test/templates/app/controllers/people_controller.rb
 - test/templates/app/controllers/vips_controller.rb

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

@@ -1,11 +0,0 @@
-# Filters added to this controller apply to all controllers in the application.
-# Likewise, all the methods added will be available for all controllers.
-
-class ApplicationController < ActionController::Base
-  helper :standard
-
-  protect_from_forgery # See ActionController::RequestForgeryProtection for details
-
-  # Scrub sensitive parameters from your log
-  # filter_parameter_logging :password
-end