msgpack-rpc 0.4.4 → 0.4.5

data/ChangeLog

@@ -1,4 +1,8 @@
 
+2011-04-14 version 0.4.5
+
+  * Fixes encoding problem of Address.parse_sockaddr(raw) on ruby 1.9
+
 2011-04-06 version 0.4.4
 
   * Fixes missing RuntimeError::CODE

data/lib/msgpack/rpc/address.rb

@@ -82,16 +82,31 @@ class Address
 		Address.parse(@serial)
 	end
 
-	def self.parse_sockaddr(raw)
-		if raw.length == 6
-			addr = Socket.pack_sockaddr_in(0, '0.0.0.0')
-			addr[2,6] = raw[0,6]
-		else
-			addr = Socket.pack_sockaddr_in(0, '::')
-			addr[2,2]  = raw[0,2]
-			addr[8,16] = raw[2,16]
+	if "".respond_to?(:encoding)
+		def self.parse_sockaddr(raw)
+			raw.force_encoding('ASCII-8BIT')
+			if raw.length == 6
+				addr = Socket.pack_sockaddr_in(0, '0.0.0.0')
+				addr[2,6] = raw[0,6]
+			else
+				addr = Socket.pack_sockaddr_in(0, '::')
+				addr[2,2]  = raw[0,2]
+				addr[8,16] = raw[2,16]
+			end
+			addr
+		end
+	else
+		def self.parse_sockaddr(raw)
+			if raw.length == 6
+				addr = Socket.pack_sockaddr_in(0, '0.0.0.0')
+				addr[2,6] = raw[0,6]
+			else
+				addr = Socket.pack_sockaddr_in(0, '::')
+				addr[2,2]  = raw[0,2]
+				addr[8,16] = raw[2,16]
+			end
+			addr
 		end
-		addr
 	end
 
 	def self.parse(raw)

data/lib/msgpack/rpc/version.rb

@@ -1,7 +1,7 @@
 module MessagePack
 module RPC
 
-VERSION = '0.4.4'
+VERSION = '0.4.5'
 
 end
 end

data/test/msgpack_rpc_test.rb

@@ -285,5 +285,13 @@ class MessagePackRPCTest < Test::Unit::TestCase
 		cli.close
 		lsock.close
 	end
+
+	def test_address
+		addr = MessagePack::RPC::Address.new('172.16.0.11', 18900)
+		raw = addr.to_msgpack
+		msg = MessagePack.unpack(raw)
+		addr2 = MessagePack::RPC::Address.load(msg)
+		assert_equal(addr, addr2)
+	end
 end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: msgpack-rpc
 version: !ruby/object:Gem::Version 
-  hash: 7
+  hash: 5
   prerelease: false
   segments: 
   - 0
   - 4
-  - 4
-  version: 0.4.4
+  - 5
+  version: 0.4.5
 platform: ruby
 authors: 
 - FURUHASHI Sadayuki
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-06 00:00:00 +09:00
+date: 2011-04-14 00:00:00 +09:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency