zabbixapi 2.4.0 → 2.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9d821fad6072067f4fcfb5a664165e19624b661f
-  data.tar.gz: 1f1a9adde080dbabc46a9333cd88bdf0d7328944
+  metadata.gz: 2734200ca0b6c573e6830ef2123d7ab8efb07095
+  data.tar.gz: 55c0ba98d8d8465c97006ac5718246f25293c3ce
 SHA512:
-  metadata.gz: c451bf0f57555ddda1827d8b73851614b7b04a2cd657788f30b7919a2d571ca468c9f90ff48922d316a9d7c7678e78c6888fbc5a492445568bc8eca3f848fb6f
-  data.tar.gz: 658565fe62621c59b5ed9d742b36cb71c1f11f8306c97f9715e2e4957e21a840587d5d0d81dbb4ea6cda4d1fef2cf7525672e8b1602b8073b23be720d93aa8bc
+  metadata.gz: 5b95307bb8ebee4a7625f4085fbc6c8db28dc7d84080ff0ab7d3448219c5914fd87e99ca413fe692fd7b272c22f6c81d63ec29b1f2dd580485a49e5f5703793c
+  data.tar.gz: 213f659237904eec7adff7c01f6b55e6cd5a88f1ad7937606789ebaf967b800941bd3b926d241223837d455cba659686c19e486b590fe918ce95068a493027d2

data/.travis.yml

@@ -3,7 +3,7 @@ language:
 rvm:
   - 1.9.3
   - 2.0.0
-  - 2.1.1
+  - 2.1
 before_script:
   - wget -qO - http://obs.express42.com/project_root:/zabbix2.4/precise/Release.key | sudo apt-key add -
   - echo "deb http://obs.express42.com/project_root:/zabbix2.4/precise/ ./" | sudo tee /etc/apt/sources.list.d/zabbix.list

data/README.md

@@ -28,7 +28,7 @@ We support only three last versions of zabbix (2.0, 2.2 and 2.4), so you should
 
 ## Installation
 ```
-gem install zabbixapi -v 2.4.0
+gem install zabbixapi -v 2.4.1
 ```
 
 ## Getting Started

data/lib/zabbixapi/basic/basic_init.rb

@@ -25,9 +25,5 @@ class ZabbixApi
       raise "Can't call indentify here"
     end
 
-    def array_flag
-      false
-    end
-
   end
 end

data/lib/zabbixapi/basic/basic_logic.rb

@@ -5,7 +5,7 @@ class ZabbixApi
       log "[DEBUG] Call create with parametrs: #{data.inspect}"
 
       data_with_default = default_options.empty? ? data : merge_params(default_options, data)
-      data_create = array_flag ? [data_with_default] : data_with_default
+      data_create = [data_with_default]
       result = @client.api_request(:method => "#{method_name}.create", :params => data_create)
       parse_keys result
     end
@@ -13,7 +13,7 @@ class ZabbixApi
     def delete(data)
       log "[DEBUG] Call delete with parametrs: #{data.inspect}"
 
-      data_delete = array_flag ? [data] : [key.to_sym => data]
+      data_delete = [data]
       result = @client.api_request(:method => "#{method_name}.delete", :params => data_delete)
       parse_keys result
     end
@@ -38,7 +38,7 @@ class ZabbixApi
         log "[DEBUG] Equal keys #{dump} and #{data}, skip update"
         item_id
       else
-        data_update = array_flag ? [data] : data
+        data_update = [data]
         result = @client.api_request(:method => "#{method_name}.update", :params => data_update)
         parse_keys result
       end

data/lib/zabbixapi/classes/graphs.rb

@@ -1,10 +1,6 @@
 class ZabbixApi
   class Graphs < Basic
 
-    def array_flag
-      true
-    end
-
     def method_name
       "graph"
     end

data/lib/zabbixapi/classes/hostgroups.rb

@@ -1,10 +1,6 @@
 class ZabbixApi
   class HostGroups < Basic
 
-    def array_flag
-      true
-    end
-
     def method_name
       "hostgroup"
     end

data/lib/zabbixapi/classes/hosts.rb

@@ -1,10 +1,6 @@
 class ZabbixApi
   class Hosts < Basic
 
-    def array_flag
-      true
-    end
-
     def method_name
       "host"
     end

data/lib/zabbixapi/classes/items.rb

@@ -1,10 +1,6 @@
 class ZabbixApi
   class Items < Basic
 
-    def array_flag
-      true
-    end
-
     def method_name
       "item"
     end

data/lib/zabbixapi/classes/mediatypes.rb

@@ -1,10 +1,6 @@
 class ZabbixApi
   class Mediatypes < Basic
 
-    def array_flag
-      true
-    end
-
     def method_name
       "mediatype"
     end

data/lib/zabbixapi/classes/proxies.rb

@@ -1,10 +1,6 @@
 class ZabbixApi
   class Proxies < Basic
 
-    def array_flag
-      true
-    end
-
     def method_name
       "proxy"
     end

data/lib/zabbixapi/classes/screens.rb

@@ -40,8 +40,8 @@ class ZabbixApi
       hsize = data[:hsize] || 3
       valign = data[:valign] || 2
       halign = data[:halign] || 2
-      rowspan = data[:rowspan] || 0
-      colspan = data[:colspan] || 0
+      rowspan = data[:rowspan] || 1
+      colspan = data[:colspan] || 1
       height = data[:height] || 320 # default 320
       width = data[:width] || 200 # default 200
       vsize = data[:vsize] || [1, (graphids.size/hsize).to_i].max

data/lib/zabbixapi/classes/templates.rb

@@ -1,10 +1,6 @@
 class ZabbixApi
   class Templates < Basic
 
-    def array_flag
-      true
-    end
-
     def method_name
       "template"
     end

data/lib/zabbixapi/classes/triggers.rb

@@ -1,10 +1,6 @@
 class ZabbixApi
   class Triggers < Basic
 
-    def array_flag
-      true
-    end
-
     def method_name
       "trigger"
     end

data/lib/zabbixapi/classes/usergroups.rb

@@ -1,10 +1,6 @@
 class ZabbixApi
   class Usergroups < Basic
 
-    def array_flag
-      true
-    end
-
     def method_name
       "usergroup"
     end

data/lib/zabbixapi/classes/usermacros.rb

@@ -1,9 +1,5 @@
 class ZabbixApi
   class Usermacros < Basic
-    def array_flag
-      true
-    end
-
     def indentify
       "macro"
     end

data/lib/zabbixapi/version.rb

@@ -1,3 +1,3 @@
 class ZabbixApi
-  VERSION = "2.4.0"
+  VERSION = "2.4.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: zabbixapi
 version: !ruby/object:Gem::Version
-  version: 2.4.0
+  version: 2.4.1
 platform: ruby
 authors:
 - Vasiliev D.V.