Reduced need for JSONMessage. (#19)

Author: ioquatix

lib/protocol/websocket/coder.rb

@@ -0,0 +1,9 @@
+require_relative 'coder/json'
+
+module Protocol
+	module WebSocket
+		module Coder
+			DEFAULT = JSON::DEFAULT
+		end
+	end
+end

lib/protocol/websocket/coder/json.rb

@@ -0,0 +1,23 @@
+require 'json'
+
+module Protocol
+	module WebSocket
+		module Coder
+			class JSON
+				def initialize(**options)
+					@options = options
+				end
+				
+				def parse(buffer)
+					::JSON.parse(buffer, **@options)
+				end
+				
+				def generate(object)
+					::JSON.generate(object, **@options)
+				end
+				
+				DEFAULT = new(symbolize_names: true)
+			end
+		end
+	end
+end

lib/protocol/websocket/json_message.rb

@@ -3,30 +3,21 @@
 # Released under the MIT License.
 # Copyright, 2022-2023, by Samuel Williams.
 
-require 'json'
-
 require_relative 'message'
 
+warn "Protocol::WebSocket::JSONMessage is deprecated. Use Protocol::WebSocket::TextMessage instead."
+
 module Protocol
 	module WebSocket
+		# @deprecated Use {TextMessage} instead.
 		class JSONMessage < TextMessage
 			def self.wrap(message)
-				if message.is_a?(TextMessage)
-					self.new(message.buffer)
-				end
+				message
 			end
 
 			def self.generate(object)
 				self.new(JSON.generate(object))
 			end
-			
-			def parse(symbolize_names: true, **options)
-				JSON.parse(@buffer, symbolize_names: symbolize_names, **options)
-			end
-			
-			def to_h
-				parse.to_h
-			end
 		end
 	end
 end

lib/protocol/websocket/message.rb

@@ -4,6 +4,7 @@
 # Copyright, 2022-2023, by Samuel Williams.
 
 require_relative 'frame'
+require_relative 'coder'
 
 module Protocol
 	module WebSocket
@@ -30,6 +31,21 @@ def to_str
 			def encoding
 				@buffer.encoding
 			end
+			
+			# Generate a message from a value using the given coder.
+			# @property value [Object] The value to encode.
+			# @property coder [Coder] The coder to use. Defaults to JSON.
+			def self.generate(value, coder = Coder::DEFAULT)
+				new(coder.generate(value))
+			end
+			
+			def parse(coder = Coder::DEFAULT)
+				coder.parse(@buffer)
+			end
+			
+			def to_h(...)
+				parse(...).to_h
+			end
 		end
 
 		class TextMessage < Message

test/protocol/websocket/message.rb

@@ -12,4 +12,21 @@
 	it "can round-trip basic object" do
 		expect(message.to_str).to be == buffer
 	end
+	
+	with "a JSON encoded message" do
+		let(:value) {{hello: "world"}}
+		let(:message) {subject.generate(value)}
+		
+		with "#parse" do
+			it "can parse JSON" do
+				expect(message.parse).to be == {hello: "world"}
+			end
+		end
+		
+		with "#to_h" do
+			it "can convert to hash" do
+				expect(message.to_h).to be == {hello: "world"}
+			end
+		end
+	end
 end