bootstraps_bootstraps 2.0.2 → 2.0.3

data/Gemfile.lock

@@ -0,0 +1,92 @@
+PATH
+  remote: .
+  specs:
+    bootstraps_bootstraps (2.0.2)
+      activesupport (~> 3.2.1)
+      rails (~> 3.2.1)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    actionmailer (3.2.3)
+      actionpack (= 3.2.3)
+      mail (~> 2.4.4)
+    actionpack (3.2.3)
+      activemodel (= 3.2.3)
+      activesupport (= 3.2.3)
+      builder (~> 3.0.0)
+      erubis (~> 2.7.0)
+      journey (~> 1.0.1)
+      rack (~> 1.4.0)
+      rack-cache (~> 1.2)
+      rack-test (~> 0.6.1)
+      sprockets (~> 2.1.2)
+    activemodel (3.2.3)
+      activesupport (= 3.2.3)
+      builder (~> 3.0.0)
+    activerecord (3.2.3)
+      activemodel (= 3.2.3)
+      activesupport (= 3.2.3)
+      arel (~> 3.0.2)
+      tzinfo (~> 0.3.29)
+    activeresource (3.2.3)
+      activemodel (= 3.2.3)
+      activesupport (= 3.2.3)
+    activesupport (3.2.3)
+      i18n (~> 0.6)
+      multi_json (~> 1.0)
+    arel (3.0.2)
+    builder (3.0.0)
+    erubis (2.7.0)
+    hike (1.2.1)
+    i18n (0.6.0)
+    journey (1.0.3)
+    json (1.6.6)
+    mail (2.4.4)
+      i18n (>= 0.4.0)
+      mime-types (~> 1.16)
+      treetop (~> 1.4.8)
+    mime-types (1.18)
+    multi_json (1.2.0)
+    polyglot (0.3.3)
+    rack (1.4.1)
+    rack-cache (1.2)
+      rack (>= 0.4)
+    rack-ssl (1.3.2)
+      rack
+    rack-test (0.6.1)
+      rack (>= 1.0)
+    rails (3.2.3)
+      actionmailer (= 3.2.3)
+      actionpack (= 3.2.3)
+      activerecord (= 3.2.3)
+      activeresource (= 3.2.3)
+      activesupport (= 3.2.3)
+      bundler (~> 1.0)
+      railties (= 3.2.3)
+    railties (3.2.3)
+      actionpack (= 3.2.3)
+      activesupport (= 3.2.3)
+      rack-ssl (~> 1.3.2)
+      rake (>= 0.8.7)
+      rdoc (~> 3.4)
+      thor (~> 0.14.6)
+    rake (0.9.2.2)
+    rdoc (3.12)
+      json (~> 1.4)
+    sprockets (2.1.2)
+      hike (~> 1.2)
+      rack (~> 1.0)
+      tilt (~> 1.1, != 1.3.0)
+    thor (0.14.6)
+    tilt (1.3.3)
+    treetop (1.4.10)
+      polyglot
+      polyglot (>= 0.3.1)
+    tzinfo (0.3.33)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  bootstraps_bootstraps!

data/README.md

@@ -12,16 +12,16 @@ Development of this gem more or less follows [Bootstrap-sass](https://github.com
 
 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.
 
+##Impetus
+
+Many form builders already exist which enable bootstrap style syntax. My biggest reason for not using any of them is that I just want to write simple rails view code in my view. I don't want to define in my model what type of form field a column needs to be represented by, because it might be represented by many interaction types. I also don't want to have to deal with syntax config files to get the form builder to render bootstrap compatible syntax.  Above all, when I don't want the markup to be mucked with *at all*, I want to be able to just render the form as rails always does.  Bootstraps_bootstraps provides this functionality by simply providing a secondary FormBuilder and a shortcut method to build forms with that builder.
+
 ##Development Strategy
 
 This isn't compatible with Bootstrap versions < 2.
 
 More or less I'm writing this library as needed.  Each time I find myself trying to do something with form_for or interact between Rails and Bootstrap I find a way to make them play nice together without losing baseline Rails functionality.
 
-Things that I know aren't in the library yet:
-
- - Collection methods (select box, check boxes, radio buttons)
-
 ##Use
 
 Add it to your gemfile: `gem 'bootstraps_bootstraps'`

data/bootstraps_bootstraps.gemspec

@@ -11,6 +11,8 @@ Gem::Specification.new do |gem|
   gem.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   gem.files         = `git ls-files`.split("\n")
   gem.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
+  gem.add_dependency 'activesupport','>= 3.1.1'
+  gem.add_dependency 'rails', '>= 3.1.1'
   gem.name          = "bootstraps_bootstraps"
   gem.require_paths = ["lib"]
   gem.version       = BootstrapsBootstraps::VERSION

data/lib/bootstraps_bootstraps.rb

@@ -1,7 +1,15 @@
 require 'version.rb'
 
+#require 'bootstraps_bootstraps/engine' if defined? ::Rails
+require 'bootstraps_bootstraps/railtie.rb'
+
 module BootstrapsBootstraps
-  load 'bootstraps_bootstraps/bootstrap_form_builder.rb'
-  load 'bootstraps_bootstraps/bootstrap_form_helper.rb'
-  load 'bootstraps_bootstraps/railtie.rb'
+  extend ::ActiveSupport::Autoload
+
+  autoload :BootstrapFormBuilder
+  autoload :BootstrapFormHelper
 end
+
+::ActionView::Helpers.send(:load, 'bootstraps_bootstraps/bootstrap_form_builder.rb')
+::ActionView::Helpers.send(:load, 'bootstraps_bootstraps/bootstrap_form_helper.rb')
+::ActionView::Helpers.send(:include, BootstrapsBootstraps::BootstrapFormHelper)

data/lib/bootstraps_bootstraps/bootstrap_form_builder.rb

@@ -72,7 +72,7 @@ module BootstrapsBootstraps
         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 = div_with_class(['control-group',errors], :content => field)
 
         field
       end
@@ -89,8 +89,13 @@ module BootstrapsBootstraps
       text = options[:label] || ''
       options.delete :label
 
-      field_label(method, options) do
-        super(method,options,checked_value,unchecked_value)  + text
+      #TODO provide support for grouped checkboxes
+      div_with_class 'control-group' do
+        div_with_class 'controls' do
+          field_label(method, options) do
+            super(method,options,checked_value,unchecked_value)  + text
+          end
+        end
       end
     end
 
@@ -102,10 +107,9 @@ module BootstrapsBootstraps
 
       errors, error_msg = render_errors method
 
-      label_options = html_options.clone
+      label_options = options.clone
       guarantee_html_class label_options, 'control-label'
-      name = options[:label] || method
-      label = options[:label] == false ? ''.html_safe : field_label(options[:label], label_options)
+      label = options[:label] == false ? ''.html_safe : field_label(method, label_options)
 
       guarantee_html_class options
       options[:class].push 'input-xlarge' if options[:large]
@@ -163,12 +167,11 @@ module BootstrapsBootstraps
       end
     end
 
-    def submit method, options = {}
+    def submit text = nil, 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
 
@@ -273,7 +276,7 @@ module BootstrapsBootstraps
       end
 
       errors = object.errors[method].any? ? 'error' : ''
-      error_msg = object.errors[method].any? ? content_tag(:span, object.errors[method].join(","), class: 'help-inline') : ''
+      error_msg = object.errors[method].any? ? content_tag(:span, object.errors[method].join(","), class: @form_mode == :vertical ? 'help-block' : 'help-inline') : ''
 
       [errors, error_msg]
     end

data/lib/bootstraps_bootstraps/engine.rb

@@ -0,0 +1,12 @@
+#module BootstrapsBootstraps
+#  class Engine < ::Rails::Engine
+#
+#    config.before_initialize do
+#      ActiveSupport.on_load :action_view do
+#        include BootstrapsBootstraps::BootstrapFormHelper
+#      end
+#    end
+#
+#  end
+#end
+#

data/lib/bootstraps_bootstraps/railtie.rb

@@ -1,18 +1,15 @@
-require 'ruby-debug'
-
 module BootstrapsBootstraps
   class Railtie < Rails::Railtie
+
     initializer "bootstraps_bootstraps.configure_rails_initialization" do |application|
       # Prevent Rails from wrapping form elements with errors in <div class="field_with_error">
       # boxes.  Bootstrap has a bit of a different paradigm.
       # Credit where due: http://stackoverflow.com/questions/5267998/rails-3-field-with-errors-wrapper-changes-the-page-appearance-how-to-avoid-t
       application.config.action_view.field_error_proc = Proc.new { |html_tag, instance| html_tag }
-    end
+      ActiveSupport.on_load :action_view do
+        include BootstrapsBootstraps::BootstrapFormHelper
+      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
 end

data/lib/version.rb

@@ -1,3 +1,3 @@
 module BootstrapsBootstraps
-  VERSION = "2.0.2"
+  VERSION = "2.0.3"
 end

metadata

@@ -1,12 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: bootstraps_bootstraps
 version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 2
-  - 0
-  - 2
-  version: 2.0.2
+  prerelease: 
+  version: 2.0.3
 platform: ruby
 authors: 
 - Robert L. Carpenter
@@ -14,10 +10,31 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-03-30 00:00:00 -06:00
+date: 2012-12-08 00:00:00 -07:00
 default_executable: 
-dependencies: []
-
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: activesupport
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 3.1.1
+  type: :runtime
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: rails
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 3.1.1
+  type: :runtime
+  version_requirements: *id002
 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
@@ -30,6 +47,7 @@ extra_rdoc_files: []
 files: 
 - .gitignore
 - Gemfile
+- Gemfile.lock
 - LICENSE
 - README.md
 - Rakefile
@@ -37,6 +55,7 @@ files:
 - lib/bootstraps_bootstraps.rb
 - lib/bootstraps_bootstraps/bootstrap_form_builder.rb
 - lib/bootstraps_bootstraps/bootstrap_form_helper.rb
+- lib/bootstraps_bootstraps/engine.rb
 - lib/bootstraps_bootstraps/railtie.rb
 - lib/version.rb
 - railtie.rb
@@ -50,23 +69,21 @@ rdoc_options: []
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Bootstrap 2.0 html helpers for Rails 3