ddp-server-rethinkdb 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fc02ef7ca06554ea7ef61095ca1f68b2216bbcfa
-  data.tar.gz: d639840e48515eb7b9a22dfe11098503c8b4c28e
+  metadata.gz: 34f2534576cce64d35a055ef32b002efbc77eaf0
+  data.tar.gz: a4d7f07d0496189f5ab914e0fe6d26d494fe759f
 SHA512:
-  metadata.gz: 9b8917caf19f51fdfb2fce59a5d8083732c3208fccd98280328f3b4ff61622ebff32e911540b6e09170ffc229c10be67ad43bd8b792dd106fc1705701d4bfdc9
-  data.tar.gz: cc39c1677ef4ef5818ee930c476c8be648b9c96b8b7fcabfe7185ce956537889c30b822cb7d299388bad47ea739e48bcc35724f5c371af521aeef78466ae90b9
+  metadata.gz: 6f4d65ee2916787ddf9e456ac2365336c8d416d9157c0be269848df996d5f770e33234aef814a9b3b73278c933617b375c0b420be04e1234b8a50ce03205fc3d
+  data.tar.gz: 78f092738fb1e64407f566ccff037cb403874fd220b5689442059dea792d6344e45ca60414cf8c31b3bbe2d98bbe5b158424a7c56089f1b93d5b1432f3f34529

data/lib/ddp/server/rethinkdb.rb

@@ -2,7 +2,7 @@ require 'rethinkdb'
 require 'connection_pool'
 require 'celluloid'
 require 'ddp/server'
-require 'ddp/server/rethinkdb'
+require 'ddp/server/rethinkdb/helpers'
 require 'ddp/server/rethinkdb/api'
 
 module DDP

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

@@ -5,6 +5,8 @@ module DDP
 			# 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
+				include Helpers
+
 				attr_accessor :database_name
 
 				def initialize(config)
@@ -23,7 +25,7 @@ module DDP
 
 				def collection_query(name, *params)
 					raise 'No such collection' unless @collections.include? name
-					wrap_query send(name, *params)
+					wrap_query(send(name, *params), new_connection)
 				end
 
 				def database
@@ -69,23 +71,6 @@ 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/helpers.rb

@@ -0,0 +1,28 @@
+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
+			module Helpers
+				def wrap_query(query, connection)
+					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
+					conn.close
+				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.1.0'
+			VERSION = '0.1.1'
 		end
 	end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ddp-server-rethinkdb
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Tinco Andringa
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-16 00:00:00.000000000 Z
+date: 2015-03-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -98,6 +98,7 @@ files:
 - examples/messages.rb
 - lib/ddp/server/rethinkdb.rb
 - lib/ddp/server/rethinkdb/api.rb
+- lib/ddp/server/rethinkdb/helpers.rb
 - lib/ddp/server/rethinkdb/version.rb
 homepage: https://github.com/d-snp/ruby-ddp-server-rethinkdb
 licenses: