bootstrap_forms 4.0.0 → 4.0.1

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 52a07c0b5800f1cf485f3fc14a4a0bed1875b362
+  data.tar.gz: 5d3026f949c7fbcfca51d167394b6935fde259ca
+SHA512:
+  metadata.gz: 197254e010f62e86ce62660f0b1653e27f21b171aa7267aa5f440814a4a9d62ac8b7f271c9b17037616f2ef29a7f30da1f7138136811991052c9ad44624c8155
+  data.tar.gz: 0abc20f96bb0944190add8e957e6fd8e6627f786c1c1c2e2ac5216673f164b0f572bb394096f6229d63972732d95377566d6ff1081e264a77b3c9e80e07e184e

data/CHANGELOG.md

@@ -0,0 +1,12 @@
+CHANGELOG
+=========
+v4.0.1
+------
+- Fix critical UI bug when displaying radio/checkbox collections (@sshaw)
+
+v4.0.0
+------
+- Created a CHANGELOG
+- **WARN**: Dropped support for 1.8/ree
+- **WARN**: Removed tests for Ruby 1.9.1 and 1.9.2 (blame Capybara)
+- **WARN**: License changed to Apache 2.0

data/README.md

@@ -103,6 +103,12 @@ You can set the `:inline` option to build inline radios.
 = f.radio_buttons :published, { "Published" => true, "Unpublished" => false }, { :inline => true }
 ```
 
+You can set radio options by passing a hash instead of a value:
+
+```haml
+= f.radio_buttons :published, { "Published" => true, "Unpublished" => {:value => false, :disabled => true} }
+```
+
 Ruby 1.8 doesn't guarantee hashes are ordered. If you care, pass in nested arrays or `ActiveSupport::OrderedHash`.
 
 Uneditable Input

data/lib/bootstrap_forms/form_builder.rb

@@ -108,11 +108,20 @@ module BootstrapForms
         label_field + input_div do
           klasses = 'radio'
           klasses << ' inline' if @field_options.delete(:inline) == true
-          values.map do |text, value|
+
+          buttons = values.map do |text, value|
+            radio_options = @field_options
+            if value.is_a? Hash
+              radio_options = radio_options.merge(value)
+              value = radio_options.delete(:value)
+            end
+
             label("#{@name}_#{value}", :class => klasses) do
-              extras { radio_button(name, value, @field_options) + text }
+              radio_button(name, value, radio_options) + text
             end
-          end.join.html_safe
+          end.join('')
+          buttons << extras
+          buttons.html_safe
         end
       end
     end
@@ -123,18 +132,20 @@ module BootstrapForms
       @args = args
 
       control_group_div do
-        label_field + extras do
-          content_tag(:div, :class => 'controls') do
-            options = @field_options.merge(required_attribute)
-            records.collect do |record|
-              options[:id] = "#{object_name}_#{attribute}_#{record.send(record_id)}"
-              checkbox = check_box_tag("#{object_name}[#{attribute}][]", record.send(record_id), [object.send(attribute)].flatten.include?(record.send(record_id)), options)
-
-              content_tag(:label, :class => ['checkbox', ('inline' if @field_options[:inline])].compact) do
-                checkbox + content_tag(:span, record.send(record_name))
-              end
-            end.join('').html_safe
-          end
+        label_field + input_div do
+          options = @field_options.except(*BOOTSTRAP_OPTIONS).merge(required_attribute)
+          # Since we're using check_box_tag() we may have to lookup the instance ourselves
+          instance = object || @template.instance_variable_get("@#{object_name}")
+          boxes = records.collect do |record|
+            options[:id] = "#{object_name}_#{attribute}_#{record.send(record_id)}"
+            checkbox = check_box_tag("#{object_name}[#{attribute}][]", record.send(record_id), [instance.send(attribute)].flatten.include?(record.send(record_id)), options)
+
+            content_tag(:label, :class => ['checkbox', ('inline' if @field_options[:inline])].compact) do
+              checkbox + record.send(record_name)
+            end
+          end.join('')
+          boxes << extras
+          boxes.html_safe
         end
       end
     end
@@ -145,18 +156,16 @@ module BootstrapForms
       @args = args
 
       control_group_div do
-        label_field + extras do
-          content_tag(:div, :class => 'controls') do
-            options = @field_options.merge(required_attribute)
-            records.collect do |record|
-              options[:id] = "#{object_name}_#{attribute}_#{record.send(record_id)}"
-              radiobutton = radio_button_tag("#{object_name}[#{attribute}]", record.send(record_id), object.send(attribute) == record.send(record_id), options)
-
-              content_tag(:label, :class => ['radio', ('inline' if @field_options[:inline])].compact) do
-                radiobutton + content_tag(:span, record.send(record_name))
-              end
-            end.join('').html_safe
-          end
+        label_field + input_div do
+          options = @field_options.merge(required_attribute)
+          buttons = records.collect do |record|
+            radiobutton = radio_button(attribute, record.send(record_id), options)
+            content_tag(:label, :class => ['radio', ('inline' if @field_options[:inline])].compact) do
+              radiobutton + record.send(record_name)
+            end
+          end.join('')
+          buttons << extras
+          buttons.html_safe
         end
       end
     end
@@ -220,7 +229,6 @@ module BootstrapForms
     end
 
     private
-
     def field_options(args)
       if @options
         @options.slice(:namespace, :index).merge(args)

data/lib/bootstrap_forms/helpers/wrappers.rb

@@ -1,6 +1,8 @@
 module BootstrapForms
   module Helpers
     module Wrappers
+      BOOTSTRAP_OPTIONS = [ :label, :help_inline, :error, :success, :warning, :help_block, :prepend, :append, :append_button, :control_group ]
+
       private
       def control_group_div(&block)
         field_errors = error_string
@@ -141,6 +143,9 @@ module BootstrapForms
             tag_options[:type] = 'button'
             tag_options[:class] = 'btn'
             tag_options.merge! button_options
+          when 'error', 'success', 'warning'
+            element = :span
+            tag_options[:class] = "help-inline #{method_name}-message"
           else
             element = :span
             tag_options[:class] = 'help-inline'
@@ -161,7 +166,7 @@ module BootstrapForms
       end
 
       def objectify_options(options)
-        super.except(:label, :help_inline, :error, :success, :warning, :help_block, :prepend, :append, :append_button, :control_group)
+        super.except(*BOOTSTRAP_OPTIONS)
       end
     end
   end

data/lib/bootstrap_forms/version.rb

@@ -1,3 +1,3 @@
 module BootstrapForms
-  VERSION = '4.0.0'
+  VERSION = '4.0.1'
 end

data/spec/lib/bootstrap_forms/form_builder_spec.rb

@@ -83,25 +83,25 @@ describe 'BootstrapForms::FormBuilder' do
       end
 
       it 'have error message on field' do
-        @builder.text_field('name').should == "<div class=\"control-group error\"><label class=\"control-label\" for=\"item_name\">Name</label><div class=\"controls\"><input id=\"item_name\" name=\"item[name]\" size=\"30\" type=\"text\" /><span class=\"help-inline\">Name is invalid</span></div></div>"
+        @builder.text_field('name').should == "<div class=\"control-group error\"><label class=\"control-label\" for=\"item_name\">Name</label><div class=\"controls\"><input id=\"item_name\" name=\"item[name]\" size=\"30\" type=\"text\" /><span class=\"help-inline error-message\">Name is invalid</span></div></div>"
       end
 
       it "joins passed error message and validation errors with ', '" do
-        @builder.text_field('name', :error => 'This is an error!').should == "<div class=\"control-group error\"><label class=\"control-label\" for=\"item_name\">Name</label><div class=\"controls\"><input id=\"item_name\" name=\"item[name]\" size=\"30\" type=\"text\" /><span class=\"help-inline\">This is an error!, Name is invalid</span></div></div>"
+        @builder.text_field('name', :error => 'This is an error!').should == "<div class=\"control-group error\"><label class=\"control-label\" for=\"item_name\">Name</label><div class=\"controls\"><input id=\"item_name\" name=\"item[name]\" size=\"30\" type=\"text\" /><span class=\"help-inline error-message\">This is an error!, Name is invalid</span></div></div>"
       end
     end
-    
+
     context "errors with translations" do
       before(:all) { I18n.backend.store_translations I18n.locale, {:errors => {:format => "%{message}", :messages => {:invalid => "Nope"}}} }
       after(:all)  { I18n.backend.reload! }
-      
+
       before(:each) do
         @project.errors.add('name')
         @result = @builder.error_messages
       end
-      
+
       it 'use i18n format on field error message' do
-        @builder.text_field('name').should match /<span class="help-inline">Nope<\/span>/
+        @builder.text_field('name').should match /<span class="help-inline error-message">Nope<\/span>/
       end
     end
 
@@ -153,7 +153,8 @@ describe 'BootstrapForms::FormBuilder' do
 
   context 'setup builder with a symbol' do
     before(:each) do
-      @template = ActionView::Base.new
+      @project = Project.new
+      @template = ActionView::Base.new(nil, :item => @project)
       @template.output_buffer = ''
       @builder = BootstrapForms::FormBuilder.new(:item, nil, @template, {}, proc {})
     end

data/spec/support/shared_context.rb

@@ -80,6 +80,20 @@ shared_examples 'a bootstrap form' do
       it 'adds inline class' do
         @builder.radio_buttons(:name, @options, {:inline => true}).should == "<div class=\"control-group\"><label class=\"control-label\" for=\"item_name\">Name</label><div class=\"controls\"><label class=\"radio inline\" for=\"item_name_1\"><input id=\"item_name_1\" name=\"item[name]\" type=\"radio\" value=\"1\" />One</label><label class=\"radio inline\" for=\"item_name_2\"><input id=\"item_name_2\" name=\"item[name]\" type=\"radio\" value=\"2\" />Two</label></div></div>"
       end
+
+      it 'adds block help' do
+        @builder.radio_buttons(:name, @options, :help_block => "Help me!").should == "<div class=\"control-group\"><label class=\"control-label\" for=\"item_name\">Name</label><div class=\"controls\"><label class=\"radio\" for=\"item_name_1\"><input id=\"item_name_1\" name=\"item[name]\" type=\"radio\" value=\"1\" />One</label><label class=\"radio\" for=\"item_name_2\"><input id=\"item_name_2\" name=\"item[name]\" type=\"radio\" value=\"2\" />Two</label><span class=\"help-block\">Help me!</span></div></div>"
+      end
+
+      describe "with disabled option" do
+        before do
+          @options = {'One' => '1', 'Two' => {:value => '2', :disabled => true}}
+        end
+
+        it 'adds the disabled attribute' do
+          @builder.radio_buttons(:name, @options).should include("<input disabled=\"disabled\" id=\"item_name_2\" name=\"item[name]\" type=\"radio\" value=\"2\" />Two<")
+        end
+      end
     end
 
     (%w{email file number password range search text url }.map{|field| ["#{field}_field",field]} + [['telephone_field', 'tel'], ['phone_field', 'tel']]).each do |field, type|
@@ -113,6 +127,34 @@ shared_examples 'a bootstrap form' do
       end # field
     end # fields
 
+    describe 'collection_radio_buttons' do
+      before do
+        @options = [ [["foo", "Foo"], ["bar", "Bar"]], :first, :last ]
+      end
+
+      it 'generates wrapped input' do
+        @builder.collection_radio_buttons(:name, *@options).should eq "<div class=\"control-group\"><label class=\"control-label\" for=\"item_name\">Name</label><div class=\"controls\"><label class=\"radio\"><input id=\"item_name_foo\" name=\"item[name]\" type=\"radio\" value=\"foo\" />Foo</label><label class=\"radio\"><input id=\"item_name_bar\" name=\"item[name]\" type=\"radio\" value=\"bar\" />Bar</label></div></div>"
+      end
+
+      it 'adds block help' do
+        @builder.collection_radio_buttons(:name, *@options, :help_block => "Help me!").should == "<div class=\"control-group\"><label class=\"control-label\" for=\"item_name\">Name</label><div class=\"controls\"><label class=\"radio\"><input id=\"item_name_foo\" name=\"item[name]\" type=\"radio\" value=\"foo\" />Foo</label><label class=\"radio\"><input id=\"item_name_bar\" name=\"item[name]\" type=\"radio\" value=\"bar\" />Bar</label><span class=\"help-block\">Help me!</span></div></div>"
+      end
+    end
+
+    describe 'collection_check_boxes' do
+      before do
+        @options = [ [["foo", "Foo"], ["bar", "Bar"]], :first, :last ]
+      end
+
+      it 'generates wrapped input' do
+        @builder.collection_check_boxes(:name, *@options).should eq "<div class=\"control-group\"><label class=\"control-label\" for=\"item_name\">Name</label><div class=\"controls\"><label class=\"checkbox\"><input id=\"item_name_foo\" name=\"item[name][]\" type=\"checkbox\" value=\"foo\" />Foo</label><label class=\"checkbox\"><input id=\"item_name_bar\" name=\"item[name][]\" type=\"checkbox\" value=\"bar\" />Bar</label></div></div>"
+      end
+
+      it 'adds block help' do
+        @builder.collection_check_boxes(:name, *@options, :help_block => "Help me!").should == "<div class=\"control-group\"><label class=\"control-label\" for=\"item_name\">Name</label><div class=\"controls\"><label class=\"checkbox\"><input id=\"item_name_foo\" name=\"item[name][]\" type=\"checkbox\" value=\"foo\" />Foo</label><label class=\"checkbox\"><input id=\"item_name_bar\" name=\"item[name][]\" type=\"checkbox\" value=\"bar\" />Bar</label><span class=\"help-block\">Help me!</span></div></div>"
+      end
+    end
+
     describe 'collection select' do
       before(:each) do
         @result = @builder.collection_select(:name, [["foo", "Foo"]], :first, :last)
@@ -196,19 +238,19 @@ shared_examples 'a bootstrap form' do
       end
 
       it 'adds error message and class' do
-        @builder.text_field(:name, :error => 'This is an error!').should == "<div class=\"control-group error\"><label class=\"control-label\" for=\"item_name\">Name</label><div class=\"controls\"><input id=\"item_name\" name=\"item[name]\" size=\"30\" type=\"text\" /><span class=\"help-inline\">This is an error!</span></div></div>"
+        @builder.text_field(:name, :error => 'This is an error!').should == "<div class=\"control-group error\"><label class=\"control-label\" for=\"item_name\">Name</label><div class=\"controls\"><input id=\"item_name\" name=\"item[name]\" size=\"30\" type=\"text\" /><span class=\"help-inline error-message\">This is an error!</span></div></div>"
       end
 
       it 'adds error message, class and appended text' do
-        @builder.text_field(:name, :error => 'This is an error!', :append => 'test').should == "<div class=\"control-group error\"><label class=\"control-label\" for=\"item_name\">Name</label><div class=\"controls\"><div class=\"input-append\"><input id=\"item_name\" name=\"item[name]\" size=\"30\" type=\"text\" /><span class=\"add-on\">test</span></div><span class=\"help-inline\">This is an error!</span></div></div>"
+        @builder.text_field(:name, :error => 'This is an error!', :append => 'test').should == "<div class=\"control-group error\"><label class=\"control-label\" for=\"item_name\">Name</label><div class=\"controls\"><div class=\"input-append\"><input id=\"item_name\" name=\"item[name]\" size=\"30\" type=\"text\" /><span class=\"add-on\">test</span></div><span class=\"help-inline error-message\">This is an error!</span></div></div>"
       end
 
       it 'adds success message and class' do
-        @builder.text_field(:name, :success => 'This checked out OK').should == "<div class=\"control-group success\"><label class=\"control-label\" for=\"item_name\">Name</label><div class=\"controls\"><input id=\"item_name\" name=\"item[name]\" size=\"30\" type=\"text\" /><span class=\"help-inline\">This checked out OK</span></div></div>"
+        @builder.text_field(:name, :success => 'This checked out OK').should == "<div class=\"control-group success\"><label class=\"control-label\" for=\"item_name\">Name</label><div class=\"controls\"><input id=\"item_name\" name=\"item[name]\" size=\"30\" type=\"text\" /><span class=\"help-inline success-message\">This checked out OK</span></div></div>"
       end
 
       it 'adds warning message and class' do
-        @builder.text_field(:name, :warning => 'Take a look at this...').should == "<div class=\"control-group warning\"><label class=\"control-label\" for=\"item_name\">Name</label><div class=\"controls\"><input id=\"item_name\" name=\"item[name]\" size=\"30\" type=\"text\" /><span class=\"help-inline\">Take a look at this...</span></div></div>"
+        @builder.text_field(:name, :warning => 'Take a look at this...').should == "<div class=\"control-group warning\"><label class=\"control-label\" for=\"item_name\">Name</label><div class=\"controls\"><input id=\"item_name\" name=\"item[name]\" size=\"30\" type=\"text\" /><span class=\"help-inline warning-message\">Take a look at this...</span></div></div>"
       end
 
       it 'prepends passed text' do

metadata

@@ -1,20 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: bootstrap_forms
 version: !ruby/object:Gem::Version
-  version: 4.0.0
-  prerelease: 
+  version: 4.0.1
 platform: ruby
 authors:
 - Seth Vargo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-30 00:00:00.000000000 Z
+date: 2013-08-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -22,7 +20,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -30,7 +27,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: capybara
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -38,7 +34,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -46,23 +41,20 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -70,7 +62,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -78,7 +69,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: country_select
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -86,7 +76,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -94,33 +83,29 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: fuubar
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: Bootstrap Forms makes Twitter's Bootstrap on Rails easy to use by creating
@@ -132,6 +117,7 @@ extra_rdoc_files: []
 files:
 - .gitignore
 - .travis.yml
+- CHANGELOG.md
 - Gemfile
 - LICENSE
 - README.md
@@ -200,27 +186,26 @@ files:
 - spec/support/shared_context.rb
 homepage: https://github.com/sethvargo/bootstrap_forms
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: 1.9.1
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Bootstrap Forms makes Twitter's Bootstrap on Rails easy!
 test_files:
 - spec/dummy/Rakefile