Skip to content

Commit 78d7617

Browse files
authored
Merge pull request #7 from cmrainey/chore/ruby-3-compatibility
chore: update deprecated methods and kwargs for ruby 3
2 parents 390625e + 6accd4d commit 78d7617

File tree

3 files changed

+9
-9
lines changed

3 files changed

+9
-9
lines changed

lib/to_lang/connector.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ class Connector
1919
if value.nil?
2020
key
2121
elsif value.is_a?(Array)
22-
value.map {|v| "#{key}=#{URI.encode(v.to_s, Regexp.new("[^#{URI::PATTERN::UNRESERVED}]"))}"}
22+
value.map {|v| "#{key}=#{URI::Parser.new.escape(v.to_s, Regexp.new("[^#{URI::PATTERN::UNRESERVED}]"))}"}
2323
else
2424
{key => value}.to_params
2525
end

lib/to_lang/core_ext.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ def normalize_param(key, value)
3131
elsif value.is_a?(Hash)
3232
stack << [key,value]
3333
else
34-
param << "#{key}=#{URI.encode(value.to_s, Regexp.new("[^#{URI::PATTERN::UNRESERVED}]"))}&"
34+
param << "#{key}=#{URI::Parser.new.escape(value.to_s, Regexp.new("[^#{URI::PATTERN::UNRESERVED}]"))}&"
3535
end
3636

3737
stack.each do |parent, hash|

lib/to_lang/translatable.rb

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ module Translatable
1212
#
1313
# @return [String] The translated string.
1414
#
15-
def translate(target, *args)
16-
ToLang.connector.request(self, target, *args)
15+
def translate(target, *args, **kwargs)
16+
ToLang.connector.request(self, target, *args, **kwargs)
1717
end
1818

1919
# Chain @method_missing@ in case another library has used it.
@@ -24,28 +24,28 @@ def translate(target, *args)
2424
#
2525
# @private
2626
#
27-
def method_missing(method, *args, &block)
27+
def method_missing(method, *args, **kwargs, &block)
2828
case method.to_s
2929
when /^to_(.*)_from_(.*)$/
3030
if CODEMAP[$1] && CODEMAP[$2]
3131
define_and_call_method(method) { translate(CODEMAP[$1], :from => CODEMAP[$2]) }
3232
else
33-
original_method_missing(method, *args, &block)
33+
original_method_missing(method, *args, **kwargs, &block)
3434
end
3535
when /^from_(.*)_to_(.*)$/
3636
if CODEMAP[$1] && CODEMAP[$2]
3737
define_and_call_method(method) { translate(CODEMAP[$2], :from => CODEMAP[$1]) }
3838
else
39-
original_method_missing(method, *args, &block)
39+
original_method_missing(method, *args, **kwargs, &block)
4040
end
4141
when /^to_(.*)$/
4242
if CODEMAP[$1]
4343
define_and_call_method(method) { translate(CODEMAP[$1]) }
4444
else
45-
original_method_missing(method, *args, &block)
45+
original_method_missing(method, *args, **kwargs, &block)
4646
end
4747
else
48-
original_method_missing(method, *args, &block)
48+
original_method_missing(method, *args, **kwargs, &block)
4949
end
5050
end
5151

0 commit comments

Comments
 (0)