zabbix_protocol 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 213565fc54f02a1b972de73fec7051a43f3e402a
-  data.tar.gz: 1c765a2e9b10acfa8fdd5165c3d5ecc192980e3a
+  metadata.gz: b24c8ba95636d6a46255007187c03a3092e14a8c
+  data.tar.gz: 7482b470bee62de53a1af853ec0818e160627410
 SHA512:
-  metadata.gz: 02f4a321facacce7f61f74bd07e868c4bb2b15ab81ade4c9394cc1dfebd1f98dec9d375aae859ed9967da76c2d801326edd0133ee7b082c03963d8c44b0e3697
-  data.tar.gz: a8a80824b2e352e19ab7725133e53d0988c2b5013d2aca91a14dd4c91e0d60ea071f4a086c56856bae9d7063094c0d246c8ad3c6acb6bb718f9c988406a72f28
+  metadata.gz: b631c8bcaf4dda3dc6ff73e569973153761fbf46ffde4cdd6684f9a19d39a5612ba947f3b2b67045a55acc13a2ec7dad39e6b8f89f847178e36518f509abca77
+  data.tar.gz: 9e45a2f07297fc37620c569a5b623f9c512d63060f649c8212b4f1cb6f0de858fb287655e615e14b5a6c128207869784580e419b74b23270171117ade7fce5ee

data/lib/zabbix_protocol/version.rb

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

data/lib/zabbix_protocol.rb

@@ -8,22 +8,22 @@ module ZabbixProtocol
   # http://www.zabbix.org/wiki/Docs/protocols/zabbix_agent/1.4
   ZABBIX_HEADER  = "ZBXD"
   ZABBIX_VERSION = "\x01"
-  DATA_LEN_BYTES = 8
+  PAYLOAD_LEN_BYTES = 8
 
-  MIN_RESPONSE_LEN = ZABBIX_HEADER.length + ZABBIX_VERSION.length + DATA_LEN_BYTES
+  MIN_DATA_LEN = ZABBIX_HEADER.length + ZABBIX_VERSION.length + PAYLOAD_LEN_BYTES
 
-  def self.dump(data)
-    if data.is_a?(Hash)
-      data = MultiJson.dump(data)
+  def self.dump(payload)
+    if payload.is_a?(Hash)
+      payload = MultiJson.dump(payload)
     else
-      data = data.to_s
+      payload = payload.to_s
     end
 
     [
       ZABBIX_HEADER,
       ZABBIX_VERSION,
-      [data.length].pack('Q'),
-      data
+      [payload.length].pack('Q'),
+      payload
     ].join
   end
 
@@ -32,32 +32,32 @@ module ZabbixProtocol
       raise TypeError, "wrong argument type #{data.class} (expected String)"
     end
 
-    if data.length < MIN_RESPONSE_LEN
+    if data.length < MIN_DATA_LEN
       raise Error, "data length is too short (data: #{data.inspect})"
     end
 
-    data = data.dup
-    header = data.slice!(0, ZABBIX_HEADER.length)
+    sliced = data.dup
+    header = sliced.slice!(0, ZABBIX_HEADER.length)
 
     if header != ZABBIX_HEADER
       raise Error, "invalid header: #{header.inspect} (data: #{data.inspect})"
     end
 
-    version = data.slice!(0, ZABBIX_VERSION.length)
+    version = sliced.slice!(0, ZABBIX_VERSION.length)
 
     if version != ZABBIX_VERSION
       raise Error, "unsupported version: #{version.inspect} (data: #{data.inspect})"
     end
 
-    data_len = data.slice!(0, DATA_LEN_BYTES)
-    data_len = data_len.unpack("Q").first
+    payload_len = sliced.slice!(0, PAYLOAD_LEN_BYTES)
+    payload_len = payload_len.unpack("Q").first
 
-    if data_len != data.length
-      raise Error, "invalid data length: expected=#{data_len}, actual=#{data.length} (data: #{data.inspect})"
+    if payload_len != sliced.length
+      raise Error, "invalid payload length: expected=#{payload_len}, actual=#{sliced.length} (data: #{data.inspect})"
     end
 
     begin
-      MultiJson.load(data)
+      MultiJson.load(sliced)
     rescue MultiJson::ParseError
       data
     end

data/spec/zabbix_protocol_spec.rb

@@ -55,14 +55,14 @@ describe ZabbixProtocol do
       expect {
         res_data = "ZBXD\x02\b\x00\x00\x00\x00\x00\x00\x001.000000"
         subject.load(res_data)
-      }.to raise_error 'unsupported version: "\\u0002" (data: "\b\u0000\u0000\u0000\u0000\u0000\u0000\u00001.000000")'
+      }.to raise_error 'unsupported version: "\u0002" (data: "ZBXD\u0002\b\u0000\u0000\u0000\u0000\u0000\u0000\u00001.000000")'
     end
 
-    it "raise error when invalid data length" do
+    it "raise error when invalid payload length" do
       expect {
         res_data = "ZBXD\x01\x00\x00\x00\x00\x00\x00\x00\x001.000000"
         subject.load(res_data)
-      }.to raise_error 'invalid data length: expected=0, actual=8 (data: "1.000000")'
+      }.to raise_error 'invalid payload length: expected=0, actual=8 (data: "ZBXD\u0001\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u00001.000000")'
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: zabbix_protocol
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Genki Sugawara