twilson63-sinatra-formhelpers 0.3.0 → 0.3.4

data/VERSION.yml

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

data/lib/sinatra/formhelpers.rb

@@ -20,8 +20,8 @@ module Sinatra
       tag :a, content, options.merge(:href => href)  
     end
     
-    def label(obj,field, options={})
-      tag :label, field.to_s.titleize, options.merge(:for => "#{obj}_#{field}")
+    def label(obj, field, display = "", options={})
+      tag :label, display.blank? ? field.to_s.titleize : display, options.merge(:for => "#{obj}_#{field}")
     end
     
     def text(obj, field="", options={})
@@ -49,8 +49,9 @@ module Sinatra
     end
     
     def radio(obj, field, value, options={})
-      content = @params[obj] && @params[obj][field.to_s] == value ? "true" : ""       
-      tag :input, value, options.merge(:type => "radio", :id => "#{obj}_#{field}", :name => "#{obj}[#{field}]", :value => value, :checked => content)
+      #content = @params[obj] && @params[obj][field.to_s] == value ? "true" : ""    
+      # , :checked => content   
+      tag :input, "", options.merge(:type => "radio", :id => "#{obj}_#{field}_#{value}", :name => "#{obj}[#{field}]", :value => value)
       
     end
     

data/sinatra-formhelpers.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{sinatra-formhelpers}
-  s.version = "0.3.0"
+  s.version = "0.3.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["twilson63"]
-  s.date = %q{2009-06-18}
+  s.date = %q{2009-07-14}
   s.email = %q{tom@jackrussellsoftware.com}
   s.extra_rdoc_files = [
     "LICENSE",
@@ -29,12 +29,12 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/twilson63/sinatra-formhelpers}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.4}
+  s.rubygems_version = %q{1.3.3}
   s.summary = %q{use basic form helpers for generic form management}
   s.test_files = [
-    "test/helper.rb",
-     "test/contest.rb",
-     "test/formhelpers_test.rb"
+    "test/contest.rb",
+     "test/formhelpers_test.rb",
+     "test/helper.rb"
   ]
 
   if s.respond_to? :specification_version then

data/test/formhelpers_test.rb

@@ -38,6 +38,23 @@ class FormHelpersTest < Test::Unit::TestCase
     it 'renders an label tag' do
       get '/'
       assert_equal "<label for='person_first_name'>First Name</label>\n", body
+    end
+    
+  end
+
+  describe 'formhelpers custom display label' do
+    setup do
+      mock_app {
+        helpers Sinatra::FormHelpers
+        get '/' do
+          haml "= label :person, :first_name, 'Hello World'"
+        end
+      }
+    end
+        
+    it 'renders an label tag with display text' do
+      get '/'
+      assert_equal "<label for='person_first_name'>Hello World</label>\n", body
     end    
   end
   
@@ -53,6 +70,7 @@ class FormHelpersTest < Test::Unit::TestCase
     
     it 'renders an input tag type text without @params' do
       get '/'
+      assert_contains "name='person[first_name]'"
       assert_equal "<input name='person[first_name]' id='person_first_name' value='' type='text' />\n", body
     end            
   end
@@ -184,7 +202,9 @@ class FormHelpersTest < Test::Unit::TestCase
     
     it 'renders an input tag with a checkbox type' do
       get '/'
-      assert_equal "<input name='person[active]' id='person_active' type='checkbox' />\n", body
+      assert_match /name=\'person\[active\]\'/, body
+      assert_match /id=\'person_active\'/, body
+      assert_match /type=\'checkbox\'/, body
     end        
   end
   

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: twilson63-sinatra-formhelpers
 version: !ruby/object:Gem::Version 
-  version: 0.3.0
+  version: 0.3.4
 platform: ruby
 authors: 
 - twilson63
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-06-18 00:00:00 -07:00
+date: 2009-07-14 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -81,6 +81,6 @@ signing_key:
 specification_version: 3
 summary: use basic form helpers for generic form management
 test_files: 
-- test/helper.rb
 - test/contest.rb
 - test/formhelpers_test.rb
+- test/helper.rb