formtastic-bootstrap 1.1.2 → 1.2.0

data/README.md

@@ -127,7 +127,22 @@ In particular:
 Contributions are welcome!
 
 * Formtastic's <tt>:country</tt> has not yet been implemented.
-* Twitter Bootstrap's Date Range, Prepend Text, Prepend Checkbox and Appended Checkbox controls have not yet been implemented.
+* Twitter Bootstrap's Date Range, Prepend Checkbox and Appended Checkbox controls have not yet been implemented.
+
+## Usage
+
+In general, the usage should be identical to Formtastic's.  Some changes have been introduced in order to support Bootstrap-specific controls.
+
+### Bootstrap-specific Controls
+
+#### Prepended Text
+To create a Prepended Text field, use the ```:prepend``` option.  This works on any text field input type, like ```:url```, ```:search```, and of course ```:string```
+
+    <%= semantic_form_for @user do |f| %>
+      <%= f.inputs do %>
+        <%= f.input :handle, :prepend => '@' %>
+      <% end %>
+    <% end %>
 
 ## Contributing
  
@@ -145,6 +160,9 @@ If you're filing a bug, thank you!  Secondly, in the report please include:
 * Anything else you think will help!
 
 ### Source Contributions
+
+Source contributions are very welcome!  Most of the recent work on this package has been done by the community.
+
 * Check out the latest master to make sure the feature hasn't been implemented or the bug hasn't been fixed yet
 * Check out the issue tracker to make sure someone already hasn't requested it and/or contributed it
 * Fork the project
@@ -162,13 +180,11 @@ If you're filing a bug, thank you!  Secondly, in the report please include:
    * :time_zone
  * Fancy Bootstrap Fields
    * Date Range
-   * Prepend Text
    * Prepend Checkbox
    * Appended Checkbox
 * :datetime, :date, :time
  * As rich functionally as their Rails counterparts.
  * Extract into a standalone gem.
-* Disabled inputs
 * Tests
  * Refactor
  * More -- See if I'm making sure the Bootstrap classes are present.

data/VERSION

@@ -1 +1 @@
-1.1.2
+1.2.0

data/formtastic-bootstrap.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "formtastic-bootstrap"
-  s.version = "1.1.2"
+  s.version = "1.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Matthew Bellantoni"]
-  s.date = "2011-12-21"
+  s.date = "2012-02-05"
   s.description = "Formtastic form builder to generate Twitter Bootstrap-friendly markup."
   s.email = "mjbellantoni@yahoo.com"
   s.extra_rdoc_files = [

data/lib/formtastic-bootstrap/inputs/base/wrapping.rb

@@ -9,7 +9,13 @@ module FormtasticBootstrap
           clearfix_div_wrapping do
             label_html <<
             input_div_wrapping do
-              yield
+              if options[:prepend]
+                prepended_input_wrapping do
+                  [template.content_tag(:span, options[:prepend], :class => 'add-on'), yield].join("\n").html_safe
+                end
+              else
+                yield
+              end
             end
           end
         end
@@ -49,7 +55,12 @@ module FormtasticBootstrap
       
           opts
         end
-
+        
+        def prepended_input_wrapping(&block)
+          template.content_tag(:div, :class => 'input-prepend') do
+            yield
+          end
+        end
       end
     end
   end

data/spec/inputs/string_input_spec.rb

@@ -178,5 +178,22 @@ describe 'string input' do
     
   end
 
+  describe "with string prepended", :now => true do
+    
+    before do
+      concat(semantic_form_for(:user) do |builder|
+        concat(builder.input(:handle, :as => :string, :prepend => '@'))
+      end)
+    end
+    
+    it "should generate span with desired prepend string" do
+      output_buffer.should have_tag('form div.input div.input-prepend span.add-on', '@')
+    end
+    
+    it "should wrap input in div.input-prepend" do
+      output_buffer.should have_tag('form div.input div.input-prepend input[name="user[handle]"]')
+    end
+  end
+
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: formtastic-bootstrap
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-21 00:00:00.000000000Z
+date: 2012-02-05 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: formtastic
-  requirement: &2156290520 !ruby/object:Gem::Requirement
+  requirement: &2158414500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2156290520
+  version_requirements: *2158414500
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &2156289060 !ruby/object:Gem::Requirement
+  requirement: &2158413960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 3.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *2156289060
+  version_requirements: *2158413960
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2156288140 !ruby/object:Gem::Requirement
+  requirement: &2158413300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2156288140
+  version_requirements: *2158413300
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &2156287300 !ruby/object:Gem::Requirement
+  requirement: &2158412700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2156287300
+  version_requirements: *2158412700
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &2156286420 !ruby/object:Gem::Requirement
+  requirement: &2158412120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2156286420
+  version_requirements: *2158412120
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &2156285100 !ruby/object:Gem::Requirement
+  requirement: &2158411460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2156285100
+  version_requirements: *2158411460
 - !ruby/object:Gem::Dependency
   name: rspec_tag_matchers
-  requirement: &2156283960 !ruby/object:Gem::Requirement
+  requirement: &2158410860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,7 +87,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2156283960
+  version_requirements: *2158410860
 description: Formtastic form builder to generate Twitter Bootstrap-friendly markup.
 email: mjbellantoni@yahoo.com
 executables: []
@@ -187,7 +187,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2102655774825126816
+      hash: 322211644369240484
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: