hpfeeds 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d1bd654109dcee1eaf2deb278fe4711f83e26108
-  data.tar.gz: 62a3c061bb49aa28e0a16dbd3890c7db6afde2f7
+  metadata.gz: 0601ce492ad0b35c6e5bc8262c63a67eb6383b07
+  data.tar.gz: 908b2970b3d03f79cff8e8f6beb4357d99323281
 SHA512:
-  metadata.gz: 251cd8a93db0ffa7ccf06351e7565e6668d88bab47165fb4f796bd8ce48c779ff53d6de73f3bed7f4e8da397c7531afb0e1b637dba36163afee7e05401e87c7a
-  data.tar.gz: 6ba3f86460c17470cec02ef40920a7e19c2ae45909672459e26b966c724c77ff50e4cc04587a6401cc3a690e155f86a3b8489a25ee5da0db6854fc3e41d84798
+  metadata.gz: f495301ebe6c183247ea8922344dcc740cdda21139e48dd7d4057828a55350198f3a0cef15d4e8ebb61c54058954c2800f133ea79ff05e7826bd3bb4990858bb
+  data.tar.gz: c0f97fa987663df406114e7e2acff07997d09ab546b136e7abf835233657fce3c3092315a9997ac4f1b2ea6dfd904f122dd7179194c7dd87c6dec0c2c38cf528

data/CHANGELOG.md

@@ -1,3 +1,12 @@
+#### 0.1.3
+- major changes:
+ - fixed bug in large feeds receiving
+ - added automatic subscription on reconnection
+ - fixed debug messages
+
+- minor changes:
+ - housekeeping
+
 #### 0.1.2
 - major changes:
  - added log_to and log_level options to HPFeeds::Client constructor

data/lib/hpfeeds/client.rb

@@ -9,7 +9,7 @@ module HPFeeds
   OP_SUBSCRIBE = 4
 
   HEADERSIZE = 5
-  BUFSIZE    = 16384
+  BLOCKSIZE  = 1024
 
   class Client
     def initialize(options)
@@ -26,11 +26,13 @@ module HPFeeds
       @stopped   = false
 
       log_to    = options[:log_to] || STDOUT
-      @logger       = Logger.new(log_to)
-      @logger.level = get_log_level(options[:log_level])
+      log_level = options[:log_level] || :info
+      @logger   = Logger.new(log_to)
+      @logger.level = get_log_level(log_level)
 
-      @decoder  = Decoder.new
-      @handlers = {}
+      @decoder = Decoder.new
+      @handlers   = {}
+      @subscribed = []
 
       tryconnect
     end
@@ -39,6 +41,9 @@ module HPFeeds
       loop do
         begin
           connect()
+          for c in @subscribed
+            subscribe_to_channel c
+          end
           break
         rescue => e
           @logger.warn("#{e.class} caugthed while connecting: #{e}. Reconnecting in #{@sleepwait} seconds...")
@@ -63,9 +68,9 @@ module HPFeeds
 
       if opcode == OP_INFO
         data = recv_timeout(len)
-        @logger.debug("received data = #{data}")
+        @logger.debug("received data = #{binary_to_hex(data)}")
         name, rand = @decoder.parse_info(data)
-        @logger.debug("received INFO, name = #{name}, rand = #{rand}")
+        @logger.debug("received INFO, name = #{name}, rand = #{binary_to_hex(rand)}")
         @brokername = name
         auth = @decoder.msg_auth(rand, @ident, @secret)
         @socket.send(auth, 0)
@@ -85,18 +90,15 @@ module HPFeeds
         raise ArgumentError.new('When subscribing to a channel, you have to provide a block as a callback for message handling')
       end
       for c in channels
-        @logger.info("subscribing to #{c}")
-        message = @decoder.msg_subscribe(@ident, c)
-        @socket.send(message, 0)
+        subscribe_to_channel c
         @handlers[c] = handler unless handler.nil?
+        @subscribed << c
       end
     end
 
     def publish(data, *channels)
       for c in channels
-        @logger.info("publish to #{c}: #{data}")
-        message = @decoder.msg_publish(@ident, c, data)
-        @socket.send(message, 0)
+        publish_to_channel c, data
       end
     end
 
@@ -124,8 +126,10 @@ module HPFeeds
             end
             opcode, len = @decoder.parse_header(header)
             @logger.debug("received header, opcode = #{opcode}, len = #{len}")
-            data = @socket.recv(len)
-            @logger.debug("received #{data.length} bytes of data")
+            data = ''
+            while data.size < len - HEADERSIZE
+              data += @socket.recv(BLOCKSIZE)
+            end
             if opcode == OP_ERROR
               unless error_callback.nil?
                 error_callback.call(data)
@@ -134,7 +138,7 @@ module HPFeeds
               end
             elsif opcode == OP_PUBLISH
               name, chan, payload = @decoder.parse_publish(data)
-              @logger.info("received #{payload.length} bytes of data from #{name} on channel #{chan}")
+              @logger.debug("received #{payload.length} bytes of data from #{name} on channel #{chan}")
               handler = @handlers[chan]
               unless handler.nil?
                 # ignore unhandled messages
@@ -156,7 +160,23 @@ module HPFeeds
     end
 
   private
-    def recv_timeout(len=BUFSIZE)
+    def binary_to_hex s
+      "0x#{s.unpack('H*')[0]}" rescue ''
+    end
+
+    def subscribe_to_channel c
+      @logger.info("subscribing to #{c}")
+      message = @decoder.msg_subscribe(@ident, c)
+      @socket.send(message, 0)
+    end
+
+    def publish_to_channel c, data
+      @logger.info("publish to #{c}: #{data}")
+      message = @decoder.msg_publish(@ident, c, data)
+      @socket.send(message, 0)
+    end
+
+    def recv_timeout(len)
       if IO.select([@socket], nil, nil, @timeout)
         @socket.recv(len)
       else
@@ -165,15 +185,10 @@ module HPFeeds
     end
 
     def get_log_level(level)
-      return Logger::INFO if level.nil?
-      case level.to_s.downcase
-        when 'debug';   Logger::DEBUG
-        when 'info';    Logger::INFO
-        when 'warn';    Logger::WARN
-        when 'warning'; Logger::WARN
-        when 'error';   Logger::ERROR
-        when 'fatal';   Logger::FATAL
-      else Logger::INFO
+      begin
+        Logger.const_get(level.to_s.upcase)
+      rescue
+        raise ArgumentError.new("Unknown log level #{level}")
       end
     end
 

data/lib/hpfeeds/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hpfeeds
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Francesco Coda Zabetta
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-16 00:00:00.000000000 Z
+date: 2013-04-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -46,7 +46,6 @@ extensions: []
 extra_rdoc_files: []
 files:
 - lib/hpfeeds/exception.rb
-- lib/hpfeeds/version.rb~
 - lib/hpfeeds/decoder.rb
 - lib/hpfeeds/client.rb
 - lib/hpfeeds/version.rb

data/lib/hpfeeds/version.rb~

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