websocket-driver 0.7.4-java → 0.7.5-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cd9397ef6b3c46b55d4f5809f8b359f261b983f5a29442d6cbb9791fb40761d8
-  data.tar.gz: 871848fa7118981c4543d4533f4a0a845ff848b5da639e42f16f7f5f6762231a
+  metadata.gz: 6c493f42d0b99554f08c80a52b3e746933b7641b5e1ff1b4bfd80eeb7c47987b
+  data.tar.gz: 1f2cd918f620ded04e91eae7ab235554f42ce7cdde6712c174490f238fda14da
 SHA512:
-  metadata.gz: 1d9b3b03d2ada8d5757d7a2ea189097a2b31b4ffbd980317d88176826aa77db2be291a89d8280533d3e3f79c46997d157c540a2d2ef77f3a80c2d00b5bd7965c
-  data.tar.gz: f87b7664488e57fc8e976809b6554dd05cac016961fef21efa7331917bb247be14f24dbe4642ae909e295d1c61dedb5a5e42d44d298b10921acbd3bf4aa69293
+  metadata.gz: 54ee4bbd62e64e87d5b42576a93ca11785b40aa64ad2cf8350f49ccd79c652bf57860e793234e742e7def2d7a4fb8039fcff1cafb7640721811083dd482099df
+  data.tar.gz: 807a05150676ded5470934212214839e23c9ea31674d6a765c85af98432a77a43306ceb2a0c0aa4354fc700f5ed92596a76eff9626e7fac40df11490d87cd0f8

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+### 0.7.5 / 2021-06-12
+
+- Do not change the encoding of strings passed to `Driver#text`
+
 ### 0.7.4 / 2021-05-24
 
 - Optimise conversions between strings and byte arrays and related encoding

data/lib/websocket/driver.rb

@@ -115,7 +115,7 @@ module WebSocket
     end
 
     def text(message)
-      message = message.encode(Encoding::UTF_8) unless message.encoding == Encoding::UTF_8
+      message = Driver.encode(message, Encoding::UTF_8)
       frame(message, :text)
     end
 
@@ -194,19 +194,19 @@ module WebSocket
       end
     end
 
-    def self.encode(string, encoding = nil)
-      case string
-        when Array then
-          string = string.pack('C*')
-          encoding ||= Encoding::BINARY
-        when String then
-          encoding ||= Encoding::UTF_8
+    def self.encode(data, encoding = nil)
+      if Array === data
+        encoding ||= Encoding::BINARY
+        return data.pack('C*').force_encoding(encoding)
       end
-      unless string.encoding == encoding
-        string = string.dup if string.frozen?
-        string.force_encoding(encoding)
-      end
-      string
+
+      encoding ||= Encoding::UTF_8
+
+      return data if data.encoding == encoding
+      return data.encode(encoding) unless data.encoding == Encoding::BINARY
+
+      data = data.dup if data.frozen?
+      data.force_encoding(encoding)
     end
 
     def self.validate_options(options, valid_keys)

data/lib/websocket/driver/hybi.rb

@@ -164,7 +164,7 @@ module WebSocket
         message.rsv1   = message.rsv2 = message.rsv3 = false
         message.opcode = OPCODES[type || (String === buffer ? :text : :binary)]
 
-        payload = Driver.encode(buffer, Encoding::BINARY)
+        payload = Driver.encode(buffer)
         payload = [code, payload].pack('S>a*') if code
         message.data = payload
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: websocket-driver
 version: !ruby/object:Gem::Version
-  version: 0.7.4
+  version: 0.7.5
 platform: java
 authors:
 - James Coglan
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-05-24 00:00:00.000000000 Z
+date: 2021-06-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement