zabbixapi 0.5.1b10 → 0.5.1b11

data/.gitignore

@@ -1,5 +1,6 @@
 .rvmrc
 *.gem
 *.swp
+.idea
 pkg
 test

data/lib/zabbixapi/basic/basic_func.rb

@@ -1,8 +1,7 @@
 class Hash
   
-  def deep_include?(sub_hash, without_key = nil)
+  def deep_include?(sub_hash)
     sub_hash.keys.all? do |key|
-      next if key == without_key
       self.has_key?(key) && if sub_hash[key].is_a?(Hash)
       self[key].is_a?(Hash) && self[key].deep_include?(sub_hash[key])
       else
@@ -16,10 +15,14 @@ end
 class ZabbixApi
   class Basic
 
+    def log(message)
+      puts "#{message}" if @client.options[:debug]
+    end
+
     def symbolize_keys(obj)
       return obj.inject({}){|memo,(k,v)| memo[k.to_sym] =  symbolize_keys(v); memo} if obj.is_a? Hash
       return obj.inject([]){|memo,v    | memo           << symbolize_keys(v); memo} if obj.is_a? Array
-      return obj
+      obj
     end
 
     def parse_keys(data)

data/lib/zabbixapi/basic/basic_logic.rb

@@ -2,7 +2,7 @@ class ZabbixApi
   class Basic
 
     def create(data)
-      puts "[DEBUG] Call create with parametrs: #{data.inspect}" if @client.options[:debug]
+      log "[DEBUG] Call create with parametrs: #{data.inspect}"
 
       data_with_default = default_options.empty? ? data : merge_params(data)
       data_create = array_flag ? [data_with_default] : data_with_default
@@ -11,7 +11,7 @@ class ZabbixApi
     end
 
     def delete(data)
-      puts "[DEBUG] Call delete with parametrs: #{data.inspect}" if @client.options[:debug]
+      log "[DEBUG] Call delete with parametrs: #{data.inspect}"
 
       data_delete = array_flag ? [data] : [key.to_sym => data]
       result = @client.api_request(:method => "#{method_name}.delete", :params => data_delete)
@@ -19,14 +19,14 @@ class ZabbixApi
     end
 
     def create_or_update(data)
-      puts "[DEBUG] Call create_or_update with parametrs: #{data.inspect}" if @client.options[:debug]
+      log "[DEBUG] Call create_or_update with parametrs: #{data.inspect}"
 
       id = get_id(indentify.to_sym => data[indentify.to_sym])
       id ? update(data.merge(key.to_sym => id.to_s)) : create(data)
     end
 
     def update(data)
-      puts "[DEBUG] Call update with parametrs: #{data.inspect}" if @client.options[:debug]
+      log "[DEBUG] Call update with parametrs: #{data.inspect}"
       
       dump = {}
       item_id = data[key.to_sym].to_i
@@ -34,18 +34,18 @@ class ZabbixApi
         dump = symbolize_keys(item) if item[key].to_i == data[key.to_sym].to_i
       end
 
-      unless dump.deep_include?(data, key.to_sym)
+      if dump.deep_include?(data)
+        item_id
+      else
         data_update = array_flag ? [data] : data
         result = @client.api_request(:method => "#{method_name}.update", :params => data_update)
         parse_keys result
-      else
-        item_id
       end
 
     end
 
     def get_full_data(data)
-      puts "[DEBUG] Call get_full_data with parametrs: #{data.inspect}" if @client.options[:debug]
+      log "[DEBUG] Call get_full_data with parametrs: #{data.inspect}"
 
       @client.api_request(
         :method => "#{method_name}.get",
@@ -59,7 +59,7 @@ class ZabbixApi
     end
 
     def dump_by_id(data)
-      puts "[DEBUG] Call dump_by_id with parametrs: #{data.inspect}" if @client.options[:debug]
+      log "[DEBUG] Call dump_by_id with parametrs: #{data.inspect}"
 
       @client.api_request(
         :method => "#{method_name}.get",
@@ -81,7 +81,7 @@ class ZabbixApi
     end
 
     def get_id(data)
-      puts "[DEBUG] Call get_id with parametrs: #{data.inspect}" if @client.options[:debug]
+      log "[DEBUG] Call get_id with parametrs: #{data.inspect}"
 
       result = symbolize_keys( get_full_data(data) )
       id = nil
@@ -90,9 +90,9 @@ class ZabbixApi
     end
 
     def get_or_create(data)
-      puts "[DEBUG] Call get_or_create with parametrs: #{data.inspect}" if @client.options[:debug]
+      log "[DEBUG] Call get_or_create with parametrs: #{data.inspect}"
 
-      unless id = get_id(data)
+      unless (id = get_id(data))
         id = create(data)
       end
       id

data/lib/zabbixapi/classes/applications.rb

@@ -20,7 +20,7 @@ class ZabbixApi
     end
 
     def get_or_create(data)
-      unless appid = get_id(data)
+      unless (appid = get_id(data))
         appid = create(data)
       end
       appid

data/lib/zabbixapi/classes/templates.rb

@@ -46,7 +46,7 @@ class ZabbixApi
     # * *Returns* :
     #   - Integer
     def get_or_create(data)
-      unless templateid = get_id(:host => data[:host])
+      unless (templateid = get_id(:host => data[:host]))
         templateid = create(data)
       end
       templateid

data/lib/zabbixapi/classes/triggers.rb

@@ -13,5 +13,9 @@ class ZabbixApi
       "description"
     end
 
+    def create_or_update(data)
+      raise "Don't use this shit, use get_or_create"
+    end
+
   end
 end

data/lib/zabbixapi/client.rb

@@ -48,10 +48,10 @@ class ZabbixApi
 
     def http_request(body)
       uri = URI.parse(@options[:url])
-      unless @proxy_uri.nil? 
-        http = Net::HTTP.new(uri.host, uri.port)
-      else
+      if @proxy_uri.nil?
         http = Net::HTTP.Proxy(@proxy_host, @proxy_port, @proxy_user, @proxy_pass).new(uri.host, uri.port)
+      else
+        http = Net::HTTP.new(uri.host, uri.port)
       end
       request = Net::HTTP::Post.new(uri.request_uri)
       request.basic_auth @options[:http_user], @options[:http_password] if @options[:http_user]

data/lib/zabbixapi/version.rb

@@ -1,3 +1,3 @@
 class ZabbixApi
-  VERSION = "0.5.1b10"
+  VERSION = "0.5.1b11"
 end

data/spec/localhost.rb

@@ -1,3 +1,5 @@
+#encoding: utf-8
+
 require 'zabbixapi'
 
 # settings
@@ -11,7 +13,7 @@ zbx = ZabbixApi.connect(
   :url => api_url,
   :user => api_login,
   :password => api_password,
-  :debug => true
+  :debug => false
 )
 
 hostgroup = "hostgroup______1"
@@ -26,21 +28,34 @@ usergroup = "SomeUserGroup"
 graph = "graph___a"
 mediatype = "somemediatype"
 
+hostgroupid = 0
+templateid = 0
+applicationid = 0
+itemid = 0
+hostid = 0
+triggerid = 0
+userid = 0
+usergroupid = 0
+graphid = 0
+screenid = 0
+mediatypeid = 0
+
 
 puts "### Zabbix API server version #{zbx.server.version} ###"
 
-describe ZabbixApi, "test_api" do
+describe ZabbixApi do
 
   it "SERVER: Get version api" do
     zbx.server.version.should be_kind_of(String)
   end
 
   it "HOSTGROUP: Create" do
-    zbx.hostgroups.create(:name => hostgroup).should be_kind_of(Integer)
+    hostgroupid = zbx.hostgroups.create(:name => hostgroup)
+    hostgroupid.should be_kind_of(Integer)
   end
 
   it "HOSTGROUP: Find" do
-    zbx.hostgroups.get_id(:name => hostgroup).should be_kind_of(Integer)
+    zbx.hostgroups.get_id(:name => hostgroup).should eq hostgroupid
   end
 
   it "HOSTGROUP: Find unknown" do
@@ -48,37 +63,38 @@ describe ZabbixApi, "test_api" do
   end
 
   it "HOSTGROUP: Create or get" do
-    zbx.hostgroups.get_or_create(:name => hostgroup).should be_kind_of(Integer)
+    zbx.hostgroups.get_or_create(:name => hostgroup).should eq hostgroupid
   end
 
   it "HOSTGROUP: Create or update" do
-    zbx.hostgroups.create_or_update(:name => hostgroup).should be_kind_of(Integer)
+    zbx.hostgroups.create_or_update(:name => hostgroup).should eq hostgroupid
   end
 
   it "HOSTGROUP: Get all" do
-    zbx.hostgroups.all.should be_kind_of(Hash)
+    zbx.hostgroups.all.should include(hostgroup=>hostgroupid.to_s)
   end
 
   it "TEMPLATE: Create" do
-    zbx.templates.create(
+    templateid = zbx.templates.create(
       :host => template,
       :groups => [:groupid => zbx.hostgroups.get_id(:name => hostgroup)]
-    ).should be_kind_of(Integer)
+    )
+    templateid.should be_kind_of(Integer)
   end
 
   it "TEMPLATE: Get get or create" do
     zbx.templates.get_or_create(
       :host => template,
       :groups => [:groupid => zbx.hostgroups.get_id(:name => hostgroup)]
-    ).should be_kind_of(Integer)
+    ).should eq templateid
   end
 
   it "TEMPLATE: Check full data" do
-    zbx.templates.get_full_data(:host => template)[0]['host'].should be_kind_of(String)
+    zbx.templates.get_full_data(:host => template)[0].should include("host"=>template)
   end
 
   it "TEMPLATE: Find" do
-    zbx.templates.get_id(:host => template).should be_kind_of(Integer)
+    zbx.templates.get_id(:host => template).should eq templateid
   end
 
   it "TEMPLATE: Find unknown" do
@@ -86,25 +102,26 @@ describe ZabbixApi, "test_api" do
   end
 
   it "APPLICATION: Create" do
-    zbx.applications.create(
+    applicationid = zbx.applications.create(
       :name => application,
       :hostid => zbx.templates.get_id(:host => template)
     )
+    applicationid.should be_kind_of(Integer)
   end
 
   it "APPLICATION: Get or create" do
     zbx.applications.get_or_create(
       :name => application,
       :hostid => zbx.templates.get_id(:host => template)
-    )
+    ).should eq applicationid
   end
 
   it "APPLICATION: Full info check" do
-    zbx.applications.get_full_data(:name => application)[0]['applicationid'].should be_kind_of(String)
+    zbx.applications.get_full_data(:name => application)[0].should include("name"=>application)
   end
 
   it "APPLICATION: Find" do
-    zbx.applications.get_id(:name => application).should be_kind_of(Integer)
+    zbx.applications.get_id(:name => application).should eq applicationid
   end
 
   it "APPLICATION: Find unknown" do
@@ -112,57 +129,69 @@ describe ZabbixApi, "test_api" do
   end
 
   it "ITEM: Create" do
-    zbx.items.create(
+    itemid = zbx.items.create(
       :description => item,
       :key_ => "proc.num[aaa]",
       :hostid => zbx.templates.get_id(:host => template),
       :applications => [zbx.applications.get_id(:name => application)]
-    ).should be_kind_of(Integer)
+    )
+    itemid.should be_kind_of(Integer)
   end
 
   it "ITEM: Full info check" do
-    zbx.items.get_full_data(:description => item)[0]['itemid'].should be_kind_of(String)
+    zbx.items.get_full_data(:description => item)[0].should include("description"=>item)
   end
 
   it "ITEM: Find" do
-    zbx.items.get_id(:description => item).should be_kind_of(Integer)
+    zbx.items.get_id(:description => item).should eq itemid
   end
 
   it "ITEM: Update" do
     zbx.items.update(
       :itemid => zbx.items.get_id(:description => item),
-      :status => 0
-    ).should be_kind_of(Integer)
+      :status => 1
+    ).should eq itemid
   end
 
-  it "ITEM: Create or update" do
+  it "ITEM: Create or update (update)" do
     zbx.items.create_or_update(
       :description => item,
       :key_ => "proc.num[aaa]",
       :status => 0,
       :hostid => zbx.templates.get_id(:host => template),
       :applications => [zbx.applications.get_id(:name => application)]
-    ).should be_kind_of(Integer)
+    ).should eq itemid
+  end
+
+  it "ITEM: Create or update (create)" do
+    zbx.items.create_or_update(
+      :description => item + "____1",
+      :key_ => "proc.num[aaabb]",
+      :status => 0,
+      :hostid => zbx.templates.get_id(:host => template),
+      :applications => [zbx.applications.get_id(:name => application)]
+    ).should eq itemid + 1
   end
 
   it "ITEM: Get unknown" do
-    zbx.items.get_id(:description => "#{item}_____")
+    zbx.items.get_id(:description => "#{item}_____").should be_kind_of(NilClass)
   end
 
   it "HOST: Create" do
-    zbx.hosts.create(
+    hostid = zbx.hosts.create(
       :host => host,
       :ip => "10.20.48.88",
       :groups => [:groupid => zbx.hostgroups.get_id(:name => hostgroup)]
-    ).should be_kind_of(Integer)
+    )
+    hostid.should be_kind_of(Integer)
   end
 
-  it "HOST: Update or create" do
+  it "HOST: Update or create (update)" do
     zbx.hosts.create_or_update(
       :host => host,
       :ip => "10.20.48.89",
       :groups => [:groupid => zbx.hostgroups.get_id(:name => hostgroup)]
-    ).should be_kind_of(Integer)
+    ).should eq hostid
   end
 
   it "HOST: Find unknown" do
@@ -170,20 +199,29 @@ describe ZabbixApi, "test_api" do
   end
 
   it "HOST: Find" do
-    zbx.hosts.get_id(:host => host).should be_kind_of(Integer)
+    zbx.hosts.get_id(:host => host).should eq hostid
   end
 
   it "HOST: Update" do
     zbx.hosts.update(
       :hostid => zbx.hosts.get_id(:host => host),
       :status => 0
-    )
+    ).should eq hostid
+  end
+
+  it "TEMPLATE: Update hosts with templates" do
+    zbx.templates.mass_update(
+      :hosts_id => [zbx.hosts.get_id(:host => host)],
+      :templates_id => [zbx.templates.get_id(:host => template)]
+    ).should be_kind_of(TrueClass)
   end
 
   it "TEMPLATE: Get all templates linked with host" do
-    zbx.templates.get_ids_by_host(
+    tmpl_array = zbx.templates.get_ids_by_host(
       :hostids => [zbx.hosts.get_id(:host => host)]
-    ).should be_kind_of(Array)
+    )
+    tmpl_array.should be_kind_of(Array)
+    tmpl_array.should include templateid.to_s
   end
 
   it "TEMPLATE: Linked hosts with templates" do
@@ -193,19 +231,12 @@ describe ZabbixApi, "test_api" do
     ).should be_kind_of(TrueClass)
   end
 
-  it "TEMPLATE: Update hosts with templates" do
-    zbx.templates.mass_update(
-      :hosts_id => [zbx.hosts.get_id(:host => host)],
-      :templates_id => [zbx.templates.get_id(:host => template)]
-    ).should be_kind_of(TrueClass)
-  end
-
   it "TEMPLATE: Get all" do 
-    zbx.templates.all.should be_kind_of(Hash)
+    zbx.templates.all.should include(template=>templateid.to_s)
   end
 
   it "TRIGGER: Create" do
-    zbx.triggers.create(
+    triggerid = zbx.triggers.create(
       :description => trigger,
       :expression => "{#{template}:proc.num[aaa].last(0)}<1",
       :comments => "Bla-bla is faulty (disaster)",
@@ -213,11 +244,12 @@ describe ZabbixApi, "test_api" do
       :status     => 0,
       :templateid => 0,
       :type => 0
-    ).should be_kind_of(Integer)
+    )
+    triggerid.should be_kind_of(Integer)
   end
 
   it "TRIGGER: Find" do
-    zbx.triggers.get_id(:description => trigger).should be_kind_of(Integer)
+    zbx.triggers.get_id(:description => trigger).should eq triggerid + 1 # вау блять
   end
 
   it "GRAPH: Create" do 
@@ -227,13 +259,14 @@ describe ZabbixApi, "test_api" do
         :type => "0",
         :periods_cnt => "5"
     }
-    zbx.graphs.create(
+    graphid = zbx.graphs.create(
       :gitems => [gitems],
       :show_triggers => "0",
       :name => graph,
       :width => "900",
       :height => "200"
-    ).should be_kind_of(Integer)
+    )
+    graphid.should be_kind_of(Integer)
   end
 
   it "GRAPH: Create or get" do 
@@ -249,7 +282,7 @@ describe ZabbixApi, "test_api" do
       :name => graph,
       :width => "900",
       :height => "200"
-    ).should be_kind_of(Integer)
+    ).should eq graphid
   end
 
   it "GRAPH: Find gititems" do
@@ -257,11 +290,13 @@ describe ZabbixApi, "test_api" do
   end
 
   it "GRAPH: Find" do
-    zbx.graphs.get_id( :name => graph ).should be_kind_of(Integer)
+    zbx.graphs.get_id( :name => graph ).should eq graphid
   end
 
   it "GRAPH: get_ids_by_host" do
-    zbx.graphs.get_ids_by_host( :host => host ).should be_kind_of(Array)
+    graph_array = zbx.graphs.get_ids_by_host( :host => host )
+    graph_array.should be_kind_of(Array)
+    graph_array.should include(graphid.to_s)
   end
 
   it "GRAPH: Update" do
@@ -271,7 +306,7 @@ describe ZabbixApi, "test_api" do
         :hostid => zbx.hosts.get_id(:host => host)
       ), 
       :ymax_type => 1
-    ).should be_kind_of(Integer)
+    ).should eq graphid
   end
 
   it "GRAPH: Create or Update" do
@@ -287,14 +322,15 @@ describe ZabbixApi, "test_api" do
     :name => graph,
     :width => "900",
     :height => "200"
-  ).should be_kind_of(Integer)
+  ).should eq graphid
   end
 
   it "SCREEN: Get or create for host" do
-    zbx.screens.get_or_create_for_host(
+    screenid = zbx.screens.get_or_create_for_host(
       :host => host,
       :graphids => zbx.graphs.get_ids_by_host(:host => host)
-    ).should be_kind_of(Integer)
+    )
+    screenid.should be_kind_of(Integer)
   end
 
   it "TEMPLATE: Unlink hosts from templates" do
@@ -307,7 +343,7 @@ describe ZabbixApi, "test_api" do
   it "SCREEN: Delete" do
     zbx.screens.delete(
       [zbx.screens.get_id(:name => "#{host}_graphs")]
-    ).should be_kind_of(Integer)
+    ).should eq screenid
   end
 
   it "GRAPH: Delete" do
@@ -315,40 +351,41 @@ describe ZabbixApi, "test_api" do
   end
 
   it "TRIGGER: Delete" do
-    zbx.triggers.delete( zbx.triggers.get_id(:description => trigger) ).should be_kind_of(Integer)
+    zbx.triggers.delete( zbx.triggers.get_id(:description => trigger) ).should eq triggerid + 1 
   end
 
   it "HOST: Delete" do
-    zbx.hosts.delete( zbx.hosts.get_id(:host => host) ).should be_kind_of(Integer)
+    zbx.hosts.delete( zbx.hosts.get_id(:host => host) ).should eq hostid
   end
 
   it "ITEM: Delete" do
     zbx.items.delete(
       zbx.items.get_id(:description => item)
-    ).should be_kind_of(Integer)
+    ).should eq itemid
   end
 
   it "APPLICATION: Delete" do
-    zbx.applications.delete( zbx.applications.get_id(:name => application) )
+    zbx.applications.delete( zbx.applications.get_id(:name => application) ).should eq applicationid
   end
 
   it "TEMPLATE: Delete" do
-    zbx.templates.delete(zbx.templates.get_id(:host => template))
+    zbx.templates.delete(zbx.templates.get_id(:host => template)).should eq templateid
   end
 
   it "HOSTGROUP: Delete" do
     zbx.hostgroups.delete(
       zbx.hostgroups.get_id(:name => hostgroup)
-    ).should be_kind_of(Integer)
+    ).should eq hostgroupid
   end
 
   it "USER: Create" do
-    zbx.users.create(
+    userid = zbx.users.create(
       :alias => "Test #{user}",
       :name => user,
       :surname => user,
       :passwd => user
-    ).should be_kind_of(Integer)
+    )
+    userid.should be_kind_of(Integer)
   end
 
   it "USER: Create or update" do
@@ -357,7 +394,7 @@ describe ZabbixApi, "test_api" do
       :name => user,
       :surname => user,
       :passwd => user
-    ).should be_kind_of(Integer)
+    ).should eq userid
   end
 
   it "USER: Find" do
@@ -369,22 +406,23 @@ describe ZabbixApi, "test_api" do
   end
 
   it "USER: Find unknown" do
-    zbx.users.get_id(:name => "#{user}_____")
+    zbx.users.get_id(:name => "#{user}_____").should be_kind_of(NilClass)
   end
 
   it "USERGROUPS: Create" do
-    zbx.usergroups.create(:name => usergroup).should be_kind_of(Integer)
+    usergroupid = zbx.usergroups.create(:name => usergroup)
+    usergroupid.should be_kind_of(Integer)
   end
 
   it "USERGROUPS: Create or update" do
-    zbx.usergroups.get_or_create(:name => usergroup).should be_kind_of(Integer)
+    zbx.usergroups.get_or_create(:name => usergroup).should eq usergroupid
   end
 
   it "USERGROUPS: Add user" do
     zbx.usergroups.add_user(
         :usrgrpids => [zbx.usergroups.get_id(:name => usergroup)],
         :userids => [zbx.users.get_id(:name => user2)]
-    ).should be_kind_of(Integer)
+    ).should eq usergroupid
   end
 
   it "USERGROUPS: Set UserGroup read & write perm" do
@@ -392,23 +430,24 @@ describe ZabbixApi, "test_api" do
       :usrgrpid => zbx.usergroups.get_or_create(:name => usergroup).to_s,
       :hostgroupids => zbx.hostgroups.all.values,
       :permission => 3
-    ).should be_kind_of(Integer)
+    ).should eq usergroupid
   end
 
   it "MEDIATYPE: Create" do
-    zbx.mediatypes.create(
+    mediatypeid = zbx.mediatypes.create(
       :description => mediatype,
       :type => 0,
       :smtp_server => "127.0.0.1",
       :smtp_email => "zabbix@test.com"
-    ).should be_kind_of(Integer)
+    )
+    mediatypeid.should be_kind_of(Integer)
   end
 
   it "MEDIATYPE: Update or create" do
     zbx.mediatypes.create_or_update(
       :description => mediatype,
       :smtp_email => "zabbix2@test.com"
-    ).should be_kind_of(Integer)
+    ).should eq mediatypeid
   end
 
   it "USER: Add mediatype" do
@@ -423,21 +462,21 @@ describe ZabbixApi, "test_api" do
           :severity => "56"
         }
       ]
-    ).should be_kind_of(Integer)
+    ).should eq userid
   end
 
   it "MEDIATYPE: Delete" do
     zbx.mediatypes.delete(
       zbx.mediatypes.get_id(:description => mediatype)
-    ).should be_kind_of(Integer)
+    ).should eq mediatypeid
   end
 
   it "USER: Delete" do
-    zbx.users.delete(zbx.users.get_id(:name => user2)).should be_kind_of(Integer)
+    zbx.users.delete(zbx.users.get_id(:name => user2)).should eq userid
   end
 
   it "USERGROUPS: Delete" do
-    zbx.usergroups.delete([zbx.usergroups.get_id(:name => usergroup)]).should be_kind_of(Integer)
+    zbx.usergroups.delete([zbx.usergroups.get_id(:name => usergroup)]).should eq usergroupid
   end
 
   it "QUERY" do

data/spec/run.rb

@@ -1,3 +1,5 @@
+#encoding: utf-8
+
 require 'zabbixapi'
 
 # settings
@@ -24,20 +26,34 @@ usergroup = "SomeUserGroup"
 graph = "graph"
 mediatype = "somemediatype"
 
+hostgroupid = 0
+templateid = 0
+applicationid = 0
+itemid = 0
+hostid = 0
+triggerid = 0
+userid = 0
+usergroupid = 0
+graphid = 0
+screenid = 0
+mediatypeid = 0
+
+
 puts "### Zabbix API server version #{zbx.server.version} ###"
 
-describe ZabbixApi, "test_api" do
+describe ZabbixApi do
 
   it "SERVER: Get version api" do
     zbx.server.version.should be_kind_of(String)
   end
 
   it "HOSTGROUP: Create" do
-    zbx.hostgroups.create(:name => hostgroup).should be_kind_of(Integer)
+    hostgroupid = zbx.hostgroups.create(:name => hostgroup)
+    hostgroupid.should be_kind_of(Integer)
   end
 
   it "HOSTGROUP: Find" do
-    zbx.hostgroups.get_id(:name => hostgroup).should be_kind_of(Integer)
+    zbx.hostgroups.get_id(:name => hostgroup).should eq hostgroupid
   end
 
   it "HOSTGROUP: Find unknown" do
@@ -45,33 +61,38 @@ describe ZabbixApi, "test_api" do
   end
 
   it "HOSTGROUP: Create or get" do
-    zbx.hostgroups.get_or_create(:name => hostgroup).should be_kind_of(Integer)
+    zbx.hostgroups.get_or_create(:name => hostgroup).should eq hostgroupid
+  end
+
+  it "HOSTGROUP: Create or update" do
+    zbx.hostgroups.create_or_update(:name => hostgroup).should eq hostgroupid
   end
 
   it "HOSTGROUP: Get all" do
-    zbx.hostgroups.all.should be_kind_of(Hash)
+    zbx.hostgroups.all.should include(hostgroup=>hostgroupid.to_s)
   end
 
   it "TEMPLATE: Create" do
-    zbx.templates.create(
+    templateid = zbx.templates.create(
       :host => template,
       :groups => [:groupid => zbx.hostgroups.get_id(:name => hostgroup)]
-    ).should be_kind_of(Integer)
+    )
+    templateid.should be_kind_of(Integer)
   end
 
   it "TEMPLATE: Get get or create" do
     zbx.templates.get_or_create(
       :host => template,
       :groups => [:groupid => zbx.hostgroups.get_id(:name => hostgroup)]
-    ).should be_kind_of(Integer)
+    ).should eq templateid
   end
 
   it "TEMPLATE: Check full data" do
-    zbx.templates.get_full_data(:host => template)[0]['host'].should be_kind_of(String)
+    zbx.templates.get_full_data(:host => template)[0].should include("host"=>template)
   end
 
   it "TEMPLATE: Find" do
-    zbx.templates.get_id(:host => template).should be_kind_of(Integer)
+    zbx.templates.get_id(:host => template).should eq templateid
   end
 
   it "TEMPLATE: Find unknown" do
@@ -79,25 +100,26 @@ describe ZabbixApi, "test_api" do
   end
 
   it "APPLICATION: Create" do
-    zbx.applications.create(
+    applicationid = zbx.applications.create(
       :name => application,
       :hostid => zbx.templates.get_id(:host => template)
     )
+    applicationid.should be_kind_of(Integer)
   end
 
   it "APPLICATION: Get or create" do
     zbx.applications.get_or_create(
       :name => application,
       :hostid => zbx.templates.get_id(:host => template)
-    )
+    ).should eq applicationid
   end
 
   it "APPLICATION: Full info check" do
-    zbx.applications.get_full_data(:name => application)[0]['applicationid'].should be_kind_of(String)
+    zbx.applications.get_full_data(:name => application)[0].should include("name"=>application)
   end
 
   it "APPLICATION: Find" do
-    zbx.applications.get_id(:name => application).should be_kind_of(Integer)
+    zbx.applications.get_id(:name => application).should eq applicationid
   end
 
   it "APPLICATION: Find unknown" do
@@ -105,57 +127,69 @@ describe ZabbixApi, "test_api" do
   end
 
   it "ITEM: Create" do
-    zbx.items.create(
+    itemid = zbx.items.create(
       :description => item,
       :key_ => "proc.num[aaa]",
       :hostid => zbx.templates.get_id(:host => template),
       :applications => [zbx.applications.get_id(:name => application)]
-    ).should be_kind_of(Integer)
+    )
+    itemid.should be_kind_of(Integer)
   end
 
   it "ITEM: Full info check" do
-    zbx.items.get_full_data(:description => item)[0]['itemid'].should be_kind_of(String)
+    zbx.items.get_full_data(:description => item)[0].should include("description"=>item)
   end
 
   it "ITEM: Find" do
-    zbx.items.get_id(:description => item).should be_kind_of(Integer)
+    zbx.items.get_id(:description => item).should eq itemid
   end
 
   it "ITEM: Update" do
     zbx.items.update(
       :itemid => zbx.items.get_id(:description => item),
-      :status => 0
-    ).should be_kind_of(Integer)
+      :status => 1
+    ).should eq itemid
   end
 
-  it "ITEM: Create or update" do
+  it "ITEM: Create or update (update)" do
     zbx.items.create_or_update(
       :description => item,
       :key_ => "proc.num[aaa]",
-      :type => 6,
+      :status => 0,
       :hostid => zbx.templates.get_id(:host => template),
       :applications => [zbx.applications.get_id(:name => application)]
-    ).should be_kind_of(Integer)
+    ).should eq itemid
+  end
+
+  it "ITEM: Create or update (create)" do
+    zbx.items.create_or_update(
+      :description => item + "____1",
+      :key_ => "proc.num[aaabb]",
+      :status => 0,
+      :hostid => zbx.templates.get_id(:host => template),
+      :applications => [zbx.applications.get_id(:name => application)]
+    ).should eq itemid + 1
   end
 
   it "ITEM: Get unknown" do
-    zbx.items.get_id(:description => "#{item}_____")
+    zbx.items.get_id(:description => "#{item}_____").should be_kind_of(NilClass)
   end
 
   it "HOST: Create" do
-    zbx.hosts.create(
+    hostid = zbx.hosts.create(
       :host => host,
       :ip => "10.20.48.88",
       :groups => [:groupid => zbx.hostgroups.get_id(:name => hostgroup)]
-    ).should be_kind_of(Integer)
+    )
+    hostid.should be_kind_of(Integer)
   end
 
-  it "HOST: Update or create" do
+  it "HOST: Update or create (update)" do
     zbx.hosts.create_or_update(
       :host => host,
       :ip => "10.20.48.89",
       :groups => [:groupid => zbx.hostgroups.get_id(:name => hostgroup)]
-    ).should be_kind_of(Integer)
+    ).should eq hostid
   end
 
   it "HOST: Find unknown" do
@@ -163,20 +197,29 @@ describe ZabbixApi, "test_api" do
   end
 
   it "HOST: Find" do
-    zbx.hosts.get_id(:host => host).should be_kind_of(Integer)
+    zbx.hosts.get_id(:host => host).should eq hostid
   end
 
   it "HOST: Update" do
     zbx.hosts.update(
       :hostid => zbx.hosts.get_id(:host => host),
       :status => 0
-    )
+    ).should eq hostid
+  end
+
+  it "TEMPLATE: Update hosts with templates" do
+    zbx.templates.mass_update(
+      :hosts_id => [zbx.hosts.get_id(:host => host)],
+      :templates_id => [zbx.templates.get_id(:host => template)]
+    ).should be_kind_of(TrueClass)
   end
 
   it "TEMPLATE: Get all templates linked with host" do
-    zbx.templates.get_ids_by_host(
+    tmpl_array = zbx.templates.get_ids_by_host(
       :hostids => [zbx.hosts.get_id(:host => host)]
-    ).should be_kind_of(Array)
+    )
+    tmpl_array.should be_kind_of(Array)
+    tmpl_array.should include templateid.to_s
   end
 
   it "TEMPLATE: Linked hosts with templates" do
@@ -186,19 +229,12 @@ describe ZabbixApi, "test_api" do
     ).should be_kind_of(TrueClass)
   end
 
-  it "TEMPLATE: Update hosts with templates" do
-    zbx.templates.mass_update(
-      :hosts_id => [zbx.hosts.get_id(:host => host)],
-      :templates_id => [zbx.templates.get_id(:host => template)]
-    ).should be_kind_of(TrueClass)
-  end
-
   it "TEMPLATE: Get all" do 
-    zbx.templates.all.should be_kind_of(Hash)
+    zbx.templates.all.should include(template=>templateid.to_s)
   end
 
   it "TRIGGER: Create" do
-    zbx.triggers.create(
+    triggerid = zbx.triggers.create(
       :description => trigger,
       :expression => "{#{template}:proc.num[aaa].last(0)}<1",
       :comments => "Bla-bla is faulty (disaster)",
@@ -206,11 +242,12 @@ describe ZabbixApi, "test_api" do
       :status     => 0,
       :templateid => 0,
       :type => 0
-    ).should be_kind_of(Integer)
+    )
+    triggerid.should be_kind_of(Integer)
   end
 
   it "TRIGGER: Find" do
-    zbx.triggers.get_id(:description => trigger).should be_kind_of(Integer)
+    zbx.triggers.get_id(:description => trigger).should eq triggerid + 1 # вау блять
   end
 
   it "GRAPH: Create" do 
@@ -220,13 +257,14 @@ describe ZabbixApi, "test_api" do
         :type => "0",
         :periods_cnt => "5"
     }
-    zbx.graphs.create(
+    graphid = zbx.graphs.create(
       :gitems => [gitems],
       :show_triggers => "0",
       :name => graph,
       :width => "900",
       :height => "200"
-    ).should be_kind_of(Integer)
+    )
+    graphid.should be_kind_of(Integer)
   end
 
   it "GRAPH: Create or get" do 
@@ -242,7 +280,7 @@ describe ZabbixApi, "test_api" do
       :name => graph,
       :width => "900",
       :height => "200"
-    ).should be_kind_of(Integer)
+    ).should eq graphid
   end
 
   it "GRAPH: Find gititems" do
@@ -250,11 +288,13 @@ describe ZabbixApi, "test_api" do
   end
 
   it "GRAPH: Find" do
-    zbx.graphs.get_id( :name => graph ).should be_kind_of(Integer)
+    zbx.graphs.get_id( :name => graph ).should eq graphid
   end
 
   it "GRAPH: get_ids_by_host" do
-    zbx.graphs.get_ids_by_host( :host => host ).should be_kind_of(Array)
+    graph_array = zbx.graphs.get_ids_by_host( :host => host )
+    graph_array.should be_kind_of(Array)
+    graph_array.should include(graphid.to_s)
   end
 
   it "GRAPH: Update" do
@@ -264,7 +304,7 @@ describe ZabbixApi, "test_api" do
         :hostid => zbx.hosts.get_id(:host => host)
       ), 
       :ymax_type => 1
-    ).should be_kind_of(Integer)
+    ).should eq graphid
   end
 
   it "GRAPH: Create or Update" do
@@ -280,14 +320,15 @@ describe ZabbixApi, "test_api" do
     :name => graph,
     :width => "900",
     :height => "200"
-  ).should be_kind_of(Integer)
+  ).should eq graphid
   end
 
   it "SCREEN: Get or create for host" do
-    zbx.screens.get_or_create_for_host(
+    screenid = zbx.screens.get_or_create_for_host(
       :host => host,
       :graphids => zbx.graphs.get_ids_by_host(:host => host)
-    ).should be_kind_of(Integer)
+    )
+    screenid.should be_kind_of(Integer)
   end
 
   it "TEMPLATE: Unlink hosts from templates" do
@@ -300,48 +341,49 @@ describe ZabbixApi, "test_api" do
   it "SCREEN: Delete" do
     zbx.screens.delete(
       [zbx.screens.get_id(:name => "#{host}_graphs")]
-    ).should be_kind_of(Integer)
+    ).should eq screenid
   end
 
   it "GRAPH: Delete" do
-    zbx.graphs.delete(zbx.graphs.get_id(:name => graph)).should be_kind_of(Integer)
+    zbx.graphs.delete(zbx.graphs.get_id(:name => graph)).should be_kind_of(TrueClass)
   end
 
   it "TRIGGER: Delete" do
-    zbx.triggers.delete( zbx.triggers.get_id(:description => trigger) ).should be_kind_of(Integer)
+    zbx.triggers.delete( zbx.triggers.get_id(:description => trigger) ).should eq triggerid + 1 
   end
 
   it "HOST: Delete" do
-    zbx.hosts.delete( zbx.hosts.get_id(:host => host) ).should be_kind_of(Integer)
+    zbx.hosts.delete( zbx.hosts.get_id(:host => host) ).should eq hostid
   end
 
   it "ITEM: Delete" do
     zbx.items.delete(
       zbx.items.get_id(:description => item)
-    ).should be_kind_of(Integer)
+    ).should eq itemid
   end
 
   it "APPLICATION: Delete" do
-    zbx.applications.delete( zbx.applications.get_id(:name => application) )
+    zbx.applications.delete( zbx.applications.get_id(:name => application) ).should eq applicationid
   end
 
   it "TEMPLATE: Delete" do
-    zbx.templates.delete(zbx.templates.get_id(:host => template))
+    zbx.templates.delete(zbx.templates.get_id(:host => template)).should eq templateid
   end
 
   it "HOSTGROUP: Delete" do
     zbx.hostgroups.delete(
       zbx.hostgroups.get_id(:name => hostgroup)
-    ).should be_kind_of(Integer)
+    ).should eq hostgroupid
   end
 
   it "USER: Create" do
-    zbx.users.create(
+    userid = zbx.users.create(
       :alias => "Test #{user}",
       :name => user,
       :surname => user,
       :passwd => user
-    ).should be_kind_of(Integer)
+    )
+    userid.should be_kind_of(Integer)
   end
 
   it "USER: Create or update" do
@@ -350,7 +392,7 @@ describe ZabbixApi, "test_api" do
       :name => user,
       :surname => user,
       :passwd => user
-    ).should be_kind_of(Integer)
+    ).should eq userid
   end
 
   it "USER: Find" do
@@ -362,22 +404,23 @@ describe ZabbixApi, "test_api" do
   end
 
   it "USER: Find unknown" do
-    zbx.users.get_id(:name => "#{user}_____")
+    zbx.users.get_id(:name => "#{user}_____").should be_kind_of(NilClass)
   end
 
   it "USERGROUPS: Create" do
-    zbx.usergroups.create(:name => usergroup).should be_kind_of(Integer)
+    usergroupid = zbx.usergroups.create(:name => usergroup)
+    usergroupid.should be_kind_of(Integer)
   end
 
   it "USERGROUPS: Create or update" do
-    zbx.usergroups.get_or_create(:name => usergroup).should be_kind_of(Integer)
+    zbx.usergroups.get_or_create(:name => usergroup).should eq usergroupid
   end
 
   it "USERGROUPS: Add user" do
     zbx.usergroups.add_user(
         :usrgrpids => [zbx.usergroups.get_id(:name => usergroup)],
         :userids => [zbx.users.get_id(:name => user2)]
-    ).should be_kind_of(Integer)
+    ).should eq usergroupid
   end
 
   it "USERGROUPS: Set UserGroup read & write perm" do
@@ -385,23 +428,24 @@ describe ZabbixApi, "test_api" do
       :usrgrpid => zbx.usergroups.get_or_create(:name => usergroup).to_s,
       :hostgroupids => zbx.hostgroups.all.values,
       :permission => 3
-    ).should be_kind_of(Integer)
+    ).should eq usergroupid
   end
 
   it "MEDIATYPE: Create" do
-    zbx.mediatypes.create(
+    mediatypeid = zbx.mediatypes.create(
       :description => mediatype,
       :type => 0,
       :smtp_server => "127.0.0.1",
       :smtp_email => "zabbix@test.com"
-    ).should be_kind_of(Integer)
+    )
+    mediatypeid.should be_kind_of(Integer)
   end
 
   it "MEDIATYPE: Update or create" do
     zbx.mediatypes.create_or_update(
       :description => mediatype,
       :smtp_email => "zabbix2@test.com"
-    ).should be_kind_of(Integer)
+    ).should eq mediatypeid
   end
 
   it "USER: Add mediatype" do
@@ -416,21 +460,21 @@ describe ZabbixApi, "test_api" do
           :severity => "56"
         }
       ]
-    ).should be_kind_of(Integer)
+    ).should eq userid
   end
 
   it "MEDIATYPE: Delete" do
     zbx.mediatypes.delete(
       zbx.mediatypes.get_id(:description => mediatype)
-    ).should be_kind_of(Integer)
+    ).should eq mediatypeid
   end
 
   it "USER: Delete" do
-    zbx.users.delete(zbx.users.get_id(:name => user2)).should be_kind_of(Integer)
+    zbx.users.delete(zbx.users.get_id(:name => user2)).should eq userid
   end
 
   it "USERGROUPS: Delete" do
-    zbx.usergroups.delete([zbx.usergroups.get_id(:name => usergroup)]).should be_kind_of(Integer)
+    zbx.usergroups.delete([zbx.usergroups.get_id(:name => usergroup)]).should eq usergroupid
   end
 
   it "QUERY" do

data/zabbixapi.gemspec

@@ -1,6 +1,6 @@
 # -*- encoding: utf-8 -*-
 $:.push File.expand_path("../lib", __FILE__)
-require "zabbixapi/version"
+require 'zabbixapi/version'
 
 Gem::Specification.new do |s|
   s.name        = "zabbixapi"
@@ -11,6 +11,8 @@ Gem::Specification.new do |s|
   s.summary     = %q{Realization for Zabbix API.}
   s.description = %q{Allows you to work with zabbix api from ruby.}
   s.licenses    = %w(MIT)
+  
+  s.add_dependency('json')
 
   s.rubyforge_project = "zabbixapi"
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: zabbixapi
 version: !ruby/object:Gem::Version
-  version: 0.5.1b10
+  version: 0.5.1b11
   prerelease: 5
 platform: ruby
 authors:
@@ -9,8 +9,24 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-19 00:00:00.000000000 Z
-dependencies: []
+date: 2012-12-21 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: json
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Allows you to work with zabbix api from ruby.
 email:
 - vadv.mkn@gmail.com
@@ -63,7 +79,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -675997134437473761
+      hash: -2676631147213702854
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: