bootstrap_forms 3.0.0.rc1 → 3.0.0

data/.ruby-version

@@ -1 +1 @@
-1.9.3-p385
+1.9.3-p392

data/Gemfile

@@ -1,2 +1,2 @@
-source :rubygems
+source "https://rubygems.org"
 gemspec

data/{README.markdown → README.md}

@@ -149,7 +149,23 @@ Adding More Options
 -------------------
 You can add as many options to any form helper tag. If they are interpreted by Bootstrap Forms, they are interpreted and rendered in the output. If not, they are passed along as values to the final HTML form object.
 
-### Available Options
+### Form Options
+<table>
+  <tr>
+    <th>Name</th>
+    <th>Description</th>
+    <th>Usage</th>
+    <th>Default</th>
+  </tr>
+  <tr>
+    <th>summary_errors</th>
+    <td>Show summary errors at the top</td>
+    <td><tt>= bootstrap_form_for @thing, summary_errors: false</td></td>
+    <td><tt>true</tt></td>
+  </tr>
+</table>
+
+### Field Options
 
 <table>
   <tr>

data/bootstrap_forms.gemspec

@@ -3,7 +3,7 @@ $:.push File.expand_path('../lib', __FILE__)
 
 Gem::Specification.new do |s|
   s.name        = 'bootstrap_forms'
-  s.version     = '3.0.0.rc1'
+  s.version     = '3.0.0'
   s.author      = 'Seth Vargo'
   s.email       = 'sethvargo@gmail.com'
   s.homepage    = 'https://github.com/sethvargo/bootstrap_forms'
@@ -19,6 +19,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'capybara', '~> 2.0.0'
   s.add_development_dependency 'rake'
   s.add_development_dependency 'rails', '~> 3.2.0'
+  s.add_development_dependency 'country_select', '~> 1.1.1'
   s.add_development_dependency 'guard-rspec'
   s.add_development_dependency 'sqlite3'
   s.add_development_dependency 'fuubar'

data/lib/bootstrap_forms/form_builder.rb

@@ -19,48 +19,53 @@ module BootstrapForms
       end
     end
 
-    %w(country_select time_zone_select email_field file_field number_field password_field phone_field range_field search_field telephone_field text_area text_field url_field datetime_select date_select time_select).each do |method_name|
-      define_method(method_name) do |name, *args|
-        # Workaround for ree and 1.8.7 since they don't allow block arguments with default values
-        args = args.extract_options!
-
-        @name = name
-        @field_options = field_options(args)
-        @args = args
-
-        control_group_div do
-          label_field + input_div do
-            merged_args = @args.merge(@field_options.merge(required_attribute))
-            input_append = (merged_args[:append] || merged_args[:prepend] || merged_args[:append_button]) ? true : nil
-            extras(input_append) { super(name, merged_args) }
+    %w(
+      select
+      collection_select
+      country_select
+      datetime_select
+      date_select
+      time_select
+      time_zone_select
+
+      email_field
+      file_field
+      number_field
+      password_field
+      phone_field
+      range_field
+      search_field
+      telephone_field
+      text_area
+      text_field
+      url_field
+    ).each do |method_name|
+      define_method(method_name) do |name, *raw_args|
+
+        options = {}
+        html_options = {}
+
+        if raw_args.length > 0
+          if raw_args[-1].is_a?(Hash) && raw_args[-2].is_a?(Hash)
+            html_options = raw_args[-1]
+            options = raw_args[-2]
+          elsif raw_args[-1].is_a?(Hash)
+            options = raw_args[-1]
           end
         end
-      end
-    end
 
-    %w(collection_select select).each do |method_name|
-      define_method(method_name) do |name, *args|
-        if args[-1].is_a? Hash
-          if args[-2].is_a? Hash
-            html_options = args.pop
-            options = args.pop
-          else
-            html_options = {}
-            options = args.pop
-          end
-        else
-          html_options = {}
-          options = {}
-        end
+        # Add options hash to argument array if its empty
+        raw_args << options if raw_args.length == 0
 
         @name = name
         @field_options = field_options(options)
-        @args = args
+        @args = options
 
         control_group_div do
           label_field + input_div do
-            rebuilt_args = args + [options.merge(@field_options.merge(required_attribute)), html_options]
-            extras { super(name, *rebuilt_args) }
+            options.merge!(@field_options.merge(required_attribute))
+            input_append = (options[:append] || options[:prepend] || options[:append_button]) ? true : nil
+            extras(input_append) { super(name, *raw_args) }
           end
         end
       end

data/lib/bootstrap_forms/helpers/form_helper.rb

@@ -4,8 +4,12 @@ module BootstrapForms
       def bootstrap_form_for(record, options = {}, &block)
         options[:builder] ||= BootstrapForms.default_form_builder
 
-        form_for(record, options) do |f|
-          if f.object.respond_to?(:errors)
+        form_options = options.deep_dup
+        options[:summary_errors] = true unless form_options.has_key?(:summary_errors)
+        form_options.delete(:summary_errors)
+
+        form_for(record, form_options) do |f|
+          if f.object.respond_to?(:errors) and options[:summary_errors]
             f.error_messages.html_safe + capture(f, &block).html_safe
           else
             capture(f, &block).html_safe

data/lib/bootstrap_forms/helpers/form_tag_helper.rb

@@ -7,7 +7,23 @@ module BootstrapForms
         form_tag(url_for_options, options, &block)
       end
 
-      %w(check_box_tag email_field_tag file_field_tag image_submit_tag number_field_tag password_field_tag phone_field_tag radio_button_tag range_field_tag search_field_tag select_tag telephone_field_tag text_area_tag text_field_tag url_field_tag).each do |method_name|
+      %w(
+        check_box_tag
+        email_field_tag
+        file_field_tag
+        image_submit_tag
+        number_field_tag
+        password_field_tag
+        phone_field_tag
+        radio_button_tag
+        range_field_tag
+        search_field_tag
+        select_tag
+        telephone_field_tag
+        text_area_tag
+        text_field_tag
+        url_field_tag
+      ).each do |method_name|
         # prefix each method with bootstrap_*
         define_method("bootstrap_#{method_name}") do |name, *args|
           @name = name

data/spec/dummy/app/views/projects/new_without_summary_errors.html.erb

@@ -0,0 +1,4 @@
+<%= bootstrap_form_for @project, :summary_errors => false do |f| -%>
+  <%= f.text_field :name %>
+  <%= f.submit %>
+<% end -%>

data/spec/lib/bootstrap_forms/bootstrap_form_for_spec.rb

@@ -10,6 +10,19 @@ describe 'bootstrap_form_for' do
       BootstrapForms.default_form_builder.should == BootstrapForms::FormBuilder
     end
 
+    context 'projects/new_without_summary_errors.html.erb', :type => :view do
+      before do
+        project = Project.new
+        project.errors.add('name')
+        assign :project, project
+        render :file => 'projects/new_without_summary_errors', :layout => 'layouts/application', :handlers => [:erb]
+      end
+
+      it 'should not render the full error messages div' do
+        rendered.should_not match /There were errors that prevented this Project from being saved/
+      end
+    end
+
     context 'when set to something else' do
       before do
         BootstrapForms.default_form_builder = MyCustomFormBuilder

data/spec/support/shared_context.rb

@@ -1,3 +1,6 @@
+
+require 'country_select'
+
 shared_examples 'a bootstrap form' do
   describe 'with no options' do
     describe 'error_messages' do
@@ -135,6 +138,28 @@ shared_examples 'a bootstrap form' do
         @result.should match /class=".*baz/
       end
     end
+    
+    
+    describe 'country_select' do
+      before(:each) do
+        @result = @builder.country_select(:name,[ "United Kingdom", "France", "Germany" ])
+      end
+
+      it 'is wrapped' do
+        @result.should match /^<div class=\"control-group\"><label class=\"control-label\" for=\"item_name\">Name<\/label><div class=\"controls\"><select id=\"item_name\" name=\"item\[name\]\"><option value=\"United Kingdom\">United Kingdom<\/option>/
+      end
+    end
+    
+    describe 'collection_select with html options' do
+      before(:each) do
+        @result = @builder.country_select(:name, [ "United Kingdom", "France", "Germany" ], {}, :class => "baz")
+      end
+
+      it 'uses html options' do
+        @result.should match /class=".*baz/
+      end
+    end
+    
 
   end # no options
 

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: bootstrap_forms
 version: !ruby/object:Gem::Version
-  version: 3.0.0.rc1
-  prerelease: 6
+  version: 3.0.0
+  prerelease: 
 platform: ruby
 authors:
 - Seth Vargo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-05 00:00:00.000000000 Z
+date: 2013-05-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec-rails
@@ -75,6 +75,22 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 3.2.0
+- !ruby/object:Gem::Dependency
+  name: country_select
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.1.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.1.1
 - !ruby/object:Gem::Dependency
   name: guard-rspec
   requirement: !ruby/object:Gem::Requirement
@@ -131,13 +147,12 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
-- .rspec
 - .ruby-version
 - .travis.yml
 - Gemfile
 - Guardfile
 - LICENSE
-- README.markdown
+- README.md
 - Rakefile
 - bootstrap_forms.gemspec
 - config/locales/en.yml
@@ -166,6 +181,7 @@ files:
 - spec/dummy/app/models/task.rb
 - spec/dummy/app/views/layouts/application.html.erb
 - spec/dummy/app/views/projects/new.html.erb
+- spec/dummy/app/views/projects/new_without_summary_errors.html.erb
 - spec/dummy/config.ru
 - spec/dummy/config/application.rb
 - spec/dummy/config/boot.rb
@@ -211,15 +227,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 594779022012185333
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>'
+  - - ! '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23
@@ -242,6 +255,7 @@ test_files:
 - spec/dummy/app/models/task.rb
 - spec/dummy/app/views/layouts/application.html.erb
 - spec/dummy/app/views/projects/new.html.erb
+- spec/dummy/app/views/projects/new_without_summary_errors.html.erb
 - spec/dummy/config.ru
 - spec/dummy/config/application.rb
 - spec/dummy/config/boot.rb
@@ -275,3 +289,4 @@ test_files:
 - spec/lib/bootstrap_forms/form_builder_spec.rb
 - spec/spec_helper.rb
 - spec/support/shared_context.rb
+has_rdoc: