log-courier 1.8.3 → 1.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 61f93d890bed07ae4b77319c2e3d2b654d1693b8
-  data.tar.gz: cb6c5837d1f2c2aac8b8cd75b4e8f61111904095
+  metadata.gz: a3e10b3c73a7cbd81fabd9f1612454986e83c7aa
+  data.tar.gz: 7758b1c088db76e8fc2646a8c45e8784ce61e545
 SHA512:
-  metadata.gz: fca087d5e6cc3bf299e0727e00cd5e6c3b9cd85ca0ebae02fdaa788a974106c3d90fefbaafbfc8a1d432db7575eecd6620ee0f4b45ea8d05b6f4f3787a0ead04
-  data.tar.gz: 873cbdc71dc1e99055cba41e9d5b1d18b41aad9b913f30f77f314a9026b42f3c14468f4417229471c38b485a31f2e826a98057e5cf5dd31f2f5f43204bab8c84
+  metadata.gz: 0f794c4963b883e806775abad5cc22134c8a8fa39c1755fb173404e587a5bfe5e6a829b3fa22fa71bbc9ea93ac76dba7a066807d34c372c8ea2c4ead727fc13a
+  data.tar.gz: 87d81f345df217fed56666c4b883e9eca494d1c0a74f645b70f1b44ab0bf34396f9ac3cb058188d8ea4d9fb42259a6d4ad56cea58933284004d20cfca68895f5

data/lib/log-courier/client.rb

@@ -72,7 +72,7 @@ module LogCourier
       events.each do |event|
         json_data = self.class.get_json_adapter.dump(event)
         # Add length and then the data
-        buffer << [json_data.length].pack('N') << json_data
+        buffer << [json_data.bytesize].pack('N') << json_data
       end
 
       # Generate and store the payload
@@ -435,7 +435,7 @@ module LogCourier
 
     def process_pong(message)
       # Sanity
-      fail ProtocolError, "Unexpected data attached to pong message (#{message.length})" if message.length != 0
+      fail ProtocolError, "Unexpected data attached to pong message (#{message.bytesize})" if message.bytesize != 0
 
       @logger.debug 'PONG message received' unless @logger.nil? || !@logger.debug?
 
@@ -446,7 +446,7 @@ module LogCourier
 
     def process_ackn(message)
       # Sanity
-      fail ProtocolError, "ACKN message size invalid (#{message.length})" if message.length != 20
+      fail ProtocolError, "ACKN message size invalid (#{message.bytesize})" if message.bytesize != 20
 
       # Grab nonce
       nonce, sequence = message.unpack('a16N')

data/lib/log-courier/server.rb

@@ -125,8 +125,8 @@ module LogCourier
 
     def process_ping(message, comm)
       # Size of message should be 0
-      if message.length != 0
-        fail ProtocolError, "unexpected data attached to ping message (#{message.length})"
+      if message.bytesize != 0
+        fail ProtocolError, "unexpected data attached to ping message (#{message.bytesize})"
       end
 
       # PONG!
@@ -142,8 +142,8 @@ module LogCourier
       # OK - first is a nonce - we send this back with sequence acks
       # This allows the client to know what is being acknowledged
       # Nonce is 16 so check we have enough
-      if message.length < 17
-        fail ProtocolError, "JDAT message too small (#{message.length})"
+      if message.bytesize < 17
+        fail ProtocolError, "JDAT message too small (#{message.bytesize})"
       end
 
       nonce = message[0...16]
@@ -155,7 +155,7 @@ module LogCourier
       end
 
       # The remainder of the message is the compressed data block
-      message = StringIO.new Zlib::Inflate.inflate(message[16...message.length])
+      message = StringIO.new Zlib::Inflate.inflate(message.byteslice(16, message.bytesize))
 
       # Message now contains JSON encoded events
       # They are aligned as [length][event]... so on
@@ -170,17 +170,17 @@ module LogCourier
         if ret.nil?
           # Finished!
           break
-        elsif length_buf.length < 4
-          fail ProtocolError, "JDAT length extraction failed (#{ret} #{length_buf.length})"
+        elsif length_buf.bytesize < 4
+          fail ProtocolError, "JDAT length extraction failed (#{ret} #{length_buf.bytesize})"
         end
 
         length = length_buf.unpack('N').first
 
         # Extract message
         ret = message.read length, data_buf
-        if ret.nil? or data_buf.length < length
+        if ret.nil? or data_buf.bytesize < length
           @logger.warn()
-          fail ProtocolError, "JDAT message extraction failed #{ret} #{data_buf.length}"
+          fail ProtocolError, "JDAT message extraction failed #{ret} #{data_buf.bytesize}"
         end
 
         data_buf.force_encoding('utf-8')

metadata

@@ -1,57 +1,57 @@
 --- !ruby/object:Gem::Specification
 name: log-courier
 version: !ruby/object:Gem::Version
-  version: 1.8.3
+  version: 1.9.0
 platform: ruby
 authors:
 - Jason Woods
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-11-08 00:00:00.000000000 Z
+date: 2015-11-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cabin
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.6'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.6'
+  prerelease: false
+  type: :runtime
 - !ruby/object:Gem::Dependency
   name: ffi-rzmq
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
+  prerelease: false
+  type: :runtime
 - !ruby/object:Gem::Dependency
   name: multi_json
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.10'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.10'
+  prerelease: false
+  type: :runtime
 description: Log Courier library
 email:
 - devel@jasonwoods.me.uk
@@ -70,7 +70,7 @@ homepage: https://github.com/driskell/ruby-log-courier
 licenses:
 - Apache
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -86,8 +86,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: nowarning
-rubygems_version: 2.4.2
-signing_key: 
+rubygems_version: 2.4.8
+signing_key:
 specification_version: 4
-summary: Ruby implementation of the Log Courier protocol
+summary: Ruby implementation of the Courier protocol
 test_files: []