zabbix-client 0.0.9 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 58e29e20ecf90e9441dd7c1d121de6a7a95e1ba1
-  data.tar.gz: f40d263ae3eca5d00bfade182dbc248673340dce
+  metadata.gz: 5ad7955298428f796e35412241a4d1338ae9fa16
+  data.tar.gz: 180b9d92f9d42baa3f864a5a8113838bc90ec9d3
 SHA512:
-  metadata.gz: e7bea380ed3cbee8f9c89344e3f47684ec7e9d610fa4cf97eaa9232521c6a131d9341c77c5b671811fd68ef7cd97d9da5ee5cf30774be01fcbdc42041ae2bb1c
-  data.tar.gz: c834b14e225e2f9a8db252b0282917bce8667e40b209977e9795e8b6348f7b88750eaa9dc9b1047c70d52173184a66e801fd655298391512eb8d6d1598e880b5
+  metadata.gz: 0810ae905c0b2864fde7081749ad5d54d29f6f6ff9f1ec46c9f863a94fd3b5ae6606f29c19c77620dbc6aec4a4fb7dfb31439c820f99c58899495fb7125cc4af
+  data.tar.gz: ee5eb325cc555b14566d61ae8d170be17751121bba79a4a5816da939e0bbaef31813e482c8be7576d822775e16a7f3606d62a13b1059186ffa60bd22d19b87a8

data/.rspec

@@ -0,0 +1,2 @@
+--colour
+--require spec_helper

data/.travis.yml

@@ -0,0 +1,6 @@
+language: ruby
+rvm:
+  - 2.0.0
+script:
+  - bundle install
+  - bundle exec rake

data/README.md

@@ -3,6 +3,7 @@
 This is a simple client of Zabbix API.
 
 [![Gem Version](https://badge.fury.io/rb/zabbix-client.svg)](http://badge.fury.io/rb/zabbix-client)
+[![Build Status](https://travis-ci.org/winebarrel/zabbix-client.svg?branch=master)](https://travis-ci.org/winebarrel/zabbix-client)
 
 ## Installation
 

data/Rakefile

@@ -1,2 +1,5 @@
 require 'bundler/gem_tasks'
+require 'rspec/core/rake_task'
 
+RSpec::Core::RakeTask.new('spec')
+task :default => :spec

data/lib/zabbix/client/client.rb

@@ -81,7 +81,9 @@ class Zabbix::Client
 
       http.start do |h|
         headers = DEFAULT_HEADERS.merge(options[:headers] || {})
-        request = Net::HTTP::Post.new(@client.url.path, headers)
+        path = @client.url.path
+        path = '/' if path.empty?
+        request = Net::HTTP::Post.new(path, headers)
         request.body = body
 
         basic_auth_user = options[:basic_auth_user]
@@ -98,7 +100,7 @@ class Zabbix::Client
         rescue JSON::ParserError
           response.value
           # Throw the following exception if no exception is thrown
-          raise response.code + ' ' + response.message.dump
+          raise [response.code, response.message.dump, response.body].join(' ')
         end
       end
     end

data/lib/zabbix/client/version.rb

@@ -1,5 +1,5 @@
 module Zabbix
   class Client
-    VERSION = '0.0.9'
+    VERSION = '0.1.0'
   end
 end

data/spec/spec_helper.rb

@@ -0,0 +1,87 @@
+$: << File.expand_path('..', __FILE__)
+require 'zabbix/client'
+require 'json'
+require 'webrick'
+require 'webrick/httpproxy'
+require 'webrick/https'
+
+trap(:INT) do
+  $zabbix_server.shutdown if $zabbix_server
+end
+
+RSpec.configure do |config|
+  config.after(:each) do
+    if $zabbix_server
+      shutdown_server($zabbix_server)
+    end
+  end
+end
+
+def start_server(server)
+  Thread.start do
+    server.start
+  end
+
+  sleep 0.1 until server.status == :Running
+end
+
+def shutdown_server(server)
+  server.shutdown
+  sleep 0.1 until server.status == :Stop
+end
+
+def default_handler
+  proc do |req, res|
+    res.body = JSON.dump(:result => {
+      :body => req.body,
+      :header => req.header,
+    })
+  end
+end
+
+def run_client(options = {})
+  options = {:handler => default_handler}.merge(options)
+
+  server_opts = {
+    :Port => 20080,
+    :Logger => WEBrick::Log.new('/dev/null'),
+    :AccessLog => []
+  }
+
+  if user_pass = options.delete(:basic_auth)
+    server_opts[:RequestCallback] = proc do |req, res|
+      WEBrick::HTTPAuth.basic_auth(req, res, "my realm") do |username, password|
+        [username, password] == user_pass
+      end
+    end
+  end
+
+  if ssl = options.delete(:ssl)
+    server_opts[:SSLEnable] = true
+    server_opts[:SSLCertName] = [['CN', WEBrick::Utils::getservername]]
+  end
+
+  $zabbix_server = WEBrick::HTTPServer.new(server_opts)
+
+  $zabbix_server.mount_proc('/', &options.delete(:handler))
+  start_server($zabbix_server)
+
+  url = (ssl ? 'https' : 'http') + '://localhost:20080'
+  client = Zabbix::Client.new(url, options)
+  yield(client)
+end
+
+def proxy
+  begin
+    server = WEBrick::HTTPProxyServer.new(
+      :Port => 30080,
+      :Logger => WEBrick::Log.new('/dev/null'),
+      :AccessLog => [])
+
+    start_server(server)
+
+    yield('localhost', 30080)
+  ensure
+    shutdown_server(server) if server
+  end
+end

data/spec/zabbix/client_spec.rb

@@ -0,0 +1,116 @@
+describe Zabbix::Client do
+  context "when call procedure" do
+    it do
+      run_client do |client|
+        result = client.apiinfo.version
+        expect(result["body"]).to eq "{\"jsonrpc\":\"2.0\",\"method\":\"apiinfo.version\",\"params\":[],\"id\":1}"
+      end
+    end
+
+    it do
+      run_client do |client|
+        result = client.item.get(:itemids => [1, 2, 3])
+        expect(result["body"]).to eq "{\"jsonrpc\":\"2.0\",\"method\":\"item.get\",\"params\":{\"itemids\":[1,2,3]},\"id\":1}"
+      end
+    end
+
+    it do
+      run_client do |client|
+        result = client.item.delete([1, 2, 3])
+        expect(result["body"]).to eq "{\"jsonrpc\":\"2.0\",\"method\":\"item.delete\",\"params\":[1,2,3],\"id\":1}"
+      end
+    end
+  end
+
+  context "login/logout" do
+    it do
+      run_client do |client|
+        client.user.login(:user => "scott", :password => "tiger")
+
+        result = client.apiinfo.version
+        expect(result["body"]).to eq "{\"jsonrpc\":\"2.0\",\"method\":\"apiinfo.version\",\"params\":[],\"id\":1}"
+
+        result = client.item.get(:itemids => [1, 2, 3])
+        expect(result["body"]).to eq "{\"jsonrpc\":\"2.0\",\"method\":\"item.get\",\"params\":{\"itemids\":[1,2,3]},\"id\":1,\"auth\":{\"body\":\"{\\\"jsonrpc\\\":\\\"2.0\\\",\\\"method\\\":\\\"user.login\\\",\\\"params\\\":{\\\"user\\\":\\\"scott\\\",\\\"password\\\":\\\"tiger\\\"},\\\"id\\\":1}\",\"header\":{\"content-type\":[\"application/json-rpc\"],\"accept-encoding\":[\"gzip;q=1.0,deflate;q=0.6,identity;q=0.3\"],\"accept\":[\"*/*\"],\"user-agent\":[\"Ruby\"],\"host\":[\"localhost:20080\"],\"content-length\":[\"91\"]}}}"
+
+        client.user.logout
+
+        result = client.item.get(:itemids => [1, 2, 3])
+        expect(result["body"]).to eq "{\"jsonrpc\":\"2.0\",\"method\":\"item.get\",\"params\":{\"itemids\":[1,2,3]},\"id\":1}"
+      end
+    end
+  end
+
+  context "when error happen" do
+    it do
+      handler = proc do |req, res|
+        res.status = 404
+        res.body = 'Not Found'
+      end
+
+      run_client(:handler => handler) do |client|
+        expect {
+          client.item.get(:itemids => [1, 2, 3])
+        }.to raise_error(Net::HTTPServerException, '404 "Not Found "')
+      end
+    end
+
+    it do
+      handler = proc do |req, res|
+        res.status = 200
+        res.body = 'non-JSON data'
+      end
+
+      run_client(:handler => handler) do |client|
+        expect {
+          client.item.get(:itemids => [1, 2, 3])
+        }.to raise_error(RuntimeError, '200 "OK " non-JSON data')
+      end
+    end
+  end
+
+  context "when add header" do
+    it do
+      run_client do |client|
+        result = client.item.get({:itemids => [1, 2, 3]}, :headers => {"User-Agent" => "Any User Agent"})
+        expect(result["header"]["user-agent"]).to eq ["Any User Agent"]
+      end
+    end
+
+    it do
+      run_client(:headers => {"User-Agent" => "Any User Agent"}) do |client|
+        result = client.apiinfo.version
+        expect(result["header"]["user-agent"]).to eq ["Any User Agent"]
+      end
+    end
+  end
+
+  context "when use proxy" do
+    it do
+      proxy do |proxy_host, proxy_port|
+        run_client(:proxy_host => proxy_host, :proxy_port => proxy_port) do |client|
+          result = client.item.get(:itemids => [1, 2, 3])
+          expect(result["body"]).to eq "{\"jsonrpc\":\"2.0\",\"method\":\"item.get\",\"params\":{\"itemids\":[1,2,3]},\"id\":1}"
+        end
+      end
+    end
+  end
+
+  context "when basic auth" do
+    it do
+      run_client(:basic_auth => ["scott", "tiger"], :basic_auth_user => "scott", :basic_auth_password => "tiger") do |client|
+        result = client.item.get(:itemids => [1, 2, 3])
+        expect(result["body"]).to eq "{\"jsonrpc\":\"2.0\",\"method\":\"item.get\",\"params\":{\"itemids\":[1,2,3]},\"id\":1}"
+      end
+    end
+  end
+
+  context "when https" do
+    it do
+      run_client(:ssl => true) do |client|
+        result = client.item.get(:itemids => [1, 2, 3])
+        expect(result["body"]).to eq "{\"jsonrpc\":\"2.0\",\"method\":\"item.get\",\"params\":{\"itemids\":[1,2,3]},\"id\":1}"
+      end
+    end
+  end
+end

data/zabbix-client.gemspec

@@ -18,6 +18,7 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ['lib']
 
-  spec.add_development_dependency 'bundler', '~> 1.7'
+  spec.add_development_dependency 'bundler'
   spec.add_development_dependency 'rake', '~> 10.0'
+  spec.add_development_dependency 'rspec', '>= 3.0.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: zabbix-client
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.1.0
 platform: ruby
 authors:
 - Genki Sugawara
@@ -14,16 +14,16 @@ dependencies:
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -38,6 +38,20 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '10.0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 3.0.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 3.0.0
 description: This is a simple client of Zabbix API.
 email:
 - sgwr_dts@yahoo.co.jp
@@ -46,6 +60,8 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .rspec
+- .travis.yml
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -54,6 +70,8 @@ files:
 - lib/zabbix/client/client.rb
 - lib/zabbix/client/error.rb
 - lib/zabbix/client/version.rb
+- spec/spec_helper.rb
+- spec/zabbix/client_spec.rb
 - zabbix-client.gemspec
 homepage: https://github.com/winebarrel/zabbix-client
 licenses:
@@ -75,8 +93,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 2.4.1
 signing_key: 
 specification_version: 4
 summary: This is a simple client of Zabbix API.
-test_files: []
+test_files:
+- spec/spec_helper.rb
+- spec/zabbix/client_spec.rb