bootstraps_bootstraps 2.0.0 → 2.0.1

data/.gitignore

@@ -1,2 +1,2 @@
 *.swp
-bootstraps_bootstraps-0.0.1.gem
+*.gem

data/lib/bootstraps_bootstraps/bootstrap_form_builder.rb

@@ -34,9 +34,13 @@ module BootstrapsBootstraps
       @form_mode = :horizontal if options[:horizontal] || detect_html_class(options, 'form-horizontal')
       @form_mode = :search     if options[:search]     || detect_html_class(options, 'form-search')
       @form_mode = :inline     if options[:inline]     || detect_html_class(options, 'form-inline')
+
+      @action_wrapped = options[:action_wrapped]
     end
 
-    %w[text_field text_area password_field number_field telephone_field url_field email_field range_field collection_select].each do |method_name|
+
+    #the main method constructor which takes care of most of the use cases
+    %w[text_field text_area password_field number_field telephone_field url_field email_field range_field file_field].each do |method_name|
       define_method(method_name) do |name, *args|
         options = args.extract_options!
 
@@ -45,17 +49,17 @@ module BootstrapsBootstraps
           return super(name, *(args.push(options)))
         end
 
-        errors = object.errors[name].any? ? 'error' : ''
-        error_msg = object.errors[name].any? ? content_tag(:span, object.errors[name].join(","), class: 'help-inline') : ''
+        errors, error_msg = render_errors name
 
-        help_text =  options[:help_text].blank? ? '' : content_tag(:span,options[:help_text], class: 'help-block')
+        label_options = options
+        label_options[:class] = options[:label_class] unless options[:label_class].nil?
+        label = options[:label] == false ? ''.html_safe : field_label(name, label_options)
 
-        label = options[:label] == false ? ''.html_safe : field_label(name, options.except(:class))
-
-        options[:class] = [options[:class]] unless options[:class].kind_of?(Array)
-        options[:class].push 'xxlarge' if options[:large] || method_name == 'text_area'
+        guarantee_html_class options
+        options[:class].push 'input-xlarge' if options[:large] || method_name == 'text_area'
         options[:class].push 'inline' if @form_mode == :inline
 
+        options.delete :label
         args.push(options).unshift(name)
 
         field = super(*args) + ' ' + error_msg
@@ -73,46 +77,96 @@ module BootstrapsBootstraps
       end
     end
 
-    #TODO update for bootstrap 2
-    def check_box(name, *args)
+    def check_box method, options = {}, checked_value = 1, unchecked_value = 0
       if options[:vanilla]
-        return super *args
-      end
-
-      options = args.extract_options!
-      if options.has_key? :class
-        unless options[:class].kind_of? Array
-          options[:class] = [options[:class]]
-        end
-      else
-        options[:class] = []
+        return super
       end
 
-      options[:class].push :checkbox
+      guarantee_html_class options, :checkbox
+      options[:class].push 'inline' if @form_mode == :inline
 
       text = options[:label] || ''
       options.delete :label
 
-      args = args.push options
+      field_label(method, options) do
+        super(method,options,checked_value,unchecked_value)  + text
+      end
+    end
 
-      field_label(name, *args) do
-        super(name, *args) + text
+    def collection_select method, collection, value_method, text_method, options = {}, html_options = {}
+      #abort and just let the rails formbuilder do its thing
+      if options[:vanilla]
+        return super
       end
+
+      errors, error_msg = render_errors method
+
+      label = options[:label] == false ? ''.html_safe : field_label(method, html_options)
+
+      guarantee_html_class options
+      options[:class].push 'input-xlarge' if options[:large]
+      options[:class].push 'inline' if @form_mode == :inline
+
+      options.delete :label
+
+      field = super(method,collection,value_method,text_method,options,html_options) + ' ' + error_msg
+
+      #wrap it in div.controls
+      field = div_with_class(['controls',errors], :content => field) if @form_mode == :horizontal
+
+      #tack on the label
+      field = label + field unless @form_mode == :inline
+
+      #wrap it in div.control-group
+      field = div_with_class(['control-group',errors], :content => field) if @form_mode == :horizontal
+
+      field
     end
 
-    def submit *args
-      options = args.extract_options!
-      args = args.push options
+    def date_select method, options = {}, html_options = {}
+      field = super
 
-      if options[:vanilla]
-        super *args
-      else
-        content_tag :div, class: 'form-actions' do
-          super *args
-        end
+      return field if options[:vanilla]
+
+      errors, error_msg = render_errors method
+
+      #hmm, apparently TODO
+      help_text options
+
+      label = options[:label] == false ? ''.html_safe : field_label(method, options.except(:class))
+
+      guarantee_html_class html_options, 'inline'
+
+      field += ' '.html_safe + error_msg
+      field = div_with_class(['controls',errors], :content => field) if @form_mode == :horizontal
+      field = label + field
+      field = div_with_class(['control-group',errors], :content => field) if @form_mode == :horizontal
+      field
+    end
+
+    def radio_button method, value, options = {}
+      guarantee_html_class options, 'radio'
+      error_class, error_message = render_errors method
+
+      text = options[:label] || ''
+      options.delete :label
+
+      content_tag(:label, class: options[:class]) do
+        super(method,value,options) + text
       end
     end
 
+    def submit method, options = {}
+      # options block gets stringify_keys called on it in the first super, no :keys exist after that
+      field = super
+      return field if options['vanilla']
+      field = div_with_class('form-actions', content: field) unless options['no_action_block'] || @action_wrapped || [:inline, :search].include?(@form_mode)
+      puts @action_wrapped
+      field
+    end
+
+
+    #input groups
     def inline_inputs field_options = {}, &block
       field_options[:inline] = true
       wrapper = lambda { |content|
@@ -123,15 +177,34 @@ module BootstrapsBootstraps
       @template.wrapped_inputs(@object_name, @object, @options.merge(field_options), wrapper, &block)
     end
 
+    def grouped_inputs field_options = {}, &block
+      wrapper = lambda do |content|
+        field_group = div_with_class('controls', content:content)
+        if field_options[:label]
+          field_group = label( field_options[:label], field_options[:label], class: 'control-label') + field_group
+        end
+        field_group = div_with_class('control-group', content:field_group)
+      end
+
+      @template.wrapped_inputs(@object_name, @object, @options, wrapper, &block)
+    end
+
+    def form_actions field_options = {}, &block
+      field_options[:action_wrapped] = true
+      wrapper = lambda { |content|
+        field_group = div_with_class('form-actions', content: content)
+      }
+
+      @template.wrapped_inputs(@object_name, @object, @options.merge(field_options), wrapper, &block)
+    end
+
   private
 
     def field_label(name, *args, &block)
       options = args.extract_options!
-      clss = options[:class] || []
-
-      required = object.class.validators_on(name).any? { |v| v.kind_of? ActiveModel::Validations::PresenceValidator}
-      clss.push 'required' if required
-
+      guarantee_html_class options
+      clss = options[:class]
+      clss.push 'required' if object.class.validators_on(name).any? { |v| v.kind_of? ActiveModel::Validations::PresenceValidator}
 
       label(name, options[:label], class: clss, &block)
     end
@@ -154,6 +227,22 @@ module BootstrapsBootstraps
       end
     end
 
+    def guarantee_html_class options_hash, *new_classes
+      if options_hash[:class].nil?
+        options_hash[:class] = []
+      elsif options_hash[:class].kind_of?(Symbol)|| options_hash[:class].kind_of?(String)
+        options_hash[:class] =  [ options_hash[:class] ]
+      end
+
+      unless new_classes.empty?
+        new_classes.each do |clss|
+          options_hash[:class].push clss
+        end
+      end
+
+      options_hash
+    end
+
     def div_with_class clss, options = {}, &block
       options[:class] = [options[:class]] || []
       options[:class].push clss
@@ -172,6 +261,19 @@ module BootstrapsBootstraps
       end
     end
 
+    def render_errors method
+      if object.nil?
+        return ['','']
+      end
+
+      errors = object.errors[method].any? ? 'error' : ''
+      error_msg = object.errors[method].any? ? content_tag(:span, object.errors[method].join(","), class: 'help-inline') : ''
+
+      [errors, error_msg]
+    end
 
+    def help_text options
+      options[:help_text].blank? ? '' : content_tag(:span,options[:help_text], class: 'help-block')
+    end
   end
 end

data/lib/version.rb

@@ -1,3 +1,3 @@
 module BootstrapsBootstraps
-  VERSION = "2.0.0"
+  VERSION = "2.0.1"
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 2
   - 0
-  - 0
-  version: 2.0.0
+  - 1
+  version: 2.0.1
 platform: ruby
 authors: 
 - Robert L. Carpenter
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-02-09 00:00:00 -07:00
+date: 2012-03-20 00:00:00 -06:00
 default_executable: 
 dependencies: []