formula 0.2.4 → 0.2.5

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2010 Kevin Sylvestre
+Copyright (c) 2010 - 2011 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,10 +1,10 @@
 = Formula
 
-Formula is a Rails form generator that generates simple clean 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 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.
 
 == Requirements
 
-The gem has only been tested with Ruby 1.9.2 and Rails 3.0.3 but may well work with other versions of Ruby and Rails.
+The gem is tested with Ruby 1.9.2 and Rails 3.0.6 but may well work with other versions of Ruby and Rails.
 
 == Installation
 
@@ -52,4 +52,4 @@ The gem has only been tested with Ruby 1.9.2 and Rails 3.0.3 but may well work w
     
 == Copyright
 
-Copyright (c) 2010 Kevin Sylvestre. See LICENSE for details.
+Copyright (c) 2010 - 2011 Kevin Sylvestre. See LICENSE for details.

data/lib/formula.rb

@@ -179,6 +179,7 @@ module Formula
     def input(method, options = {})
       options[:as] ||= as(method)
       options[:input] ||= {}
+      options[:input][:html] ||= {}
       
       self.block(method, options) do
         @template.content_tag(::Formula.input_tag, :class => [::Formula.input_class, options[:as]]) do
@@ -192,9 +193,10 @@ module Formula
             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 :date     then date_select     method, options[:input]
-            when :time     then time_select     method, options[:input]
-            when :datetime then datetime_select method, options[:input]
+            when :date     then date_select     method, options[:input], options[:input][:html]
+            when :time     then time_select     method, options[:input], options[:input][:html]
+            when :datetime then datetime_select method, options[:input], options[:input][:html]
+            when :select   then select          method, options[:choices], options[:input], options[:input][:html]
           end
         end
       end
@@ -348,7 +350,8 @@ module Formula
     # representation. 
     
     def error(method)
-      @object.errors[method].to_sentence
+      errors = @object.errors[method] if @object
+      errors.to_sentence if errors
     end
     
     

data/lib/formula/version.rb

@@ -1,3 +1,3 @@
 module Formula
-  VERSION = "0.2.4"
+  VERSION = "0.2.5"
 end

metadata

@@ -2,7 +2,7 @@
 name: formula
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.2.4
+  version: 0.2.5
 platform: ruby
 authors: 
 - Kevin Sylvestre
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-23 00:00:00 -05:00
+date: 2011-05-17 00:00:00 -04:00
 default_executable: 
 dependencies: []
 
@@ -55,7 +55,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.5.0
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: A great way to simplify complex forms