speedo-formstrap 1.2.3 → 1.2.4

data/spec/support/formtastic_spec_helper.rb

@@ -118,18 +118,6 @@ module FormtasticSpecHelper
     include ActiveModel::Conversion if defined?(ActiveModel::Conversion)
   end
 
-  ##
-  # We can't mock :respond_to?, so we need a concrete class override
-  class ::MongoidReflectionMock < RSpec::Mocks::Mock
-    def initialize(name=nil, stubs_and_options={})
-      super name, stubs_and_options
-    end
-
-    def respond_to?(sym)
-      sym == :options ? false : super
-    end
-  end
-
   def _routes
     url_helpers = mock('url_helpers')
     url_helpers.stub!(:hash_for_posts_path).and_return({})
@@ -144,9 +132,7 @@ module FormtasticSpecHelper
   end
 
   def controller
-    env = mock('env', :[] => nil)
-    request = mock('request', :env => env)
-    mock('controller', :controller_path= => '', :params => {}, :request => request)
+    mock('controller', :controller_path= => '', :params => {})
   end
 
   def default_url_options
@@ -277,9 +263,7 @@ module FormtasticSpecHelper
       when :main_post
         mock('reflection', :options => {}, :klass => ::Post, :macro => :belongs_to)
       when :mongoid_reviewer
-        ::MongoidReflectionMock.new('reflection',
-          :options => Proc.new { raise NoMethodError, "Mongoid has no reflection.options" },
-          :klass => ::Author, :macro => :referenced_in, :foreign_key => "reviewer_id") # custom id
+        mock('reflection', :options => nil, :klass => ::Author, :macro => :referenced_in, :foreign_key => "reviewer_id") # custom id
       end
     end
     ::Post.stub!(:find).and_return([@freds_post])
@@ -395,4 +379,4 @@ module FormtasticSpecHelper
     FormtasticBootstrap::FormBuilder.send(:"#{config_method_name}=", old_value)
   end
 
-end
+end

data/vendor/assets/stylesheets/formtastic-bootstrap.css

@@ -0,0 +1,3 @@
+.hidden {
+	display: none;
+}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: speedo-formstrap
 version: !ruby/object:Gem::Version
-  version: 1.2.3
+  version: 1.2.4
   prerelease: 
 platform: ruby
 authors:
@@ -10,33 +10,33 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-28 00:00:00.000000000Z
+date: 2012-07-09 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: formtastic
-  requirement: &2170362520 !ruby/object:Gem::Requirement
+  requirement: &2169090420 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.1.0.beta1
+        version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2170362520
+  version_requirements: *2169090420
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &2170361740 !ruby/object:Gem::Requirement
+  requirement: &2169088980 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
         version: 3.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *2170361740
+  version_requirements: *2169088980
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2170360980 !ruby/object:Gem::Requirement
+  requirement: &2169086640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,10 +44,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2170360980
+  version_requirements: *2169086640
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &2170360220 !ruby/object:Gem::Requirement
+  requirement: &2169085240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,10 +55,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2170360220
+  version_requirements: *2169085240
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &2170359260 !ruby/object:Gem::Requirement
+  requirement: &2169082840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -66,10 +66,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2170359260
+  version_requirements: *2169082840
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &2170358040 !ruby/object:Gem::Requirement
+  requirement: &2169081040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -77,10 +77,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2170358040
+  version_requirements: *2169081040
 - !ruby/object:Gem::Dependency
   name: rspec_tag_matchers
-  requirement: &2170357380 !ruby/object:Gem::Requirement
+  requirement: &2169079680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -88,9 +88,9 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2170357380
+  version_requirements: *2169079680
 description: Formtastic form builder to generate Twitter Bootstrap-friendly markup.
-email: stu@t.apio.ca
+email: mjbellantoni@yahoo.com
 executables: []
 extensions: []
 extra_rdoc_files:
@@ -105,59 +105,47 @@ files:
 - README.md
 - Rakefile
 - VERSION
+- formtastic-bootstrap.gemspec
 - lib/action_view/helpers/text_field_date_helper.rb
-- lib/speedo-formstrap.rb
-- lib/speedo-formstrap/actions.rb
-- lib/speedo-formstrap/actions/base.rb
-- lib/speedo-formstrap/actions/button_action.rb
-- lib/speedo-formstrap/actions/input_action.rb
-- lib/speedo-formstrap/actions/link_action.rb
-- lib/speedo-formstrap/engine.rb
-- lib/speedo-formstrap/form_builder.rb
-- lib/speedo-formstrap/helpers.rb
-- lib/speedo-formstrap/helpers/action_helper.rb
-- lib/speedo-formstrap/helpers/actions_helper.rb
-- lib/speedo-formstrap/helpers/buttons_helper.rb
-- lib/speedo-formstrap/helpers/fieldset_wrapper.rb
-- lib/speedo-formstrap/helpers/input_helper.rb
-- lib/speedo-formstrap/helpers/inputs_helper.rb
-- lib/speedo-formstrap/inputs.rb
-- lib/speedo-formstrap/inputs/base.rb
-- lib/speedo-formstrap/inputs/base/choices.rb
-- lib/speedo-formstrap/inputs/base/errors.rb
-- lib/speedo-formstrap/inputs/base/hints.rb
-- lib/speedo-formstrap/inputs/base/html.rb
-- lib/speedo-formstrap/inputs/base/labelling.rb
-- lib/speedo-formstrap/inputs/base/numeric.rb
-- lib/speedo-formstrap/inputs/base/stringish.rb
-- lib/speedo-formstrap/inputs/base/timeish.rb
-- lib/speedo-formstrap/inputs/base/wrapping.rb
-- lib/speedo-formstrap/inputs/boolean_input.rb
-- lib/speedo-formstrap/inputs/check_boxes_input.rb
-- lib/speedo-formstrap/inputs/date_input.rb
-- lib/speedo-formstrap/inputs/datetime_input.rb
-- lib/speedo-formstrap/inputs/email_input.rb
-- lib/speedo-formstrap/inputs/file_input.rb
-- lib/speedo-formstrap/inputs/hidden_input.rb
-- lib/speedo-formstrap/inputs/number_input.rb
-- lib/speedo-formstrap/inputs/password_input.rb
-- lib/speedo-formstrap/inputs/phone_input.rb
-- lib/speedo-formstrap/inputs/radio_input.rb
-- lib/speedo-formstrap/inputs/range_input.rb
-- lib/speedo-formstrap/inputs/search_input.rb
-- lib/speedo-formstrap/inputs/select_input.rb
-- lib/speedo-formstrap/inputs/string_input.rb
-- lib/speedo-formstrap/inputs/text_input.rb
-- lib/speedo-formstrap/inputs/time_input.rb
-- lib/speedo-formstrap/inputs/time_zone_input.rb
-- lib/speedo-formstrap/inputs/url_input.rb
-- spec/actions/button_action_spec.rb
-- spec/actions/generic_action_spec.rb
-- spec/actions/input_action_spec.rb
-- spec/actions/link_action_spec.rb
+- lib/formtastic-bootstrap.rb
+- lib/formtastic-bootstrap/engine.rb
+- lib/formtastic-bootstrap/form_builder.rb
+- lib/formtastic-bootstrap/helpers.rb
+- lib/formtastic-bootstrap/helpers/buttons_helper.rb
+- lib/formtastic-bootstrap/helpers/fieldset_wrapper.rb
+- lib/formtastic-bootstrap/helpers/input_helper.rb
+- lib/formtastic-bootstrap/helpers/inputs_helper.rb
+- lib/formtastic-bootstrap/inputs.rb
+- lib/formtastic-bootstrap/inputs/base.rb
+- lib/formtastic-bootstrap/inputs/base/choices.rb
+- lib/formtastic-bootstrap/inputs/base/errors.rb
+- lib/formtastic-bootstrap/inputs/base/hints.rb
+- lib/formtastic-bootstrap/inputs/base/html.rb
+- lib/formtastic-bootstrap/inputs/base/labelling.rb
+- lib/formtastic-bootstrap/inputs/base/stringish.rb
+- lib/formtastic-bootstrap/inputs/base/timeish.rb
+- lib/formtastic-bootstrap/inputs/base/wrapping.rb
+- lib/formtastic-bootstrap/inputs/boolean_input.rb
+- lib/formtastic-bootstrap/inputs/check_boxes_input.rb
+- lib/formtastic-bootstrap/inputs/date_input.rb
+- lib/formtastic-bootstrap/inputs/datetime_input.rb
+- lib/formtastic-bootstrap/inputs/email_input.rb
+- lib/formtastic-bootstrap/inputs/file_input.rb
+- lib/formtastic-bootstrap/inputs/hidden_input.rb
+- lib/formtastic-bootstrap/inputs/number_input.rb
+- lib/formtastic-bootstrap/inputs/password_input.rb
+- lib/formtastic-bootstrap/inputs/phone_input.rb
+- lib/formtastic-bootstrap/inputs/radio_input.rb
+- lib/formtastic-bootstrap/inputs/range_input.rb
+- lib/formtastic-bootstrap/inputs/search_input.rb
+- lib/formtastic-bootstrap/inputs/select_input.rb
+- lib/formtastic-bootstrap/inputs/string_input.rb
+- lib/formtastic-bootstrap/inputs/text_input.rb
+- lib/formtastic-bootstrap/inputs/time_input.rb
+- lib/formtastic-bootstrap/inputs/time_zone_input.rb
+- lib/formtastic-bootstrap/inputs/url_input.rb
+- spec/builder/errors_spec.rb
 - spec/builder/semantic_fields_for_spec.rb
-- spec/helpers/action_helper_spec.rb
-- spec/helpers/actions_helper_spec.rb
 - spec/helpers/buttons_helper_spec.rb
 - spec/helpers/input_helper_spec.rb
 - spec/helpers/inputs_helper_spec.rb
@@ -184,8 +172,8 @@ files:
 - spec/support/custom_macros.rb
 - spec/support/depracation.rb
 - spec/support/formtastic_spec_helper.rb
-- speedo-formstrap.gemspec
-homepage: http://github.com/thugsb/speedo-formstrap
+- vendor/assets/stylesheets/formtastic-bootstrap.css
+homepage: http://github.com/thugsb/formtastic-bootstrap
 licenses:
 - MIT
 post_install_message: 
@@ -200,7 +188,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 558193621491411412
+      hash: 2766219528928196940
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:

data/lib/speedo-formstrap/actions/base.rb

@@ -1,18 +0,0 @@
-module SpeedoFormstrap
-	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/speedo-formstrap/actions/button_action.rb

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

data/lib/speedo-formstrap/actions/input_action.rb

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

data/lib/speedo-formstrap/actions/link_action.rb

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

data/lib/speedo-formstrap/actions.rb

@@ -1,4 +0,0 @@
-require "speedo-formstrap/actions/base"
-require "speedo-formstrap/actions/input_action"
-require "speedo-formstrap/actions/link_action"
-require "speedo-formstrap/actions/button_action"

data/lib/speedo-formstrap/helpers/action_helper.rb

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

data/lib/speedo-formstrap/helpers/actions_helper.rb

@@ -1,23 +0,0 @@
-module SpeedoFormstrap
-	module Helpers
-		module ActionsHelper
-
-			include Formtastic::Helpers::ActionsHelper
-			include SpeedoFormstrap::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/speedo-formstrap/inputs/base/choices.rb

@@ -1,38 +0,0 @@
-module SpeedoFormstrap
-  module Inputs
-    module Base
-      module Choices
-
-        def input_div_wrapping(&block)
-          template.content_tag(:div, choices_wrapping_html_options) do
-            [yield, error_html(:block), hint_html(:block)].join("\n").html_safe
-          end
-        end
-
-        def choices_wrapping_html_options
-          new_class = [super[:class], "controls"].compact.join(" ")
-          super.merge(:class => new_class)
-        end
-
-        #def choices_group_wrapping(&block)
-        #  template.content_tag(:ul,
-        #    template.capture(&block),
-        #    choices_group_wrapping_html_options
-        #  )
-        #end
-
-        # This is actually a label in Bootstrap.
-        def legend_html
-          template.content_tag(:label, control_label_html_options) do
-            render_label? ? label_text : "".html_safe
-          end
-        end
-
-        def control_label_html_options
-          super.merge(:for => nil)
-        end
-
-      end
-    end
-  end
-end

data/lib/speedo-formstrap/inputs/base/labelling.rb

@@ -1,28 +0,0 @@
-module SpeedoFormstrap
-  module Inputs
-    module Base
-      module Labelling
-
-        include Formtastic::Inputs::Base::Labelling
-
-        def label_html
-          render_label? ? builder.label(input_name, label_text, control_label_html_options) : "".html_safe
-        end
-
-        def label_html_options
-          opts = {}
-          opts[:for] ||= input_html_options[:id]
-          opts[:class] = [opts[:class]]
-
-          opts
-        end
-
-        def control_label_html_options
-          new_class = [label_html_options[:class], "control-label"].compact.join(" ")
-          label_html_options.merge(:class => new_class)
-        end
-
-      end
-    end
-  end
-end

data/lib/speedo-formstrap/inputs/base/numeric.rb

@@ -1,18 +0,0 @@
-# Alas, I need to duplicate code from Formtastic::Inputs::Base::Numeric because
-# there's no way to re-import that module.
-module SpeedoFormstrap
-	module Inputs
-		module Base
-			module Numeric
-
-				include Formtastic::Inputs::Base::Numeric
-
-				def wrapper_html_options
-					new_class = [super[:class], "numeric", "stringish"].compact.join(" ")
-					super.merge(:class => new_class)
-				end
-
-			end
-		end
-	end
-end