bootstrap_forms 1.0.3 → 1.0.4

data/README.markdown

@@ -24,7 +24,7 @@ Add it to your `Gemfile`:
 
     gem 'bootstrap_forms'
 
-Don't forget to run the `bundle` command. The gem will add 2 methods `bootstrap_form_for` and `bootstrap_fields_for` for use in your project. This is different from `bootstrap_forms < 0.1.0`. In previous versions, the default form builders were overridden by default. With backlash from various community members, this is no longer the default.
+Don't forget to run the `bundle` command. The gem will add the method `bootstrap_form_for` for use in your project. This is different from `bootstrap_forms < 0.1.0`. In previous versions, the default form builders were overridden by default. With backlash from various community members, this is no longer the default.
 
 Be sure to restart your Rails server after installing the gem.
 
@@ -69,6 +69,14 @@ See description above...
 = f.collection_radio_buttons :primary_category_id, Category.all, :id, :name
 ```
 
+### radio_buttons
+
+```haml
+= f.radio_buttons :published, { "Published" => true, "Unpublished" => false }
+```
+
+Ruby 1.8 doesn't guarantee hashes are ordered. If you care, pass in nested arrays or `ActiveSupport::OrderedHash`.
+
 Uneditable Input
 ----------------
 Bootstrap Forms adds another helper method that generates the necessary markup for uneditable inputs:
@@ -105,6 +113,8 @@ generates:
 </div>
 ```
 
+You can skip the cancel button by passing the `:include_cancel` button a `false` value.
+
 Pretty swell if you ask me.
 
 Adding More Options
@@ -187,4 +197,4 @@ Permission is hereby granted, free of charge, to any person obtaining a copy of
 
 The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
 
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

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     = "1.0.3"
+  s.version     = "1.0.4"
   s.author      = "Seth Vargo"
   s.email       = "sethvargo@gmail.com"
   s.homepage    = "https://github.com/sethvargo/bootstrap_forms"

data/config/locales/sv.yml

@@ -0,0 +1,6 @@
+sv:
+  bootstrap_forms:
+    errors:
+      header: "Kunde inte spara på grund av nedanstående fel:"
+    buttons:
+      cancel: 'Avbryt'

data/lib/bootstrap_forms/form_builder.rb

@@ -4,9 +4,8 @@ module BootstrapForms
 
     def error_messages
       if object.errors.full_messages.any?
-        content_tag(:div, :class => 'alert alert-block alert-error') do
-          link_to('×'.html_safe, '#', {:class => 'close', :data => { :dismiss => 'alert' }}) +
-          content_tag(:h4, I18n.t('bootstrap_forms.errors.header', :model => object.class.model_name.humanize), :class => 'alert-heading') +
+        content_tag(:div, :class => 'alert alert-block alert-error validation-errors') do
+          content_tag(:h4, I18n.t('bootstrap_forms.errors.header', :model => object.class.model_name.human), :class => 'alert-heading') +
           content_tag(:ul) do
             object.errors.full_messages.map do |message|
               content_tag(:li, message)
@@ -18,20 +17,15 @@ module BootstrapForms
       end
     end
 
-    def bootstrap_fields_for(record_name, record_object = nil, options = {}, &block)
-      options[:builder] = BootstrapForms::FormBuilder
-      fields_for(record_name, record_object, options, &block)
-    end
-
     %w(collection_select select email_field file_field number_field password_field phone_field radio_button range_field search_field telephone_field text_area text_field url_field).each do |method_name|
       define_method(method_name) do |name, *args|
         @name = name
-        @options = args.extract_options!
+        @field_options = args.extract_options!
         @args = args
 
         control_group_div do
           label_field + input_div do
-            extras { super(name, *(@args << @options)) }
+            extras { super(name, *(@args << @field_options)) }
           end
         end
       end
@@ -39,21 +33,36 @@ module BootstrapForms
 
     def check_box(name, *args)
       @name = name
-      @options = args.extract_options!
+      @field_options = args.extract_options!
       @args = args
 
       control_group_div do
         input_div do
           label(@name, :class => [ 'checkbox', required_class ].compact.join(' ')) do
-            extras { super(name, *(@args << @options)) + object.class.human_attribute_name(name) }
+            extras { super(name, *(@args << @field_options)) + human_attribute_name }
           end
         end
       end
     end
 
+    def radio_buttons(name, values={}, opts={})
+      @name = name
+      @options = opts
+
+      control_group_div do
+        label_field + input_div do
+          values.map do |text, value|
+            label("#{@name}_#{value}", :class => [ 'radio', required_class ].compact.join(' ')) do
+              extras { radio_button(name, value, @options) + text }
+            end
+          end.join.html_safe
+        end
+      end
+    end
+
     def collection_check_boxes(attribute, records, record_id, record_name, *args)
       @name = attribute
-      @options = args.extract_options!
+      @field_options = args.extract_options!
       @args = args
 
       control_group_div do
@@ -61,9 +70,9 @@ module BootstrapForms
           content_tag(:div, :class => 'controls') do
             records.collect do |record|
               element_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.merge({:id => element_id}))
+              checkbox = check_box_tag("#{object_name}[#{attribute}][]", record.send(record_id), [object.send(attribute)].flatten.include?(record.send(record_id)), @field_options.merge({:id => element_id}))
 
-              content_tag(:label, :class => ['checkbox', ('inline' if @options[:inline])].compact.join(' ')) do
+              content_tag(:label, :class => ['checkbox', ('inline' if @field_options[:inline])].compact.join(' ')) do
                 checkbox + content_tag(:span, record.send(record_name))
               end
             end.join('').html_safe
@@ -74,7 +83,7 @@ module BootstrapForms
 
     def collection_radio_buttons(attribute, records, record_id, record_name, *args)
       @name = attribute
-      @options = args.extract_options!
+      @field_options = args.extract_options!
       @args = args
 
       control_group_div do
@@ -82,9 +91,9 @@ module BootstrapForms
           content_tag(:div, :class => 'controls') do
             records.collect do |record|
               element_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.merge({:id => element_id}))
+              radiobutton = radio_button_tag("#{object_name}[#{attribute}][]", record.send(record_id), object.send(attribute) == record.send(record_id), @field_options.merge({:id => element_id}))
 
-              content_tag(:label, :class => ['radio', ('inline' if @options[:inline])].compact.join(' ')) do
+              content_tag(:label, :class => ['radio', ('inline' if @field_options[:inline])].compact.join(' ')) do
                 radiobutton + content_tag(:span, record.send(record_name))
               end
             end.join('').html_safe
@@ -95,14 +104,14 @@ module BootstrapForms
 
     def uneditable_input(name, *args)
       @name = name
-      @options = args.extract_options!
+      @field_options = args.extract_options!
       @args = args
 
       control_group_div do
         label_field + input_div do
           extras do
             content_tag(:span, :class => 'uneditable-input') do
-              @options[:value] || object.send(@name.to_sym)
+              @field_options[:value] || object.send(@name.to_sym)
             end
           end
         end
@@ -111,34 +120,51 @@ module BootstrapForms
 
     def submit(name = nil, *args)
       @name = name
-      @options = args.extract_options!
+      @field_options = args.extract_options!
       @args = args
 
-      @options[:class] = 'btn btn-primary'
+      @field_options[:class] = 'btn btn-primary'
 
       content_tag(:div, :class => 'form-actions') do
-        super(name, *(args << @options)) + ' ' + button_tag(I18n.t('bootstrap_forms.buttons.cancel'), :type => 'reset', :class => 'btn cancel')
+        if @field_options[:include_cancel] == false
+          super(name, *(args << @field_options))
+        else
+          super(name, *(args << @field_options)) + ' ' + link_to(I18n.t('bootstrap_forms.buttons.cancel'), (@field_options[:back] || :back), :class => 'btn cancel')
+        end
       end
     end
 
     private
     def control_group_div(&block)
-      @options[:error] = object.errors[@name].collect{|e| "#{@options[:label] || @name} #{e}".humanize}.join(', ') unless object.errors[@name].empty?
+      @field_options[:error] = error_string
 
       klasses = ['control-group']
-      klasses << 'error' if @options[:error]
-      klasses << 'success' if @options[:success]
-      klasses << 'warning' if @options[:warning]
+      klasses << 'error' if @field_options[:error]
+      klasses << 'success' if @field_options[:success]
+      klasses << 'warning' if @field_options[:warning]
       klass = klasses.join(' ')
 
       content_tag(:div, :class => klass, &block)
     end
 
+    def error_string
+      errors = object.errors[@name]
+      if errors.present?
+        errors.map { |e|
+          "#{@options[:label] || human_attribute_name} #{e}"
+        }.join(", ")
+      end
+    end
+
+    def human_attribute_name
+      object.class.human_attribute_name(@name)
+    end
+
     def input_div(&block)
       content_tag(:div, :class => 'controls') do
-        if @options[:append] || @options[:prepend]
-          klass = 'input-prepend' if @options[:prepend]
-          klass = 'input-append' if @options[:append]
+        if @field_options[:append] || @field_options[:prepend]
+          klass = 'input-prepend' if @field_options[:prepend]
+          klass = 'input-append' if @field_options[:append]
           content_tag(:div, :class => klass, &block)
         else
           yield if block_given?
@@ -147,17 +173,17 @@ module BootstrapForms
     end
 
     def label_field(&block)
-      label(@name, block_given? ? block : @options[:label], :class => ['control-label', required_class].compact.join(' '))
+      label(@name, block_given? ? block : @field_options[:label], :class => ['control-label', required_class].compact.join(' '))
     end
 
     def required_class
-      'required' if object.class.validators_on(@name).any? { |v| v.kind_of? ActiveModel::Validations::PresenceValidator }
+      return 'required' if object.class.validators_on(@name).any? { |v| v.kind_of? ActiveModel::Validations::PresenceValidator }
       nil
     end
 
     %w(help_inline error success warning help_block append prepend).each do |method_name|
       define_method(method_name) do |*args|
-        return '' unless value = @options[method_name.to_sym]
+        return '' unless value = @field_options[method_name.to_sym]
         case method_name
         when 'help_block'
           element = :p

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bootstrap_forms
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -25,6 +25,7 @@ files:
 - Rakefile
 - bootstrap_forms.gemspec
 - config/locales/en.yml
+- config/locales/sv.yml
 - lib/bootstrap_forms.rb
 - lib/bootstrap_forms/engine.rb
 - lib/bootstrap_forms/form_builder.rb