zobbix 0.0.4 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fe780a7edc0dcaf9a8330101a6b6cabda2390a92
-  data.tar.gz: 3c5b511db823535493b7b7ab5a3bbab8c1bfd6be
+  metadata.gz: 32104052200babb6cd6287f873dfdf4a6e63c78f
+  data.tar.gz: a2f3ae52af02afee02380dabb7ebbd280ea265e4
 SHA512:
-  metadata.gz: 4e2b8fb63c46c2ce26507fdcc1bc295050d98ff5885f380102abef9f5535404fcf9c6a337b93681611cd92b3d4ed6cfac02f5f99308bfbbdd34fd47943941090
-  data.tar.gz: 07e44b487a16eb17e5459480c8ea2adacbb41808c1336653358c3240d5e73903cf20bbd6c13ddb3e2f03225b154cc00a34e6ac566177a25248f80a67fd058975
+  metadata.gz: f86193cfadffdd44a567c5dc2c5a1b68a5c6954a78e87c3aa7293d9a712338dd8da2248640d4ce97d012593c1fa706647660da71cab8275f770d8c14c326a36f
+  data.tar.gz: 0c533422068a92555b61e0b1c4258a3b311a296788b31cfbc298e2b0faf7cfd0a2c6e56754672e45c2989e02d936ee1d904e9b013030a1ee2d8efcb2cdbcd095

data/lib/zobbix.rb

@@ -43,8 +43,9 @@ class Zobbix
       .tap(&:authenticate!)
   end
 
-  def self.supported_version?(zabbix_version)
-    zabbix_version.to_s =~ /^2\.4\./
+  def self.supported_version?(version)
+    version = Gem::Version.new(version)
+    ZABBIX_VERSION_REQUIREMENT.satisfied_by?(version)
   end
 
   attr_reader :credentials, :auth
@@ -66,8 +67,7 @@ class Zobbix
       raise ConnectionError.new(credentials)
     end
 
-    version = Gem::Version.new(version)
-    unless ZABBIX_VERSION_REQUIREMENT.satisfied_by?(version)
+    unless self.class.supported_version?(version)
       raise UnsupportedVersionError.new(version)
     end
   end
@@ -98,9 +98,10 @@ class Zobbix
   #
   # @see https://www.zabbix.com/documentation/2.4/manual/api/reference
   def request(method, params = {})
-    params = params.merge(auth: @auth) if requires_auth?(method)
+    args = [credentials.uri, method, params]
+    args << @auth if requires_auth?(method)
 
-    response = ApiRequest.perform(credentials.uri, method, params)
+    response = ApiRequest.perform(*args)
     response.raise_exception if @raise_exceptions && response.error?
     response
   end

data/lib/zobbix/api_request.rb

@@ -23,10 +23,11 @@ class Zobbix
     # @param [String] uri Zabbix Server uri
     # @param [String] method API method
     # @param [Hash] params API method params
-    def initialize(uri, method, params)
+    # @param [String] auth Auth token
+    def initialize(uri, method, params, auth = nil)
       @uri    = uri.sub(/\/$/, '')
       @method = method
-      @auth   = params.delete(:auth)
+      @auth   = auth
       @params = params
     end
 

data/lib/zobbix/version.rb

@@ -1,3 +1,3 @@
 class Zobbix
-  VERSION = '0.0.4'
+  VERSION = '0.1.0'
 end

data/test/fixtures/vcr_casettes/array_params.yml

@@ -0,0 +1,77 @@
+---
+http_interactions:
+- request:
+    method: post
+    uri: http://localhost/zabbix/api_jsonrpc.php
+    body:
+      encoding: UTF-8
+      string: '{"jsonrpc":"2.0","method":"user.login","params":{"user":"Admin","password":"zabbix"},"auth":null,"id":8212}'
+    headers:
+      Content-Type:
+      - application/json-rpc
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      Date:
+      - Mon, 26 Oct 2015 10:48:39 GMT
+      Server:
+      - Apache/2.4.7 (Ubuntu)
+      X-Powered-By:
+      - PHP/5.5.9-1ubuntu4.13
+      Access-Control-Allow-Origin:
+      - "*"
+      Access-Control-Allow-Headers:
+      - Content-Type
+      Access-Control-Allow-Methods:
+      - POST
+      Access-Control-Max-Age:
+      - '1000'
+      Content-Length:
+      - '71'
+      Content-Type:
+      - application/json
+    body:
+      encoding: UTF-8
+      string: '{"jsonrpc":"2.0","result":"cf58cfe673d0f5cd4c5985610c1413c0","id":8212}'
+    http_version: 
+  recorded_at: Mon, 26 Oct 2015 10:48:39 GMT
+- request:
+    method: post
+    uri: http://localhost/zabbix/api_jsonrpc.php
+    body:
+      encoding: UTF-8
+      string: '{"jsonrpc":"2.0","method":"host.delete","params":[10123],"auth":"cf58cfe673d0f5cd4c5985610c1413c0","id":7044}'
+    headers:
+      Content-Type:
+      - application/json-rpc
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      Date:
+      - Mon, 26 Oct 2015 10:48:39 GMT
+      Server:
+      - Apache/2.4.7 (Ubuntu)
+      X-Powered-By:
+      - PHP/5.5.9-1ubuntu4.13
+      Access-Control-Allow-Origin:
+      - "*"
+      Access-Control-Allow-Headers:
+      - Content-Type
+      Access-Control-Allow-Methods:
+      - POST
+      Access-Control-Max-Age:
+      - '1000'
+      Content-Length:
+      - '56'
+      Content-Type:
+      - application/json
+    body:
+      encoding: UTF-8
+      string: '{"jsonrpc":"2.0","result":{"hostids":[10123]},"id":7044}'
+    http_version: 
+  recorded_at: Mon, 26 Oct 2015 10:48:39 GMT
+recorded_with: VCR 2.9.3

data/test/zobbix_test.rb

@@ -41,4 +41,14 @@ class ZobbixTest < Minitest::Test
       end
     end
   end
+
+  def test_params_as_array
+    VCR.use_cassette('array_params') do
+      z = zbx
+      z.authenticate!
+      response = z.request('host.delete', [10123])
+      assert_success(response)
+      pass
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zobbix
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.1.0
 platform: ruby
 authors:
 - Michael Lutsiuk
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-21 00:00:00.000000000 Z
+date: 2015-10-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -118,6 +118,7 @@ files:
 - test/credentials_test.rb
 - test/fixtures/vcr_casettes/api_request.yml
 - test/fixtures/vcr_casettes/apiinfo_version.yml
+- test/fixtures/vcr_casettes/array_params.yml
 - test/fixtures/vcr_casettes/authentication.yml
 - test/fixtures/vcr_casettes/bad_authentication.yml
 - test/fixtures/vcr_casettes/check_version/high_version.yml
@@ -159,6 +160,7 @@ test_files:
 - test/credentials_test.rb
 - test/fixtures/vcr_casettes/api_request.yml
 - test/fixtures/vcr_casettes/apiinfo_version.yml
+- test/fixtures/vcr_casettes/array_params.yml
 - test/fixtures/vcr_casettes/authentication.yml
 - test/fixtures/vcr_casettes/bad_authentication.yml
 - test/fixtures/vcr_casettes/check_version/high_version.yml