recog 1.0.8 → 1.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 25ed93ab984d93aa284e7a17dfe96cd4395913e5
-  data.tar.gz: 7f5caf500b3646ac3f180c5cc55c72cab6b5aa26
+  metadata.gz: a661719e8af83d9afd786f25510ec87d01c96fd9
+  data.tar.gz: b70ff39d8f3daa85bc150ee9f16320b4367bf14b
 SHA512:
-  metadata.gz: 00951a92a9893f2d58f0bc0dd9566ff45a5c58f5b9a024f31bb80e707073bec5f2709ca973f87259e30834834b0f6feb53cd06a3d3f85450b65529df3baf44bf
-  data.tar.gz: cc48bdd99a6d8c263ae93ca2552ea34e3725d7f07c04aad2c64f8d74c47b602448dbeb625132d64e464d295b98a4913b03632a461db0de5515cda11b6f739f15
+  metadata.gz: a9b2be07b4ed3ed0f589421e3fc6292b892eb930ee37f7f5d5f2cf86fbed0077ce863a9d08717155f9464e2242bbe1885e4db4f0d4a8d2b635224e08c94eb576
+  data.tar.gz: 170977c3716f1a3d4e4f90c5b08d484e762cbc281fdef8d0a66d01f76506b927d34fb3cc3617e88de92e9cf966563107c5f632671c4e1197e3634ee289c07c08

data/lib/recog/fingerprint.rb

@@ -128,7 +128,7 @@ class Fingerprint
   # @return [String] Contents of the source XML's `description` tag
   def parse_description(xml)
     element = xml.xpath('description')
-    element.empty? ? '' : element.first.content.gsub(/[\r\n]+/, ' ').gsub(/\s{3,}/, '  ').strip
+    element.empty? ? '' : element.first.content.to_s.gsub(/\s+/, ' ').strip
   end
 
   # @param xml [Nokogiri::XML::Element]

data/lib/recog/version.rb

@@ -1,3 +1,3 @@
 module Recog
-  VERSION = '1.0.8'
+  VERSION = '1.0.9'
 end

data/spec/data/whitespaced_fingerprint.xml

@@ -0,0 +1,5 @@
+<fingerprint pattern=".*this doesn't matter.*">
+  <description> I    love    
+    whitespace!
+  </description>
+</fingerprint>

data/spec/lib/recog/fingerprint_spec.rb

@@ -1,5 +1,17 @@
+require 'nokogiri'
 require 'recog/fingerprint'
 
 describe Recog::Fingerprint do
+  let(:xml) do
+    path = File.expand_path(File.join('spec', 'data', 'whitespaced_fingerprint.xml'))
+    doc = Nokogiri::XML(IO.read(path))
+    doc.xpath("//fingerprint").first
+  end
+  subject { Recog::Fingerprint.new(xml) }
 
+  describe "#name" do
+    it "properly squashes whitespace" do
+      expect(subject.name).to eq('I love whitespace!')
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: recog
 version: !ruby/object:Gem::Version
-  version: 1.0.8
+  version: 1.0.9
 platform: ruby
 authors:
 - Rapid7 Research
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-08 00:00:00.000000000 Z
+date: 2015-01-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -164,6 +164,7 @@ files:
 - spec/data/best_service_match_1.yml
 - spec/data/smb_native_os.txt
 - spec/data/test_fingerprints.xml
+- spec/data/whitespaced_fingerprint.xml
 - spec/lib/fingerprint_self_test_spec.rb
 - spec/lib/recog/db_spec.rb
 - spec/lib/recog/fingerprint/regexp_factory.rb