async-redis 0.3.3 → 0.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4908d7f5eef4279d5be275a46c17feb0d453f4c6bbc6e2cfa026eef027e518cc
-  data.tar.gz: 2dc99ed8cc6b160656b370a413118083787808104097382a7eac4e50b6cbb1be
+  metadata.gz: 4cf3ca6e7a1400dd30aa057b8688fe5c36dfd259ed6a62e74452e72706026434
+  data.tar.gz: 377bb98eb47f7e21bde259224c2cbc61fa9e960804d6037c4b7e8556d1892bb1
 SHA512:
-  metadata.gz: 81bb8852f240c15d49670753acd9a1edba37911fd51c1594431e977d5e6b9bf8c31599523a5ce5a7c925b3674db5788bc2e764b0261ba43c07de67bf41822878
-  data.tar.gz: 2eb751bbc41d0a043139f19a33b031e3f40de3915f8e8c82b1e3cae3edab409689aaab0b73714a75fa96bfadb566bbfd1138478faf034c7e31fc5f3404877cb7
+  metadata.gz: 1ab1e184597d78757881a5a692763e00d0be075480a98600bb2ec87b87484bd17b3840692cd07bdc7d024ab3860b5ed410ae4c618df26a8bb0b8743425a68dff
+  data.tar.gz: b4ce7600597fea36ba4f9e5b6d68db84fe286a259f4946e001a7ebade416989694a5c760eac08285f446b49956b8569402adfa0f7ed9a61189feec61d1e5df30

data/async-redis.gemspec

@@ -21,9 +21,16 @@ Gem::Specification.new do |spec|
 	spec.add_dependency("async-io", "~> 1.10")
 	
 	spec.add_development_dependency "async-rspec", "~> 1.1"
-	
+	spec.add_development_dependency "redis"
+	spec.add_development_dependency "benchmark-ips"
+
 	spec.add_development_dependency "covered"
 	spec.add_development_dependency "bundler"
 	spec.add_development_dependency "rspec", "~> 3.6"
 	spec.add_development_dependency "rake"
+
+	# Dependencies with C extensions
+	if defined?(RUBY_ENGINE) && RUBY_ENGINE == "ruby"
+		spec.add_development_dependency "hiredis"
+	end
 end

data/lib/async/redis/client.rb

@@ -100,6 +100,18 @@ module Async
 				end
 			end
 			
+			def nested(&block)
+				context = Context::Nested.new(@pool)
+				
+				return context unless block_given?
+				
+				begin
+					yield context
+				ensure
+					context.close
+				end
+			end
+			
 			def call(*arguments)
 				@pool.acquire do |connection|
 					connection.write_request(arguments)
@@ -113,7 +125,7 @@ module Async
 			def connect(connection_limit: nil)
 				Pool.new(connection_limit) do
 					peer = @endpoint.connect
-						
+					
 					peer.setsockopt(Socket::IPPROTO_TCP, Socket::TCP_NODELAY, 1)
 					
 					stream = IO::Stream.new(peer)

data/lib/async/redis/context/multi.rb

@@ -21,18 +21,10 @@
 
 require_relative 'nested'
 
-require_relative '../methods/strings'
-require_relative '../methods/keys'
-require_relative '../methods/lists'
-
 module Async
 	module Redis
 		module Context
 			class Multi < Nested
-				include Methods::Strings
-				include Methods::Keys
-				include Methods::Lists
-
 				def initialize(pool, *args)
 					super(pool)
 					

data/lib/async/redis/context/nested.rb

@@ -19,10 +19,18 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
+require_relative '../methods/strings'
+require_relative '../methods/keys'
+require_relative '../methods/lists'
+
 module Async
 	module Redis
 		module Context
 			class Nested
+				include Methods::Strings
+				include Methods::Keys
+				include Methods::Lists
+				
 				def initialize(pool, *args)
 					@pool = pool
 					@connection = pool.acquire

data/lib/async/redis/methods/lists.rb

@@ -23,15 +23,15 @@ module Async
 	module Redis
 		module Methods
 			module Lists
-				def blpop(ttl=0, *keys)
-					return call('BLPOP', *keys, ttl)
+				def blpop(*keys, timeout: 0)
+					return call('BLPOP', *keys, timeout)
 				end
 
-				def brpop(ttl=0, *keys)
-					return call('BRPOP', *keys, ttl)
+				def brpop(*keys, timeout: 0)
+					return call('BRPOP', *keys, timeout)
 				end
 
-				def brpoplpush(sorce, destination, timeout)
+				def brpoplpush(source, destination, timeout)
 					return call('BRPOPLPUSH', source, destination, timeout)
 				end
 

data/lib/async/redis/protocol/resp.rb

@@ -67,36 +67,30 @@ module Async
 					end
 				end
 				
-				# def write_lines(*args)
-				# 	puts "write_lines(#{args.inspect})"
-				# 	super
-				# end
-				# 
-				# def read_line
-				# 	result = super
-				# 	puts "read_line #{result}"
-				# 
-				# 	return result
-				# end
+				def read_data(length)
+					buffer = @stream.read(length) or @stream.eof!
+					
+					# Eat trailing whitespace because length does not include the CRLF:
+					@stream.read(2) or @stream.eof!
+					
+					return buffer
+				end
 				
 				def read_object
-					token = @stream.read(1)
+					line = read_line
+					token = line.slice!(0, 1)
 					
 					case token
 					when '$'
-						length = read_line.to_i
+						length = line.to_i
 						
 						if length == -1
 							return nil
 						else
-							buffer = @stream.read(length)
-							# Eat trailing whitespace because length does not include the CRLF:
-							read_line
-						
-							return buffer
+							return read_data(length)
 						end
 					when '*'
-						count = read_line.to_i
+						count = line.to_i
 						
 						# Null array (https://redis.io/topics/protocol#resp-arrays):
 						return nil if count == -1
@@ -105,19 +99,21 @@ module Async
 						
 						return array
 					when ':'
-						return read_line.to_i
+						return line.to_i
 					
 					when '-'
-						raise ServerError.new(read_line)
+						raise ServerError.new(line)
 					
 					when '+'
-						return read_line
+						return line
 					
 					else
 						@stream.flush
 						
 						raise NotImplementedError, "Implementation for token #{token} missing"
 					end
+					
+					# TODO: If an exception (e.g. Async::TimeoutError) propagates out of this function, perhaps @stream should be closed? Otherwise it might be in a weird state.
 				end
 				
 				alias read_response read_object

data/lib/async/redis/version.rb

@@ -20,6 +20,6 @@
 
 module Async
 	module Redis
-		VERSION = "0.3.3"
+		VERSION = "0.3.4"
 	end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: async-redis
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.3.4
 platform: ruby
 authors:
 - Samuel Williams
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-02-28 00:00:00.000000000 Z
+date: 2019-05-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: async
@@ -53,6 +53,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.1'
+- !ruby/object:Gem::Dependency
+  name: redis
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: benchmark-ips
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: covered
   requirement: !ruby/object:Gem::Requirement
@@ -109,6 +137,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: hiredis
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: 
 email:
 - samuel.williams@oriontransfer.co.nz
@@ -155,7 +197,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.2
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: A Redis client library.