1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

socket.rb: kwargs

Browse Source 
* ext/socket/lib/socket.rb (connect_{from,to}, connect): let use
  keyword arguments.

* ext/socket/lib/socket.rb (Socket.tcp): ditto.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@56778 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2016-11-14 07:53:31 +00:00
parent 8bc277f1d2
commit bfcb3fb3be
1 changed files with 10 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
ext/socket/lib/socket.rb
View File

@ -110,10 +110,8 @@ class Addrinfo
# puts s.read
# }
#
def connect_from(*args, &block)
opts = Hash === args.last ? args.pop : {}
local_addr_args = args
connect_internal(family_addrinfo(*local_addr_args), opts[:timeout], &block)
def connect_from(*args, timeout: nil, &block)
connect_internal(family_addrinfo(*args), timeout, &block)
end
# :call-seq:
@ -135,8 +133,8 @@ class Addrinfo
# puts s.read
# }
#
def connect(opts={}, &block)
connect_internal(nil, opts[:timeout], &block)
def connect(timeout: nil, &block)
connect_internal(nil, timeout, &block)
end
# :call-seq:
@ -158,11 +156,9 @@ class Addrinfo
# puts s.read
# }
#
def connect_to(*args, &block)
opts = Hash === args.last ? args.pop : {}
remote_addr_args = args
remote_addrinfo = family_addrinfo(*remote_addr_args)
remote_addrinfo.send(:connect_internal, self, opts[:timeout], &block)
def connect_to(*args, timeout: nil, &block)
remote_addrinfo = family_addrinfo(*args)
remote_addrinfo.send(:connect_internal, self, timeout, &block)
end
# creates a socket bound to self.
@ -609,15 +605,10 @@ class Socket < BasicSocket
# puts sock.read
# }
#
def self.tcp(host, port, *rest) # :yield: socket
opts = Hash === rest.last ? rest.pop : {}
raise ArgumentError, "wrong number of arguments (#{rest.length} for 2)" if 2 < rest.length
local_host, local_port = rest
def self.tcp(host, port, local_host = nil, local_port = nil, connect_timeout: nil) # :yield: socket
last_error = nil
ret = nil
connect_timeout = opts[:connect_timeout]
local_addr_list = nil
if local_host != nil || local_port != nil
local_addr_list = Addrinfo.getaddrinfo(local_host, local_port, nil, :STREAM, nil)
@ -632,8 +623,8 @@ class Socket < BasicSocket
end
begin
sock = local_addr ?
ai.connect_from(local_addr, :timeout => connect_timeout) :
ai.connect(:timeout => connect_timeout)
ai.connect_from(local_addr, timeout: connect_timeout) :
ai.connect(timeout: connect_timeout)
rescue SystemCallError
last_error = $!
next