bootstrap_forms 1.0.5 → 2.0.0

data/.gitignore

@@ -2,3 +2,6 @@
 .bundle
 Gemfile.lock
 pkg/*
+.DS_Store
+.rspec
+.rvmrc

data/.travis.yml

@@ -0,0 +1,4 @@
+language: ruby
+rvm:
+  - 1.9.2
+  - 1.9.3

data/Guardfile

@@ -0,0 +1,7 @@
+# A sample Guardfile
+# More info at https://github.com/guard/guard#readme
+guard 'rspec', :version => 2 do
+  watch(%r{^spec/.+_spec\.rb$})
+  watch(%r{^lib/(.+)\.rb$})     { |m| "spec/lib/#{m[1]}_spec.rb" }
+  watch('spec/spec_helper.rb')  { "spec" }
+end

data/Rakefile

@@ -1 +1,18 @@
-require 'bundler/gem_tasks'
+require 'bundler/gem_tasks'
+require 'rspec/core/rake_task'
+
+desc 'Default: run specs.'
+task :default => :spec
+
+desc "Run specs"
+RSpec::Core::RakeTask.new do |t|
+  t.pattern = "./spec/**/*_spec.rb" # don't need this, it's default.
+  # Put spec opts in a file named .rspec in root
+end
+
+desc "Generate code coverage"
+RSpec::Core::RakeTask.new(:coverage) do |t|
+  t.pattern = "./spec/**/*_spec.rb" # don't need this, it's default.
+  t.rcov = true
+  t.rcov_opts = ['--exclude', 'spec']
+end

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.5"
+  s.version     = "2.0.0"
   s.author      = "Seth Vargo"
   s.email       = "sethvargo@gmail.com"
   s.homepage    = "https://github.com/sethvargo/bootstrap_forms"
@@ -14,4 +14,11 @@ Gem::Specification.new do |s|
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
+  
+  s.add_development_dependency "rspec-rails", "~> 2.9.0"
+  s.add_development_dependency "capybara", "~> 1.1.0"
+  s.add_development_dependency "rake"
+  s.add_development_dependency "rails", "~> 3.2.0"
+  s.add_development_dependency "guard-rspec"
+  s.add_development_dependency "sqlite3"
 end

data/lib/bootstrap_forms.rb

@@ -1 +1,9 @@
-require 'bootstrap_forms/engine' if defined?(Rails)
+# encoding: utf-8
+require 'bootstrap_forms/engine' if defined?(::Rails)
+
+module BootstrapForms
+  extend ActiveSupport::Autoload
+
+  autoload :FormBuilder
+  autoload :Helpers
+end

data/lib/bootstrap_forms/engine.rb

@@ -1,7 +1,17 @@
 module BootstrapForms
   class Engine < ::Rails::Engine
-    config.after_initialize do |app|
-      require 'bootstrap_forms/initializer'
+    initializer 'bootstrap_forms.initialize' do
+      config.to_prepare do
+        ActiveSupport.on_load(:action_view) do
+          include BootstrapForms::Helpers::FormHelper
+          include BootstrapForms::Helpers::FormTagHelper
+          
+          # Do not wrap errors in the extra div
+          ::ActionView::Base.field_error_proc = Proc.new do |html_tag, instance_tag|
+            html_tag
+          end
+        end
+      end
     end
   end
 end

data/lib/bootstrap_forms/form_builder.rb

@@ -1,5 +1,7 @@
 module BootstrapForms
-  class FormBuilder < ActionView::Helpers::FormBuilder
+  class FormBuilder < ::ActionView::Helpers::FormBuilder
+    include BootstrapForms::Helpers::Wrappers
+    
     delegate :content_tag, :hidden_field_tag, :check_box_tag, :radio_button_tag, :button_tag, :link_to, :to => :@template
 
     def error_messages
@@ -17,7 +19,7 @@ module BootstrapForms
       end
     end
 
-    %w(collection_select 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|
+    %w(collection_select select 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).each do |method_name|
       define_method(method_name) do |name, *args|
         @name = name
         @field_options = args.extract_options!
@@ -39,16 +41,16 @@ module BootstrapForms
       control_group_div do
         input_div do
           label(@name, :class => [ 'checkbox', required_class ].compact.join(' ')) do
-            extras { super(name, *(@args << @field_options)) + human_attribute_name }
+            extras { super(name, *(@args << @field_options)) + (@field_options[:label].blank? ? human_attribute_name : @field_options[:label])}
           end
         end
       end
     end
 
-    def radio_buttons(name, values={}, opts={})
+    def radio_buttons(name, values = {}, opts = {})
       @name = name
       @options = opts
-
+      @field_options = opts
       control_group_div do
         label_field + input_div do
           values.map do |text, value|
@@ -91,7 +93,7 @@ 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), @field_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 @field_options[:inline])].compact.join(' ')) do
                 radiobutton + content_tag(:span, record.send(record_name))
@@ -118,95 +120,37 @@ module BootstrapForms
       end
     end
 
-    %w(submit button).each do |method_name|
-      define_method(method_name) do |name=nil, *args|
-        @name = name
-        @field_options = args.extract_options!
-        @args = args
-
-        @field_options[:class] = 'btn btn-primary'
-
-        content_tag(:div, :class => 'form-actions') do
-          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
-    end
-
-    private
-    def control_group_div(&block)
-      @field_options[:error] = error_string
-
-      klasses = ['control-group']
-      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 button(name = nil, *args)
+      @name = name
+      @field_options = args.extract_options!
+      @args = args
 
-    def human_attribute_name
-      object.class.human_attribute_name(@name)
+      @field_options[:class] = 'btn btn-primary'
+      super(name, *(args << @field_options))
     end
 
-    def input_div(&block)
-      content_tag(:div, :class => 'controls') do
-        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?
-        end
-      end
-    end
+    def submit(name = nil, *args)
+      @name = name
+      @field_options = args.extract_options!
+      @args = args
 
-    def label_field(&block)
-      label(@name, block_given? ? block : @field_options[:label], :class => ['control-label', required_class].compact.join(' '))
+      @field_options[:class] = 'btn btn-primary'
+      super(name, *(args << @field_options))
     end
 
-    def required_class
-      return 'required' if object.class.validators_on(@name).any? { |v| v.kind_of? ActiveModel::Validations::PresenceValidator }
-      nil
+    def cancel(*args)
+      @field_options = args.extract_options!
+      link_to(I18n.t('bootstrap_forms.buttons.cancel'), (@field_options[:back] || :back), :class => 'btn cancel')
     end
 
-    %w(help_inline error success warning help_block append prepend).each do |method_name|
-      define_method(method_name) do |*args|
-        return '' unless value = @field_options[method_name.to_sym]
-        case method_name
-        when 'help_block'
-          element = :p
-          klass = 'help-block'
-        when 'append', 'prepend'
-          element = :span
-          klass = 'add-on'
+    def actions(&block)
+      content_tag(:div, :class => 'form-actions') do
+        if block_given?
+          yield
         else
-          element = :span
-          klass = 'help-inline'
+          [submit, cancel].join(' ').html_safe
         end
-        content_tag(element, value, :class => klass)
       end
     end
-
-    def extras(&block)
-      [prepend, (yield if block_given?), append, help_inline, error, success, warning, help_block].join('').html_safe
-    end
-
-    def objectify_options(options)
-      super.except(:label, :help_inline, :error, :success, :warning, :help_block, :prepend, :append)
-    end
   end
 end

data/lib/bootstrap_forms/helpers.rb

@@ -0,0 +1,7 @@
+module BootstrapForms
+  module Helpers
+    autoload :FormHelper, 'bootstrap_forms/helpers/form_helper'
+    autoload :FormTagHelper, 'bootstrap_forms/helpers/form_tag_helper'
+    autoload :Wrappers, 'bootstrap_forms/helpers/wrappers'
+  end
+end

data/lib/bootstrap_forms/{initializer.rb → helpers/form_helper.rb}

@@ -1,19 +1,17 @@
-require 'bootstrap_forms/form_builder'
-
-module ActionView
+module BootstrapForms
   module Helpers
-    module FormHelper
+    module FormHelper      
       def bootstrap_form_for(record, options = {}, &block)
         options[:builder] = BootstrapForms::FormBuilder
         form_for(record, options) do |f|
           f.error_messages.html_safe + capture(f, &block).html_safe
         end
       end
+    
+      def bootstrap_fields_for(record, options = {}, &block)
+        options[:builder] = BootstrapForms::FormBuilder
+        fields_for(record, nil, options, &block)
+      end
     end
   end
-end
-
-# don't wrap in those special divs
-ActionView::Base.field_error_proc = Proc.new do |html_tag, instance_tag|
-  html_tag
 end

data/lib/bootstrap_forms/helpers/form_tag_helper.rb

@@ -0,0 +1,76 @@
+module BootstrapForms
+  module Helpers
+    module FormTagHelper
+      include BootstrapForms::Helpers::Wrappers
+      
+      def bootstrap_form_tag(url_for_options = {}, options = {}, &block)
+        form_tag(url_for_options, options, &block)
+      end
+      
+      %w(button_tag check_box_tag email_field_tag field_set_tag file_field_tag image_submit_tag label_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 utf8_enforcer_tag).each do |method_name|
+        # prefix each method with bootstrap_*
+        define_method("bootstrap_#{method_name}") do |name, *args|
+          value = args.shift
+          @name = name
+          @field_options = args.extract_options!
+          @args = args
+
+          control_group_div do
+            label_field + input_div do
+              extras { send(method_name.to_sym, name, value, *(@args << @field_options)) }
+            end
+          end
+        end
+      end
+      
+      def uneditable_input_tag(name, *args)
+        @name = name
+        @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
+                @field_options[:value] || object.send(@name.to_sym)
+              end
+            end
+          end
+        end
+      end
+
+      def bootstrap_button_tag(name = nil, *args)
+        @name = name
+        @field_options = args.extract_options!
+        @args = args
+
+        @field_options[:class] = 'btn btn-primary'
+        button_tag(name, *(args << @field_options))
+      end
+
+      def bootstrap_submit_tag(name = nil, *args)
+        @name = name
+        @field_options = args.extract_options!
+        @args = args
+
+        @field_options[:class] = 'btn btn-primary'
+        submit_tag(name, *(args << @field_options))
+      end
+
+      def bootstrap_cancel_tag(*args)
+        @field_options = args.extract_options!
+        link_to(I18n.t('bootstrap_forms.buttons.cancel'), (@field_options[:back] || :back), :class => 'btn cancel')
+      end
+
+      def bootstrap_actions(&block)
+        content_tag(:div, :class => 'form-actions') do
+          if block_given?
+            yield
+          else
+            [bootstrap_submit_tag, bootstrap_cancel_tag].join(' ').html_safe
+          end
+        end
+      end
+    end
+  end
+end

data/lib/bootstrap_forms/helpers/wrappers.rb

@@ -0,0 +1,92 @@
+module BootstrapForms
+  module Helpers
+    module Wrappers
+      private
+      def control_group_div(&block)
+        field_errors = error_string
+        if @field_options[:error] 
+          (@field_options[:error] << ", " << field_errors) if field_errors
+        else
+          @field_options[:error] = field_errors
+        end
+
+        klasses = ['control-group']
+        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
+        if respond_to?(:object)
+          errors = object.errors[@name]
+          if errors.present?
+            errors.map { |e|
+              "#{@options[:label] || human_attribute_name} #{e}"
+            }.join(", ")
+          end
+        end
+      end
+
+      def human_attribute_name
+        object.class.human_attribute_name(@name)
+      end
+
+      def input_div(&block)
+        content_tag(:div, :class => 'controls') do
+          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?
+          end
+        end
+      end
+
+      def label_field(&block)
+        if respond_to?(:object)
+          label(@name, block_given? ? block : @field_options[:label], :class => ['control-label', required_class].compact.join(' '))
+        else
+          label_tag(@name, block_given? ? block : @field_options[:label], :class => ['control-label', required_class].compact.join(' '))
+        end
+      end
+
+      def required_class
+        return 'required' if @field_options[:required]
+        if respond_to?(:object)
+          return 'required' if object.class.validators_on(@name).any? { |v| v.kind_of? ActiveModel::Validations::PresenceValidator }
+        end
+        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 = @field_options[method_name.to_sym]
+          case method_name
+          when 'help_block'
+            element = :p
+            klass = 'help-block'
+          when 'append', 'prepend'
+            element = :span
+            klass = 'add-on'
+          else
+            element = :span
+            klass = 'help-inline'
+          end
+          content_tag(element, value, :class => klass)
+        end
+      end
+
+      def extras(&block)
+        [prepend, (yield if block_given?), append, help_inline, error, success, warning, help_block].join('').html_safe
+      end
+
+      def objectify_options(options)
+        super.except(:label, :help_inline, :error, :success, :warning, :help_block, :prepend, :append)
+      end
+    end
+  end
+end