iproto 0.3.15 → 0.3.16

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    NTI0M2I4ODY4NDA1OWI3MmJjNjBkYzhkZWY3MTJlMjVlYzFiNTYxMw==
+  data.tar.gz: !binary |-
+    YWEyNDM1ZGYwY2ExMjU1MWEzMWVmMjJhMDczNjAxYjFmNGViNjI0Yg==
+SHA512:
+  metadata.gz: !binary |-
+    NjUxZWRhZjRkNjhmMzE3ODI3OGJmNTMxYTE4OGNkZmRlYzU1ZDVjMmY3MmYx
+    NjUzNTYyNTliY2ViMWI1YWJhYjI4N2FjMDg3OGY0Njg5NWU1MGIyYTE3Yzlm
+    MTlmODIxYWQwYmE5NDFkNzZjODE5MmUxMjBlZTNiZmQyYWQ4NmQ=
+  data.tar.gz: !binary |-
+    ZTRkOTI1MzI3MzUzNjZjNmRjMzYwNGUyMjJlYmYzOWI4ZTFkNjQ2YmExNjYy
+    MmEyNTQ4NWJhMTQyMmQwNWEwYTVlNTIxOTA3N2EyZTJiNDBhYzVkNDNmNjhm
+    Mjg0NzVmNTY1MTcwMTc2ODY3ZmNiOWU0MTQyZmFlZjgyMzJmY2Q=

data/iproto.gemspec

@@ -4,8 +4,8 @@ Gem::Specification.new do |s|
   s.rubygems_version = '1.3.5'
 
   s.name              = 'iproto'
-  s.version           = '0.3.15'
-  s.date              = '2014-10-27'
+  s.version           = '0.3.16'
+  s.date              = '2014-10-28'
   s.rubyforge_project = 'iproto'
 
   s.summary     = "Mail.Ru simple network protocol"

data/lib/iproto.rb

@@ -1,5 +1,5 @@
 module IProto
-  VERSION = '0.3.15'
+  VERSION = '0.3.16'
   class IProtoError < StandardError; end
   class ConnectionError < IProtoError; end
   class CouldNotConnect < ConnectionError; end

data/lib/iproto/em.rb

@@ -53,24 +53,17 @@ module IProto
       shutdown_hook
     end
 
-    def _start_pinger
-      if @connected == true && (cit = comm_inactivity_timeout) != 0 && @ping_timer == nil
-        @ping_timer = EM.add_periodic_timer([1, cit / 4.0].min, method(:_ping))
-      end
-    end
-
     def _stop_pinger
       if @ping_timer
-        @ping_timer.cancel
+        EM.cancel_timer @ping_timer
         @ping_timer = nil
       end
     end
 
     def comm_inactivity_timeout=(t)
-      _stop_pinger
       @inactivity_timeout = t
       super
-      _start_pinger
+      _ping
     end
 
     def connected?
@@ -112,6 +105,7 @@ module IProto
 
     def _ping
       send_data pack_request(PING, PING_ID, EMPTY_STR)
+      @ping_timer = nil
     end
 
     def receive_chunk(chunk)
@@ -129,6 +123,9 @@ module IProto
       if @request_id == PING_ID
         @_needed_size = HEADER_SIZE
         @_state = :receive_header
+        if @ping_timer == nil && @inactivity_timeout > 0
+          @ping_timer = ::EM.add_timer(@inactivity_timeout / 4.0, method(:_ping))
+        end
         return
       end
       request = @waiting_requests.delete @request_id

metadata

@@ -1,32 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: iproto
 version: !ruby/object:Gem::Version
-  prerelease: 
-  version: 0.3.15
+  version: 0.3.16
 platform: ruby
 authors:
 - Andrew Rudenko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-27 00:00:00.000000000 Z
+date: 2014-10-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  type: :runtime
+  prerelease: false
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.0.3
-  prerelease: false
+  type: :runtime
+  name: bin_utils
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.0.3
-  name: bin_utils
 description: Mail.Ru simple network protocol
 email: ceo@prepor.ru
 executables: []
@@ -47,26 +44,25 @@ files:
 homepage: http://github.com/mailru/iproto-ruby
 licenses:
 - BSD-2-Clause
+metadata: {}
 post_install_message: 
 rdoc_options:
 - --charset=UTF-8
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: iproto
-rubygems_version: 1.8.23
+rubygems_version: 2.4.2
 signing_key: 
 specification_version: 2
 summary: Mail.Ru simple network protocol