zabbix_protocol 0.1.5.beta → 0.1.5.beta2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a62768171ebe8a4628070f57c06e1c7926e9e25a
-  data.tar.gz: 06884716424ddcb37733ffe44e1540b7b0ecfc67
+  metadata.gz: 2ad71e098d1d6641e868186bbcb191fe022f36db
+  data.tar.gz: 2b49036eb5e410e380be019f7475103ea3752130
 SHA512:
-  metadata.gz: b96e8c4175247e9acb3727753a72ae8f1149b72b0da732d9bc3fbd04b3035c77d0102668b3eba7ba58da4f0c1560067f705b3509fb804ad3e4b5be53719bb538
-  data.tar.gz: 212615a265fde21f1efae21b0ae0f16566c90976fbd211cb07cadb9fb527cd06071cfe0b214fb4773aedc6dcec619dbb3015cf003cfad55d55e26630c3adbd8b
+  metadata.gz: a8be4c0d4a6f51aab987d34c8641f0687ae2693d8344bfaa0e31e001a89917d32583916623afffa5e7f9a7ba5bc62531ba9abb390cdbbd2d4bbed469db458933
+  data.tar.gz: a8255c048e7a19d59423f69324aa33cf900709ac8cf42347a164763711a3cbb84e285bbabe85a874d69eff895d06b7541978c6f4a092294123138cdcf8d43824

data/lib/zabbix_protocol/version.rb

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

data/lib/zabbix_protocol.rb

@@ -1,5 +1,4 @@
 require "multi_json"
-
 require "zabbix_protocol/version"
 
 module ZabbixProtocol
@@ -34,6 +33,7 @@ module ZabbixProtocol
       raise TypeError, "wrong argument type #{data.class} (expected String)"
     end
 
+    original_encoding = data.encoding
     data = data.dup
     data.force_encoding('ASCII-8BIT')
 
@@ -61,6 +61,15 @@ module ZabbixProtocol
       raise Error, "invalid payload length: expected=#{payload_len}, actual=#{sliced.bytesize} (data: #{data.inspect})"
     end
 
+    duplicated = sliced.dup
+
+    begin
+      duplicated.force_encoding(original_encoding)
+      sliced = duplicated
+    rescue
+      # XXX: nothing to do
+    end
+
     begin
       MultiJson.load(sliced)
     rescue MultiJson::ParseError

data/spec/zabbix_protocol_spec.rb

@@ -59,6 +59,13 @@ describe ZabbixProtocol do
       data = subject.load(res_data)
       expect(data).to eq({"response"=>"success", "data"=>[]})
     end
+
+    it "should parse string" do
+      res_data = "ZBXD\x01\x0f\x00\x00\x00\x00\x00\x00\x00response-string"
+      data = subject.load(res_data)
+      expect(data).to eq("response-string")
+      expect(data.encoding).to eq Encoding::UTF_8
+    end
   end
 
   context "when error happen" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: zabbix_protocol
 version: !ruby/object:Gem::Version
-  version: 0.1.5.beta
+  version: 0.1.5.beta2
 platform: ruby
 authors:
 - Genki Sugawara