hpfeeds 0.1.6 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dc12c81b25dbb4039affdce014d7c4af220aca81
-  data.tar.gz: ce85a6e663faa4eba9eaf47565797da3695da8d0
+  metadata.gz: a4b13652c42715d1615773a7ba11efc138b1db62
+  data.tar.gz: eb42bc92b8126e3233570207b65358624b75b6f7
 SHA512:
-  metadata.gz: 0142b027a55252e987cadb998dbdcf567f886f07cf6bb19b7397f2f3e9808347b2ed92021875bea66110664edc497f015277380c26cdda4040b687abaa8735d0
-  data.tar.gz: 3c8e557fc15854b90ab97dc32229bf5ef584ea413f238c28d170a27d6db058d107dc2723a3751aeb8925234872c103cd9387cce627d2fa32c64a50764c8b69ce
+  metadata.gz: c913b2ac6cd2c27550ca5e46d507d9aee14599b9c93eac30ebadc4809c5c39aa1c9a5899f98b5d51908e549f6181ae85963d6b4e1bcf740505a9e43f219576ae
+  data.tar.gz: a7bed4d118ad9bcc03e0d56602d003ea36f877cb47dee06639e43f601280e0228de7b9e387d2b36834fb063a7b0960156620f9e8c8a489fe49d5388048126414

data/CHANGELOG.md

@@ -1,31 +1,38 @@
+#### 0.1.7
+- Fix `reconnect: false` options
+
+#### 0.1.6
+- minor changes:
+- minor fixes in README
+
 #### 0.1.5
 - major changes:
- - fixed bug in socket data receiving (feed split in different TCP packets)
+- fixed bug in socket data receiving (feed split in different TCP packets)
 
 #### 0.1.4
 - major changes:
- - fixed bug in socket data receiving
+- fixed bug in socket data receiving
 
 #### 0.1.3
 - major changes:
- - fixed bug in large feeds receiving
- - added automatic subscription on reconnection
- - fixed debug messages
+- fixed bug in large feeds receiving
+- added automatic subscription on reconnection
+- fixed debug messages
 
 - minor changes:
- - housekeeping
+- housekeeping
 
 #### 0.1.2
 - major changes:
- - added log_to and log_level options to HPFeeds::Client constructor
+- added log_to and log_level options to HPFeeds::Client constructor
 
 #### 0.1.1
 - major changes:
- - separate handlers for messages from different chanels
- - better error messages handling
+- separate handlers for messages from different chanels
+- better error messages handling
 
 - minor changes:
- - documentation, indentation
+- documentation, indentation
 
 #### 0.1.0
 First release

data/README.md

@@ -26,7 +26,7 @@ require "hpfeeds"
 def on_data(name, chan, payload)
   puts "[%s] %s: %s" % [ chan, name, payload ]
   # just an example here...
-  @hp.publish('channel', 'message')
+  @hp.publish('message', 'channel')
 end
 
 def on_error(data)

data/lib/hpfeeds/client.rb

@@ -12,20 +12,20 @@ module HPFeeds
 
   class Client
     def initialize(options)
-      @host   = options[:host]
-      @port   = options[:port] || 10000
-      @ident  = options[:ident]
-      @secret = options[:secret]
+      @host   = options.fetch(:host)
+      @port   = options.fetch(:port, 10000)
+      @ident  = options.fetch(:ident)
+      @secret = options.fetch(:secret)
 
-      @timeout   = options[:timeout]   || 3
-      @reconnect = options[:reconnect] || true
-      @sleepwait = options[:sleepwait] || 20
+      @timeout   = options.fetch(:timeout, 30)
+      @reconnect = options.fetch(:reconnect, true)
+      @sleepwait = options.fetch(:sleepwait, 20)
 
       @connected = false
       @stopped   = false
 
-      log_to    = options[:log_to] || STDOUT
-      log_level = options[:log_level] || :info
+      log_to    = options.fetch(:log_to, STDOUT)
+      log_level = options.fetch(:log_level, :info)
       @logger   = Logger.new(log_to)
       @logger.level = get_log_level(log_level)
 
@@ -45,7 +45,8 @@ module HPFeeds
           end
           break
         rescue => e
-          @logger.warn("#{e.class} caugthed while connecting: #{e}. Reconnecting in #{@sleepwait} seconds...")
+          @logger.warn("#{e.class} caught while connecting: #{e}. Reconnecting in #{@sleepwait} seconds...")
+          raise(e) unless @reconnect
           sleep(@sleepwait)
         end
       end
@@ -118,14 +119,14 @@ module HPFeeds
       begin
         while !@stopped
           while @connected
-            header = receive_data(HEADERSIZE)
+            header = receive_data(HEADERSIZE, @timeout)
             if header.empty?
               @connected = false
               break
             end
             opcode, len = @decoder.parse_header(header)
             @logger.debug("received header, opcode = #{opcode}, len = #{len}")
-            data = receive_data(len - HEADERSIZE)
+            data = receive_data(len - HEADERSIZE, @timeout)
             if opcode == OP_ERROR
               unless error_callback.nil?
                 error_callback.call(data)
@@ -145,11 +146,16 @@ module HPFeeds
           @logger.debug("Lost connection, trying to connect again...")
           tryconnect
         end
+      rescue Timeout => e
+        @logger.warn("#{e.class} caught while connecting: #{e}. Reconnecting in #{@sleepwait} seconds...")
+        raise(e) unless @reconnect
+        sleep(@sleepwait)
+        tryconnect
       rescue ErrorMessage => e
-        @logger.warn("#{e.class} caugthed in main loop: #{e}")
+        @logger.warn("#{e.class} caught in main loop: #{e}")
         raise e
       rescue => e
-        message = "#{e.class} caugthed in main loop: #{e}\n"
+        message = "#{e.class} caught in main loop: #{e}\n"
         message += e.backtrace.join("\n")
         @logger.error(message)
       end
@@ -176,7 +182,7 @@ module HPFeeds
       if IO.select([@socket], nil, nil, timeout)
         read_from_socket(max)
       else
-        raise Exception.new("Connection receive timeout.")
+        raise Timeout.new("Connection receive timeout.")
       end
     end
 

data/lib/hpfeeds/exception.rb

@@ -1,4 +1,5 @@
 module HPFeeds
   class Exception < RuntimeError; end
   class ErrorMessage < RuntimeError; end
+  class Timeout < TimeoutError; end
 end

data/lib/hpfeeds/version.rb

@@ -1,3 +1,3 @@
 module HPFeeds
-  VERSION = "0.1.6"
+  VERSION = "0.1.7"
 end

metadata

@@ -1,41 +1,41 @@
 --- !ruby/object:Gem::Specification
 name: hpfeeds
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
 platform: ruby
 authors:
 - Francesco Coda Zabetta
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-07 00:00:00.000000000 Z
+date: 2017-03-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Ruby client for HPFeeds protocol
@@ -45,15 +45,15 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- lib/hpfeeds/version.rb
-- lib/hpfeeds/exception.rb
-- lib/hpfeeds/decoder.rb
-- lib/hpfeeds/client.rb
-- lib/hpfeeds.rb
+- CHANGELOG.md
 - LICENSE.txt
-- Rakefile
 - README.md
-- CHANGELOG.md
+- Rakefile
+- lib/hpfeeds.rb
+- lib/hpfeeds/client.rb
+- lib/hpfeeds/decoder.rb
+- lib/hpfeeds/exception.rb
+- lib/hpfeeds/version.rb
 homepage: https://github.com/vicvega/hpfeeds-ruby
 licenses:
 - MIT
@@ -64,17 +64,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: Ruby client for HPFeeds protocol