nexpose 3.3.1 → 3.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 68d45a47d8793a2dad4275370d1b52bec3e9c4fa
-  data.tar.gz: 60b3700499822c989f301534af290aa75311a9aa
+  metadata.gz: ff0a541a3881e177817bd44ffd71e0372d327c53
+  data.tar.gz: 810e7389172b58708ac6569e94c83dcb08ffc73d
 SHA512:
-  metadata.gz: 49e10063754f100fdd3532c0429ce8ec1cd4e0a6a76f0ebecb109e5414ebe4e733e89dabf17b60e36fe284aec9ff2e05bdaa66aae144f15a428939d8c190e4b0
-  data.tar.gz: 9c163a49136f5021dca89c79142602825d8b7c53b3c72032d2e51ca1e4b971d8adfdd57c38ddc993cdeb9320093de1198dc7b71b2c251fd1062273629db13ac4
+  metadata.gz: c7553f4f8723d41cc0e19a19bf81e1ae0dc1041e1ef1c87729c1c14408992351c3c45ea449c311872bd06896f4d9eb2e04d4f8d003a590d37e59661a797788a7
+  data.tar.gz: 533a132b22a6cf35ae454690ece01e0ef6bb87ccfecb677b791645a10ff6aa0deb80d5d02d687d1f0754976a272dab4f824b9467c3ff0f311e10663963cfbe49

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    nexpose (3.3.0)
+    nexpose (3.3.1)
 
 GEM
   remote: https://rubygems.org/

data/lib/nexpose/ajax.rb

@@ -245,11 +245,12 @@ module Nexpose
     end
 
     def get_rows(nsc, pref)
-      uri = '/ajax/user_pref_get.txml'
-      resp = get(nsc, uri, CONTENT_TYPE::XML, 'name' => "#{pref}.rows")
-      xml = REXML::Document.new(resp)
-      if val = REXML::XPath.first(xml, 'GetUserPref/userPref')
-        rows = val.text.to_i
+      uri = '/data/user/preferences/all'
+      pref_key = "#{pref}.rows"
+      resp = get(nsc, uri)
+      json = JSON.parse(resp)
+      if json.has_key?(pref_key)
+        rows = json[pref_key].to_i
         rows > 0 ? rows : 10
       else
         10
@@ -257,14 +258,12 @@ module Nexpose
     end
 
     def set_rows(nsc, pref, value)
-      uri = '/ajax/user_pref_set.txml'
+      uri = '/data/user/preference'
       params = { 'name'  => "#{pref}.rows",
                  'value' => value }
-      resp = get(nsc, uri, CONTENT_TYPE::XML, params)
-      xml = REXML::Document.new(resp)
-      if attr = REXML::XPath.first(xml, 'SetUserPref/@success')
-        attr.value == '1'
-      end
+
+      form_post(nsc, uri, params)
     end
+
   end
 end

data/lib/nexpose/util.rb

@@ -50,7 +50,7 @@ module Nexpose
     # @return [IPRange|HostName] Valid class, if it can be converted.
     #
     def convert(asset)
-      ips = asset.split(' - ')
+      ips = asset.split('-').map(&:strip)
       IPAddr.new(ips[0])
       IPAddr.new(ips[1]) if ips[1]
       IPRange.new(ips[0], ips[1])

data/lib/nexpose/version.rb

@@ -1,4 +1,4 @@
 module Nexpose
   # The latest version of the Nexpose gem
-  VERSION = '3.3.1'
+  VERSION = '3.3.2'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nexpose
 version: !ruby/object:Gem::Version
-  version: 3.3.1
+  version: 3.3.2
 platform: ruby
 authors:
 - HD Moore
@@ -13,7 +13,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-08 00:00:00.000000000 Z
+date: 2016-04-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler