ddp-server-rethinkdb 0.0.4 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: aa94a4cca936bfbf2bf20c120067c298b8d17e6d
-  data.tar.gz: 56313a5652b9ff977015507ed2b42e8ac064f481
+  metadata.gz: fc02ef7ca06554ea7ef61095ca1f68b2216bbcfa
+  data.tar.gz: d639840e48515eb7b9a22dfe11098503c8b4c28e
 SHA512:
-  metadata.gz: 00b8772d4df7bc4f20d200c1a5e12c30de75a29b2fb9410164f6f0e65fe85b6d16663bbf9134f512fe3d280b181a5f80dc61e23a01d0bddd3931fde2635a532f
-  data.tar.gz: c4d2e8d3d75b7b4e2645786f16b9cf7c41307047918fd79d02eb6b95e077d7906ef5a8e4d2cd918853a237850400c953e050687d6d4405f1b3897166854cd83c
+  metadata.gz: 9b8917caf19f51fdfb2fce59a5d8083732c3208fccd98280328f3b4ff61622ebff32e911540b6e09170ffc229c10be67ad43bd8b792dd106fc1705701d4bfdc9
+  data.tar.gz: cc39c1677ef4ef5818ee930c476c8be648b9c96b8b7fcabfe7185ce956537889c30b822cb7d299388bad47ea739e48bcc35724f5c371af521aeef78466ae90b9

data/ddp-server-rethinkdb.gemspec

@@ -21,8 +21,7 @@ Gem::Specification.new do |spec|
 	spec.add_development_dependency 'bundler', '~> 1.6'
 	spec.add_development_dependency 'rake'
 
-	spec.add_dependency 'ddp-server', '>= 0.0.4'
-	spec.add_dependency 'celluloid-websocket', '>= 0.0.9'
+	spec.add_dependency 'ddp-server', '>= 0.1.1'
 	spec.add_dependency 'rethinkdb'
 	spec.add_dependency 'connection_pool'
 end

data/examples/messages.rb

@@ -32,4 +32,4 @@ config = {
 	database: 'message'
 }
 
-run DDP::Server::RethinkDB::WebSocket.rack(Messager, config)
+run DDP::Server::WebSocket.rack(Messager, config)

data/lib/ddp/server/rethinkdb/api.rb

@@ -23,7 +23,7 @@ module DDP
 
 				def collection_query(name, *params)
 					raise 'No such collection' unless @collections.include? name
-					send(name, *params)
+					wrap_query send(name, *params)
 				end
 
 				def database
@@ -69,6 +69,23 @@ module DDP
 					@collections = collections_module.instance_methods.map(&:to_s)
 					singleton_class.include collections_module
 				end
+
+				def wrap_query(query)
+					lambda do |&on_update|
+						connection = new_connection
+						results = query.run(connection)
+						results.each { |r| on_update.call(nil, r) }
+						wrap_changes(query, connection, on_update)
+					end
+				end
+
+				def wrap_changes(query, conn, on_update)
+					query.changes().run(conn).each do |change|
+						old_value = change['old_val']
+						new_value = change['new_val']
+						on_update.call(old_value, new_value)
+					end
+				end
 			end
 		end
 	end

data/lib/ddp/server/rethinkdb/version.rb

@@ -2,7 +2,7 @@ module DDP
 	module Server
 		# Include the version
 		module RethinkDB
-			VERSION = '0.0.4'
+			VERSION = '0.1.0'
 		end
 	end
 end

data/lib/ddp/server/rethinkdb.rb

@@ -4,8 +4,6 @@ require 'celluloid'
 require 'ddp/server'
 require 'ddp/server/rethinkdb'
 require 'ddp/server/rethinkdb/api'
-require 'ddp/server/rethinkdb/subscription'
-require 'ddp/server/rethinkdb/websocket'
 
 module DDP
 	module Server

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ddp-server-rethinkdb
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.1.0
 platform: ruby
 authors:
 - Tinco Andringa
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-01 00:00:00.000000000 Z
+date: 2015-03-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -44,28 +44,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.0.4
+        version: 0.1.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.0.4
-- !ruby/object:Gem::Dependency
-  name: celluloid-websocket
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.0.9
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.0.9
+        version: 0.1.1
 - !ruby/object:Gem::Dependency
   name: rethinkdb
   requirement: !ruby/object:Gem::Requirement
@@ -112,9 +98,7 @@ files:
 - examples/messages.rb
 - lib/ddp/server/rethinkdb.rb
 - lib/ddp/server/rethinkdb/api.rb
-- lib/ddp/server/rethinkdb/subscription.rb
 - lib/ddp/server/rethinkdb/version.rb
-- lib/ddp/server/rethinkdb/websocket.rb
 homepage: https://github.com/d-snp/ruby-ddp-server-rethinkdb
 licenses:
 - MIT

data/lib/ddp/server/rethinkdb/subscription.rb

@@ -1,30 +0,0 @@
-module DDP
-	module Server
-		module RethinkDB
-			# Actor that asynchronously monitors a collection
-			class Subscription
-				include Celluloid
-
-				attr_reader :name, :stopped
-				alias_method :stopped?, :stopped
-
-				def initialize(listener, id, name, query)
-					@stopped = false
-					@name = name
-					async.read_loop(listener, query, id)
-				end
-
-				def read_loop(listener, query, id)
-					query.changes.run(listener.api.new_connection).each do |change|
-						listener.subscription_update(id, change)
-						break if stopped?
-					end
-				end
-
-				def stop
-					@stopped = true
-				end
-			end
-		end
-	end
-end

data/lib/ddp/server/rethinkdb/websocket.rb

@@ -1,61 +0,0 @@
-module DDP
-	module Server
-		module RethinkDB
-			# Implementation of the WebSocket DDP::Server
-			class WebSocket < DDP::Server::WebSocket
-				attr_reader :api
-
-				def self.rack(api, config, pool_config = {})
-					super(pool_config.merge(args: [api, config]))
-				end
-
-				def initialize(api_class, config)
-					@api = api_class.new(config)
-					@subscriptions = {}
-				end
-
-				def handle_sub(id, name, params)
-					params ||= []
-					query = @api.collection_query(name, *params)
-
-					# TODO: this should somehow be atomically executed so we dont have overlap.
-					@subscriptions[id] = Subscription.new(self, id, name, query)
-
-					@api.with_connection do |conn|
-						query.run(conn).each { |r| send_added(name, r['id'], r) }
-					end
-
-					send_ready([id])
-				rescue => e
-					send_error_result(id, e)
-				end
-
-				def subscription_update(id, change)
-					subscription_name = @subscriptions[id].name
-					old_value = change['old_val']
-					new_value = change['new_val']
-
-					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?
-
-					cleared = old_value.keys.reject { |key| new_value.include? key }
-					send_changed(subscription.name, old_value['id'], new_value, cleared)
-				end
-
-				def handle_unsub(id)
-					subscription = @subscriptions.delete(id)
-					subscription.stop unless subscription.nil?
-					send_nosub(id)
-				end
-
-				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
-			end
-		end
-	end
-end