BrianTheCoder-ratpack 0.2.3 → 0.2.4

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
 :minor: 2
-:patch: 3
+:patch: 4
 :major: 0

data/lib/ratpack/forms.rb

@@ -11,7 +11,7 @@ module RatPack
     %w(text password hidden file).each do |kind|
       self.class_eval <<-RUBY, __FILE__, __LINE__ + 1
         def #{kind}_field(attrs)
-          attrs[:class] = "text" if %w(text password).include?("#{kind}")         
+          attrs[:class] = "text" if %w(text password).include?("#{kind}") && !attrs.has_key?(:class)         
           closed_form_field(:input, {:type => "#{kind}"}.merge(attrs))
         end
       RUBY
@@ -38,13 +38,17 @@ module RatPack
     end
     
     def check_box(attrs)
+      html = ""
+      label = build_field(attrs)
       if attrs.delete(:boolean)
         on, off = attrs.delete(:on), attrs.delete(:off)
-        hidden_field(:name => attrs[:name], :value => off) <<
-          closed_form_field(:input, {:type => "checkbox", :value => on}.merge(attrs))
+        html << hidden_field(:name => attrs[:name], :value => off)
+        html << self_closing_tag(:input, {:type => "checkbox", :value => on}.merge(attrs))
       else
         closed_form_field(:input, {:type => "checkbox"}.merge(attrs))
+        html << self_closing_tag(:input, {:type => "checkbox"}.merge(attrs))
       end
+      html + label
     end
     
     def select(attrs = {})
@@ -52,13 +56,20 @@ module RatPack
       form_field(:select, options_for(attrs), attrs)
     end
     
-    def submit(value, attrs = {})
+    def submit(value="Submit", attrs = {})
       attrs[:type]  ||= "submit"
       attrs[:name]  ||= "submit"
       attrs[:value] ||= value
       closed_form_field(:input, attrs)
     end
     
+    def reset(value="Reset", attrs = {})
+      attrs[:type]  ||= "reset"
+      attrs[:name]  ||= "reset"
+      attrs[:value] ||= value
+      closed_form_field(:input, attrs)
+    end
+    
     private
     
     def form_field(type, content, attrs)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: BrianTheCoder-ratpack
 version: !ruby/object:Gem::Version 
-  version: 0.2.3
+  version: 0.2.4
 platform: ruby
 authors: 
 - brianthecoder
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-04-12 00:00:00 -07:00
+date: 2009-04-14 00:00:00 -07:00
 default_executable: 
 dependencies: []