zabbixapi 0.5.0b4 → 0.5.0b5

data/lib/zabbixapi/hostgroups.rb

@@ -23,6 +23,16 @@ class ZabbixApi
       delete(data)
     end
 
+    def create_or_update(data)
+      userid = get_id(:name => data[:name])
+      userid ? update(data.merge(:groupid => userid)) : create(data)
+    end
+
+    def update(data)
+      result = @client.api_request(:method => "hostgroup.update", :params => data)
+      result ? result['groupids'][0].to_i : nil
+    end
+
     def get_or_create(data)
       unless hostgroupid = get_id(data)
         hostgroupid = update(data)

data/lib/zabbixapi/screens.rb

@@ -94,7 +94,7 @@ class ZabbixApi
     # Create screen all graphs for host
     #
     # * *Args*    :
-    #   - +data+ -> Hash with :host=> "hostname", :graphsid => [], [:hsize, :vsize]
+    #   - +data+ -> Hash with :host=> "hostname", :graphsid => [], [:hsize, :vsize, :valign, :halign]
     # * *Returns* :
     #   - Nil or Integer
     def get_or_create_for_host(data)
@@ -102,6 +102,8 @@ class ZabbixApi
       graphids = data[:graphids]
       screenitems = []
       hsize = data[:hsize] || 3
+      valign = data[:valign] || 2
+      halign = data[:halign] || 2
       vsize = data[:vsize] || ((graphids.size/hsize) + 1).to_i
       screenid = get_id(:name => screen_name)
       unless screenid
@@ -111,7 +113,9 @@ class ZabbixApi
             :resourcetype => 0,
             :resourceid => graphid,
             :x => (index % hsize).to_i,
-            :y => (index % graphids.size/hsize).to_i
+            :y => (index % graphids.size/hsize).to_i,
+            :valign =>valign,
+            :halign =>halign
           }
         end
         screenid = create(

data/lib/zabbixapi/version.rb

@@ -1,3 +1,3 @@
 class ZabbixApi
-  VERSION = "0.5.0b4"
+  VERSION = "0.5.0b5"
 end

data/spec/localhost.rb

@@ -51,6 +51,10 @@ describe ZabbixApi, "test_api" do
     zbx.hostgroups.get_or_create(:name => hostgroup).should be_kind_of(Integer)
   end
 
+  it "HOSTGROUP: Create or update" do
+    zbx.hostgroups.create_or_update(:name => hostgroup).should be_kind_of(Integer)
+  end
+
   it "HOSTGROUP: Get all" do
     zbx.hostgroups.all.should be_kind_of(Hash)
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: zabbixapi
 version: !ruby/object:Gem::Version
-  version: 0.5.0b4
+  version: 0.5.0b5
   prerelease: 5
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-28 00:00:00.000000000 Z
+date: 2012-12-03 00:00:00.000000000 Z
 dependencies: []
 description: Allows you to work with zabbix api from ruby.
 email:
@@ -59,7 +59,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2258863443762518848
+      hash: -1736011782781099386
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: