bootstrap-form 0.0.3 → 0.0.4

data/README.md

@@ -1,9 +1,8 @@
 # Bootstrap Form
 
-Helpers to easily use the twitter bootstrap CSS framework on your forms.
+Form Helpers to make your form inputs [look like this](http://twitter.github.com/bootstrap/#forms).
 
-For more info about [Twitter
-Bootstrap go here](http://twitter.github.com/bootstrap).
+Helps you to create beautiful mocks really quickly.
 
 ## Usage
 
@@ -15,17 +14,21 @@ Bundle install
 
     bundle install
 
-## Text Field
+To make them look even better, I recommend you add this to your
+application.rb
 
-Will add all the divs around the textfield and the classes required to
-work with bootstrap.
+    ActionView::Base.field_error_proc = proc { |input, instance| input }
+
+## Example
+
+You write this:
 
     form_for @account do |f|
       f.bootstrap_text_field :name
     end
 
 
-Will generate something like:
+You get something like this:
 
     <div class="clearfix">
       <label for="account_name">Name</label>
@@ -34,6 +37,8 @@ Will generate something like:
       </div>
     </div>
 
+Pretty straight forward.
+
 ## Other helpers
 
 So far, I have implemented the following helpers:
@@ -41,6 +46,7 @@ So far, I have implemented the following helpers:
 * bootstrap_text_field
 * bootstrap_password_field
 * bootstrap_collection_select
+* bootstrap_file_field
 
 Expect more in the near future
 
@@ -51,5 +57,4 @@ bootstrap styles.
 
 # TODO
 
-* Refactor the code, there's lots of things that can be done better
 * More form inputs

data/bootsrap-form.gemspec

@@ -18,7 +18,9 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  s.add_dependency 'rails', '~> 3.0'
+
+  s.add_dependency 'railties', '~> 3.0'
+  s.add_dependency 'actionpack', '~> 3.0'
 
   s.add_development_dependency "minitest"
   s.add_development_dependency "rr"

data/lib/bootstrap-form/form_helper.rb

@@ -2,43 +2,52 @@ module  ActionView
   module Helpers
     module FormHelper
       def bootstrap_text_field(object_name, method, options={})
-        bootstrap_clearfix_wrap(object_name, method, options.dup, text_field(object_name, method, options))
+        bootstrap_clearfix_wrap(object_name, method, text_field(object_name, method, options.dup), options)
       end
 
       def bootstrap_password_field(object_name, method, options={})
-        bootstrap_clearfix_wrap(object_name, method, options.dup, password_field(object_name, method, options))
+        bootstrap_clearfix_wrap(object_name, method, password_field(object_name, method, options.dup), options)
       end
 
       def bootstrap_collection_select(object_name, method, collection, value_method, text_method, options = {}, html_options = {})
-        bootstrap_clearfix_wrap(object_name, method, options.dup, collection_select(object_name, method, collection, value_method, text_method, options, html_options))
+        bootstrap_clearfix_wrap(object_name, method, collection_select(object_name, method, collection, value_method, text_method, options.dup, html_options), options)
       end
 
-      def bootstrap_clearfix_wrap(object_name, method, options={}, content)
+      def bootstrap_file_field(object_name, method, options={})
+        bootstrap_clearfix_wrap(object_name, method, file_field(object_name, method, options.dup), options)
+      end
+
+      def bootstrap_clearfix_wrap(object_name, method, content, options={})
         error_messages = options[:object].errors[method]
         clearfix_tag = error_messages.empty? ? 'clearfix' : 'clearfix error'
         content_tag(:div, label(object_name, method) +
-            content_tag(:div, content + inline_help_tag(error_messages), class: 'input'),
-            class: clearfix_tag)
+            content_tag(:div, content + inline_help_tag(error_messages), :class => 'input'),
+            :class => clearfix_tag)
       end
 
       def inline_help_tag(messages)
         message_span = ActiveSupport::SafeBuffer.new(" #{messages.join(',')}")
-        messages.empty? ? '' : content_tag(:span, message_span, class: 'help-inline')
+        messages.empty? ? '' : content_tag(:span, message_span, :class => 'help-inline')
       end
     end
   end
 end
 
 class ActionView::Helpers::FormBuilder #:nodoc:
-  def bootstrap_text_field(method, options = {})
+  def bootstrap_text_field(method, options={})
     @template.bootstrap_text_field(@object_name, method, objectify_options(options))
   end
 
-  def bootstrap_password_field(method, options = {})
+  def bootstrap_password_field(method, options={})
     @template.bootstrap_password_field(@object_name, method, objectify_options(options))
   end
 
   def bootstrap_collection_select(method, collection, value_method, text_method, options = {}, html_options = {})
     @template.bootstrap_collection_select(@object_name, method, collection, value_method, text_method, objectify_options(options), html_options)
   end
+
+  def bootstrap_file_field(method, options={})
+    self.multipart = true
+    @template.bootstrap_file_field(@object_name, method, objectify_options(options))
+  end
 end

data/lib/bootstrap-form/version.rb

@@ -1,5 +1,5 @@
 module Bootstrap
   module Form
-    VERSION = "0.0.3"
+    VERSION = "0.0.4"
   end
 end

data/test/lib/action_view/helpers/form_helper_test.rb

@@ -10,7 +10,7 @@ class FormHelperTest < ActionView::TestCase
     stub(object).name   { 'Object Name' }
 
     expected_code = %{<div class="clearfix"><label for="post_name">Name</label><div class="input">content</div></div>}
-    assert_equal expected_code, bootstrap_clearfix_wrap(:post, :name, options, content)
+    assert_equal expected_code, bootstrap_clearfix_wrap(:post, :name, content, options)
   end
 
   def test_bootstrap_clearfix_wrap_with_errors
@@ -22,7 +22,7 @@ class FormHelperTest < ActionView::TestCase
     stub(object).name   { 'Object Name' }
 
     expected_code = %{<div class="clearfix error"><label for="post_name">Name</label><div class="input">content<span class="help-inline"> can't be blank</span></div></div>}
-    assert_equal expected_code, bootstrap_clearfix_wrap(:post, :name, options, content)
+    assert_equal expected_code, bootstrap_clearfix_wrap(:post, :name, content, options)
   end
 
   def test_bootstrap_text_field
@@ -30,7 +30,7 @@ class FormHelperTest < ActionView::TestCase
     options = { :object => mock }
 
     mock(self).text_field(:post, :name, options) { text_field }
-    mock(self).bootstrap_clearfix_wrap(:post, :name, options.dup, text_field) { html }
+    mock(self).bootstrap_clearfix_wrap(:post, :name, text_field, options.dup) { html }
     assert_equal html, bootstrap_text_field(:post, :name, options)
   end
 
@@ -39,7 +39,7 @@ class FormHelperTest < ActionView::TestCase
     options = { :object => mock }
 
     mock(self).password_field(:post, :password, options) { password_field }
-    mock(self).bootstrap_clearfix_wrap(:post, :password, options.dup, password_field) { html }
+    mock(self).bootstrap_clearfix_wrap(:post, :password, password_field, options.dup) { html }
     assert_equal html, bootstrap_password_field(:post, :password, options)
   end
 
@@ -48,8 +48,17 @@ class FormHelperTest < ActionView::TestCase
     options = { :object => mock }
 
     mock(self).collection_select(:post, :name, collection, :id, :name, options, {}) { collection_select_html }
-    mock(self).bootstrap_clearfix_wrap(:post, :name, options.dup, collection_select_html) { html }
+    mock(self).bootstrap_clearfix_wrap(:post, :name, collection_select_html, options.dup) { html }
 
     assert_equal html, bootstrap_collection_select(:post, :name, collection, :id ,:name, options)
   end
+
+  def test_bootstrap_file_field
+    html, text_field = mock, mock
+    options = { :object => mock }
+
+    mock(self).file_field(:post, :attachment, options) { text_field }
+    mock(self).bootstrap_clearfix_wrap(:post, :attachment, text_field, options.dup) { html }
+    assert_equal html, bootstrap_file_field(:post, :attachment, options)
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bootstrap-form
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -12,8 +12,8 @@ cert_chain: []
 date: 2011-09-09 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rails
-  requirement: &70254815421580 !ruby/object:Gem::Requirement
+  name: railties
+  requirement: &70208123840560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,21 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70254815421580
+  version_requirements: *70208123840560
+- !ruby/object:Gem::Dependency
+  name: actionpack
+  requirement: &70208123840060 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *70208123840060
 - !ruby/object:Gem::Dependency
   name: minitest
-  requirement: &70254815421160 !ruby/object:Gem::Requirement
+  requirement: &70208123839660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70254815421160
+  version_requirements: *70208123839660
 - !ruby/object:Gem::Dependency
   name: rr
-  requirement: &70254815420700 !ruby/object:Gem::Requirement
+  requirement: &70208123839060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +54,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70254815420700
+  version_requirements: *70208123839060
 description: Twitter Bootstrap Form helpers
 email:
 - david@crowdint.com