json-socket 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e68046e17ebd89adb2e51d3a84004153267794bb3f7eab627a2adf86656128c4
-  data.tar.gz: 2f1336e84ef7f97ca5d4f6a30a4ddb375a311093c90eab2d0005a4dabb62f0c6
+  metadata.gz: 33170988476a7155bf6a8375019eab67d034a18faa6a4b31b12b4f59c43aca66
+  data.tar.gz: 0dbf13616b22f1810140e8243aa230466309f4b8063bc4a095b0386eaaeef04f
 SHA512:
-  metadata.gz: 91b92b004df4b35f1f9ac0cc281ae1e255f8e4db66f1bcfbfd766052056e17c90f7e74e13755facbe17b8748dce69ab864b93ce613284d6dc67e550043cea802
-  data.tar.gz: 2362b87bdcde12c4c74b79507d69d8b4de4fbd21cec77e464046b5677bc142607df40fc55880b7a9f1183df9a3c0901f250cf2f0e36f9412dc2bc74e9ec222e8
+  metadata.gz: 6eeab193107952cf98e36e6a506a71e37b952be649d71cb65f1edc4cb887e9711cbdd9cfa85d7bb0f30e6af2e6f5ea11b59ef010a527ca35236c561d2754ee46
+  data.tar.gz: 4f99730df94bf9a65d9a56d41501927fa7056ff3d4af47f8c2d0605428e5a0aead95d259ac2024a2193460e35f17f04b0249d33a6c3045db64c541eee9d5dc5a

data/lib/json-socket.rb

@@ -1,10 +1,26 @@
 require "socket"
-require "yajl"
-require 'fileutils'
+require "fileutils"
+require "oj"
 
 module JSONSocket
+
+  module JsonEncodeDecode
+
+    def parse_json(string)
+      return Oj.load(string)
+    end
+
+    def encode_json(object)
+      return Oj.dump(object)
+    end
+
+  end
+
+
   class Server
 
+    include JsonEncodeDecode
+
     def initialize(host: "127.0.0.1", port: 1234, delimeter: "#", unix_socket: nil)
       @delimeter = delimeter
       @stop = false
@@ -24,8 +40,10 @@ module JSONSocket
       loop do
         Thread.start(@server.accept) do |client|
           begin
+            # https://stackoverflow.com/questions/25303943/how-to-send-a-utf-8-encoded-strings-via-tcpsocket-in-ruby/25305256
+            client.set_encoding 'UTF-8'
             message_length = client.gets(@delimeter).to_i
-            on_message(Yajl::Parser.parse(client.read(message_length)), client)
+            on_message(parse_json(client.read(message_length)), client)
           rescue Exception => e
             STDERR.puts e.message
           end
@@ -49,7 +67,8 @@ module JSONSocket
     end
 
     def send_end_message(message, client)
-      strigified = Yajl::Encoder.encode(message)
+      client.set_encoding 'UTF-8'
+      strigified = encode_json(message)
       client << "#{strigified.bytesize}#{@delimeter}#{strigified}"
       client.close
     end
@@ -57,6 +76,9 @@ module JSONSocket
   end
 
   class Client
+
+    include JsonEncodeDecode
+
     def initialize(host: "127.0.0.1", port: 1234, delimeter: "#", unix_socket: nil)
       @delimeter = delimeter
       @unix_socket = unix_socket
@@ -65,10 +87,11 @@ module JSONSocket
     end
 
     def handle_send_receive(socket, message)
-      strigified = Yajl::Encoder.encode(message)
+      socket.set_encoding 'UTF-8'
+      strigified = encode_json(message)
       socket << "#{strigified.bytesize}#{@delimeter}#{strigified}"
       message_length = socket.gets(@delimeter).to_i
-      return Yajl::Parser.parse(socket.read(message_length))
+      return parse_json(socket.read(message_length))
     end
 
     def send(message)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: json-socket
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - foi
@@ -11,7 +11,7 @@ cert_chain: []
 date: 2018-07-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: yajl-ruby
+  name: oj
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -66,7 +66,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 2.7.7
 signing_key: 
 specification_version: 4
 summary: json-socket protocol implementation