formtastic 1.0.0.beta4 → 1.0.0.rc

data/lib/formtastic.rb

@@ -1205,9 +1205,11 @@ module Formtastic #:nodoc:
         html_options = options.delete(:input_html) || {}
         checked = options.key?(:checked) ? options[:checked] : options[:selected]
         html_options[:checked] = checked == true if [:selected, :checked].any? { |k| options.key?(k) }
+        checked_value = options.delete(:checked_value) || '1'
+        unchecked_value = options.delete(:unchecked_value) || '0'
 
         input = self.check_box(method, strip_formtastic_options(options).merge(html_options),
-                               options.delete(:checked_value) || '1', options.delete(:unchecked_value) || '0')
+                               checked_value, unchecked_value)
         options = options_for_label(options)
 
         # the label() method will insert this nested input into the label at the last minute

data/spec/inputs/boolean_input_spec.rb

@@ -38,7 +38,7 @@ describe 'boolean input' do
       concat(builder.input(:allow_comments, :as => :boolean, :checked_value => 'checked', :unchecked_value => 'unchecked'))
     end
 
-    output_buffer.should have_tag('form li label input[@type="checkbox"][@value="checked"]')
+    output_buffer.should have_tag('form li label input[@type="checkbox"][@value="checked"]:not([@unchecked_value][@checked_value])')
     output_buffer.should have_tag('form li label input[@type="hidden"][@value="unchecked"]')
   end
 

metadata

@@ -6,8 +6,8 @@ version: !ruby/object:Gem::Version
   - 1
   - 0
   - 0
-  - beta4
-  version: 1.0.0.beta4
+  - rc
+  version: 1.0.0.rc
 platform: ruby
 authors: 
 - Justin French
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-31 00:00:00 +10:00
+date: 2010-08-01 00:00:00 +10:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency