twitter_bootstrap_form_for 1.0.0.rc1 → 1.0.0.rc2

data/README.markdown

@@ -1,7 +1,7 @@
 Twitter Bootstrap Form For
 ==========================
 
-twitter_bootstrap_form_for is a Rails FormBuilder DSL that, like Formtastic,
+`twitter_bootstrap_form_for` is a Rails FormBuilder DSL that, like Formtastic,
 makes it easier to create semantically awesome, readily-stylable, and
 wonderfully accessible HTML forms in your Rails applications. It abides by
 the markup expectations of [Twitter Bootstrap], make your forms look great right
@@ -14,9 +14,7 @@ Formtastic does), it only lightly wraps the existing Rails form tag helpers.
 Dependencies
 ============
 
-Besides Rails, Twitter Bootstrap depends on Haml. You don't have to use it
-yourself, but it made the views for this gem far, far cleaner and more
-readable.
+Just Rails. But you were going to use that anyway, weren't you?
 
 I may consider adding a dependency on `less-rails-bootstrap` in the future, to
 tie this plugin to specific releases of Twitter Bootstrap.
@@ -24,38 +22,46 @@ tie this plugin to specific releases of Twitter Bootstrap.
 Syntax
 ======
 
-    = twitter_bootstrap_form_for @user do |user|
-
-      / wraps a section in a fieldset with the provided legend text
-      = user.inputs 'Sign up' do
+```haml
+= twitter_bootstrap_form_for @user do |user|
   
-        / generates an email field with descriptive help text and standard
-        / HTML attributes
-        = user.email_field :email, :placeholder => 'me@example.com' do
-          %span.help-block No account? #{link_to('Sign up!', '#')}
+  / wraps a section in a fieldset with the provided legend text
+  = user.inputs 'Sign up' do
     
-        / generates a password field in a similar manner
-        = user.password_field :password do
-          %span.help-block= link_to('Forgot your password?', '#')
-
-        / a field with a custom label
-        = user.password_field :password_confirmation, 'Confirm Password'
+    / generates a standard email field
+    = user.email_field :email, :placeholder => 'me@example.com'
+    
+    / generates a password field with a descriptive aside
+    = user.password_field :password do
+      %span.help-block
+        Must be no larger than 6 characters<br/>
+        Must contain only the letters 'x' or 'p'
     
-        / input fields with custom add-ons
-        = user.text_field :twitter_id, 'Twitter', :class => 'medium', :add_on => :prepend do
-          %span.add-on @
+    / a field with a custom label
+    = user.password_field :password_confirmation, 'Confirm Password'
     
-        / lists of checkboxes / radio buttons
-        = user.toggles 'Agreements' do
-          = user.check_box :agree, 'I agree to the Terms and Conditions'
-          = user.check_box :spam,  'I agree to receive all sorts of spam'
+    / input fields with custom add-ons
+    = user.text_field :twitter_id, 'Twitter', :class => 'medium', :add_on => :prepend do
+      %span.add-on @
+    
+    / lists of checkboxes / radio buttons
+    = user.toggles 'Agreements' do
+      = user.check_box :agree,   'I agree to the abusive Terms and Conditions'
+      = user.check_box :spam,    'I agree to receive all sorts of spam'
+      = user.check_box :spammer, 'I agree to let the site spam others through my Twitter account'
   
-      = user.actions do
-        = user.submit 'Sign up'
-        = button_tag 'Cancel', :type => 'reset', :class => 'btn'
+  / wraps buttons in a distinctive style
+  = user.actions do
+    = user.submit 'Sign up'
+    = button_tag 'Cancel', :type => 'reset', :class => 'btn'
+```
+
+That code produces the following output, with no custom stylesheets.
+
+![](https://github.com/stouset/twitter_bootstrap_form_for/raw/master/examples/screenshot.png)
 
 That's it. All of the Rails field helpers you know and love work just like
 their normal FormBuilder counterparts, but with minor extensions to expose
 the functionality anticipated by Twitter Bootstrap.
 
-[Twitter Bootstrap]: http://twitter.github.com/bootstrap/
+[Twitter Bootstrap]: http://twitter.github.com/bootstrap/

data/lib/twitter_bootstrap_form_for/form_builder.rb

@@ -27,14 +27,18 @@ class TwitterBootstrapFormFor::FormBuilder < ActionView::Helpers::FormBuilder
   # +legend+ text.
   #
   def inputs(legend = nil, &block)
-    # TODO: don't wrap error fields in field_with_error divs
-    # ActionView::Base.field_error_proc = ->(html_tag, instance) { html_tag }
-  
-    template.render(
-      :layout => 'twitter_bootstrap_form_for/inputs',
-      :locals => { :legend => legend },
-      &block
-    )
+    # stash the old field_error_proc, then override it temporarily
+    original_field_error_proc = template.field_error_proc
+    template.field_error_proc = ->(html_tag, instance) { html_tag }
+    
+    # TODO: fix field with errors for good
+    template.field_error_proc = ->(html_tag, instance) { html_tag }
+    template.content_tag(:fieldset) do
+      template.concat template.content_tag(:legend, legend) unless legend.nil?
+      block.call
+    end
+  ensure
+    template.field_error_proc = original_field_error_proc
   end
   
   #
@@ -43,22 +47,19 @@ class TwitterBootstrapFormFor::FormBuilder < ActionView::Helpers::FormBuilder
   # inside of here, and will not look correct unless they are.
   #
   def toggles(label = nil, &block)
-    template.render(
-      :layout => 'twitter_bootstrap_form_for/toggles',
-      :locals => { :label => label },
-      &block
-    )
+    template.content_tag(:div, :class => "clearfix") do
+      template.concat template.content_tag(:label, label)
+      template.concat template.content_tag(:div, :class => "input") {
+        template.content_tag(:ul, :class => "inputs-list") { block.call }
+      }
+    end
   end
   
   #
   # Wraps action buttons into their own styled container.
   #
   def actions(&block)
-    template.render(
-      :layout => 'twitter_bootstrap_form_for/actions',
-      :locals => { },
-      &block
-    )
+    template.content_tag(:div, :class => 'actions', &block)
   end
   
   #
@@ -73,34 +74,35 @@ class TwitterBootstrapFormFor::FormBuilder < ActionView::Helpers::FormBuilder
   
   INPUTS.each do |input|
     define_method input do |attribute, *args, &block|
-      options = args.extract_options!
+      options  = args.extract_options!
+      label    = args.first.nil? ? '' : args.shift
+      classes  = [ 'input' ]
+      classes << ('input-' + options.delete(:add_on).to_s) if options[:add_on]
       
-      template.render(
-        :layout => 'twitter_bootstrap_form_for/input',
-        :locals => {
-          :form      => self,
-          :attribute => attribute,
-          # only skip label if it's explicitly false
-          :label     => args.first.nil? ? '' : args.shift,
-          :add_on    => (options[:add_on] && 'input-' << options.delete(:add_on).to_s),
-          :block     => block
+      self.div_wrapper(attribute, :class => 'clearfix') do
+        template.concat self.label(attribute, label) if label
+        template.concat template.content_tag(:div, :class => classes.join(' ')) {
+          template.concat super(attribute, *(args << options))
+          template.concat template.content_tag(:span, self.errors_for(attribute), :class => 'help-inline') if self.errors_on?(attribute)
+          block.call if block.present?
         }
-      ) { super attribute, *(args << options) }
+      end
     end
   end
   
   TOGGLES.each do |toggle|
     define_method toggle do |attribute, *args, &block|
       options = args.extract_options!
+      label   = args.first.nil? ? '' : args.shift
+      target  = self.object_name.to_s + '_' + attribute.to_s
       
-      template.render(
-        :layout => 'twitter_bootstrap_form_for/toggle',
-        :locals => {
-          :form      => self,
-          :attribute => attribute,
-          :label     => args.first.nil? ? '' : args.shift,
+      template.content_tag(:li) do
+        template.concat template.content_tag(:label, :for => target) {
+          template.concat super(attribute, *(args << options))
+          template.concat ' ' # give the input and span some room
+          template.concat template.content_tag(:span, label)
         }
-      ) { super attribute, *(args << options) }
+      end
     end
   end
   

data/lib/twitter_bootstrap_form_for/railtie.rb

@@ -5,6 +5,5 @@ class TwitterBootstrapFormFor::Railtie < Rails::Railtie
   initializer 'twitter_bootstrap_form_for.initialize',
     :after => :after_initialize do
     ActionView::Base.send :include, TwitterBootstrapFormFor::FormHelpers
-    ActionController::Base.append_view_path Pathname.new(__FILE__).join('../../../app/views')
   end
 end

data/lib/twitter_bootstrap_form_for/version.rb

@@ -1,3 +1,3 @@
 module TwitterBootstrapFormFor
-  VERSION = '1.0.0.rc1'
+  VERSION = '1.0.0.rc2'
 end

data/twitter_bootstrap_form_for.gemspec

@@ -10,15 +10,11 @@ Gem::Specification.new do |s|
   s.summary     = 'Rails form builder optimized for Twitter Bootstrap'
   s.description = 'A custom Rails FormBuilder that assumes the use of Twitter Bootstrap'
   
-  # s.required_rubygems_version = '>= 1.8.0'
-  # s.rubyforge_project         = 'twitter_bootstrap_form_for'
-  
   s.files        = `git ls-files`.split("\n")
   s.executables  = `git ls-files`.split("\n").map {|f| f =~ /^bin\/(.*)/ ? $1 : nil }.compact
   s.require_path = 'lib'
 
   s.add_dependency 'rails', '~> 3'
-  s.add_dependency 'haml',  '~> 3'
   # TODO: uncomment the next line
   #  s.add_dependency 'twitter-bootstrap', '~> 1.3'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: twitter_bootstrap_form_for
 version: !ruby/object:Gem::Version
-  version: 1.0.0.rc1
+  version: 1.0.0.rc2
   prerelease: 6
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-09-30 00:00:00.000000000Z
+date: 2011-10-04 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70272000133280 !ruby/object:Gem::Requirement
+  requirement: &70107045286300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,18 +21,7 @@ dependencies:
         version: '3'
   type: :runtime
   prerelease: false
-  version_requirements: *70272000133280
-- !ruby/object:Gem::Dependency
-  name: haml
-  requirement: &70272000132780 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '3'
-  type: :runtime
-  prerelease: false
-  version_requirements: *70272000132780
+  version_requirements: *70107045286300
 description: A custom Rails FormBuilder that assumes the use of Twitter Bootstrap
 email:
 - stephen@touset.org
@@ -44,11 +33,7 @@ files:
 - .rvmrc
 - Gemfile
 - README.markdown
-- app/views/twitter_bootstrap_form_for/_actions.html.haml
-- app/views/twitter_bootstrap_form_for/_input.html.haml
-- app/views/twitter_bootstrap_form_for/_inputs.html.haml
-- app/views/twitter_bootstrap_form_for/_toggle.html.haml
-- app/views/twitter_bootstrap_form_for/_toggles.html.haml
+- examples/screenshot.png
 - lib/twitter_bootstrap_form_for.rb
 - lib/twitter_bootstrap_form_for/form_builder.rb
 - lib/twitter_bootstrap_form_for/form_helpers.rb
@@ -75,7 +60,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.8
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Rails form builder optimized for Twitter Bootstrap

data/app/views/twitter_bootstrap_form_for/_actions.html.haml

@@ -1,2 +0,0 @@
-.actions
-  = yield

data/app/views/twitter_bootstrap_form_for/_input.html.haml

@@ -1,6 +0,0 @@
-= form.div_wrapper attribute, :class => 'clearfix' do
-  = form.label attribute, label if label
-  .input{:class => add_on}
-    = yield
-    %span.help-inline= form.errors_for(attribute) if form.errors_on?(attribute)
-    = capture &block if block.present?

data/app/views/twitter_bootstrap_form_for/_inputs.html.haml

@@ -1,5 +0,0 @@
-%fieldset
-  - if legend.present?
-    %legend= legend
-  
-  = yield

data/app/views/twitter_bootstrap_form_for/_toggle.html.haml

@@ -1,4 +0,0 @@
-%li
-  %label
-    = yield
-    %span= label

data/app/views/twitter_bootstrap_form_for/_toggles.html.haml

@@ -1,6 +0,0 @@
-.clearfix
-  %label= label
-
-  .input
-    %ul.inputs-list
-      = yield