twitter_bootstrap_form_for 1.0.1 → 1.0.2

data/CHANGELOG.markdown

@@ -1,8 +1,14 @@
 Twitter Bootstrap Form For Changes
 ==================================
 
+## 1.0.2 (2011-10-31) ##
+  - dependencies reduced to just `railties` and `actionpack`
+  - 1.8.7 compatibility fixes
+  - added compatibility with non-ActiveModel objects
+  - demonstrated use of radio buttons in the README
+
 ## 1.0.1 (2011-10-06) ##
-  - hidden_field tags are no accidentally marked-up (issue #5)
+  - hidden_field tags are no longer accidentally marked-up (issue #5)
 
 ## 1.0.0 (2011-10-04) ##
   - added a changelog

data/README.markdown

@@ -15,39 +15,41 @@ Formtastic does), it only lightly wraps the existing Rails form tag helpers.
 
 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.
-
 ## Syntax ##
 
 ```haml
 = twitter_bootstrap_form_for @user do |user|
-  
+
   / wraps a section in a fieldset with the provided legend text
   = user.inputs 'Sign up' do
-    
+
     / 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'
-    
+
     / a field with a custom label
     = user.password_field :password_confirmation, 'Confirm Password'
-    
+
     / 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
+
+    / group of radio buttons
+    = user.toggles 'Email Preferences' do
+      = user.radio_button :email, 'HTML Email', :html, :checked => true
+      = user.radio_button :email, 'Plain Text', :plain
+
+    / group of checkboxes
     = 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'
-  
+
   / wraps buttons in a distinctive style
   = user.actions do
     = user.submit 'Sign up'

data/lib/twitter_bootstrap_form_for.rb

@@ -1,9 +1,10 @@
+require 'action_view'
+
 module TwitterBootstrapFormFor
-  require 'twitter_bootstrap_form_for/version'
-  
   autoload :FormBuilder, 'twitter_bootstrap_form_for/form_builder'
   autoload :FormHelpers, 'twitter_bootstrap_form_for/form_helpers'
   autoload :Railtie,     'twitter_bootstrap_form_for/railtie'
+  autoload :VERSION,     'twitter_bootstrap_form_for/version'
 end
 
 TwitterBootstrapFormFor::Railtie # trigger loading the Railtie

data/lib/twitter_bootstrap_form_for/form_builder.rb

@@ -1,28 +1,29 @@
 require 'twitter_bootstrap_form_for'
+require 'action_view/helpers'
 
 class TwitterBootstrapFormFor::FormBuilder < ActionView::Helpers::FormBuilder
   # TODO: support inline inputs
-  
+
   include TwitterBootstrapFormFor::FormHelpers
-  
+
   attr_reader :template
   attr_reader :object
   attr_reader :object_name
-  
+
   INPUTS = [
     :select,
-    *ActionView::Helpers::FormBuilder.instance_methods.grep(%r{_area$}),
-    *ActionView::Helpers::FormBuilder.instance_methods.grep(%r{_field$}),
-    *ActionView::Helpers::FormBuilder.instance_methods.grep(%r{_select$}),
+    *ActionView::Helpers::FormBuilder.instance_methods.grep(%r{
+      _(area|field|select)$ # all area, field, and select methods
+    }mx)
   ]
-  
+
   INPUTS.delete(:hidden_field)
-  
+
   TOGGLES = [
     :check_box,
     :radio_button,
   ]
-  
+
   #
   # Wraps the contents of the block passed in a fieldset with optional
   # +legend+ text.
@@ -30,10 +31,8 @@ class TwitterBootstrapFormFor::FormBuilder < ActionView::Helpers::FormBuilder
   def inputs(legend = nil, &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.field_error_proc = lambda {|html_tag, instance| html_tag }
+
     template.content_tag(:fieldset) do
       template.concat template.content_tag(:legend, legend) unless legend.nil?
       block.call
@@ -41,7 +40,7 @@ class TwitterBootstrapFormFor::FormBuilder < ActionView::Helpers::FormBuilder
   ensure
     template.field_error_proc = original_field_error_proc
   end
-  
+
   #
   # Wraps groups of toggles (radio buttons, checkboxes) with a single label
   # and the appropriate markup. All toggle buttons should be rendered
@@ -55,87 +54,100 @@ class TwitterBootstrapFormFor::FormBuilder < ActionView::Helpers::FormBuilder
       }
     end
   end
-  
+
   #
   # Wraps action buttons into their own styled container.
   #
   def actions(&block)
     template.content_tag(:div, :class => 'actions', &block)
   end
-  
+
   #
   # Renders a submit tag with default classes to style it as a primary form
   # button.
   #
   def submit(value = nil, options = {})
     options[:class] ||= 'btn primary'
-    
+
     super value, options
   end
-  
+
   INPUTS.each do |input|
     define_method input do |attribute, *args, &block|
       options  = args.extract_options!
       label    = args.first.nil? ? '' : args.shift
       classes  = [ 'input' ]
       classes << ('input-' + options.delete(:add_on).to_s) if options[:add_on]
-      
-      self.div_wrapper(attribute, :class => 'clearfix') do
+
+      self.div_wrapper(attribute) 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)
+          template.concat error_span(attribute)
           block.call if block.present?
         }
       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.content_tag(:li) do
         template.concat template.content_tag(:label, :for => target) {
-          template.concat super(attribute, *(args << options))
+          template.concat super(attribute, *args)
           template.concat ' ' # give the input and span some room
           template.concat template.content_tag(:span, label)
         }
       end
     end
   end
-  
+
+  #
+  # Wraps the contents of +block+ inside a +tag+ with an appropriate class and
+  # id for the object's +attribute+. HTML options can be overridden by passing
+  # an +options+ hash.
+  #
   def div_wrapper(attribute, options = {}, &block)
     options[:id]    = _wrapper_id      attribute, options[:id]
-    options[:class] = _wrapper_classes attribute, options[:class]
-    
-    template.content_tag(:div, options, &block)
+    options[:class] = _wrapper_classes attribute, options[:class], 'clearfix'
+
+    template.content_tag :div, options, &block
   end
-  
+
+  def error_span(attribute, options = {})
+    options[:class] ||= 'help-inline'
+
+    template.content_tag(
+      :span, self.errors_for(attribute),
+      :class => options[:class]
+    ) if self.errors_on?(attribute)
+  end
+
   def errors_on?(attribute)
-    self.object.errors[attribute].present?
+    self.object.errors[attribute].present? if self.object.respond_to?(:errors)
   end
-  
+
   def errors_for(attribute)
     self.object.errors[attribute].try(:join, ', ')
   end
-  
+
   private
-  
+
   #
   # Returns an HTML id to uniquely identify the markup around an input field.
   # If a +default+ is provided, it uses that one instead.
   #
   def _wrapper_id(attribute, default = nil)
     default || [
-      _object_name + _object_index, 
+      _object_name + _object_index,
       _attribute_name(attribute),
       'input'
      ].join('_')
   end
-  
+
   #
   # Returns any classes necessary for the wrapper div around fields for
   # +attribute+, such as 'errors' if any errors are present on the attribute.
@@ -144,17 +156,17 @@ class TwitterBootstrapFormFor::FormBuilder < ActionView::Helpers::FormBuilder
   def _wrapper_classes(attribute, *classes)
     classes.tap do |classes|
       classes.push 'error' if self.errors_on?(attribute)
-    end
+    end.join(' ')
   end
-  
+
   def _attribute_name(attribute)
     attribute.to_s.gsub(/[\?\/\-]$/, '')
   end
-  
+
   def _object_name
     self.object_name.to_s.gsub(/\]\[|[^-a-zA-Z0-9:.]/, "_").sub(/_$/, "")
   end
-  
+
   def _object_index
     case
       when options.has_key?(:index) then options[:index]

data/lib/twitter_bootstrap_form_for/form_helpers.rb

@@ -7,7 +7,7 @@ module TwitterBootstrapFormFor::FormHelpers
         # add the TwitterBootstrap builder to the options
         options           = args.extract_options!
         options[:builder] = TwitterBootstrapFormFor::FormBuilder
-        
+
         # call the original method with our overridden options
         send method, record, *(args << options), &block
       end

data/lib/twitter_bootstrap_form_for/railtie.rb

@@ -1,5 +1,5 @@
 require 'twitter_bootstrap_form_for'
-require 'rails'
+require 'rails/railtie'
 
 class TwitterBootstrapFormFor::Railtie < Rails::Railtie
   initializer 'twitter_bootstrap_form_for.initialize',

data/lib/twitter_bootstrap_form_for/version.rb

@@ -1,3 +1,3 @@
 module TwitterBootstrapFormFor
-  VERSION = '1.0.1'
+  VERSION = '1.0.2'
 end

data/twitter_bootstrap_form_for.gemspec

@@ -9,12 +9,11 @@ Gem::Specification.new do |s|
   s.homepage    = 'http://github.com/stouset/twitter_bootstrap_form_for'
   s.summary     = 'Rails form builder optimized for Twitter Bootstrap'
   s.description = 'A custom Rails FormBuilder that assumes the use of Twitter Bootstrap'
-  
+
   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'
-  # TODO: uncomment the next line
-  #  s.add_dependency 'twitter-bootstrap', '~> 1.3'
+  s.add_dependency 'railties',   '~> 3'
+  s.add_dependency 'actionpack', '~> 3'
 end

metadata

@@ -1,35 +1,61 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: twitter_bootstrap_form_for
-version: !ruby/object:Gem::Version
-  version: 1.0.1
+version: !ruby/object:Gem::Version 
+  hash: 19
   prerelease: 
+  segments: 
+  - 1
+  - 0
+  - 2
+  version: 1.0.2
 platform: ruby
-authors:
+authors: 
 - Stephen Touset
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-10-06 00:00:00.000000000Z
-dependencies:
-- !ruby/object:Gem::Dependency
-  name: rails
-  requirement: &70145897266080 !ruby/object:Gem::Requirement
+
+date: 2011-10-31 00:00:00 -04:00
+default_executable: 
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: railties
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: '3'
+      - !ruby/object:Gem::Version 
+        hash: 5
+        segments: 
+        - 3
+        version: "3"
   type: :runtime
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: actionpack
   prerelease: false
-  version_requirements: *70145897266080
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 5
+        segments: 
+        - 3
+        version: "3"
+  type: :runtime
+  version_requirements: *id002
 description: A custom Rails FormBuilder that assumes the use of Twitter Bootstrap
-email:
+email: 
 - stephen@touset.org
 executables: []
+
 extensions: []
+
 extra_rdoc_files: []
-files:
-- .gitignore
+
+files: 
 - CHANGELOG.markdown
 - README.markdown
 - examples/screenshot.png
@@ -39,28 +65,39 @@ files:
 - lib/twitter_bootstrap_form_for/railtie.rb
 - lib/twitter_bootstrap_form_for/version.rb
 - twitter_bootstrap_form_for.gemspec
+has_rdoc: true
 homepage: http://github.com/stouset/twitter_bootstrap_form_for
 licenses: []
+
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
 requirements: []
+
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Rails form builder optimized for Twitter Bootstrap
 test_files: []
+

data/.gitignore

@@ -1,3 +0,0 @@
-.bundle
-
-Gemfile.lock