formula 0.3.5 → 0.3.6

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2010 - 2011 Kevin Sylvestre
+Copyright (c) 2010 - 2012 Kevin Sylvestre
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.rdoc

@@ -1,6 +1,6 @@
 = Formula
 
-Formula is a Rails form helper that generates awesome markup. The project aims to let users create semantically beautiful forms without introducing too much syntax. The goal is to make integrating advanced layout systems (such as grid systems) as simple as possible.
+Formula is a Rails form helper that generates awesome markup. The project lets users create semantically beautiful forms without introducing too much syntax.
 
 == Requirements
 
@@ -17,7 +17,7 @@ The gem is tested with:
 == Installation
 
   gem install formula
-  
+
 == Examples
 
   <% formula_form_for @user do |f| %>
@@ -31,14 +31,14 @@ The gem is tested with:
     <%= f.input :password, label: "Password:", hint: "Must be at least six characters." %>
     <%= f.button 'Save' %>
   <% end %>
-  
+
   <% formula_form_for @company do |f|
     <%= f.input :url,   container: { class: 'grid-04' }, input: { class: 'fill' } %>
     <%= f.input :phone, container: { class: 'grid-04' }, input: { class: 'fill' } %>
     <%= f.input :email, container: { class: 'grid-04' }, input: { class: 'fill' } %>
     <%= f.button 'Save', button: { class: 'fancy' } %>
   <% end %>
-  
+
   <% formula_form_for @user do |f| %>
     <%= f.input :email, label: "Email:" %>
     <%= f.input :password, label: "Password:" %>
@@ -49,7 +49,7 @@ The gem is tested with:
     <% end %>
     <%= f.button 'Save', button: { class: 'fancy' } %>
   <% end %>
-  
+
   <% formula_form_for @user do |f| %>
     <%= f.block :favourite %>
       <% @favourites.each do |favourite| %>
@@ -69,4 +69,4 @@ The gem is tested with:
 
 == Copyright
 
-Copyright (c) 2010 - 2011 Kevin Sylvestre. See LICENSE for details.
+Copyright (c) 2010 - 2012 Kevin Sylvestre. See LICENSE for details.

data/lib/formula.rb

@@ -1,76 +1,76 @@
 module Formula
-  
-  
+
+
   require 'formula/railtie' if defined?(Rails)
-  
-  
+
+
   # Default class assigned to block (<div class="block">...</div>).
   mattr_accessor :block_class
   @@block_class = 'block'
-  
+
   # Default class assigned to input (<div class="input">...</div>).
   mattr_accessor :input_class
   @@input_class = 'input'
-  
+
   # Default class assigned to association (<div class="association">...</div>).
   mattr_accessor :association_class
   @@association_class = 'association'
-  
+
   # Default class assigned to block with errors (<div class="block errors">...</div>).
   mattr_accessor :block_error_class
   @@block_error_class = 'errors'
-  
+
   # Default class assigned to input with errors (<div class="input errors">...</div>).
   mattr_accessor :input_error_class
   @@input_error_class = false
-  
+
   # Default class assigned to input with errors (<div class="association errors">...</div>).
   mattr_accessor :association_error_class
   @@association_error_class = false
-  
+
   # Default class assigned to error (<div class="error">...</div>).
   mattr_accessor :error_class
   @@error_class = 'error'
-  
+
   # Default class assigned to hint (<div class="hint">...</div>).
   mattr_accessor :hint_class
   @@hint_class = 'hint'
-  
+
   # Default tag assigned to block (<div class="input">...</div>).
   mattr_accessor :block_tag
   @@block_tag = :div
-  
+
   # Default tag assigned to input (<div class="input">...</div>).
   mattr_accessor :input_tag
   @@input_tag = :div
-  
+
   # Default tag assigned to association (<div class="association">...</div>).
-   mattr_accessor :association_tag
-   @@association_tag = :div
-  
+  mattr_accessor :association_tag
+  @@association_tag = :div
+
   # Default tag assigned to error (<div class="error">...</div>).
   mattr_accessor :error_tag
   @@error_tag = :div
-  
+
   # Default tag assigned to hint (<div class="hint">...</div>).
   mattr_accessor :hint_tag
   @@hint_tag = :div
-  
+
   # Method for file.
   mattr_accessor :file
   @@file = [:file?]
-  
+
   # Default as.
   mattr_accessor :default_as
   @@default_as = :string
-  
-  
+
+
   class FormulaFormBuilder < ActionView::Helpers::FormBuilder
-    
-    
-    # Generate a form button. 
+
+
+    # Generate a form button.
     #
-    # Options: 
+    # Options:
     #
     # * :container - add custom options to the container
     # * :button    - add custom options to the button
@@ -84,23 +84,23 @@ module Formula
     #   <div class="block">
     #     <%= f.submit("Save")
     #   </div>
-    
+
     def button(value = nil, options = {})
       options[:button] ||= {}
-      
+
       options[:container] ||= {}
       options[:container][:class] = arrayorize(options[:container][:class]) << ::Formula.block_class
-      
-      
+
+
       @template.content_tag(::Formula.block_tag, options[:container]) do
         submit value, options[:button]
       end
     end
-    
-    
+
+
     # Basic container generator for use with blocks.
     #
-    # Options: 
+    # Options:
     #
     # * :hint       - specify a hint to be displayed ('We promise not to spam you.', etc.)
     # * :label      - override the default label used ('Name:', 'URL:', etc.)
@@ -120,34 +120,34 @@ module Formula
     #     <div class="hint">Please use your full name.</div>
     #     <div class="error">...</div>
     #   </div>
-    
+
     def block(method = nil, options = {}, &block)
       options[:error] ||= error(method) if method
-            
+
       components = "".html_safe
-      
+
       if method
         components << self.label(method, options[:label]) if options[:label] or options[:label].nil? and method
       end
-      
+
       components << @template.capture(&block)
-      
+
       options[:container] ||= {}
       options[:container][:class] = arrayorize(options[:container][:class]) << ::Formula.block_class << method
       options[:container][:class] << ::Formula.block_error_class if ::Formula.block_error_class.present? and error?(method)
-      
+
       components << @template.content_tag(::Formula.hint_tag , options[:hint ], :class => ::Formula.hint_class ) if options[:hint ]
       components << @template.content_tag(::Formula.error_tag, options[:error], :class => ::Formula.error_class) if options[:error]
-      
+
       @template.content_tag(::Formula.block_tag, options[:container]) do
         components
       end
     end
-    
-    
-    # Generate a suitable form input for a given method by performing introspection on the type. 
+
+
+    # Generate a suitable form input for a given method by performing introspection on the type.
     #
-    # Options: 
+    # Options:
     #
     # * :as         - override the default type used (:url, :email, :phone, :password, :number, :text)
     # * :label      - override the default label used ('Name:', 'URL:', etc.)
@@ -190,42 +190,42 @@ module Formula
     #       <div class="error">...</div>
     #     </div>
     #   </div>
-    
+
     def input(method, options = {})
       options[:as] ||= as(method)
       options[:input] ||= {}
-      
+
       return hidden_field method, options[:input] if options[:as] == :hidden
-      
+
       klass = [::Formula.input_class, options[:as]]
       klass << ::Formula.input_error_class if ::Formula.input_error_class.present? and error?(method)
-      
+
       self.block(method, options) do
         @template.content_tag(::Formula.input_tag, :class => klass) do
           case options[:as]
-            when :text     then text_area       method, options[:input]            
-            when :file     then file_field      method, options[:input]
-            when :string   then text_field      method, options[:input]
-            when :password then password_field  method, options[:input]
-            when :boolean  then check_box       method, options[:input]
-            when :url      then url_field       method, options[:input]
-            when :email    then email_field     method, options[:input]
-            when :phone    then phone_field     method, options[:input]
-            when :number   then number_field    method, options[:input]
-            when :country  then country_select  method, options[:input]
-            when :date     then date_select     method, options[:input], options[:input].delete(:html) || {}
-            when :time     then time_select     method, options[:input], options[:input].delete(:html) || {}
-            when :datetime then datetime_select method, options[:input], options[:input].delete(:html) || {}
-            when :select   then select          method, options[:choices], options[:input], options[:input].delete(:html) || {}
+          when :text     then text_area       method, options[:input]
+          when :file     then file_field      method, options[:input]
+          when :string   then text_field      method, options[:input]
+          when :password then password_field  method, options[:input]
+          when :boolean  then check_box       method, options[:input]
+          when :url      then url_field       method, options[:input]
+          when :email    then email_field     method, options[:input]
+          when :phone    then phone_field     method, options[:input]
+          when :number   then number_field    method, options[:input]
+          when :country  then country_select  method, options[:input]
+          when :date     then date_select     method, options[:input], options[:input].delete(:html) || {}
+          when :time     then time_select     method, options[:input], options[:input].delete(:html) || {}
+          when :datetime then datetime_select method, options[:input], options[:input].delete(:html) || {}
+          when :select   then select          method, options[:choices], options[:input], options[:input].delete(:html) || {}
           end
         end
       end
     end
-    
-    
-    # Generate a suitable form association for a given method by performing introspection on the type. 
+
+
+    # Generate a suitable form association for a given method by performing introspection on the type.
     #
-    # Options: 
+    # Options:
     #
     # * :label       - override the default label used ('Name:', 'URL:', etc.)
     # * :error       - override the default error used ('invalid', 'incorrect', etc.)
@@ -268,30 +268,30 @@ module Formula
     #       <div class="error">...</div>
     #     </div>
     #   </div>
-    
-    
+
+
     def association(method, collection, value, text, options = {})
       options[:as] ||= :select
       options[:association] ||= {}
-      
+
       klass = [::Formula.association_class, options[:as]]
       klass << ::Formula.association_error_class if ::Formula.association_error_class.present? and error?(method)
-      
+
       self.block(method, options) do
         @template.content_tag(::Formula.association_tag, :class => klass) do
           case options[:as]
-            when :select then collection_select :"#{method}_id", collection, value, text, 
+          when :select then collection_select :"#{method}_id", collection, value, text,
               options[:association], options[:association].delete(:html) || {}
           end
         end
       end
     end
-    
-    
-  private
-    
-    
-    # Introspection on the column to determine how to render a method. The method is used to 
+
+
+    private
+
+
+    # Introspection on the column to determine how to render a method. The method is used to
     # identify a method type (if the method corresponds to a column)
     #
     # Returns:
@@ -305,16 +305,16 @@ module Formula
     # * :date     - for columns of type 'date'
     # * :time     - for columns of type 'time'
     # * nil       - for unkown columns
-  
+
     def type(method)
       column = @object.column_for_attribute(method) if @object.respond_to?(:column_for_attribute)
       return column.type if column
     end
-    
-    
-    # Introspection on an association to determine if a method is a file. This 
+
+
+    # Introspection on an association to determine if a method is a file. This
     # is determined by the methods ability to respond to file methods.
-    
+
     def file?(method)
       @files ||= {}
       @files[method] ||= begin
@@ -322,9 +322,9 @@ module Formula
         file && ::Formula.file.any? { |method| file.respond_to?(method) }
       end
     end
-    
-    
-    # Introspection on the field and method to determine how to render a method. The method is 
+
+
+    # Introspection on the field and method to determine how to render a method. The method is
     # used to generate form element types.
     #
     # Returns:
@@ -339,68 +339,68 @@ module Formula
     # * :time     - for time column
     # * :text     - for time column
     # * :string   - for all other cases
-    
+
     def as(method)
-      
+
       case "#{method}"
-        when /url/      then return :url
-        when /email/    then return :email
-        when /phone/    then return :phone
-        when /password/ then return :password
+      when /url/      then return :url
+      when /email/    then return :email
+      when /phone/    then return :phone
+      when /password/ then return :password
       end
-      
+
       case type(method)
-        when :string    then return :string
-        when :integer   then return :number
-        when :float     then return :number
-        when :decimal   then return :number
-        when :timestamp then return :datetime
-        when :datetime  then return :datetime
-        when :date      then return :date
-        when :time      then return :time
-        when :text      then return :text
+      when :string    then return :string
+      when :integer   then return :number
+      when :float     then return :number
+      when :decimal   then return :number
+      when :timestamp then return :datetime
+      when :datetime  then return :datetime
+      when :date      then return :date
+      when :time      then return :time
+      when :text      then return :text
       end
-      
+
       return :file if file?(method)
-      
+
       return ::Formula.default_as
-      
+
     end
-    
-    
-    # Generate error messages by combining all errors on an object into a comma seperated string 
-    # representation. 
-    
+
+
+    # Generate error messages by combining all errors on an object into a comma seperated string
+    # representation.
+
     def error(method)
       errors = @object.errors[method] if @object
       errors.to_sentence if errors.present?
     end
-    
-    
+
+
     # Identify if error message exists for a given method by checking for the presence of the object
     # followed by the presence of errors.
-    
+
     def error?(method)
       @object.present? and @object.errors[method].present?
     end
-    
-    
-    # Create an array from a string, a symbol, or an undefined value. The default is to return 
+
+
+    # Create an array from a string, a symbol, or an undefined value. The default is to return
     # the value and assume it has already is valid.
-    
+
     def arrayorize(value)
       case value
-        when nil    then return []
-        when String then value.to_s.split
-        when Symbol then value.to_s.split
-        else value
+      when nil    then return []
+      when String then value.to_s.split
+      when Symbol then value.to_s.split
+      else value
       end
     end
-    
-    
-  public
-  
-  
+
+
+    public
+
+
     # Generates a wrapper around fields_form with :builder set to FormulaFormBuilder.
     #
     # Supports:
@@ -418,22 +418,22 @@ module Formula
     #     <%= company_f.input :url %>
     #     <%= company_f.input :phone %>
     #   <% end %>
-    
+
     def formula_fields_for(record_or_name_or_array, *args, &block)
       options = args.extract_options!
       options[:builder] ||= self.class
       fields_for(record_or_name_or_array, *(args << options), &block)
     end
-    
+
     alias :fieldsula_for :formula_fields_for
 
 
   end
-  
+
   module FormulaFormHelper
     @@builder = ::Formula::FormulaFormBuilder
-    
-    
+
+
     # Generates a wrapper around form_for with :builder set to FormulaFormBuilder.
     #
     # Supports:
@@ -450,16 +450,16 @@ module Formula
     #     <%= f.input :email %>
     #     <%= f.input :password %>
     #   <% end %>
-    
+
     def formula_form_for(record_or_name_or_array, *args, &proc)
-       options = args.extract_options!
-       options[:builder] ||= @@builder
-       form_for(record_or_name_or_array, *(args << options), &proc)
+      options = args.extract_options!
+      options[:builder] ||= @@builder
+      form_for(record_or_name_or_array, *(args << options), &proc)
     end
-    
+
     alias :formula_for :formula_form_for
-    
-    
+
+
     # Generates a wrapper around fields_for with :builder set to FormulaFormBuilder.
     #
     # Supports:
@@ -477,15 +477,15 @@ module Formula
     #     <%= company_f.input :url %>
     #     <%= company_f.input :phone %>
     #   <% end %>
-    
+
     def formula_fields_for(record_or_name_or_array, *args, &block)
       options = args.extract_options!
       options[:builder] ||= @@builder
       fields_for(record_or_name_or_array, *(args << options), &block)
     end
-    
-    alias :fieldsula_for :formula_fields_for 
-    
+
+    alias :fieldsula_for :formula_fields_for
+
   end
-  
-end
+
+end