zabbix-client 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: afe57c5c0df8e0697b078819f389c24800851c5f
-  data.tar.gz: 39f8ae2f99cd3ad53a1526a89c82021a9c11d08e
+  metadata.gz: e8b691bf54ee678deb78e3816ef6476a6ea3d675
+  data.tar.gz: fec1029fe26fb68b7d9a7fc30234665a3ee7b9a3
 SHA512:
-  metadata.gz: 0d79e5942658df87f604146100f0f5530459ded6190bb9714a01349d87b6e1d25caa98f2e44f8d01968943903b8ca37ef2630ab950edf1d8f4b5ff2c99895b7e
-  data.tar.gz: fccd34bde530893ec6ebe9095ce73b21f76ed5d0dc56880b0160f2dbf4a3ba1b09e18e38956ea3809dfd85bf0f45f1d60cf03d227d1e18dc1f870d30b6646b3a
+  metadata.gz: 21af3e5d0e95bf6781d5de12977edd1fb83c4e340aa38b79eb409e01185c5a5a1dfe8a03e821a33bae778f58f3629a04a3878683111d7657c50633846ea14998
+  data.tar.gz: e9e437307e46b300e5eb01f5bde87db6cd8706c36d875b7982dcf6b43035020e950757ccfebf53152ca76ce36413865dc4b87518ee517068939fdd6711705a43

data/lib/zabbix/client/client.rb

@@ -52,12 +52,14 @@ class Zabbix::Client
     private
 
     def query(method, params, options)
+      options = (@client.options || {}).merge(options)
+
       body = {
         :jsonrpc => JSON_RPC_VERSION,
         :method  => method,
         :params  => params,
         :id      => JSON_RPC_REQUEST_ID,
-      }.merge(options)
+      }.merge(options[:json_rpc_request] || {})
 
       if @client.auth and not UNAUTHENTICATED_METHODS.include?(method)
         body[:auth] = @client.auth
@@ -65,8 +67,8 @@ class Zabbix::Client
 
       body = JSON.dump(body)
 
-      proxy_user = @client.options[:proxy_user]
-      proxy_password = @client.options[:proxy_password]
+      proxy_user = options[:proxy_user]
+      proxy_password = options[:proxy_password]
       http = Net::HTTP.Proxy(proxy_user, proxy_password).new(@client.url.host, @client.url.port)
 
       if @client.url.scheme == 'https'
@@ -74,15 +76,15 @@ class Zabbix::Client
         http.verify_mode = OpenSSL::SSL::VERIFY_NONE
       end
 
-      http.set_debug_output($stderr) if @client.options[:debug]
+      http.set_debug_output($stderr) if options[:debug]
 
       http.start do |h|
-        headers = DEFAULT_HEADERS.merge(@client.options[:headers] || {})
+        headers = DEFAULT_HEADERS.merge(options[:headers] || {})
         request = Net::HTTP::Post.new(@client.url.path, headers)
         request.body = body
 
-        basic_auth_user = @client.options[:basic_auth_user]
-        basic_auth_password = @client.options[:basic_auth_password]
+        basic_auth_user = options[:basic_auth_user]
+        basic_auth_password = options[:basic_auth_password]
 
         if basic_auth_user and basic_auth_password
           request.basic_auth(basic_auth_user, basic_auth_password)

data/lib/zabbix/client/version.rb

@@ -1,5 +1,5 @@
 module Zabbix
   class Client
-    VERSION = '0.0.4'
+    VERSION = '0.0.5'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: zabbix-client
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Genki Sugawara