zabbixapi 0.5.6 → 0.5.7

data/lib/zabbixapi.rb

@@ -23,7 +23,7 @@ class ZabbixApi
     case @client.api_version
       when "1.3", "1.2"
         apidir = "1.8"
-      when "2.0.4"
+      when "1.4", "2.0.4"
         apidir = "2.0"
       else
         raise "unknown Api version!"

data/lib/zabbixapi/1.8/classes/screens.rb

@@ -64,6 +64,13 @@ class ZabbixApi
       width = data[:width] || 200 # default 200
       vsize = data[:vsize] || (graphids.size/hsize).to_i
       screenid = get_id(:name => screen_name)
+
+      if ((graphids.size/hsize) / 2) == 0
+        vsize = data[:vsize] || (graphids.size/hsize).to_i
+      else
+        vsize = data[:vsize] || ((graphids.size/hsize)+1).to_i
+      end
+
       unless screenid
         # Create screen
         graphids.each_with_index do |graphid, index|

data/lib/zabbixapi/2.0/classes/screens.rb

@@ -64,6 +64,13 @@ class ZabbixApi
       width = data[:width] || 200 # default 200
       vsize = data[:vsize] || (graphids.size/hsize).to_i
       screenid = get_id(:name => screen_name)
+
+      if ((graphids.size/hsize) / 2) == 0
+        vsize = data[:vsize] || (graphids.size/hsize).to_i
+      else
+        vsize = data[:vsize] || ((graphids.size/hsize)+1).to_i
+      end
+
       unless screenid
         # Create screen
         graphids.each_with_index do |graphid, index|

data/lib/zabbixapi/client.rb

@@ -49,7 +49,7 @@ class ZabbixApi
     def http_request(body)
       uri = URI.parse(@options[:url])
 
-      if @proxy_uri.nil?
+      unless @proxy_uri.nil?
         http = Net::HTTP.Proxy(@proxy_host, @proxy_port, @proxy_user, @proxy_pass).new(uri.host, uri.port)
         if uri.port == 443
           http.use_ssl = true

data/lib/zabbixapi/version.rb

@@ -1,3 +1,3 @@
 class ZabbixApi
-  VERSION = "0.5.6"
+  VERSION = "0.5.7"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: zabbixapi
 version: !ruby/object:Gem::Version
-  version: 0.5.6
+  version: 0.5.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-03 00:00:00.000000000 Z
+date: 2013-03-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -111,3 +111,4 @@ summary: Realization for Zabbix API.
 test_files:
 - spec/localhost.rb
 - spec/run.rb
+has_rdoc: