formatted_form 2.0.2 → 2.0.3

data/VERSION

@@ -1 +1 @@
-2.0.2
+2.0.3

data/formatted_form.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "formatted_form"
-  s.version = "2.0.2"
+  s.version = "2.0.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jack Neto", "Oleg Khabarov", "The Working Group Inc."]
-  s.date = "2012-12-10"
+  s.date = "2012-12-13"
   s.description = ""
   s.email = "jack@twg.ca"
   s.extra_rdoc_files = [

data/lib/formatted_form/form_builder.rb

@@ -35,6 +35,7 @@ class FormattedForm::FormBuilder < ActionView::Helpers::FormBuilder
   #   form.check_box :color, {}, ['red', 'blue']
   #   form.check_box :color, {}, [['Red', 'red'], ['Blue', 'blue']]
   def check_box(method, options = {}, checked_value = "1", unchecked_value = "0")
+    return super(method, options, checked_value, unchecked_value) if options.delete(:builder) == false
     is_array = checked_value.is_a?(Array)
     options.merge!(:multiple => true) if is_array
     checked_value = is_array ? checked_value : [[checked_value, checked_value, unchecked_value]]
@@ -52,6 +53,7 @@ class FormattedForm::FormBuilder < ActionView::Helpers::FormBuilder
   #   form.radio_button :role, ['admin', 'regular']
   #   form.radio_button :role, [['Admin', 1], ['Regular', 0]]
   def radio_button(method, tag_value, options = {})
+    return super(method, tag_value, options) if options.delete(:builder) == false
     tag_values = tag_value.is_a?(Array) ? tag_value : [tag_value]
     choices = tag_values.collect do |label, choice|
       label, choice = label, label if !choice
@@ -95,7 +97,7 @@ protected
   
   # Main rendering method
   def default_field(field_name, method, options = {}, &block)
-    return yield if options.delete(:builder) == false
+    return yield if options.delete(:builder) == false && block_given?
     builder_options = builder_options!(options)
     @template.render(
       :partial => "formatted_form/#{field_name}",

data/test/form_builder_test.rb

@@ -216,6 +216,13 @@ class FormBuilderTest < ActionView::TestCase
     end
   end
   
+  def test_check_box_with_no_builder
+    with_check_box :colors, :builder => false
+    assert_select "div[class='control-group cg-colors']", 0
+    assert_select "label[for='user_colors']", 0
+    assert_select "input[builder='false']", 0
+  end
+  
   # -- Element --------------------------------------------------------------
   def test_element
     with_element 'Label', 'Content'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: formatted_form
 version: !ruby/object:Gem::Version
-  version: 2.0.2
+  version: 2.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-10 00:00:00.000000000 Z
+date: 2012-12-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -134,7 +134,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2473177573234554938
+      hash: 578154842120635120
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: