hpfeeds 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0601ce492ad0b35c6e5bc8262c63a67eb6383b07
-  data.tar.gz: 908b2970b3d03f79cff8e8f6beb4357d99323281
+  metadata.gz: 6d5af098a432900571e7e05e0b7b333a8d99d02b
+  data.tar.gz: 883bd7c4a69d0934e4976428f3b2b32125ca43da
 SHA512:
-  metadata.gz: f495301ebe6c183247ea8922344dcc740cdda21139e48dd7d4057828a55350198f3a0cef15d4e8ebb61c54058954c2800f133ea79ff05e7826bd3bb4990858bb
-  data.tar.gz: c0f97fa987663df406114e7e2acff07997d09ab546b136e7abf835233657fce3c3092315a9997ac4f1b2ea6dfd904f122dd7179194c7dd87c6dec0c2c38cf528
+  metadata.gz: 49ebb7c0f6c6304f8403130a5462a62af4c0b6bf54bfc445b34ff8b98741385376e1afc0e87c52b55523ef16313ee7c31fc8e115525af306a638a52fbb714add
+  data.tar.gz: 3ff03cc873f66aacac67d19b75fae0feebf4672bd1063d608856903928926aba81f014b6f69af70879877f8d5a60f618a870bb74f68b143420d2431824136470

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+#### 0.1.4
+- major changes:
+ - fixed bug in socket data receiving
+
 #### 0.1.3
 - major changes:
  - fixed bug in large feeds receiving

data/lib/hpfeeds/client.rb

@@ -9,7 +9,7 @@ module HPFeeds
   OP_SUBSCRIBE = 4
 
   HEADERSIZE = 5
-  BLOCKSIZE  = 1024
+  BLOCKSIZE  = 1500
 
   class Client
     def initialize(options)
@@ -62,12 +62,12 @@ module HPFeeds
         raise Exception.new("Could not connect to broker: #{e}.")
       end
       @logger.debug("waiting for data")
-      header = recv_timeout(HEADERSIZE)
+      header = receive_data(HEADERSIZE, @timeout)
       opcode, len = @decoder.parse_header(header)
       @logger.debug("received header, opcode = #{opcode}, len = #{len}")
 
       if opcode == OP_INFO
-        data = recv_timeout(len)
+        data = receive_data(len-HEADERSIZE, @timeout)
         @logger.debug("received data = #{binary_to_hex(data)}")
         name, rand = @decoder.parse_info(data)
         @logger.debug("received INFO, name = #{name}, rand = #{binary_to_hex(rand)}")
@@ -119,17 +119,14 @@ module HPFeeds
       begin
         while !@stopped
           while @connected
-            header = @socket.recv(HEADERSIZE)
+            header = receive_data(HEADERSIZE)
             if header.empty?
               @connected = false
               break
             end
             opcode, len = @decoder.parse_header(header)
             @logger.debug("received header, opcode = #{opcode}, len = #{len}")
-            data = ''
-            while data.size < len - HEADERSIZE
-              data += @socket.recv(BLOCKSIZE)
-            end
+            data = receive_data(len - HEADERSIZE)
             if opcode == OP_ERROR
               unless error_callback.nil?
                 error_callback.call(data)
@@ -176,14 +173,22 @@ module HPFeeds
       @socket.send(message, 0)
     end
 
-    def recv_timeout(len)
-      if IO.select([@socket], nil, nil, @timeout)
-        @socket.recv(len)
+    def receive_data(max, timeout=nil)
+      if IO.select([@socket], nil, nil, timeout)
+        read_from_socket(max)
       else
         raise Exception.new("Connection receive timeout.")
       end
     end
 
+    def read_from_socket(max, block = BLOCKSIZE)
+      data = ''
+      (max/block).times do
+        data += @socket.recv(block)
+      end
+      data += @socket.recv(max % block)
+    end
+
     def get_log_level(level)
       begin
         Logger.const_get(level.to_s.upcase)

data/lib/hpfeeds/version.rb

@@ -1,3 +1,3 @@
 module HPFeeds
-  VERSION = "0.1.3"
+  VERSION = "0.1.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hpfeeds
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Francesco Coda Zabetta
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-18 00:00:00.000000000 Z
+date: 2013-04-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -45,10 +45,10 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- lib/hpfeeds/version.rb
 - lib/hpfeeds/exception.rb
 - lib/hpfeeds/decoder.rb
 - lib/hpfeeds/client.rb
-- lib/hpfeeds/version.rb
 - lib/hpfeeds.rb
 - LICENSE.txt
 - Rakefile