zabbix_protocol 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 68192799b80b8e4af27e6cd775304e0566eec47c
-  data.tar.gz: f327dd238150587052b9553adf9e9f17cc5350a4
+  metadata.gz: ba8ff0426cf78193691e25d0ca9e578beb0f8691
+  data.tar.gz: 4a66154c9a451c5b9f98b7fa680eca2042967d9e
 SHA512:
-  metadata.gz: 9594e301b14992cc73313977997aa1517ebda8c61072651e521ea89613f18a6212710c6e6ab3a13a64b8836b712922d963a6f9151bdae8b061a64cf0a5fb12b0
-  data.tar.gz: 4832ed560cc62c9c825bc83396e64261bcf45fc483330f0b4bbafd09f1686db83a63bed19513f199ee442bef9be18f0e907bf1b9f5a4d31ad88b5b68736494bf
+  metadata.gz: be5dd593ea6e29a70dfbad6ee50f6214b23ca175e7079436868c9ab353ac63b1c06e72ed9785b5af351acc022f34d25a2c4cab69540e02cf470ec3aedaec6ae3
+  data.tar.gz: e3a7099d791633c090684ab9c4c85e31e456d628b6731a47f8a692b3e48f1cd28904429a08c4a06a9e5c7079054f9281976521fcd48decf0e941afa1f0c00e58

data/lib/zabbix_protocol/version.rb

@@ -1,3 +1,3 @@
 module ZabbixProtocol
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

data/lib/zabbix_protocol.rb

@@ -6,23 +6,22 @@ module ZabbixProtocol
   class Error < StandardError; end
 
   # http://www.zabbix.org/wiki/Docs/protocols/zabbix_agent/1.4
-  HEADER  = "ZBXD"
-  VERSION = "\x01"
+  ZABBIX_HEADER  = "ZBXD"
+  ZABBIX_VERSION = "\x01"
   DATA_LEN_BYTES = 8
 
-  MIN_RESPONSE_LEN = HEADER.length + VERSION.length + DATA_LEN_BYTES
+  MIN_RESPONSE_LEN = ZABBIX_HEADER.length + ZABBIX_VERSION.length + DATA_LEN_BYTES
 
   def self.dump(data)
     if data.is_a?(Hash)
       data = MultiJson.dump(data)
     else
       data = data.to_s
-      data << "\n" unless data =~ /\n\z/
     end
 
     [
-      HEADER,
-      VERSION,
+      ZABBIX_HEADER,
+      ZABBIX_VERSION,
       [data.length].pack('Q'),
       data
     ].join
@@ -38,15 +37,15 @@ module ZabbixProtocol
     end
 
     data = res_data.dup
-    header = data.slice!(0, HEADER.length)
+    header = data.slice!(0, ZABBIX_HEADER.length)
 
-    if header != HEADER
+    if header != ZABBIX_HEADER
       raise Error, "invalid header: #{header.inspect}"
     end
 
-    version = data.slice!(0, VERSION.length)
+    version = data.slice!(0, ZABBIX_VERSION.length)
 
-    if version != VERSION
+    if version != ZABBIX_VERSION
       raise Error, "unsupported version: #{version.inspect}"
     end
 

data/spec/zabbix_protocol_spec.rb

@@ -4,8 +4,8 @@ describe ZabbixProtocol do
   context "when request" do
     it "should convert string to zabbix request" do
       res = subject.dump("system.cpu.load[all,avg1]")
-      expect(res).to eq "ZBXD\x01\x1A\x00\x00\x00\x00\x00\x00\x00" +
-       "system.cpu.load[all,avg1]\n"
+      expect(res).to eq "ZBXD\x01\x19\x00\x00\x00\x00\x00\x00\x00" +
+       "system.cpu.load[all,avg1]"
     end
 
     it "should convert hash to zabbix request" do

metadata

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