protoplasm-em-server 0.1.7 → 0.1.8

data/lib/protoplasm/client/blocking_client.rb

@@ -28,14 +28,28 @@ module Protoplasm
       raise "Must be implemented by the client class"
     end
 
-    def _socket
+    def _socket(timeout = 5)
       count = 0
       begin
         host, port = host_port
         @socket ||= begin
-          s = TCPSocket.open(host, port)
-          s.setsockopt(Socket::SOL_SOCKET, Socket::SO_KEEPALIVE, true)
-          s
+          addr = Socket.getaddrinfo(host, nil)
+          sock = Socket.new(Socket.const_get(addr[0][0]), Socket::SOCK_STREAM, 0)
+
+          if timeout
+            secs = Integer(timeout)
+            usecs = Integer((timeout - secs) * 1_000_000)
+            optval = [secs, usecs].pack("l_2")
+            begin
+              io.setsockopt Socket::SOL_SOCKET, Socket::SO_RCVTIMEO, optval
+              io.setsockopt Socket::SOL_SOCKET, Socket::SO_SNDTIMEO, optval
+            rescue Exception => ex
+              # Solaris, for one, does not like/support socket timeouts.
+              @logger.info "[memcache-client] Unable to use raw socket timeouts: #{ex.class.name}: #{ex.message}" if @logger
+            end
+          end
+          sock.connect(Socket.pack_sockaddr_in(port, addr[0][3]))
+          sock
         end
         yield @socket if block_given?
       rescue Errno::EPIPE, Errno::ECONNRESET
@@ -74,7 +88,7 @@ module Protoplasm
               while data.size < len
                 data << socket.sysread([len - data.size, 4096].min)
               end
-              obj = type.response_class.decode(data)
+              obj = type.response_class.decode(data.force_encoding('BINARY'))
               yield obj if block_given?
             end
             fetch_objects = false unless type.streaming?

data/lib/protoplasm/server/em_server.rb

@@ -74,6 +74,7 @@ module Protoplasm
       obj = type.response_class.new(*args)
       s = ''
       obj.encode(s)
+      s = s.force_encoding('BINARY')
       send_data [Types::Response::NORMAL].pack("C")
       send_data [s.size].pack("Q")
       send_data s

data/lib/protoplasm/version.rb

@@ -1,3 +1,3 @@
 module Protoplasm
-  VERSION = "0.1.7"
+  VERSION = "0.1.8"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: protoplasm-em-server
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.8
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-07 00:00:00.000000000 Z
+date: 2012-02-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine
-  requirement: &70098254751460 !ruby/object:Gem::Requirement
+  requirement: &70111869145700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70098254751460
+  version_requirements: *70111869145700
 - !ruby/object:Gem::Dependency
   name: beefcake
-  requirement: &70098254748100 !ruby/object:Gem::Requirement
+  requirement: &70111869145200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 0.3.7
   type: :runtime
   prerelease: false
-  version_requirements: *70098254748100
+  version_requirements: *70111869145200
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70098254746360 !ruby/object:Gem::Requirement
+  requirement: &70111869144780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70098254746360
+  version_requirements: *70111869144780
 - !ruby/object:Gem::Dependency
   name: minitest
-  requirement: &70098254734380 !ruby/object:Gem::Requirement
+  requirement: &70111869144240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,7 +54,7 @@ dependencies:
         version: 2.6.1
   type: :development
   prerelease: false
-  version_requirements: *70098254734380
+  version_requirements: *70111869144240
 description: A protoplasm server backed by EventMachine.
 email:
 - joshbuddy@gmail.com
@@ -87,18 +87,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -844767653554300454
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -844767653554300454
 requirements: []
 rubyforge_project: protoplasm-em-server
 rubygems_version: 1.8.15
@@ -108,3 +102,4 @@ summary: A protoplasm server backed by EventMachine
 test_files:
 - test/protoplasm_test.rb
 - test/test_helper.rb
+has_rdoc: