Skip to content

Commit bb84232

Browse files
author
Cody Fauser
committed
kill deprecation warnings with rails 2.3
1 parent 6e4fff2 commit bb84232

File tree

3 files changed

+3
-2
lines changed

3 files changed

+3
-2
lines changed

CHANGELOG

+1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
= ActiveMerchant CHANGELOG
22

3+
* Use :words_connector instead of connector in RequiresParameters [cody]
34
* Fixed CreditCard not validating start_month and start_year when set as string [Tekin]
45
* Update PostsData to support get requests [cody]
56
* Fix broken Quickpay remote test [cody]

Rakefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ spec = Gem::Specification.new do |s|
8686
s.email = "[email protected]"
8787
s.homepage = "http://activemerchant.org/"
8888

89-
s.add_dependency('activesupport', '>= 1.4.1')
89+
s.add_dependency('activesupport', '>= 2.3.2')
9090
s.add_dependency('builder', '>= 2.0.0')
9191

9292
s.signing_key = ENV['GEM_PRIVATE_KEY']

lib/active_merchant/lib/requires_parameters.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ def requires!(hash, *params)
66
raise ArgumentError.new("Missing required parameter: #{param.first}") unless hash.has_key?(param.first)
77

88
valid_options = param[1..-1]
9-
raise ArgumentError.new("Parameter: #{param.first} must be one of #{valid_options.to_sentence(:connector => 'or')}") unless valid_options.include?(hash[param.first])
9+
raise ArgumentError.new("Parameter: #{param.first} must be one of #{valid_options.to_sentence(:words_connector => 'or')}") unless valid_options.include?(hash[param.first])
1010
else
1111
raise ArgumentError.new("Missing required parameter: #{param}") unless hash.has_key?(param)
1212
end

0 commit comments

Comments
 (0)