prtg 0.0.1p2 → 0.0.1p3

data/lib/prtg/client.rb

@@ -45,7 +45,8 @@ module Prtg # :nodoc:
     end
 
     def getstatus
-      host.get("/api/getstatus.xml")
+      url_params = Utils.url_params(auth_params)
+      parse_response(host.get("/api/getstatus.xml" + url_params))
     end
 
     def devices
@@ -80,12 +81,27 @@ module Prtg # :nodoc:
     end
 
     def api_request(params)
-      resp_body = host.get("/api/table.xml?" + Utils.url_params(auth_params.merge(params))).body
-      XmlSimple.xml_in(resp_body)
+      url_params = Utils.url_params(auth_params.merge(params))
+      response   = host.get("/api/table.xml?" + url_params)
+
+      parse_response(response)
     end
 
     def method_missing(*args)
       super(*args)
     end
+
+    private
+
+    def parse_response(response)
+      hash = XmlSimple.xml_in(response.body)
+
+      if hash["error"]
+        raise hash["error"]
+
+      else
+        hash["item"]
+      end
+    end
   end
 end

data/lib/prtg/query.rb

@@ -19,7 +19,7 @@ module Prtg # :nodoc:
     # content is like a table
     # count is like LIMIT
     # start is like OFFSET
-    VALUES = [:count, :start, :output, :id]
+    VALUES = [:count, :start, :output, :objid]
 
     VALUES.each do |key|
       define_method key do |value|

data/lib/prtg.rb

@@ -1,8 +1,10 @@
 # encoding: utf-8
+dir = File.dirname(__FILE__)
+$LOAD_PATH.unshift dir unless $LOAD_PATH.include?(dir)
 require "rubygems"
-require "prtg/client"
-require "prtg/query"
-require "prtg/utils"
+require "#{dir}/prtg/client"
+require "#{dir}/prtg/query"
+require "#{dir}/prtg/utils"
 
 # This is a wrapper for the api of paessler's prtg monitoring tool.
 #
@@ -14,5 +16,5 @@ require "prtg/utils"
 #   client = Prtg::Client.new(:host => http, :username => "foo", :password => "bar")
 #   p client.live_data(:sensors)
 module Prtg
-  VERSION = "0.0.1"
+  VERSION = "0.0.1p3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: prtg
 version: !ruby/object:Gem::Version
-  version: 0.0.1p2
+  version: 0.0.1p3
   prerelease: 5
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-13 00:00:00.000000000Z
+date: 2012-01-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: xml-simple
-  requirement: &70137843766000 !ruby/object:Gem::Requirement
+  requirement: &21831180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,7 +21,7 @@ dependencies:
         version: 1.1.1
   type: :runtime
   prerelease: false
-  version_requirements: *70137843766000
+  version_requirements: *21831180
 description: This gem is a wrapper around the prth http api.Prtg is an network monitoring
   solution which provides a api to retrieve several information about monitored devices.
 email: k@kanello.de
@@ -29,9 +29,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- lib/prtg/client.rb
-- lib/prtg/query.rb
 - lib/prtg/utils.rb
+- lib/prtg/query.rb
+- lib/prtg/client.rb
 - lib/prtg.rb
 homepage: http://github.com/ikaros/Prtg-for-Ruby
 licenses: []
@@ -44,7 +44,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
-      version: 1.9.2
+      version: 1.8.7
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -58,3 +58,4 @@ signing_key:
 specification_version: 3
 summary: Wrapper for the prtg network monitor api (http://www.paessler.com/prtg)
 test_files: []
+has_rdoc: