sanford-protocol 0.5.1 → 0.5.3

data/lib/sanford-protocol/connection.rb

@@ -1,4 +1,5 @@
 require 'sanford-protocol/msg_data'
+require 'socket'
 
 module Sanford::Protocol
 
@@ -33,6 +34,11 @@ module Sanford::Protocol
       @socket.write(msg_version, size, body)
     end
 
+    def peek(timeout=nil)
+      wait_for_data(timeout) if timeout
+      @socket.peek
+    end
+
     def close
       @socket.close
     end
@@ -57,13 +63,17 @@ module Sanford::Protocol
     end
 
     def read(number_of_bytes)
-      tcp_socket.recvfrom(number_of_bytes).first
+      tcp_socket.recv(number_of_bytes)
     end
 
     def write(*binary_strings)
       tcp_socket.send(binary_strings.join, 0)
     end
 
+    def peek(number_of_bytes = 1)
+      tcp_socket.recv(number_of_bytes, ::Socket::MSG_PEEK)
+    end
+
     def close
       tcp_socket.close rescue false
     end

data/lib/sanford-protocol/test/fake_socket.rb

@@ -39,8 +39,8 @@ module Sanford::Protocol::Test
 
     # Socket methods -- requied by Sanford::Protocol
 
-    def recvfrom(number_of_bytes)
-      [ @in.read(number_of_bytes.to_i) ]
+    def recv(number_of_bytes, flags = nil)
+      @in.read(number_of_bytes.to_i) || ""
     end
 
     def send(bytes, flag)

data/lib/sanford-protocol/version.rb

@@ -1,5 +1,5 @@
 module Sanford
   module Protocol
-    GEM_VERSION = "0.5.1"
+    GEM_VERSION = "0.5.3"
   end
 end

data/test/unit/connection_tests.rb

@@ -12,7 +12,7 @@ class Sanford::Protocol::Connection
     end
     subject{ @connection }
 
-    should have_instance_methods :read, :write, :close
+    should have_instance_methods :read, :write, :close, :peek
 
     should "read messages off the socket with #read" do
       assert_equal @data, subject.read
@@ -27,19 +27,45 @@ class Sanford::Protocol::Connection
       subject.close
       assert @socket.closed?
     end
-  end
 
-  class TimeoutTests < BaseTests
-    desc "when timing out on a read"
-    setup do
-      IO.stubs(:select).returns(nil) # mock IO.select behavior when it times out
+    should "look at the first byte of data on the socket with #peek" do
+      assert_equal @socket.in[0, 1], subject.peek
     end
-    teardown do
-      IO.unstub(:select)
+
+  end
+
+  class RealConnectionTests < BaseTests
+
+    def start_server(options, &block)
+      begin
+        # this `fork` is a separate process, so it runs parallel to the code
+        # after it's block
+        pid = fork do
+          tcp_server = TCPServer.open 'localhost', 12000
+          trap("TERM"){ tcp_server.close }
+          socket = tcp_server.accept # blocks here, waits for `block` to connect
+          options[:serve].call(socket) if options[:serve]
+        end
+        sleep 0.2 # give the server time to boot
+        yield
+      ensure
+        if pid
+          Process.kill("TERM", pid)
+          Process.wait(pid)
+        end
+      end
     end
 
+  end
+
+  class TimeoutTests < RealConnectionTests
+    desc "when timing out on a read"
+
     should "raise `TimeoutError` if given a timeout value" do
-      assert_raises(Sanford::Protocol::TimeoutError) { subject.read(1) }
+      self.start_server(:serve => proc{ sleep 0.2 }) do
+        connection = Sanford::Protocol::Connection.new(TCPSocket.new('localhost', 12000))
+        assert_raises(Sanford::Protocol::TimeoutError) { connection.read(0.1) }
+      end
     end
 
   end

data/test/unit/fake_socket_tests.rb

@@ -13,7 +13,7 @@ class Sanford::Protocol::Test::FakeSocket
 
     should have_cmeths :with_request, :with_msg_body, :with_encoded_msg_body
     should have_imeths :in, :out, :reset
-    should have_imeths :recvfrom, :send
+    should have_imeths :recv, :send
 
     should "have no `in` or `out` data by default" do
       assert_empty subject.in
@@ -38,11 +38,10 @@ class Sanford::Protocol::Test::FakeSocket
       assert_equal @in_data, subject.in
     end
 
-    should "pull `in` data using #recvfrom" do
-      recvfrom_data = subject.recvfrom(@in_data.bytesize)
+    should "pull `in` data using #recv" do
+      recv_data = subject.recv(@in_data.bytesize)
 
-      assert_kind_of ::Array, recvfrom_data
-      assert_equal @in_data, recvfrom_data.first
+      assert_equal @in_data, recv_data
     end
 
     should "reset its `in` data using #reset" do

data/test/unit/msg_data_tests.rb

@@ -75,7 +75,7 @@ class Sanford::Protocol::MsgData
         raises("simulated socket read error!")
     end
     teardown do
-      Sanford::Protocol.unstub(:read)
+      @socket.unstub(:read)
     end
 
     should "raise a BadMessageError with a relevant message" do

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: sanford-protocol
 version: !ruby/object:Gem::Version 
-  hash: 9
+  hash: 13
   prerelease: 
   segments: 
   - 0
   - 5
-  - 1
-  version: 0.5.1
+  - 3
+  version: 0.5.3
 platform: ruby
 authors: 
 - Collin Redding
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-01-17 00:00:00 Z
+date: 2013-02-05 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   prerelease: false