nexpose 0.7.3 → 0.7.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4677c4dd25b090fc264d724267847713d52ab710
-  data.tar.gz: 159f12eb89b3bd12456fc7f8e02106ca5de37319
+  metadata.gz: ba59c0bac7e5f25cdd613a70b20b71090047a7d2
+  data.tar.gz: f265a3d518dc026a7d5bfc06745020562b84daad
 SHA512:
-  metadata.gz: ff0e90870bc691af8242ae260e59076115d1e8ad8c7504c0d6a8205e0b17d730feabca4e256fc9c9f97f3f7cb477d6a93d2f50f8c11861827cdeecfea61d7c85
-  data.tar.gz: 00e40eb6f9bec0e4a60d7249dd147e3adb59440ac559763e2f57ab815d464123b8af5703a48b5fc5a7f5a7dfd9fd2b590d9c3a89b5cf188eb74f46912a723ca1
+  metadata.gz: a374f92191a04827fa4fb570724def193cbaea92e991cb2008c7a5be47bea85ce4322fbe3c8aeb0a40605dfc5f1968d844879f3d655a15d3f9e5c93101bb3468
+  data.tar.gz: 97f09e56659a23ce47ae322adca8a159724a84a21efef4327480afa2de7bb4e781b3690196bd249922b50a9457b0bf9fd42aeada9162764169bf973db65d4d3d

data/lib/nexpose/api_request.rb

@@ -123,7 +123,7 @@ module Nexpose
     end
 
     def self.execute(url, req, api_version='1.1', options = {})
-      obj = self.new(req, url, api_version)
+      obj = self.new(req.to_s, url, api_version)
       obj.execute(options)
       raise APIError.new(obj, "Action failed: #{obj.error}") unless obj.success
       obj

data/lib/nexpose/role.rb

@@ -64,9 +64,8 @@ module Nexpose
     alias_method :roles, :role_listing
 
     def role_delete(role, scope = Scope::SILO)
-      xml = %Q(<RoleDeleteRequest session-id="#{@session_id}">)
-      xml << %Q(<Role name="#{role}" scope="#{scope}"/>)
-      xml << '</RoleDeleteRequest>'
+      xml = make_xml('RoleDeleteRequest')
+      xml.add_element('Role', {'name' => role, 'scope' => scope})
       response = execute(xml, '1.2')
       response.success
     end
@@ -98,7 +97,7 @@ module Nexpose
     attr_accessor :scope
 
     def initialize(name, full_name, id, description, enabled = true, scope = Scope::SILO)
-      @name, @full_name, @id, @description, @enabled, @scope = name, full_name, id, description, enabled, scope
+      @name, @full_name, @id, @description, @enabled, @scope = name, full_name, id.to_i, description, enabled, scope
     end
 
     def self.parse(xml)
@@ -133,7 +132,7 @@ module Nexpose
     attr_accessor :existing
 
     def initialize(name, full_name, id = -1, enabled = true, scope = Scope::SILO)
-      @name, @full_name, @id, @enabled, @scope = name, full_name, id, enabled, scope
+      @name, @full_name, @id, @enabled, @scope = name, full_name, id.to_i, enabled, scope
       @privileges = []
     end
 
@@ -146,11 +145,10 @@ module Nexpose
     # @return [Role] requested role.
     #
     def self.load(nsc, name, scope = Scope::SILO)
-      xml = %Q(<RoleDetailsRequest session-id="#{nsc.session_id}">)
-      xml << %Q(<Role name="#{name}" scope="#{scope}"/>)
-      xml << '</RoleDetailsRequest>'
-
+      xml = nsc.make_xml('RoleDetailsRequest')
+      xml.add_element('Role', {'name' => name, 'scope' => scope})
       response = APIRequest.execute(nsc.url, xml, '1.2')
+
       if response.success
         elem = REXML::XPath.first(response.res, 'RoleDetailsResponse/Role/')
         parse(elem)
@@ -165,14 +163,11 @@ module Nexpose
     #
     def save(nsc)
       if @existing
-        xml = %Q(<RoleUpdateRequest session-id="#{nsc.session_id}">)
-        xml << to_xml
-        xml << '</RoleUpdateRequest>'
+        xml = nsc.make_xml('RoleUpdateRequest')
       else
-        xml = %Q(<RoleCreateRequest session-id="#{nsc.session_id}">)
-        xml << to_xml
-        xml << '</RoleCreateRequest>'
+        xml = nsc.make_xml('RoleCreateRequest')
       end
+      xml.add_element(as_xml)
 
       response = APIRequest.execute(nsc.url, xml, '1.2')
       xml = REXML::XPath.first(response.res, 'RoleCreateResponse')
@@ -202,11 +197,7 @@ module Nexpose
     # @param [Connection] nsc Nexpose connection.
     #
     def delete(nsc)
-      xml = %Q(<RoleDeleteRequest session-id="#{nsc.session_id}">)
-      xml << %Q(<Role name="#{@name}" scope="#{@scope}"/>)
-      xml << '</RoleDeleteRequest>'
-      response = APIRequest.execute(nsc.url, xml, '1.2')
-      response.success
+      nsc.role_delete(name, scope)
     end
 
     def self.parse(xml)
@@ -233,37 +224,36 @@ module Nexpose
     end
 
     def to_xml
-      xml = %Q(<Role name="#{replace_entities(@name)}" full-name="#{replace_entities(@full_name)}")
-      xml << %Q( enabled="#{(enabled ? 'true' : 'false')}")
-      xml << %Q( id="#{@id}") if @id > 0
-      xml << %Q( scope="#{@scope}">)
-      xml << %Q(<Description>#{replace_entities(@description)}</Description>)
+      as_xml.to_s
+    end
+
+    def as_xml
+      xml = REXML::Element.new('Role')
+      xml.add_attributes({'name' => @name, 'full-name' => @full_name, 'enabled' => enabled , 'scope' => @scope})
+      xml.add_attribute('id', @id) if @id > 0
+      xml.add_element('Description').text = @description
 
-      xml << '<SitePrivileges>'
+      site_privileges = xml.add_element('SitePrivileges')
       Privilege::Site::constants.each do |field|
         as_s = Privilege::Site.const_get(field)
-        enabled = (privileges.member? as_s) ? 'true' : 'false'
-        xml << %Q(<#{as_s} enabled="#{enabled}"/>)
+        enabled = privileges.member? as_s
+        site_privileges.add_element( as_s, {'enabled' => enabled})
       end
-      xml << '</SitePrivileges>'
 
-      xml << '<AssetGroupPrivileges>'
+      asset_group_privileges = xml.add_element('AssetGroupPrivileges')
       Privilege::AssetGroup::constants.each do |field|
         as_s = Privilege::AssetGroup.const_get(field)
-        enabled = (privileges.member? as_s) ? 'true' : 'false'
-        xml << %Q(<#{as_s} enabled="#{enabled}"/>)
+        enabled = privileges.member? as_s
+        asset_group_privileges.add_element( as_s, {'enabled' => enabled})
       end
-      xml << '</AssetGroupPrivileges>'
 
-      xml << '<GlobalPrivileges>'
+      global_privileges = xml.add_element('GlobalPrivileges')
       Privilege::Global::constants.each do |field|
         as_s = Privilege::Global.const_get(field)
-        enabled = (privileges.member? as_s) ? 'true' : 'false'
-        xml << %Q(<#{as_s} enabled="#{enabled}"/>)
+        enabled = privileges.member? as_s
+        global_privileges.add_element( as_s, {'enabled' => enabled})
       end
-      xml << '</GlobalPrivileges>'
 
-      xml << '</Role>'
       xml
     end
   end

data/lib/nexpose/tag.rb

@@ -168,7 +168,7 @@ module Nexpose
       end
     end
 
-    DEFAULT_COLOR = '#F6F6F6'
+    DEFAULT_COLOR = '#f6f6f6'
 
     # Creation source
     attr_accessor :source

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nexpose
 version: !ruby/object:Gem::Version
-  version: 0.7.3
+  version: 0.7.4
 platform: ruby
 authors:
 - HD Moore
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-30 00:00:00.000000000 Z
+date: 2014-05-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: librex