speedo-formstrap 1.2.7 → 1.2.8

data/Gemfile

@@ -1,12 +1,12 @@
 source "http://rubygems.org"
 
-gem 'formtastic'
+gem 'formtastic', '~> 2.1.0.beta1'
 gem 'rails', '>= 3.1.0'
 
 group :development, :test do
   gem "rspec"
   gem "bundler"
   gem "jeweler"
-  gem "rcov", ">= 0"
+  gem "simplecov"
   gem "rspec_tag_matchers"
 end

data/Gemfile.lock

@@ -1,119 +1,121 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    actionmailer (3.1.3)
-      actionpack (= 3.1.3)
-      mail (~> 2.3.0)
-    actionpack (3.1.3)
-      activemodel (= 3.1.3)
-      activesupport (= 3.1.3)
+    actionmailer (3.2.6)
+      actionpack (= 3.2.6)
+      mail (~> 2.4.4)
+    actionpack (3.2.6)
+      activemodel (= 3.2.6)
+      activesupport (= 3.2.6)
       builder (~> 3.0.0)
       erubis (~> 2.7.0)
-      i18n (~> 0.6)
-      rack (~> 1.3.5)
-      rack-cache (~> 1.1)
-      rack-mount (~> 0.8.2)
+      journey (~> 1.0.1)
+      rack (~> 1.4.0)
+      rack-cache (~> 1.2)
       rack-test (~> 0.6.1)
-      sprockets (~> 2.0.3)
-    activemodel (3.1.3)
-      activesupport (= 3.1.3)
+      sprockets (~> 2.1.3)
+    activemodel (3.2.6)
+      activesupport (= 3.2.6)
       builder (~> 3.0.0)
-      i18n (~> 0.6)
-    activerecord (3.1.3)
-      activemodel (= 3.1.3)
-      activesupport (= 3.1.3)
-      arel (~> 2.2.1)
+    activerecord (3.2.6)
+      activemodel (= 3.2.6)
+      activesupport (= 3.2.6)
+      arel (~> 3.0.2)
       tzinfo (~> 0.3.29)
-    activeresource (3.1.3)
-      activemodel (= 3.1.3)
-      activesupport (= 3.1.3)
-    activesupport (3.1.3)
+    activeresource (3.2.6)
+      activemodel (= 3.2.6)
+      activesupport (= 3.2.6)
+    activesupport (3.2.6)
+      i18n (~> 0.6)
       multi_json (~> 1.0)
-    arel (2.2.1)
+    arel (3.0.2)
     builder (3.0.0)
     diff-lcs (1.1.3)
     erubis (2.7.0)
-    formtastic (2.0.2)
-      rails (~> 3.0)
+    formtastic (2.1.1)
+      actionpack (~> 3.0)
     git (1.2.5)
     hike (1.2.1)
     i18n (0.6.0)
-    jeweler (1.6.4)
+    jeweler (1.8.4)
       bundler (~> 1.0)
       git (>= 1.2.5)
       rake
-    json (1.6.3)
-    mail (2.3.0)
+      rdoc
+    journey (1.0.4)
+    json (1.7.3)
+    mail (2.4.4)
       i18n (>= 0.4.0)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
-    mime-types (1.17.2)
-    multi_json (1.0.4)
-    nokogiri (1.5.0)
+    mime-types (1.19)
+    multi_json (1.3.6)
+    nokogiri (1.5.5)
     polyglot (0.3.3)
-    rack (1.3.5)
-    rack-cache (1.1)
+    rack (1.4.1)
+    rack-cache (1.2)
       rack (>= 0.4)
-    rack-mount (0.8.3)
-      rack (>= 1.0.0)
     rack-ssl (1.3.2)
       rack
     rack-test (0.6.1)
       rack (>= 1.0)
-    rails (3.1.3)
-      actionmailer (= 3.1.3)
-      actionpack (= 3.1.3)
-      activerecord (= 3.1.3)
-      activeresource (= 3.1.3)
-      activesupport (= 3.1.3)
+    rails (3.2.6)
+      actionmailer (= 3.2.6)
+      actionpack (= 3.2.6)
+      activerecord (= 3.2.6)
+      activeresource (= 3.2.6)
+      activesupport (= 3.2.6)
       bundler (~> 1.0)
-      railties (= 3.1.3)
-    railties (3.1.3)
-      actionpack (= 3.1.3)
-      activesupport (= 3.1.3)
+      railties (= 3.2.6)
+    railties (3.2.6)
+      actionpack (= 3.2.6)
+      activesupport (= 3.2.6)
       rack-ssl (~> 1.3.2)
       rake (>= 0.8.7)
       rdoc (~> 3.4)
-      thor (~> 0.14.6)
+      thor (>= 0.14.6, < 2.0)
     rake (0.9.2.2)
-    rcov (0.9.11)
     rdoc (3.12)
       json (~> 1.4)
-    rspec (2.7.0)
-      rspec-core (~> 2.7.0)
-      rspec-expectations (~> 2.7.0)
-      rspec-mocks (~> 2.7.0)
-    rspec-core (2.7.1)
-    rspec-expectations (2.7.0)
-      diff-lcs (~> 1.1.2)
-    rspec-mocks (2.7.0)
-    rspec-rails (2.7.0)
-      actionpack (~> 3.0)
-      activesupport (~> 3.0)
-      railties (~> 3.0)
-      rspec (~> 2.7.0)
+    rspec (2.11.0)
+      rspec-core (~> 2.11.0)
+      rspec-expectations (~> 2.11.0)
+      rspec-mocks (~> 2.11.0)
+    rspec-core (2.11.0)
+    rspec-expectations (2.11.1)
+      diff-lcs (~> 1.1.3)
+    rspec-mocks (2.11.0)
+    rspec-rails (2.11.0)
+      actionpack (>= 3.0)
+      activesupport (>= 3.0)
+      railties (>= 3.0)
+      rspec (~> 2.11.0)
     rspec_tag_matchers (1.0.0)
       nokogiri (>= 1.4.0)
       rspec-rails (>= 1.2.6)
-    sprockets (2.0.3)
+    simplecov (0.6.4)
+      multi_json (~> 1.0)
+      simplecov-html (~> 0.5.3)
+    simplecov-html (0.5.3)
+    sprockets (2.1.3)
       hike (~> 1.2)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
-    thor (0.14.6)
+    thor (0.15.4)
     tilt (1.3.3)
     treetop (1.4.10)
       polyglot
       polyglot (>= 0.3.1)
-    tzinfo (0.3.31)
+    tzinfo (0.3.33)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   bundler
-  formtastic
+  formtastic (~> 2.1.0.beta1)
   jeweler
   rails (>= 3.1.0)
-  rcov
   rspec
   rspec_tag_matchers
+  simplecov

data/README.md

@@ -127,7 +127,18 @@ 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
+
+#### 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
  
@@ -162,7 +173,6 @@ 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

data/Rakefile

@@ -19,7 +19,7 @@ Jeweler::Tasks.new do |gem|
   gem.license = "MIT"
   gem.summary = %Q{Formtastic form builder to generate Twitter Bootstrap-friendly markup.}
   gem.description = gem.summary
-  gem.email = "mjbellantoni@yahoo.com"
+  gem.email = "stu@t.apio.ca"
   gem.authors = ["Matthew Bellantoni", "Stu Basden"]
   # dependencies defined in Gemfile
 end

data/VERSION

@@ -1 +1 @@
-1.2.6
+1.2.8

data/lib/formtastic-bootstrap.rb

@@ -2,5 +2,6 @@ require "formtastic"
 require "formtastic-bootstrap/engine" if defined?(::Rails) # For tests
 require "formtastic-bootstrap/helpers"
 require "formtastic-bootstrap/inputs"
+require "formtastic-bootstrap/actions"
 require "formtastic-bootstrap/form_builder"
 require "action_view/helpers/text_field_date_helper"

data/lib/formtastic-bootstrap/actions.rb

@@ -0,0 +1,4 @@
+require "formtastic-bootstrap/actions/base"
+require "formtastic-bootstrap/actions/input_action"
+require "formtastic-bootstrap/actions/link_action"
+require "formtastic-bootstrap/actions/button_action"

data/lib/formtastic-bootstrap/actions/base.rb

@@ -0,0 +1,18 @@
+module FormtasticBootstrap
+	module Actions
+		module Base
+
+			def wrapper(&block)
+				template.capture(&block)
+			end
+
+			def button_html
+				new_class = [super[:class], wrapper_html_options[:class], "btn"]
+				new_class << "btn-primary" if method == :submit
+				new_class = new_class.compact.join(" ")
+				wrapper_html_options.merge(super).merge(:class => new_class)
+			end
+
+		end
+	end
+end

data/lib/formtastic-bootstrap/actions/button_action.rb

@@ -0,0 +1,7 @@
+module FormtasticBootstrap
+	module Actions
+		class ButtonAction < Formtastic::Actions::ButtonAction
+			include Base
+		end
+	end
+end

data/lib/formtastic-bootstrap/actions/input_action.rb

@@ -0,0 +1,7 @@
+module FormtasticBootstrap
+	module Actions
+		class InputAction < Formtastic::Actions::InputAction
+			include Base
+		end
+	end
+end

data/lib/formtastic-bootstrap/actions/link_action.rb

@@ -0,0 +1,7 @@
+module FormtasticBootstrap
+	module Actions
+		class LinkAction < Formtastic::Actions::LinkAction
+			include Base
+		end
+	end
+end

data/lib/formtastic-bootstrap/form_builder.rb

@@ -1,5 +1,5 @@
 module FormtasticBootstrap
-  
+
   class FormBuilder < Formtastic::FormBuilder
 
     configure :default_inline_error_class, 'help-inline'
@@ -11,18 +11,18 @@ module FormtasticBootstrap
       # self.default_inline_error_class
       raise
     end
-    
+
     def self.default_error_class=(error_class)
       # self.default_inline_error_class = error_class
       # self.default_block_error_class = error_class
       raise
     end
-    
+
     def self.default_hint_class
       # self.default_inline_hint_class
       raise
     end
-    
+
     def self.default_hint_class=(hint_class)
       # self.default_inline_hint_class = hint_class
       # self.default_block_hint_class = hint_class
@@ -32,7 +32,9 @@ module FormtasticBootstrap
     include FormtasticBootstrap::Helpers::InputHelper
     include FormtasticBootstrap::Helpers::InputsHelper
     include FormtasticBootstrap::Helpers::ButtonsHelper
+    include FormtasticBootstrap::Helpers::ActionHelper
+    include FormtasticBootstrap::Helpers::ActionsHelper
 
   end
 
-end
+end

data/lib/formtastic-bootstrap/helpers.rb

@@ -1,5 +1,7 @@
 require "formtastic-bootstrap/helpers/buttons_helper"
 require "formtastic-bootstrap/helpers/fieldset_wrapper"
+require "formtastic-bootstrap/helpers/action_helper"
+require "formtastic-bootstrap/helpers/actions_helper"
 require "formtastic-bootstrap/helpers/input_helper"
 require "formtastic-bootstrap/helpers/inputs_helper"
 
@@ -11,7 +13,7 @@ module FormtasticBootstrap
     # autoload :FormHelper, 'formtastic/helpers/form_helper'
     # autoload :InputHelper, 'formtastic/helpers/input_helper'
     # autoload :InputsHelper, 'formtastic/helpers/inputs_helper'
-    # autoload :LabelHelper, 'formtastic/helpers/label_helper' 
+    # autoload :LabelHelper, 'formtastic/helpers/label_helper'
     # autoload :SemanticFormHelper, 'formtastic/helpers/semantic_form_helper'
     # autoload :Reflection, 'formtastic/helpers/reflection'
   end

data/lib/formtastic-bootstrap/helpers/action_helper.rb

@@ -0,0 +1,12 @@
+module FormtasticBootstrap
+	module Helpers
+		module ActionHelper
+			include Formtastic::Helpers::ActionHelper
+
+			def standard_action_class_name(as)
+			  "FormtasticBootstrap::Actions::#{as.to_s.camelize}Action"
+			end
+
+		end
+	end
+end

data/lib/formtastic-bootstrap/helpers/actions_helper.rb

@@ -0,0 +1,23 @@
+module FormtasticBootstrap
+	module Helpers
+		module ActionsHelper
+
+			include Formtastic::Helpers::ActionsHelper
+			include FormtasticBootstrap::Helpers::FieldsetWrapper
+
+			def actions(*args, &block)
+				html_options = args.extract_options!
+				html_options[:class] ||= "form-actions"
+
+				if block_given?
+				  field_set_and_list_wrapping(html_options, &block)
+				else
+				  args = default_actions if args.empty?
+				  contents = args.map { |action_name| action(action_name) }
+				  field_set_and_list_wrapping(html_options, contents)
+				end
+			end
+
+		end
+	end
+end

data/lib/formtastic-bootstrap/helpers/buttons_helper.rb

@@ -5,10 +5,11 @@ module FormtasticBootstrap
       include Formtastic::Helpers::ButtonsHelper
 
       def buttons(*args, &block)
+        ::ActiveSupport::Deprecation.warn("f.buttons is deprecated in favour of f.actions and will be removed from Formtastic after 2.1. Please see ActionsHelper and InputAction or ButtonAction for more information")
 
         html_options = args.extract_options!
-        html_options[:class] ||= "actions"
-  
+        html_options[:class] ||= "form-actions"
+
         if html_options.has_key?(:name)
           ActiveSupport::Deprecation.warn('The :name option is not supported')
         end
@@ -16,7 +17,7 @@ module FormtasticBootstrap
         if block_given?
           template.content_tag(:div, html_options) do
             yield
-          end          
+          end
         else
           args = [:commit] if args.empty?
           contents = args.map { |button_name| send(:"#{button_name}_button") }
@@ -28,25 +29,28 @@ module FormtasticBootstrap
       end
 
       def commit_button(*args)
+        ::ActiveSupport::Deprecation.warn("f.commit_button is deprecated in favour of f.action(:submit) and will be removed from Formtastic after 2.1. Please see ActionsHelper and InputAction or ButtonAction for more information")
+
         options = args.extract_options!
         text = options.delete(:label) || args.shift
-      
+
         text = (localized_string(commit_button_i18n_key, text, :action, :model => commit_button_object_name) ||
                 Formtastic::I18n.t(commit_button_i18n_key, :model => commit_button_object_name)) unless text.is_a?(::String)
-      
+
         button_html = options.delete(:button_html) || {}
+        button_html[:id] ||= "#{@object_name}_submit"
         button_html.merge!(:class => [button_html[:class], "btn commit", commit_button_i18n_key].compact.join(' '))
-      
+
         # TODO We don't have a wrapper. Add deprecation message.
         # wrapper_html = options.delete(:wrapper_html) || {}
         # wrapper_html[:class] = (commit_button_wrapper_html_class << wrapper_html[:class]).flatten.compact.join(' ')
-      
+
         accesskey = (options.delete(:accesskey) || default_commit_button_accesskey) unless button_html.has_key?(:accesskey)
         button_html = button_html.merge(:accesskey => accesskey) if accesskey
-        
+
         Formtastic::Util.html_safe(submit(text, button_html))
       end
 
     end
   end
-end
+end