ddp-server-rethinkdb 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3762c90b25c888a4b99e65b397456dae694fd44a
-  data.tar.gz: 0c0d33f7dfcf26ba39c4d9e52a681647a304bb29
+  metadata.gz: 6388cf68529ae0dd89d4f7ffb09d991ddf3e461e
+  data.tar.gz: fa6e9aa686e7776246ae5f22888855a49fa50274
 SHA512:
-  metadata.gz: 50f516ea1223ac1f42a469920af571f8681e667966ab656ea4c56f1cbd97968d0fde6ec6a7b207cc1b9f0fca3d0ccb4b8d83ca218a877a286c9bbc1d3bc7d948
-  data.tar.gz: 812f96b5d42529d100a5629c1f3e570aabdc18f7bd84b8faeb183dac40adc079447b25a65bd19dac1de2336d5f9e0dbd731d70bce2e16fe484ce4b943f71061a
+  metadata.gz: e4a140f59e7926c624ed8c367dee381ff2f79a0fe0083e3216c0e4dc799c09b03c1f1b082f906347f71a4589928d7d26e2bdeb4a8e3a2aad74bf671632a7617b
+  data.tar.gz: 0afc8680402b614d8c25210802a50995bf7f0f91eabc1ee7d49ba87ac1b5839c911f913c49babda6a6af697b274eff027be2aa99d5a3555431d43f62cb0d2a41

data/ddp-server-rethinkdb.gemspec

@@ -21,7 +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.3'
+	spec.add_dependency 'ddp-server', '>= 0.0.4'
 	spec.add_dependency 'rethinkdb'
 	spec.add_dependency 'connection_pool'
 end

data/lib/ddp/server/rethinkdb.rb

@@ -1,126 +1,16 @@
-require 'ddp/server'
-require 'ddp/server/rethinkdb/version'
 require 'rethinkdb'
 require 'connection_pool'
+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
-		# A RethinkDB DDP Server
+		# A RethinkDB DDP Server implementation
 		module RethinkDB
-			# Implementation of the WebSocket DDP::Server
-			class WebSocket < DDP::Server::WebSocket
-				include Celluloid::Logger
-
-				attr_reader :api
-
-				def self.rack(api, config, pool_config = {})
-					super(pool_config.merge(args: [api, config]))
-				end
-
-				def initialize(api_class, config)
-					collections_module = api_class.const_get :Collections
-					rpc_module = api_class.const_get :RPC
-					@collections = collections_module.instance_methods.map(&:to_s)
-					@rpc_methods = rpc_module.instance_methods.map(&:to_s)
-					@api = api_class.new(config)
-					@api.singleton_class.include collections_module
-					@api.singleton_class.include rpc_module
-					@subscriptions = {}
-				end
-
-				def handle_sub(id, name, params)
-					params ||= []
-					return send_nosub(id, error: 'No such collection') unless @collections.include? name
-					query = api.send(name, *params)
-					@subscriptions[id] = Subscription.new(self, id, name, query)
-				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 ||= []
-					raise 'No such method' unless @rpc_methods.include? method
-					result = @api.send(method, *params)
-					send_result(id, result)
-				rescue => e
-					send_error_result(id, e)
-				end
-			end
-
-			# Helper class that users can extend to implement an API that can be passed
-			# as the RPC API parameter to the RethinkDB DDP protocol
-			class API
-				def initialize(config)
-					@connection_pool = ConnectionPool.new(
-						size:    config[:connection_pool_size],
-						timeout: config[:connection_pool_timeout]
-					) do
-						::RethinkDB::Connection.new(
-							host: config[:host],
-							port: config[:port]
-						)
-					end
-					@database_name = config[:database]
-				end
-
-				def database
-					::RethinkDB::RQL.new.db(@database_name)
-				end
-
-				def table(name)
-					database.table(name)
-				end
-
-				def with_connection
-					@connection_pool.with do |conn|
-						yield conn
-					end
-				end
-			end
-
-			# Actor that asynchronously monitors a collection
-			class Subscription
-				include Celluloid
-				include Celluloid::Logger
-
-				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)
-					listener.api.with_connection do |conn|
-						query.changes.run(conn).each do |change|
-							listener.subscription_update(id, change)
-							break if stopped?
-						end
-					end
-				end
-
-				def stop
-					@stopped = true
-				end
-			end
 		end
 	end
 end

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

@@ -0,0 +1,75 @@
+module DDP
+	module Server
+		# A RethinkDB DDP Server implementation
+		module RethinkDB
+			# Helper class that users can extend to implement an API that can be passed
+			# as the RPC API parameter to the RethinkDB DDP protocol
+			class API
+				attr_accessor :database_name
+
+				def initialize(config)
+					@config = config
+					@database_name = config[:database]
+
+					setup_connection_pool
+					setup_rpc
+					setup_collections
+				end
+
+				def invoke_rpc(method, *params)
+					raise 'No such method' unless @rpc_methods.include? method
+					send(method, *params)
+				end
+
+				def collection_query(name, *params)
+					raise 'No such collection' unless @collections.include? name
+					send(name, *params)
+				end
+
+				def database
+					::RethinkDB::RQL.new.db(@database_name)
+				end
+
+				def table(name)
+					database.table(name)
+				end
+
+				def with_connection
+					@connection_pool.with do |conn|
+						yield conn
+					end
+				end
+
+				def new_connection
+					::RethinkDB::Connection.new(
+						host: @config[:host],
+						port: @config[:port]
+					)
+				end
+
+				private
+
+				def setup_connection_pool
+					@connection_pool = ConnectionPool.new(
+						size:    @config[:connection_pool_size],
+						timeout: @config[:connection_pool_timeout]
+					) do
+						new_connection
+					end
+				end
+
+				def setup_rpc
+					rpc_module = self.class.const_get :RPC
+					@rpc_methods = rpc_module.instance_methods.map(&:to_s)
+					singleton_class.include rpc_module
+				end
+
+				def setup_collections
+					collections_module = self.class.const_get :Collections
+					@collections = collections_module.instance_methods.map(&:to_s)
+					singleton_class.include collections_module
+				end
+			end
+		end
+	end
+end

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

@@ -0,0 +1,30 @@
+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/version.rb

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

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

@@ -0,0 +1,53 @@
+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)
+					@subscriptions[id] = Subscription.new(self, id, name, query)
+				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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ddp-server-rethinkdb
 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-20 00:00:00.000000000 Z
+date: 2015-03-01 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.3
+        version: 0.0.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.0.3
+        version: 0.0.4
 - !ruby/object:Gem::Dependency
   name: rethinkdb
   requirement: !ruby/object:Gem::Requirement
@@ -97,7 +97,10 @@ files:
 - ddp-server-rethinkdb.gemspec
 - 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