ddp-server 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ec53e4163f85296c7c2dd0201e980a920d4467af
-  data.tar.gz: 3bf64d5e0e8081498875d86c82e5475f29dc373e
+  metadata.gz: 5321d037bf5da044192560738c9bad091acde4b7
+  data.tar.gz: a2898c62564467a37ef8f4bc090c981d00c67fbd
 SHA512:
-  metadata.gz: f03405546f2eda99a66ee4a1bf507ffa202f3fa957f2cd81ad99946b1b15d94d8eb3af43d89d069f397584af1d626219a3a0652e53d3e0659b4df18b4f466c75
-  data.tar.gz: 9b2f36255c527a46bdb170b8929c9b8b1392f06f0e0c18af203b75ed6b866e3f85fabc6cff6cf472a5861a93fec5ce411d8e8cdebf6c25620df66e918fb90c69
+  metadata.gz: 953c4d98aee48c9708223c2b9664dfe0ada3e5e2a85a02dac5d25620cafd67a7029908c1fa82eaf4b21a7b06cb6e39306b5f83fa3e10346fc7558ac88b1e4580
+  data.tar.gz: ca9e0fb1e9f42f73291c3dab6d9b968f25daae2b6094a18cc39272b756f1aae1c837dd6b27c9b53a1f62e5dfe245f7e21ef58926d47e3796a6cbdb6f48b2f723

data/lib/ddp/server/protocol/data.rb

@@ -6,58 +6,58 @@ module DDP
 				def handle_data
 					case @message['msg']
 					when 'sub'
-						handle_sub
+						handle_sub(@message['id'], @message['name'], @message['params'])
 						true
 					when 'unsub'
-						handle_unsub
+						handle_unsub(@message['id'])
 						true
 					else
 						false
 					end
 				end
 
-				def handle_sub
+				def handle_sub(_id, _name, _params)
 					raise 'Must be overridden'
 				end
 
-				def handle_unsub
+				def handle_unsub(_id)
 					raise 'Must be overridden'
 				end
 
-				def nosub(id, error = nil)
+				def send_nosub(id, error = nil)
 					message = { msg: 'nosub', id: id }
 					message.merge!(error: error) if error
 					write_message message
 				end
 
-				def added(collection, id, fields = nil)
+				def send_added(collection, id, fields = nil)
 					message = { msg: 'added', id: id, collection: collection }
 					message.merge!(fields: fields) if fields
 					write_message message
 				end
 
-				def changed(collection, id, fields = nil, cleared = nil)
+				def send_changed(collection, id, fields = nil, cleared = nil)
 					message = { msg: 'changed', id: id, collection: collection }
 					message.merge!(fields: fields) if fields
 					message.merge!(cleared: cleared) if cleared
 					write_message message
 				end
 
-				def removed(collection, id)
+				def send_removed(collection, id)
 					write_message msg: 'removed', collection: collection, id: id
 				end
 
-				def ready(subs)
+				def send_ready(subs)
 					write_message msg: 'ready', subs: subs
 				end
 
-				def added_before(collection, id, fields = nil, before = nil)
+				def send_added_before(collection, id, fields = nil, before = nil)
 					message = { msg: 'addedBefore', id: id, collection: collection, before: before }
 					message.merge!(fields: fields) if fields
 					write_message message
 				end
 
-				def moved_before(collection, id, before = nil)
+				def send_moved_before(collection, id, before = nil)
 					write_message msg: 'movedBefore', id: id, collection: collection, before: before
 				end
 			end

data/lib/ddp/server/protocol/rpc.rb

@@ -3,33 +3,39 @@ module DDP
 		module Protocol
 			# Protocol regarding remote procedure calls
 			module RPC
+				NO_RESULT = Object.new
+
 				def handle_rpc
 					case @message['msg']
 					when 'method'
-						handle_method
+						handle_method(@message['id'], @message['method'], @message['params'])
 						true
 					else
 						false
 					end
 				end
 
-				def handle_method
+				def handle_method(_id, _method, _params)
 					raise 'Must be overridden'
 				end
 
-				def result(id, result = nil)
+				def send_result(id, result = NO_RESULT)
 					message = { msg: 'result', id: id }
-					if result
-						if result['error']
-							message['error'] = result
-						else
-							message['result'] = result
-						end
-					end
+					message['result'] = result unless result == NO_RESULT
+					write_message(message)
+				end
+
+				def send_error_result(id, error)
+					message = { msg: 'result', id: id }
+					message['error'] = {
+						error: error.class.name,
+						reason: error.message,
+						details: "Backtrace: \n#{error.backtrace.join("\n")}"
+					}
 					write_message(message)
 				end
 
-				def updated(methods)
+				def send_updated(methods)
 					write_message msg: 'updated', methods: methods
 				end
 			end

data/lib/ddp/server/version.rb

@@ -1,6 +1,6 @@
 module DDP
 	# We use semantic versioning
 	module Server
-		VERSION = '0.0.2'
+		VERSION = '0.0.3'
 	end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ddp-server
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Tinco Andringa
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-18 00:00:00.000000000 Z
+date: 2015-02-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler