zbxapi 0.1.398 → 0.2.415

data/zbxapi/api_exceptions.rb

@@ -17,8 +17,8 @@
 
 ##########################################
 # Subversion information
-# $Id: api_exceptions.rb 319 2011-09-25 21:53:30Z nelsonab $
-# $Revision: 319 $
+# $Id: api_exceptions.rb 337 2011-10-14 16:11:39Z nelsonab $
+# $Revision: 337 $
 ##########################################
 
 #------------------------------------------------------------------------------

data/zbxapi/exceptions.rb

@@ -17,8 +17,8 @@
 
 ##########################################
 # Subversion information
-# $Id: exceptions.rb 319 2011-09-25 21:53:30Z nelsonab $
-# $Revision: 319 $
+# $Id: exceptions.rb 337 2011-10-14 16:11:39Z nelsonab $
+# $Revision: 337 $
 ##########################################
 
 require 'zbxapi/utils'

data/zbxapi/result.rb

@@ -0,0 +1,74 @@
+#License:: GPL 2.0  http://www.gnu.org/licenses/gpl-2.0.html
+#Copyright:: Copyright (C) 2009,2010 Andrew Nelson nelsonab(at)red-tux(dot)net
+#
+#This program is free software; you can redistribute it and/or
+#modify it under the terms of the GNU General Public License
+#as published by the Free Software Foundation; either version 2
+#of the License, or (at your option) any later version.
+#
+#This program is distributed in the hope that it will be useful,
+#but WITHOUT ANY WARRANTY; without even the implied warranty of
+#MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#GNU General Public License for more details.
+#
+#You should have received a copy of the GNU General Public License
+#along with this program; if not, write to the Free Software
+#Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+
+##########################################
+# Subversion information
+# $Id: result.rb 395 2012-05-18 03:49:48Z nelsonab $
+# $Revision: 395 $
+##########################################
+
+require 'zbxapi/zdebug'
+require 'zbxapi/exceptions'
+#require 'json'
+require 'pp'
+
+class ApiResult < Array
+  include ZDebug
+
+  class InvalidResult < ZError
+  end
+
+  class ErrorMessage <ZError
+  end
+
+  attr_accessor :fields, :params, :method_called
+
+  def initialize(values={})
+    raise InvalidResult.new if values["result"].nil?
+
+    @params=values[:params]
+    values.delete(:params) if values.key?(:params)
+    @method_called=values[:method]
+    values.delete(:method) if values.key?(:method)
+
+    @id=values["id"]
+    if values["result"].class!=Array
+      super([values["result"]])
+    else
+      super(values["result"])
+    end
+    @fields=self.first.keys.map{|i| i.intern }
+  end
+
+  def method_missing(sym,*args)
+    if @fields.index(sym)
+       p @fields
+       map {|i| i[sym.to_s]}
+    else
+      super(sym,*args)
+    end
+  end
+
+
+  def [](*args)
+    index=args[0]
+    return self if index=="result"
+    return self.first[index] if index.is_a?(String)
+    super(*args)
+  end
+
+end

data/zbxapi/utils.rb

@@ -17,8 +17,8 @@
 
 ##########################################
 # Subversion information
-# $Id: utils.rb 319 2011-09-25 21:53:30Z nelsonab $
-# $Revision: 319 $
+# $Id: utils.rb 337 2011-10-14 16:11:39Z nelsonab $
+# $Revision: 337 $
 ##########################################
 
 

data/zbxapi/zdebug.rb

@@ -17,8 +17,8 @@
 
 ##########################################
 # Subversion information
-# $Id: zdebug.rb 324 2011-09-26 08:53:11Z nelsonab $
-# $Revision: 324 $
+# $Id: zdebug.rb 337 2011-10-14 16:11:39Z nelsonab $
+# $Revision: 337 $
 ##########################################
 
 module ZDebug

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: zbxapi
 version: !ruby/object:Gem::Version 
-  hash: 775
-  prerelease: 
+  hash: 809
+  prerelease: false
   segments: 
   - 0
-  - 1
-  - 398
-  version: 0.1.398
+  - 2
+  - 415
+  version: 0.2.415
 platform: ruby
 authors: 
 - A. Nelson
@@ -15,7 +15,8 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-05-22 00:00:00 Z
+date: 2012-09-22 00:00:00 -04:00
+default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: json
@@ -44,20 +45,23 @@ files:
 - zbxapi/zdebug.rb
 - zbxapi/api_exceptions.rb
 - zbxapi/exceptions.rb
-- zbxapi/revision.rb
 - zbxapi/utils.rb
-- api_classes/application.rb
-- api_classes/history.rb
-- api_classes/host.rb
-- api_classes/host_group.rb
-- api_classes/item.rb
-- api_classes/proxy.rb
-- api_classes/graph.rb
-- api_classes/sysmap.rb
-- api_classes/trigger.rb
-- api_classes/user.rb
-- api_classes/user_group.rb
-- api_classes/subclass_base.rb
+- zbxapi/result.rb
+- api_classes/api_dsl.rb
+- api_classes/dsl_event.rb
+- api_classes/dsl_graph.rb
+- api_classes/dsl_history.rb
+- api_classes/dsl_host.rb
+- api_classes/dsl_hostgroup.rb
+- api_classes/dsl_item.rb
+- api_classes/dsl_proxy.rb
+- api_classes/dsl_template.rb
+- api_classes/dsl_trigger.rb
+- api_classes/dsl_user.rb
+- api_classes/dsl_usergroup.rb
+- api_classes/dsl_usermacro.rb
+- api_classes/dsl_usermedia.rb
+has_rdoc: true
 homepage: http://trac.red-tux.net/
 licenses: 
 - LGPL 2.1
@@ -87,7 +91,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: 
 - Requires json
 rubyforge_project: zbxapi
-rubygems_version: 1.8.15
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Ruby wrapper to the Zabbix API

data/api_classes/application.rb

@@ -1,88 +0,0 @@
-# Title:: Zabbix API Ruby Library
-# License:: LGPL 2.1   http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html
-# Copyright:: Copyright (C) 2009,2010 Andrew Nelson nelsonab(at)red-tux(dot)net
-#
-# This library is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Lesser General Public
-# License as published by the Free Software Foundation; either
-# version 2.1 of the License, or (at your option) any later version.
-#
-# This library is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public
-# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
-
-#--
-##########################################
-# Subversion information
-# $Id: zbxapi.rb 281 2011-04-06 18:10:16Z nelsonab $
-# $Revision: 281 $
-##########################################
-#++
-
-require "api_classes/subclass_base"
-
-#******************************************************************************
-
-#
-# Class ZbxAPI_Application
-#
-# Class encapsulating application functions
-#
-# API Function          Status
-# get			Not implemented
-# getById		Implemented
-# getId			Not implemented
-# create	              Not implemented
-# update		Not implemented
-# delete		Not implemented
-#
-#******************************************************************************
-
-
-class ZbxAPI_Application < ZbxAPI_Sub
-  def get(options={})
-    debug(8, :msg=>"Application.get Start")
-    checkauth
-    checkversion(1,1)
-
-    obj=do_request(json_obj('application.get',options))
-    return obj['result']
-  end
-
-  def create(options={})
-    debug(8, :msg=>"Application.create Start")
-    checkauth
-    checkversion(1,1)
-
-    obj=do_request(json_obj('application.create',options))
-    return obj['result']
-  end
-
-  # Alias function for code written against 1.0 API
-  def add(options={})
-    puts "WARNING API Function Application.add is deprecated and will be removed in the future without further warning"
-    create(options)
-  end
-
-  def getid(options={})
-    debug(8, :msg=>"Application.getid Start")
-    checkauth
-    checkversion(1,1)
-
-    begin
-      obj=do_request(json_obj('application.getid',options))
-    rescue ZbxAPI_GeneralError => e
-      if e.message["code"]==-32400
-        return 0
-      else
-        raise e
-      end
-    end
-    return obj['result']
-  end
-end

data/api_classes/graph.rb

@@ -1,77 +0,0 @@
-# Title:: Zabbix API Ruby Library
-# License:: LGPL 2.1   http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html
-# Copyright:: Copyright (C) 2009-2012 Andrew Nelson nelsonab(at)red-tux(dot)net
-#
-# This library is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Lesser General Public
-# License as published by the Free Software Foundation; either
-# version 2.1 of the License, or (at your option) any later version.
-#
-# This library is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public
-# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
-
-#--
-##########################################
-# Subversion information
-# $Id$
-# $Revision$
-##########################################
-#++
-
-require "api_classes/subclass_base"
-
-#******************************************************************************
-#
-# Class ZbxAPI_Item
-#
-# Class encapsulating Item functions
-#
-# API Function          Status
-# get                   Function implemented
-# create                Function implemented
-# update		Function implemented
-# delete                Function implemented  - need to add type checking to input
-#
-#******************************************************************************
-
-class ZbxAPI_Graph < ZbxAPI_Sub
-  def get(options={})
-    checkauth
-    checkversion(1,1)
-
-    obj=do_request(json_obj('graph.get',options))
-    return obj['result']
-  end
-
-  def create(options)
-    debug(8,:var=>options)
-    checkauth
-    checkversion(1,1)
-
-    obj=do_request(json_obj('graph.create', options))
-    return obj['result']
-  end
-
-  def update(options)
-    debug(8,:var=>options)
-    checkauth
-    checkversion(1,1)
-
-    obj=do_request(json_obj('graph.update', options))
-    return obj['result']
-  end
-
-  def delete(ids)
-    checkauth
-    checkversion(1,1)
-
-    obj=do_request(json_obj('graph.delete', ids))
-    return obj['result']
-  end
-end

data/api_classes/host.rb

@@ -1,124 +0,0 @@
-# Title:: Zabbix API Ruby Library
-# License:: LGPL 2.1   http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html
-# Copyright:: Copyright (C) 2009,2010 Andrew Nelson nelsonab(at)red-tux(dot)net
-#
-# This library is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Lesser General Public
-# License as published by the Free Software Foundation; either
-# version 2.1 of the License, or (at your option) any later version.
-#
-# This library is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public
-# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
-
-#--
-##########################################
-# Subversion information
-# $Id: zbxapi.rb 281 2011-04-06 18:10:16Z nelsonab $
-# $Revision: 281 $
-##########################################
-#++
-
-require "api_classes/subclass_base"
-
-#******************************************************************************
-#
-# Class ZbxAPI_Host
-#
-# Class encapsulating Host and template functions
-#
-# API Function          Status
-# get                   Basic function implemented
-# getid
-# create                Basic function implemented 20091020
-# update
-# massupdate
-# delete                Implimented
-#
-# template.create       implemented as host.create_template
-# template.get          implemented as host.get_template
-# template.delete       implemented as host.delete_template
-#
-#******************************************************************************
-
-class ZbxAPI_Host < ZbxAPI_Sub
-  def get(options={})
-    checkauth
-    checkversion(1,1)
-
-    obj=do_request(json_obj('host.get',options))
-    obj['result']
-  end
-
-  def get_template(options={})
-    checkauth
-    checkversion(1,3)
-
-    obj=do_request(json_obj('template.get',options))
-    obj['result']
-  end
-
-  def create(options={})
-    checkauth
-    checkversion(1,1)
-
-    obj=do_request(json_obj('host.create',options))
-    obj['result']
-  end
-
-  def update(options={})
-    checkauth
-    checkversion(1,3)
-
-    obj=do_request(json_obj('host.update',options))
-    obj['result']
-  end
-
-  def create_template(options={})
-    checkauth
-    checkversion(1,3)
-
-    obj=do_request(json_obj('template.create',options))
-    obj['result']
-  end
-
-  # http://www.zabbix.com/documentation/1.8/api/objects/host#hostdelete
-  #Accepts a single host id or an array  of host id's to be deleted
-  def delete(ids)
-    checkauth
-    checkversion(1,3)
-
-    obj=do_request(json_obj('host.delete',delete_helper("hostid",ids)))
-    obj['result']
-  end
-
-  def delete_template(ids)
-    checkauth
-    checkversion(1,3)
-
-    obj=do_request(json_obj('template.delete',delete_helper("templateid",ids)))
-    obj['result']
-  end
-
-  private
-
-  def delete_helper(id_type,ids)
-    if ids.class==Fixnum
-      ids=[ids]
-    elsif ids.class==Array
-      ids=ids
-    else
-      raise ZbxAPI_ParameterError, "ids parameter must be number or array"
-    end
-
-    ids.map do |id|
-      {id_type=>id}
-    end
-  end
-
-end