bootstraps_bootstraps 0.0.1 → 2.0.0

data/.gitignore

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

data/README.md

@@ -6,6 +6,8 @@
 
 To get the best experience out of both worlds Rails needs a bit of bootstrapping to get a form builder that plays nice with Bootstrap.  This gem provides the bootstraps that Bootstrap needs to make Rails+Bootstrap a potent combination.
 
+Development of this gem more or less follows [Bootstrap-sass](https://github.com/thomas-mcdonald/bootstrap-sass).  As such the version number of this project correspond to the Twitter Bootstrap version numbers for both the Major and Minor.  The Patch number will track independently.
+
 ##Current Features
 
 An extended form_for called `bootstrap_form` with all the classic functionality yet extended to provide correct Bootstrap 2 syntax for horizontal forms (classed with .form_horizontal) for most elements.
@@ -19,24 +21,33 @@ More or less I'm writing this library as needed.  Each time I find myself trying
 Things that I know aren't in the library yet:
 
  - Collection methods (select box, check boxes, radio buttons)
- - Check boxes in general
- - Full implementation of an optional attribute to make bootstrapped_form silence and revert to the default for a specific form field
- - `.form-vertical`, `.form-search`, and `.form-inline` specific html syntax
 
 ##Use
 
-Add this to your gemfile: `gem 'bootstraps_bootstraps', git: 'git@github.com:robacarp/bootstraps_bootstraps.git'`
+Add it to your gemfile: `gem 'bootstraps_bootstraps'`
 
 To use the Bootstrap 2 form helper in your views:
 
 ```ruby
-= bootstrapped_form @user do |f|
+
+# set the form class as you would for the Bootstrap library.  Bootstraps_bootstraps will use that to determine the html elements required.
+= bootstrapped_form @user, html: {class: 'form-horizontal'} do |f|
+  # Labels are added automatically
   = f.text_field :first_name
   = f.text_field :last_name
+
+  # Override the label text with :label in the options hash
   = f.collection_select :occupations, Occupation.all, :id, :name, :label => 'Job'
   = f.text_field :address,  :label => "Address Line 1"
   = f.text_field :address2,  :label => "Line 2"
-  = f.submit ("Shipping Options →").html_safe, :class=>'fright'
+
+  #make an inline field group inside of the horizontal form
+  = f.inline_inputs label: 'Expiration Date' do |inline|
+    = inline.collection_select :month, (1..12), :to_s, :to_s
+    \-
+    = inline.collection_select :year, (Time.now.year...Time.now.year + 10), :to_s, :to_s
+
+  = f.submit
 ```
 
 ## Contributing

data/bootstraps_bootstraps.gemspec

@@ -4,7 +4,7 @@ require File.expand_path('../lib/version', __FILE__)
 Gem::Specification.new do |gem|
   gem.authors       = ["Robert L. Carpenter"]
   gem.email         = ["codemonkey@robacarp.com"]
-  gem.description   = %q{A gem to make working with Bootstrap 2.0 in Rails 3 easier and better.  Includes a new bootstrapped_form replacement for form_for which wgives error text handling and html formatting to match Bootstrap's syntax.}
+  gem.description   = %q{A gem to make working with Bootstrap 2.0 in Rails 3 easier and better.  Includes a new bootstrapped_form replacement for form_for which gives error text handling and html formatting to match Bootstrap's syntax.}
   gem.summary       = %q{Bootstrap 2.0 html helpers for Rails 3}
   gem.homepage      = "https://github.com/robacarp/bootstraps_bootstraps"
 

data/lib/bootstraps_bootstraps.rb

@@ -1,7 +1,7 @@
 require 'version.rb'
 
 module BootstrapsBootstraps
-  require 'bootstraps_bootstraps/bootstrap_form_builder.rb'
-  require 'bootstraps_bootstraps/bootstrap_form_helper.rb'
-  require 'bootstraps_bootstraps/railtie'
+  load 'bootstraps_bootstraps/bootstrap_form_builder.rb'
+  load 'bootstraps_bootstraps/bootstrap_form_helper.rb'
+  load 'bootstraps_bootstraps/railtie.rb'
 end

data/lib/bootstraps_bootstraps/bootstrap_form_builder.rb

@@ -1,21 +1,46 @@
+module ActionView
+  module Helpers
+    module FormHelper
+
+      def wrapped_inputs object_name, object = nil, options = {}, wrapper, &block
+        builder = instantiate_builder(object_name, object, options, &block)
+        fields = capture(builder, &block)
+        wrapper.call(fields)
+      end
+
+    end
+  end
+end
+
+
 module BootstrapsBootstraps
+  #
+  #  This class started out as a gist somewhere but I can't seem to find the
+  #  original.  At any rate its been modified over time to make it not break
+  #  and to update it to make it compatible with Bootstrap2.
+  #
+  #  If I'm being brutally honest its a bit of a cluster of metaprogramming
+  #  and it can be pretty difficult to understand.  BUT it does seem to work
+  #  so far.
+  #
   class BootstrapFormBuilder < ActionView::Helpers::FormBuilder
 
     delegate :capture, :content_tag, :tag, to: :@template
 
-    #
-    #  This method started out as a gist somewhere but I can't seem to find the
-    #  original.  At any rate its been modified over time to make it not break
-    #  and to update it to make it compatible with Bootstrap2.
-    #
-    #  If I'm being brutally honest its a bit of a cluster of metaprogramming
-    #  and it can be pretty difficult to understand.  BUT it does seem to work
-    #  so far.
-    #
-    %w[text_field text_area password_field collection_select].each do |method_name|
+    def initialize(object_name, object, template, options, block)
+      super(object_name, object, template, options, block)
+
+      @form_mode = :vertical   #default value
+      @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')
+    end
+
+    %w[text_field text_area password_field number_field telephone_field url_field email_field range_field collection_select].each do |method_name|
       define_method(method_name) do |name, *args|
         options = args.extract_options!
 
+        #abort and just let the rails formbuilder do its thing
         if options[:vanilla]
           return super(name, *(args.push(options)))
         end
@@ -24,35 +49,54 @@ module BootstrapsBootstraps
         error_msg = object.errors[name].any? ? content_tag(:span, object.errors[name].join(","), class: 'help-inline') : ''
 
         help_text =  options[:help_text].blank? ? '' : content_tag(:span,options[:help_text], class: 'help-block')
-        label = options[:label] == '' ? ''.html_safe : field_label(name, options)
 
-        if options[:large] || method_name == 'text_area'
-          options[:class] = [options[:class]] || []
-          options[:class].push 'xxlarge'
-        end
+        label = options[:label] == false ? ''.html_safe : field_label(name, options.except(:class))
 
-        content_tag :div, class: "control-group #{errors}" do
-          label + content_tag(:div, class: "controls #{errors}") do
-            super(name, *(args.push(options))) + ' ' + error_msg
-          end + help_text
-        end
+        options[:class] = [options[:class]] unless options[:class].kind_of?(Array)
+        options[:class].push 'xxlarge' if options[:large] || method_name == 'text_area'
+        options[:class].push 'inline' if @form_mode == :inline
+
+        args.push(options).unshift(name)
+
+        field = super(*args) + ' ' + 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
     end
 
     #TODO update for bootstrap 2
     def check_box(name, *args)
-      content_tag :div, class:"clearfix" do
-        content_tag(:div, class:"input") do
-          content_tag(:ul, class:"inputs-list") do
-            content_tag(:li) do
-              content_tag(:label) do
-                super(name, *args) + content_tag(:span) do
-                  field_label(name, *args)
-                end
-              end
-            end
-          end
+      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] = []
+      end
+
+      options[:class].push :checkbox
+
+      text = options[:label] || ''
+      options.delete :label
+
+      args = args.push options
+
+      field_label(name, *args) do
+        super(name, *args) + text
       end
     end
 
@@ -67,20 +111,67 @@ module BootstrapsBootstraps
           super *args
         end
       end
+    end
 
+    def inline_inputs field_options = {}, &block
+      field_options[:inline] = true
+      wrapper = lambda { |content|
+        field_group = div_with_class('controls', content: content)
+        field_group = label( field_options[:label], field_options[:label], class: 'control-label' ) + field_group
+        field_group = div_with_class('control-group', content: field_group)
+      }
+      @template.wrapped_inputs(@object_name, @object, @options.merge(field_options), wrapper, &block)
     end
 
   private
 
-    def field_label(name, *args)
+    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}
-      label(name, options[:label], class: ("required" if required))
+      clss.push 'required' if required
+
+
+      label(name, options[:label], class: clss, &block)
     end
 
     def objectify_options(options)
       super.except(:label)
     end
 
+    def detect_html_class options_hash, css_class
+      if options[:html] && options[:html][:class]
+        if options[:html][:class].kind_of? Array
+          options[:html][:class].include css_class
+        elsif options[:html][:class].kind_of? String
+          options[:html][:class] == css_class
+        else
+          false
+        end
+      else
+        false
+      end
+    end
+
+    def div_with_class clss, options = {}, &block
+      options[:class] = [options[:class]] || []
+      options[:class].push clss
+
+      classes = options[:class].join(' ').strip
+
+      if block_given?
+        content_tag :div, :class => classes, &block
+      elsif options[:content]
+        content_tag :div, :class => classes do
+          options[:content]
+        end
+      else
+        content_tag :div, :class => classes do
+        end
+      end
+    end
+
+
   end
 end

data/lib/bootstraps_bootstraps/railtie.rb

@@ -1,3 +1,5 @@
+require 'ruby-debug'
+
 module BootstrapsBootstraps
   class Railtie < Rails::Railtie
     initializer "bootstraps_bootstraps.configure_rails_initialization" do |application|
@@ -8,6 +10,8 @@ module BootstrapsBootstraps
     end
 
     config.to_prepare do
+      #RELOAD THE GEM ALL THE TIME WITHOUT RESTARTING THE SERVER :O (without restarting the server)
+      ::ActionView::Helpers.send(:load, 'bootstraps_bootstraps/bootstrap_form_builder.rb')
       ::ActionView::Helpers.send(:include, BootstrapsBootstraps::BootstrapFormHelper)
     end
   end

data/lib/version.rb

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

metadata

@@ -3,10 +3,10 @@ name: bootstraps_bootstraps
 version: !ruby/object:Gem::Version 
   prerelease: false
   segments: 
+  - 2
   - 0
   - 0
-  - 1
-  version: 0.0.1
+  version: 2.0.0
 platform: ruby
 authors: 
 - Robert L. Carpenter
@@ -14,11 +14,11 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-02-06 00:00:00 -07:00
+date: 2012-02-09 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
-description: A gem to make working with Bootstrap 2.0 in Rails 3 easier and better.  Includes a new bootstrapped_form replacement for form_for which wgives error text handling and html formatting to match Bootstrap's syntax.
+description: A gem to make working with Bootstrap 2.0 in Rails 3 easier and better.  Includes a new bootstrapped_form replacement for form_for which gives error text handling and html formatting to match Bootstrap's syntax.
 email: 
 - codemonkey@robacarp.com
 executables: []