nebulous_stomp 3.0.7 → 3.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 53153cf352f2c866e92f780540a077aa72cdd1b5
-  data.tar.gz: 6804ad691e2863f8b403563c962b2de1f5e73bf4
+  metadata.gz: 37e0259753ea592ddf7b7423f2a76c1b621fe559
+  data.tar.gz: e950e016aade0dbc078010b7b39d1a685e82561b
 SHA512:
-  metadata.gz: ee8d27f2fc80b9c32a12c22eea38e39b7281136575daca91c61adb4c7cf63ac9cd4249777a4081d5b0b6c08f14d441634902c5ae077ae3054f0d5422c676416e
-  data.tar.gz: 6c02255538ec06fccf4829307944c4c2f7f9bc441060dcfaabd4d424c1376cf2cfb879348ad58bc20b8b0cbe7f9fd2abb5cdf8f6e77ec82d74772e3b2a928a0c
+  metadata.gz: 84c92a22e5bdb5574bc7e7336e5c0f3577d3360e7eaadff4bd2b5ddedcc4ba12be1aa401d53859588d9cfbb4d51ba3968912f625f7bb7c560bc1aaba91e46ccc
+  data.tar.gz: e03c089d8d140125a4f1a124537014fbb1e36d1167ece86b4e0c99956d0069e77d4add4f485f2d8cb5389d2d523c3288be6a3c174e19a6b22151ad09e9fab633

data/lib/nebulous_stomp/msg/body.rb

@@ -27,7 +27,7 @@ module NebulousStomp
       #
       def initialize(is_json, hash)
         @is_json    = !!is_json
-        @stomp_body = hash[:stompBody]
+        @stomp_body = fix_bad_encoding( hash[:stompBody] )
         @body       = hash[:body]
         @verb       = hash[:verb]
         @params     = hash[:parameters] || hash[:params] 
@@ -35,11 +35,10 @@ module NebulousStomp
 
         fill_from_stomp
 
-        @stomp_body = fix_bad_encoding(@stomp_body)
-        @body       = fix_bad_encoding(@body)
-        @verb       = fix_bad_encoding(@verb)
-        @params     = fix_bad_encoding(@params)
-        @desc       = fix_bad_encoding(@desc)
+        @body   = fix_bad_encoding(@body)
+        @verb   = fix_bad_encoding(@verb)
+        @params = fix_bad_encoding(@params)
+        @desc   = fix_bad_encoding(@desc)
       end
 
       ##
@@ -169,18 +168,23 @@ module NebulousStomp
       end
 
       ##
-      # Deal with encoding problems.  Try ISO8859-1 first.  (Sorry for the Western bias, but this
-      # solves a lot of use-cases for us.)
+      # Deal with encoding problems.
       #
       def fix_bad_encoding(string)
         return string unless string.is_a? String
 
-        unless string.valid_encoding?
-          s = string.encode("UTF-8", "ISO8859-1") 
-          string = s if s.valid_encoding?
+        # Assume that anything without a real encoding is actually in ISO8859-1, and convert it to
+        # UTF-8.  (Sorry for the UK bias, but this fixes problems for us here. Eventually I'd like
+        # to see an an optional encoding set against each target, but that's for another day.)
+        if string.encoding == Encoding::ASCII_8BIT
+          string.force_encoding("ISO8859-1")
+          string.encode!("UTF-8", invalid: :replace, undef: :replace)
+
+        # Otherwise if there are problems don't screw with the encoding, but do fix the problems.
+        elsif !string.valid_encoding?
+          string.encode!(invalid: :replace, undef: :replace)
         end
 
-        string.encode!(invalid: :replace, undef: :replace) unless string.valid_encoding?
         string
       end
 

data/lib/nebulous_stomp/version.rb

@@ -1,5 +1,5 @@
 module NebulousStomp
 
   # Nebulous version number
-  VERSION = "3.0.7"
+  VERSION = "3.0.8"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nebulous_stomp
 version: !ruby/object:Gem::Version
-  version: 3.0.7
+  version: 3.0.8
 platform: ruby
 authors:
 - Andy Jones