ddp-server 0.0.5 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 950aa0c33840f83ddc2708dba9b8be77b6bbed71
-  data.tar.gz: 602b119c4b1c339c3f5395bc2ce23aa69d152d83
+  metadata.gz: 2d646729580513ffa2a77c522b58986656316e38
+  data.tar.gz: f0852db69edb241a9c691728f736d016cb7fcbeb
 SHA512:
-  metadata.gz: 7e2a9fb98f64ed089af30ee95f06bda60d29c61d69955ef62e90b78819f6e88033c2b413fd1bf2c54a9bb39671ed77aca511a475d5ff095131a61964da132f72
-  data.tar.gz: 15cebf56397143b80badf733327f2c6a17850ed8789c1f667d8d0d53d15a01a9dd92f6c505c942f093042f03bc8951207db61c6978fd655cba118ad8f6d99695
+  metadata.gz: 0731bfe5e51e1871840ea5cccd484a217af6b9c3a7bec5bdf73634cffe1c954b1b8a95adcf3fd6577eb3d2dd507c7d82d93f2e5aabf4f7b7b84308ec91a93304
+  data.tar.gz: a2d49e26c08c6bcf97f57c8d3f7f331dd107b9b6f35888a111ff9222d06df46e5a9ca190f4342588b2f01cc4769b9b2373fbfb958d4d4e3edd980395b6ec77ef

data/ddp-server.gemspec

@@ -21,5 +21,5 @@ Gem::Specification.new do |spec|
 	spec.add_development_dependency 'bundler', '~> 1.3'
 	spec.add_development_dependency 'rake'
 
-	spec.add_dependency 'celluloid-websocket', '~> 0.0.7'
+	spec.add_dependency 'celluloid-websocket', '~> 0.0.10'
 end

data/examples/rack_example.ru

@@ -1,3 +1,22 @@
 require 'ddp/server'
 
-run DDP::Server::WebSocket.rack
+class APIClass
+	def invoke_rpc(method, *args)
+		case method
+		when 'hello_world' then 'Hello world!'
+		else
+			raise 'Don\'t know that method'
+		end
+	end
+
+	def collection_query(name, *args)
+		lambda do |&on_update|
+			5.times do |i|
+				sleep 5
+				on_update.({}, id: 1, message: "Message #{name}: #{i}")
+			end
+		end
+	end
+end
+
+run DDP::Server::WebSocket.rack(APIClass)

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

@@ -1,3 +1,5 @@
+require 'celluloid'
+
 module DDP
 	module Server
 		module Protocol
@@ -16,12 +18,31 @@ module DDP
 					end
 				end
 
-				def handle_sub(_id, _name, _params)
-					raise 'Must be overridden'
+				def handle_sub(id, name, params)
+					params ||= []
+					query = api.collection_query(name, *params)
+					subscription = subscriptions[id] = Subscription.new(self, id, name, query)
+					subscription.async.start
+					send_ready([id])
+				rescue => e
+					send_error_result(id, e)
 				end
 
-				def handle_unsub(_id)
-					raise 'Must be overridden'
+				def subscription_update(id, old_value, new_value)
+					subscription_name = @subscriptions[id].name
+					new_value_id = new_value['id']
+					old_value_id = old_value['id']
+
+					return send_added(subscription_name, new_value_id, new_value) if old_value.nil?
+					return send_removed(subscription_name, old_value_id) if new_value.nil?
+
+					send_changed(subscription_name, old_value_id, new_value, old_value.keys - new_value.keys)
+				end
+
+				def handle_unsub(id)
+					subscription = @subscriptions.delete(id)
+					subscription.stop unless subscription.nil?
+					send_nosub(id)
 				end
 
 				def send_nosub(id, error = nil)
@@ -60,6 +81,33 @@ module DDP
 				def send_moved_before(collection, id, before = nil)
 					write_message msg: 'movedBefore', id: id, collection: collection, before: before
 				end
+
+				# Actor that asynchronously monitors a collection
+				class Subscription
+					include Celluloid
+
+					attr_reader :name, :stopped, :listener, :query, :id
+					alias_method :stopped?, :stopped
+
+					def initialize(listener, id, name, query)
+						@stopped = false
+						@name = name
+						@listener = listener
+						@id = id
+						@query = query
+					end
+
+					def start
+						query.call do |old_value, new_value|
+							listener.subscription_update(id, old_value, new_value)
+							break if stopped?
+						end
+					end
+
+					def stop
+						@stopped = true
+					end
+				end
 			end
 		end
 	end

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

@@ -15,8 +15,12 @@ module DDP
 					end
 				end
 
-				def handle_method(_id, _method, _params)
-					raise 'Must be overridden'
+				def handle_method(id, method, params)
+					params ||= []
+					result = api.invoke_rpc(method, *params)
+					send_result(id, result)
+				rescue => e
+					send_error_result(id, e)
 				end
 
 				def send_result(id, result = NO_RESULT)

data/lib/ddp/server/version.rb

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

data/lib/ddp/server.rb

@@ -10,6 +10,13 @@ module DDP
 		class WebSocket < Celluloid::WebSocket
 			include DDP::Server::Protocol
 
+			attr_accessor :api, :subscriptions
+
+			def initialize(api_class, *args)
+				@api = api_class.new(*args)
+				@subscriptions = {}
+			end
+
 			def on_open
 				handle_connect
 			end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ddp-server
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.1.0
 platform: ruby
 authors:
 - Tinco Andringa
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-04 00:00:00.000000000 Z
+date: 2015-03-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.7
+        version: 0.0.10
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.7
+        version: 0.0.10
 description: DDP Protocol server for implementing Ruby DDP backends
 email:
 - mail@tinco.nl