speedo-formstrap 1.2.2 → 1.2.3

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (44) hide show
  1. data/Gemfile +0 -1
  2. data/README.md +4 -4
  3. data/Rakefile +1 -1
  4. data/VERSION +1 -1
  5. data/lib/speedo-formstrap/form_builder.rb +7 -5
  6. data/lib/speedo-formstrap/helpers.rb +3 -1
  7. data/lib/speedo-formstrap/helpers/buttons_helper.rb +13 -9
  8. data/lib/speedo-formstrap/helpers/fieldset_wrapper.rb +11 -6
  9. data/lib/speedo-formstrap/helpers/inputs_helper.rb +4 -4
  10. data/lib/speedo-formstrap/inputs/base.rb +2 -1
  11. data/lib/speedo-formstrap/inputs/base/choices.rb +12 -23
  12. data/lib/speedo-formstrap/inputs/base/labelling.rb +16 -6
  13. data/lib/speedo-formstrap/inputs/base/timeish.rb +5 -12
  14. data/lib/speedo-formstrap/inputs/base/wrapping.rb +32 -14
  15. data/lib/speedo-formstrap/inputs/number_input.rb +2 -2
  16. data/lib/speedo-formstrap/inputs/radio_input.rb +13 -12
  17. data/lib/speedo-formstrap/inputs/range_input.rb +2 -2
  18. data/spec/builder/semantic_fields_for_spec.rb +16 -16
  19. data/spec/helpers/buttons_helper_spec.rb +56 -46
  20. data/spec/helpers/input_helper_spec.rb +209 -209
  21. data/spec/helpers/inputs_helper_spec.rb +117 -103
  22. data/spec/inputs/boolean_input_spec.rb +74 -46
  23. data/spec/inputs/check_boxes_input_spec.rb +110 -82
  24. data/spec/inputs/date_input_spec.rb +81 -15
  25. data/spec/inputs/datetime_input_spec.rb +13 -13
  26. data/spec/inputs/email_input_spec.rb +34 -6
  27. data/spec/inputs/file_input_spec.rb +34 -6
  28. data/spec/inputs/hidden_input_spec.rb +41 -13
  29. data/spec/inputs/number_input_spec.rb +127 -97
  30. data/spec/inputs/password_input_spec.rb +34 -6
  31. data/spec/inputs/phone_input_spec.rb +34 -6
  32. data/spec/inputs/radio_input_spec.rb +73 -45
  33. data/spec/inputs/range_input_spec.rb +94 -66
  34. data/spec/inputs/search_input_spec.rb +33 -6
  35. data/spec/inputs/select_input_spec.rb +124 -78
  36. data/spec/inputs/string_input_spec.rb +67 -22
  37. data/spec/inputs/text_input_spec.rb +42 -15
  38. data/spec/inputs/time_input_spec.rb +23 -23
  39. data/spec/inputs/time_zone_input_spec.rb +20 -20
  40. data/spec/inputs/url_input_spec.rb +34 -6
  41. data/spec/support/custom_macros.rb +67 -196
  42. data/spec/support/formtastic_spec_helper.rb +22 -6
  43. data/speedo-formstrap.gemspec +2 -2
  44. metadata +17 -17
@@ -118,6 +118,18 @@ module FormtasticSpecHelper
118
118
  include ActiveModel::Conversion if defined?(ActiveModel::Conversion)
119
119
  end
120
120
 
121
+ ##
122
+ # We can't mock :respond_to?, so we need a concrete class override
123
+ class ::MongoidReflectionMock < RSpec::Mocks::Mock
124
+ def initialize(name=nil, stubs_and_options={})
125
+ super name, stubs_and_options
126
+ end
127
+
128
+ def respond_to?(sym)
129
+ sym == :options ? false : super
130
+ end
131
+ end
132
+
121
133
  def _routes
122
134
  url_helpers = mock('url_helpers')
123
135
  url_helpers.stub!(:hash_for_posts_path).and_return({})
@@ -132,7 +144,9 @@ module FormtasticSpecHelper
132
144
  end
133
145
 
134
146
  def controller
135
- mock('controller', :controller_path= => '', :params => {})
147
+ env = mock('env', :[] => nil)
148
+ request = mock('request', :env => env)
149
+ mock('controller', :controller_path= => '', :params => {}, :request => request)
136
150
  end
137
151
 
138
152
  def default_url_options
@@ -263,7 +277,9 @@ module FormtasticSpecHelper
263
277
  when :main_post
264
278
  mock('reflection', :options => {}, :klass => ::Post, :macro => :belongs_to)
265
279
  when :mongoid_reviewer
266
- mock('reflection', :options => nil, :klass => ::Author, :macro => :referenced_in, :foreign_key => "reviewer_id") # custom id
280
+ ::MongoidReflectionMock.new('reflection',
281
+ :options => Proc.new { raise NoMethodError, "Mongoid has no reflection.options" },
282
+ :klass => ::Author, :macro => :referenced_in, :foreign_key => "reviewer_id") # custom id
267
283
  end
268
284
  end
269
285
  ::Post.stub!(:find).and_return([@freds_post])
@@ -373,10 +389,10 @@ module FormtasticSpecHelper
373
389
  end
374
390
 
375
391
  def with_config(config_method_name, value, &block)
376
- old_value = SpeedoFormstrap::FormBuilder.send(config_method_name)
377
- SpeedoFormstrap::FormBuilder.send(:"#{config_method_name}=", value)
392
+ old_value = FormtasticBootstrap::FormBuilder.send(config_method_name)
393
+ FormtasticBootstrap::FormBuilder.send(:"#{config_method_name}=", value)
378
394
  yield
379
- SpeedoFormstrap::FormBuilder.send(:"#{config_method_name}=", old_value)
395
+ FormtasticBootstrap::FormBuilder.send(:"#{config_method_name}=", old_value)
380
396
  end
381
397
 
382
- end
398
+ end
@@ -5,13 +5,13 @@
5
5
 
6
6
  Gem::Specification.new do |s|
7
7
  s.name = "speedo-formstrap"
8
- s.version = "1.2.2"
8
+ s.version = "1.2.3"
9
9
 
10
10
  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
11
11
  s.authors = ["Matthew Bellantoni", "Stu Basden"]
12
12
  s.date = "2012-06-28"
13
13
  s.description = "Formtastic form builder to generate Twitter Bootstrap-friendly markup."
14
- s.email = "mjbellantoni@yahoo.com"
14
+ s.email = "stu@t.apio.ca"
15
15
  s.extra_rdoc_files = [
16
16
  "LICENSE.txt",
17
17
  "README.md"
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: speedo-formstrap
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.2.2
4
+ version: 1.2.3
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors:
@@ -14,7 +14,7 @@ date: 2012-06-28 00:00:00.000000000Z
14
14
  dependencies:
15
15
  - !ruby/object:Gem::Dependency
16
16
  name: formtastic
17
- requirement: &2169749020 !ruby/object:Gem::Requirement
17
+ requirement: &2170362520 !ruby/object:Gem::Requirement
18
18
  none: false
19
19
  requirements:
20
20
  - - ~>
@@ -22,10 +22,10 @@ dependencies:
22
22
  version: 2.1.0.beta1
23
23
  type: :runtime
24
24
  prerelease: false
25
- version_requirements: *2169749020
25
+ version_requirements: *2170362520
26
26
  - !ruby/object:Gem::Dependency
27
27
  name: rails
28
- requirement: &2169748260 !ruby/object:Gem::Requirement
28
+ requirement: &2170361740 !ruby/object:Gem::Requirement
29
29
  none: false
30
30
  requirements:
31
31
  - - ! '>='
@@ -33,10 +33,10 @@ dependencies:
33
33
  version: 3.1.0
34
34
  type: :runtime
35
35
  prerelease: false
36
- version_requirements: *2169748260
36
+ version_requirements: *2170361740
37
37
  - !ruby/object:Gem::Dependency
38
38
  name: rspec
39
- requirement: &2169747640 !ruby/object:Gem::Requirement
39
+ requirement: &2170360980 !ruby/object:Gem::Requirement
40
40
  none: false
41
41
  requirements:
42
42
  - - ! '>='
@@ -44,10 +44,10 @@ dependencies:
44
44
  version: '0'
45
45
  type: :development
46
46
  prerelease: false
47
- version_requirements: *2169747640
47
+ version_requirements: *2170360980
48
48
  - !ruby/object:Gem::Dependency
49
49
  name: bundler
50
- requirement: &2169747040 !ruby/object:Gem::Requirement
50
+ requirement: &2170360220 !ruby/object:Gem::Requirement
51
51
  none: false
52
52
  requirements:
53
53
  - - ! '>='
@@ -55,10 +55,10 @@ dependencies:
55
55
  version: '0'
56
56
  type: :development
57
57
  prerelease: false
58
- version_requirements: *2169747040
58
+ version_requirements: *2170360220
59
59
  - !ruby/object:Gem::Dependency
60
60
  name: jeweler
61
- requirement: &2169746400 !ruby/object:Gem::Requirement
61
+ requirement: &2170359260 !ruby/object:Gem::Requirement
62
62
  none: false
63
63
  requirements:
64
64
  - - ! '>='
@@ -66,10 +66,10 @@ dependencies:
66
66
  version: '0'
67
67
  type: :development
68
68
  prerelease: false
69
- version_requirements: *2169746400
69
+ version_requirements: *2170359260
70
70
  - !ruby/object:Gem::Dependency
71
71
  name: rcov
72
- requirement: &2169745580 !ruby/object:Gem::Requirement
72
+ requirement: &2170358040 !ruby/object:Gem::Requirement
73
73
  none: false
74
74
  requirements:
75
75
  - - ! '>='
@@ -77,10 +77,10 @@ dependencies:
77
77
  version: '0'
78
78
  type: :development
79
79
  prerelease: false
80
- version_requirements: *2169745580
80
+ version_requirements: *2170358040
81
81
  - !ruby/object:Gem::Dependency
82
82
  name: rspec_tag_matchers
83
- requirement: &2169744500 !ruby/object:Gem::Requirement
83
+ requirement: &2170357380 !ruby/object:Gem::Requirement
84
84
  none: false
85
85
  requirements:
86
86
  - - ! '>='
@@ -88,9 +88,9 @@ dependencies:
88
88
  version: '0'
89
89
  type: :development
90
90
  prerelease: false
91
- version_requirements: *2169744500
91
+ version_requirements: *2170357380
92
92
  description: Formtastic form builder to generate Twitter Bootstrap-friendly markup.
93
- email: mjbellantoni@yahoo.com
93
+ email: stu@t.apio.ca
94
94
  executables: []
95
95
  extensions: []
96
96
  extra_rdoc_files:
@@ -200,7 +200,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
200
200
  version: '0'
201
201
  segments:
202
202
  - 0
203
- hash: -228544398461260747
203
+ hash: 558193621491411412
204
204
  required_rubygems_version: !ruby/object:Gem::Requirement
205
205
  none: false
206
206
  requirements: