zabbix_protocol 0.1.4 → 0.1.5.beta

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 67c7b17dd4b63ade76364acfb3b28c210aca1982
-  data.tar.gz: c4b185dc8941064df32696c631fdc404cf5c963c
+  metadata.gz: a62768171ebe8a4628070f57c06e1c7926e9e25a
+  data.tar.gz: 06884716424ddcb37733ffe44e1540b7b0ecfc67
 SHA512:
-  metadata.gz: fcd39d464d79479dcc0bfbb89adfe133d115fdb8544a3dc6a7842fa0004c7877c278e5ec4b63a3bf2f86f54cd17c2ee136c302f4d032c765fe2c2a1778016c65
-  data.tar.gz: f86b19d6b0fb50a391ab9fe9372129c5985b76ef1f5c212d42455507391fc578204e9230ebbaac58e4f70fc504dc121930ab0fd5cbb7d29738cdfbf751d10818
+  metadata.gz: b96e8c4175247e9acb3727753a72ae8f1149b72b0da732d9bc3fbd04b3035c77d0102668b3eba7ba58da4f0c1560067f705b3509fb804ad3e4b5be53719bb538
+  data.tar.gz: 212615a265fde21f1efae21b0ae0f16566c90976fbd211cb07cadb9fb527cd06071cfe0b214fb4773aedc6dcec619dbb3015cf003cfad55d55e26630c3adbd8b

data/.travis.yml

@@ -1,6 +1,9 @@
 language: ruby
 rvm:
-- 2.0.0
+- 2.0
+- 2.1
+- 2.2
+- jruby-19mode
 script:
 - bundle install
 - bundle exec rake

data/lib/zabbix_protocol.rb

@@ -10,7 +10,7 @@ module ZabbixProtocol
   ZABBIX_VERSION = "\x01"
   PAYLOAD_LEN_BYTES = 8
 
-  MIN_DATA_LEN = ZABBIX_HEADER.length + ZABBIX_VERSION.length + PAYLOAD_LEN_BYTES
+  MIN_DATA_LEN = ZABBIX_HEADER.bytesize + ZABBIX_VERSION.bytesize + PAYLOAD_LEN_BYTES
 
   def self.dump(payload)
     if payload.is_a?(Hash)
@@ -19,10 +19,12 @@ module ZabbixProtocol
       payload = payload.to_s
     end
 
+    payload.force_encoding('ASCII-8BIT')
+
     [
       ZABBIX_HEADER,
       ZABBIX_VERSION,
-      [payload.length].pack('Q'),
+      [payload.bytesize].pack('Q'),
       payload
     ].join
   end
@@ -32,18 +34,21 @@ module ZabbixProtocol
       raise TypeError, "wrong argument type #{data.class} (expected String)"
     end
 
-    if data.length < MIN_DATA_LEN
+    data = data.dup
+    data.force_encoding('ASCII-8BIT')
+
+    if data.bytesize < MIN_DATA_LEN
       raise Error, "data length is too short (data: #{data.inspect})"
     end
 
     sliced = data.dup
-    header = sliced.slice!(0, ZABBIX_HEADER.length)
+    header = sliced.slice!(0, ZABBIX_HEADER.bytesize)
 
     if header != ZABBIX_HEADER
       raise Error, "invalid header: #{header.inspect} (data: #{data.inspect})"
     end
 
-    version = sliced.slice!(0, ZABBIX_VERSION.length)
+    version = sliced.slice!(0, ZABBIX_VERSION.bytesize)
 
     if version != ZABBIX_VERSION
       raise Error, "unsupported version: #{version.inspect} (data: #{data.inspect})"
@@ -52,8 +57,8 @@ module ZabbixProtocol
     payload_len = sliced.slice!(0, PAYLOAD_LEN_BYTES)
     payload_len = payload_len.unpack("Q").first
 
-    if payload_len != sliced.length
-      raise Error, "invalid payload length: expected=#{payload_len}, actual=#{sliced.length} (data: #{data.inspect})"
+    if payload_len != sliced.bytesize
+      raise Error, "invalid payload length: expected=#{payload_len}, actual=#{sliced.bytesize} (data: #{data.inspect})"
     end
 
     begin

data/lib/zabbix_protocol/version.rb

@@ -1,3 +1,3 @@
 module ZabbixProtocol
-  VERSION = "0.1.4"
+  VERSION = "0.1.5.beta"
 end

data/spec/zabbix_protocol_spec.rb

@@ -1,3 +1,5 @@
+# coding: utf-8
+
 describe ZabbixProtocol do
   subject { described_class }
 
@@ -22,6 +24,27 @@ describe ZabbixProtocol do
       expect(res).to eq "ZBXD\x01Z\x00\x00\x00\x00\x00\x00\x00" +
         '{"request":"sender.data","data":[{"host":"LinuxDB3","key":"db.connections","value":"43"}]}'
     end
+
+    context "when multibyte character" do
+      it "should convert hash to zabbix request" do
+        req_data = {
+          "request" => "sender.data",
+          "data" => [{
+            "host" => "LinuxDB3",
+            "key" => "multibyte.item",
+            "value" => "ййццууккееннггшшщщ"
+          }]
+        }
+
+        res = subject.dump(req_data)
+
+        expected = "ZBXD\x01|\x00\x00\x00\x00\x00\x00\x00" +
+          %!{"request":"sender.data","data":[{"host":"LinuxDB3","key":"multibyte.item","value":"\xD0\xB9\xD0\xB9\xD1\x86\xD1\x86\xD1\x83\xD1\x83\xD0\xBA\xD0\xBA\xD0\xB5\xD0\xB5\xD0\xBD\xD0\xBD\xD0\xB3\xD0\xB3\xD1\x88\xD1\x88\xD1\x89\xD1\x89"}]}!
+        expected.force_encoding('ASCII-8BIT')
+
+        expect(res).to eq expected
+      end
+    end
   end
 
   context "when response" do
@@ -55,14 +78,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: "ZBXD\u0002\b\u0000\u0000\u0000\u0000\u0000\u0000\u00001.000000")'
+      }.to raise_error 'unsupported version: "\x02" (data: "ZBXD\x02\b\x00\x00\x00\x00\x00\x00\x001.000000")'
     end
 
     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 payload length: expected=0, actual=8 (data: "ZBXD\u0001\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u00001.000000")'
+      }.to raise_error 'invalid payload length: expected=0, actual=8 (data: "ZBXD\x01\x00\x00\x00\x00\x00\x00\x00\x001.000000")'
     end
 
     it "should parse error message" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zabbix_protocol
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5.beta
 platform: ruby
 authors:
 - Genki Sugawara
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-13 00:00:00.000000000 Z
+date: 2015-12-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json
@@ -100,12 +100,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Zabbix protocols builder/parser.