nexpose 0.1.1 → 0.1.2

data/lib/nexpose/api_request.rb

@@ -55,7 +55,7 @@ module Nexpose
         @raw_response_data = @raw_response.read_body
         @res = parse_xml(@raw_response_data)
 
-        if (not @res.root)
+        unless @res.root
           @error = 'Nexpose service returned invalid XML.'
           return @sid
         end
@@ -68,12 +68,19 @@ module Nexpose
           @success = true
         else
           @success = false
-          @res.elements.each('//Failure/Exception') do |s|
-            s.elements.each('message') do |m|
-              @error = m.text
+          if @api_version =~ /1.2/
+            @res.elements.each('//Exception/Message') do |message|
+              @error = message.text.sub(/.*Exception: */, '')
             end
-            s.elements.each('stacktrace') do |m|
-              @trace = m.text
+            @res.elements.each('//Exception/Stacktrace') do |stacktrace|
+              @trace = stacktrace.text
+            end
+          else
+            @res.elements.each('//message') do |message|
+              @error = message.text.sub(/.*Exception: */, '')
+            end
+            @res.elements.each('//stacktrace') do |stacktrace|
+              @trace = stacktrace.text
             end
           end
         end
@@ -123,9 +130,7 @@ module Nexpose
     def self.execute(url, req, api_version='1.1')
       obj = self.new(req, url, api_version)
       obj.execute
-      if (not obj.success)
-        raise APIError.new(obj, "Action failed: #{obj.error}")
-      end
+      raise APIError.new(obj, "Action failed: #{obj.error}") unless obj.success
       obj
     end
 

data/lib/nexpose/report.rb

@@ -179,6 +179,8 @@ module Nexpose
     attr_accessor :template_id
     # Format. One of: pdf|html|rtf|xml|text|csv|db|raw-xml|raw-xml-v2|ns-xml|qualys-xml
     attr_accessor :format
+    attr_accessor :owner
+    attr_accessor :time_zone
 
     # Array of filters associated with this report.
     attr_accessor :filters
@@ -190,9 +192,11 @@ module Nexpose
     # particular date.
     attr_accessor :baseline
 
-    def initialize(template_id, format, site_id = nil)
+    def initialize(template_id, format, site_id = nil, owner = nil, time_zone = nil)
       @template_id = template_id 
       @format = format 
+      @owner = owner
+      @time_zone = time_zone
 
       @filters = []
       @filters << Filter.new('site', site_id) if site_id
@@ -204,13 +208,16 @@ module Nexpose
     end
 
     def to_xml
-      xml = %Q{<AdhocReportConfig format='#{@format}' template-id='#{@template_id}'>}
+      xml = %Q(<AdhocReportConfig format='#{@format}' template-id='#{@template_id}')
+      xml << %Q( owner='#{@owner}') if @owner
+      xml << %Q( timezone='#{@time_zone}') if @time_zone
+      xml << '>'
 
       xml << '<Filters>'
       @filters.each { |filter| xml << filter.to_xml }
       xml << '</Filters>'
 
-      xml << %Q{<Baseline compareTo='#{@baseline}' />} if @baseline
+      xml << %Q(<Baseline compareTo='#{@baseline}' />) if @baseline
 
       xml << '</AdhocReportConfig>'
     end
@@ -257,8 +264,6 @@ module Nexpose
     attr_accessor :id
     # The unique name assigned to the report definition.
     attr_accessor :name
-    attr_accessor :owner
-    attr_accessor :time_zone
 
     # Description associated with this report.
     attr_accessor :description

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nexpose
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-25 00:00:00.000000000 Z
+date: 2012-12-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: librex