quixoten-puppetdb-terminus 3.2.2 → 3.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ea438abd4b55566e0db19975b6a7a251e09c39aa
-  data.tar.gz: adaba8f9743a0fa2c135f46dfdc3fd56af9d8564
+  metadata.gz: 8e45da9f15369e2e8dc3a59116c008e4b07be912
+  data.tar.gz: 4a0c080aec986122dc8abd2a4d276e6242cfd140
 SHA512:
-  metadata.gz: a46eb91ac0a9c4d1c402ab1d64e42886b394bb97391280a7d73f1baab2ac1bfb3265d275d4e06a1cfce35f6e1e375b31358d47ddfe484345e7f1d3b1cbacc3df
-  data.tar.gz: 941b40c315cdea6bba242560a95edfe7917d5c62d1d6fd8f3eea0bb52a3b7bd7e32f09ade82556a8cdc907dd6d0b0f7f25a4b636aa3774adbee2cfa65def4c7b
+  metadata.gz: 94b4278ca6f334d9177a9945f4b8f3fe8c514eca44a78160ac9001584e076fb72f3bee47c2b63536c74cfada4445abf765abe9d469418580555d4e36462c8944
+  data.tar.gz: f7125969eb043f116f6ce808106b0c2267860fda85d7cfc09ca293f2745b584dbd0830fc44680f0a66a8c94357c17c029c31b720ebf5d9ba0db62944703f897a

data/lib/puppet/util/puppetdb/char_encoding.rb

@@ -32,66 +32,48 @@ module CharEncoding
   Utf8ReplacementChar = [ 0xEF, 0xBF, 0xBD ].pack("c*")
 
   DEFAULT_INVALID_CHAR = "\ufffd"
-
-  # @api private
-  def self.all_indexes_of_char(str, char)
-    (0..str.length).find_all{ |i| str[i] == char}
-  end
+  NOT_INVALID_REGEX = Regexp.new( "[^" + DEFAULT_INVALID_CHAR + "]" )
 
   # @api private
   #
-  # Takes an array and returns a sub-array without the last element
+  # Finds the beginning and ending index of the first block of invalid
+  # characters.
   #
-  # @return [Object]
-  def self.drop_last(array)
-    array[0..-2]
-  end
-
-  # @api private
-  #
-  # Takes an array of increasing integers and collapses the sequential
-  # integers into ranges
-  #
-  # @param index_array an array of sorted integers
-  # @return [Range]
-  def self.collapse_ranges(index_array)
-    ranges = index_array.each.inject([]) do |spans, n|
-      if spans.empty? || spans.last.end != n - 1
-        spans << Range.new(n, n)
-      else
-        drop_last(spans) << Range.new(spans.last.begin,n)
-      end
+  # @param str string to scan for invalid characters
+  # @return Range
+  def self.first_invalid_char_range(str)
+    begin_bad_chars_idx = str.index(DEFAULT_INVALID_CHAR)
+
+    if begin_bad_chars_idx
+      first_good_char = str.index(NOT_INVALID_REGEX, begin_bad_chars_idx)
+      Range.new(begin_bad_chars_idx, (first_good_char || str.length) - 1)
+    else
+      nil
     end
   end
 
   # @api private
   #
-  # Scans the string s with bad characters found at bad_char_indexes
-  # and returns an array of messages that give some context around the
-  # bad characters. This will give up to 100 characters prior to the
-  # bad character and 100 after. It will return fewer if it's at the
-  # beginning of a string or if another bad character appears before
-  # reaching the 100 characters
+  # Scans the string str with invalid characters found at
+  # bad_char_range and returns a message that give some context around
+  # the bad characters. This will give up to 100 characters prior to
+  # the bad character and 100 after. It will return fewer if it's at
+  # the beginning of a string or if another bad character appears
+  # before reaching the 100 characters
   #
   # @param str string coming from to_pson, likely a command to be submitted to PDB
-  # @param bad_char_indexes an array of indexes into the string where invalid characters were found
-  # @return [String]
-  def self.error_char_context(str, bad_char_indexes)
-    bad_char_ranges = collapse_ranges(bad_char_indexes)
-    bad_char_ranges.each_with_index.inject([]) do |state, (r, index)|
-      gap = r.to_a.length
-
-      prev_bad_char_end = bad_char_ranges[index-1].end + 1 if index > 0
-      next_bad_char_begin = bad_char_ranges[index+1].begin - 1 if index < bad_char_ranges.length - 1
-
-      start_char = [prev_bad_char_end || 0, r.begin-100].max
-      end_char = [next_bad_char_begin || str.length - 1, r.end+100].min
-      x = [next_bad_char_begin || str.length, r.end+100, str.length]
-      prefix = str[start_char..r.begin-1]
-      suffix = str[r.end+1..end_char]
-
-      state << "'#{prefix}' followed by #{gap} invalid/undefined bytes then '#{suffix}'"
-    end
+  # @param bad_char_range a range indicating a block of invalid characters
+  # @return String
+  def self.error_char_context(str, bad_char_range)
+    
+    gap = bad_char_range.to_a.length
+
+    start_char = [0, bad_char_range.begin-100].max
+    end_char = [str.index(DEFAULT_INVALID_CHAR, bad_char_range.end+1) || str.length, bad_char_range.end+100].min
+    prefix = str[start_char..bad_char_range.begin-1]
+    suffix = str[bad_char_range.end+1..end_char-1]
+
+    "'#{prefix}' followed by #{gap} invalid/undefined bytes then '#{suffix}'"
   end
 
   # @api private
@@ -104,13 +86,14 @@ module CharEncoding
   # @param error_context_str information about where this string came from for use in error messages
   # @return String
   def self.warn_if_invalid_chars(str, error_context_str)
-    bad_char_indexes = all_indexes_of_char(str, DEFAULT_INVALID_CHAR)
-    if bad_char_indexes.empty?
+
+    if str.index(DEFAULT_INVALID_CHAR).nil?
       str
     else
       Puppet.warning "#{error_context_str} ignoring invalid UTF-8 byte sequences in data to be sent to PuppetDB, see debug logging for more info"
+
       if Puppet.settings[:log_level] == "debug"
-        Puppet.debug error_context_str + "\n" + error_char_context(str, bad_char_indexes).join("\n")
+        Puppet.debug error_context_str + "\n" + error_char_context(str, first_invalid_char_range(str))
       end
 
       str

data/lib/puppetdb/terminus/version.rb

@@ -1,6 +1,6 @@
 module PuppetDB
   module Terminus
-    VERSION          = "3.2.2"
+    VERSION          = "3.2.3"
     UPSTREAM_VERSION = VERSION.split(".")[0..2].join(".")
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: quixoten-puppetdb-terminus
 version: !ruby/object:Gem::Version
-  version: 3.2.2
+  version: 3.2.3
 platform: ruby
 authors:
 - Devin Christensen