async-redis 0.3.4 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4cf3ca6e7a1400dd30aa057b8688fe5c36dfd259ed6a62e74452e72706026434
-  data.tar.gz: 377bb98eb47f7e21bde259224c2cbc61fa9e960804d6037c4b7e8556d1892bb1
+  metadata.gz: c94ef3534e5271a37e5588ac9906f88e421f03db3a3251de8e3f0b8aa414f91a
+  data.tar.gz: d8503520edb25b468aed41db06ce61a38ddb753bf5ec8034f9b129ec60e2a600
 SHA512:
-  metadata.gz: 1ab1e184597d78757881a5a692763e00d0be075480a98600bb2ec87b87484bd17b3840692cd07bdc7d024ab3860b5ed410ae4c618df26a8bb0b8743425a68dff
-  data.tar.gz: b4ce7600597fea36ba4f9e5b6d68db84fe286a259f4946e001a7ebade416989694a5c760eac08285f446b49956b8569402adfa0f7ed9a61189feec61d1e5df30
+  metadata.gz: b2926a1fccbba8221ed83b9b46e62f82fc2f4a44104e74d1b29973124375305eb3a3da0cdeef03071adb6b967ab7d72f2747829a243e20db9bebb34139973370
+  data.tar.gz: 57636bc3338aad4c34aa411034a67a586e753e0729c3436b290c9d84a59387b8d2c69a4be8f72f48b34a9f2590d2186c9944eba78fecbfa4c31bfc4f56681177

data/.gitignore

@@ -10,3 +10,4 @@
 
 # rspec failure tracking
 .rspec_status
+.covered.db

data/Gemfile

@@ -3,6 +3,8 @@ source 'https://rubygems.org'
 # Specify your gem's dependencies in async-io.gemspec
 gemspec
 
+# gem "protocol-redis", path: "../protocol-redis"
+
 group :development do
 	gem 'pry'
 end

data/README.md

@@ -35,7 +35,7 @@ require 'async/redis'
 endpoint = Async::Redis.local_endpoint
 client = Async::Redis::Client.new(endpoint)
 
-Async.run do
+Async do
 	pp client.info
 ensure
 	client.close
@@ -45,12 +45,13 @@ end
 ### Variables
 
 ```ruby
+require 'async'
 require 'async/redis'
 
 endpoint = Async::Redis.local_endpoint
 client = Async::Redis::Client.new(endpoint)
 
-Async.run do
+Async do
 	client.set('X', 10)
 	pp client.get('X')
 ensure
@@ -61,24 +62,30 @@ end
 ### Subscriptions
 
 ```ruby
+require 'async'
 require 'async/redis'
-require 'json'
 
 endpoint = Async::Redis.local_endpoint
 client = Async::Redis::Client.new(endpoint)
 
-Async.run do |task|
+Async do |task|
+	condition = Async::Condition.new
+	
+	publisher = task.async do
+		condition.wait
+		
+		client.publish 'status.frontend', 'good'
+	end
+	
 	subscriber = task.async do
 		client.subscribe 'status.frontend' do |context|
+			condition.signal # We are waiting for messages.
+			
 			type, name, message = context.listen
 			
 			pp type, name, message
 		end
 	end
-	
-	publisher = task.async do
-		client.publish 'status.frontend', 'good'
-	end
 ensure
 	client.close
 end

data/async-redis.gemspec

@@ -20,6 +20,8 @@ Gem::Specification.new do |spec|
 	spec.add_dependency("async", "~> 1.8")
 	spec.add_dependency("async-io", "~> 1.10")
 	
+	spec.add_dependency("protocol-redis", "~> 0.2.0")
+	
 	spec.add_development_dependency "async-rspec", "~> 1.1"
 	spec.add_development_dependency "redis"
 	spec.add_development_dependency "benchmark-ips"

data/lib/async/redis/client.rb

@@ -18,31 +18,31 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-require_relative 'protocol/resp'
 require_relative 'pool'
-require_relative 'context/multi'
+require_relative 'context/pipeline'
+require_relative 'context/transaction'
 require_relative 'context/subscribe'
 
-require_relative 'methods/strings'
-require_relative 'methods/keys'
-require_relative 'methods/lists'
-require_relative 'methods/server'
+require_relative 'protocol/resp2'
 
 require 'async/io'
+require 'async/io/stream'
+
+require 'protocol/redis/methods'
 
 module Async
 	module Redis
+		# Legacy.
+		ServerError = ::Protocol::Redis::ServerError
+		
 		def self.local_endpoint
 			Async::IO::Endpoint.tcp('localhost', 6379)
 		end
 		
 		class Client
-			include Methods::Strings
-			include Methods::Keys
-			include Methods::Lists
-			include Methods::Server
+			include ::Protocol::Redis::Methods
 			
-			def initialize(endpoint = Redis.local_endpoint, protocol = Protocol::RESP, **options)
+			def initialize(endpoint = Redis.local_endpoint, protocol = Protocol::RESP2, **options)
 				@endpoint = endpoint
 				@protocol = protocol
 				
@@ -100,8 +100,8 @@ module Async
 				end
 			end
 			
-			def nested(&block)
-				context = Context::Nested.new(@pool)
+			def transaction(&block)
+				context = Context::Transaction.new(@pool)
 				
 				return context unless block_given?
 				
@@ -111,11 +111,28 @@ module Async
 					context.close
 				end
 			end
+
+			def pipeline(&block)
+				context = Context::Pipeline.new(@pool)
+
+				return context unless block_given?
+
+				begin
+					yield context
+				ensure
+					context.close
+				end
+			end
+			
+			# Deprecated.
+			alias nested pipeline
 			
 			def call(*arguments)
 				@pool.acquire do |connection|
 					connection.write_request(arguments)
 					
+					connection.flush
+					
 					return connection.read_response
 				end
 			end

data/lib/async/redis/context/{nested.rb → generic.rb}

@@ -19,18 +19,12 @@
 # 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'
+require 'protocol/redis/methods'
 
 module Async
 	module Redis
 		module Context
-			class Nested
-				include Methods::Strings
-				include Methods::Keys
-				include Methods::Lists
-				
+			class Generic
 				def initialize(pool, *args)
 					@pool = pool
 					@connection = pool.acquire
@@ -43,10 +37,21 @@ module Async
 					end
 				end
 				
-				def call(command, *args)
+				def write_request(command, *args)
 					@connection.write_request([command, *args])
+				end
+				
+				def read_response
+					@connection.flush
+					
 					return @connection.read_response
 				end
+				
+				def call(command, *args)
+					write_request(command, *args)
+					
+					return read_response
+				end
 			end
 		end
 	end

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

@@ -0,0 +1,104 @@
+# Copyright, 2019, by Samuel G. D. Williams. <http://www.codeotaku.com>
+# Copyright, 2019, by Huba Nagy.
+# 
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+# 
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+# 
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
+
+require_relative 'generic'
+
+module Async
+	module Redis
+		module Context
+			# Send multiple commands without waiting for the response, instead of sending them one by one.
+			class Pipeline < Generic
+				include ::Protocol::Redis::Methods
+				
+				class Sync
+					include ::Protocol::Redis::Methods
+					
+					def initialize(pipeline)
+						@pipeline = pipeline
+					end
+					
+					# This method just accumulates the commands and their params.
+					def call(command, *args)
+						@pipeline.call(command, *args)
+						
+						@pipeline.flush(1)
+						
+						return @pipeline.read_response
+					end
+				end
+				
+				def initialize(pool)
+					super(pool)
+					
+					@count = 0
+					@sync = nil
+				end
+				
+				# Flush responses.
+				# @param count [Integer] leave this many responses.
+				def flush(count = 0)
+					while @count > count
+						read_response
+					end
+				end
+				
+				def sync
+					@sync ||= Sync.new(self)
+				end
+				
+				# This method just accumulates the commands and their params.
+				def write_request(*)
+					super
+					
+					@count += 1
+				end
+				
+				# This method just accumulates the commands and their params.
+				def call(command, *args)
+					write_request(command, *args)
+					
+					return nil
+				end
+				
+				def read_response
+					if @count > 0
+						@count -= 1
+						super
+					else
+						raise RuntimeError, "No more responses available!"
+					end
+				end
+				
+				def collect
+					yield
+					
+					@count.times.map{read_response}
+				end
+				
+				def close
+					flush
+					
+					super
+				end
+			end
+		end
+	end
+end

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

@@ -19,14 +19,12 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-require_relative 'nested'
-
-require 'set'
+require_relative 'generic'
 
 module Async
 	module Redis
 		module Context
-			class Subscribe < Nested
+			class Subscribe < Generic
 				def initialize(pool, channels)
 					super(pool)
 					
@@ -43,6 +41,7 @@ module Async
 				
 				def subscribe(channels)
 					@connection.write_request ['SUBSCRIBE', *channels]
+					@connection.flush
 					
 					response = nil
 					

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

@@ -0,0 +1,51 @@
+# Copyright, 2018, by Samuel G. D. Williams. <http://www.codeotaku.com>
+# Copyright, 2018, by Huba Nagy.
+# 
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+# 
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+# 
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
+
+require_relative 'pipeline'
+
+module Async
+	module Redis
+		module Context
+			class Transaction < Pipeline
+				def initialize(pool, *args)
+					super(pool)
+				end
+				
+				def multi
+					call('MULTI')
+				end
+				
+				def watch(*keys)
+					sync.call('WATCH', *keys)
+				end
+				
+				# Execute all queued commands, provided that no watched keys have been modified. It's important to note that even when a command fails, all the other commands in the queue are processed – Redis will not stop the processing of commands.
+				def execute
+					sync.call('EXEC')
+				end
+				
+				def discard
+					sync.call('DISCARD')
+				end
+			end
+		end
+	end 
+end

data/lib/async/redis/{methods/server.rb → key.rb}

@@ -1,5 +1,4 @@
 # Copyright, 2018, by Samuel G. D. Williams. <http://www.codeotaku.com>
-# Copyright, 2018, by Huba Nagy.
 # 
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
@@ -21,27 +20,37 @@
 
 module Async
 	module Redis
-		module Methods
-			module Server
-				# Get info from server.
-				# @return [Hash] the server metadata.
-				def info
-					metadata = {}
-					
-					call('INFO').each_line(Protocol::CRLF) do |line|
-						key, value = line.split(':')
-						
-						if value
-							metadata[key.to_sym] = value.chomp!
-						end
-					end
-					
-					return metadata
-				end
-				
-				def flushdb!
-					call 'FLUSHDB'
-				end
+		class Key
+			def self.[] path
+				self.new(path)
+			end
+			
+			include Comparable
+			
+			def initialize(path)
+				@path = path
+			end
+			
+			def size
+				@path.bytesize
+			end
+			
+			attr :path
+			
+			def to_s
+				@path
+			end
+			
+			def to_str
+				@path
+			end
+			
+			def [] key
+				self.class.new("#{@path}:#{key}")
+			end
+			
+			def <=> other
+				@path <=> other.to_str
 			end
 		end
 	end

data/lib/async/redis/pool.rb

@@ -72,7 +72,7 @@ module Async
 			end
 			
 			def to_s
-				"\#<#{self.class} resources=#{resources.count} limit=#{@limit}>"
+				"\#<#{self.class} resources=#{resources.size} limit=#{@limit}>"
 			end
 			
 			protected

data/lib/async/redis/{context/multi.rb → protocol/resp2.rb}

@@ -1,5 +1,4 @@
 # Copyright, 2018, by Samuel G. D. Williams. <http://www.codeotaku.com>
-# Copyright, 2018, by Huba Nagy.
 # 
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
@@ -19,27 +18,16 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-require_relative 'nested'
+require 'protocol/redis'
 
 module Async
 	module Redis
-		module Context
-			class Multi < Nested
-				def initialize(pool, *args)
-					super(pool)
-					
-					@connection.write_request(['MULTI'])
-					@connection.read_response
-				end
-				
-				def execute
-					return call 'EXEC'
-				end
-				
-				def discard
-					return call 'DISCARD'
+		module Protocol
+			module RESP2
+				def self.client(stream)
+					::Protocol::Redis::Connection.new(stream)
 				end
 			end
 		end
-	end 
+	end
 end

data/lib/async/redis/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: async-redis
 version: !ruby/object:Gem::Version
-  version: 0.3.4
+  version: 0.4.0
 platform: ruby
 authors:
 - Samuel Williams
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-05-05 00:00:00.000000000 Z
+date: 2019-08-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: async
@@ -39,6 +39,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.10'
+- !ruby/object:Gem::Dependency
+  name: protocol-redis
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.2.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.2.0
 - !ruby/object:Gem::Dependency
   name: async-rspec
   requirement: !ruby/object:Gem::Requirement
@@ -169,15 +183,13 @@ files:
 - async-redis.gemspec
 - lib/async/redis.rb
 - lib/async/redis/client.rb
-- lib/async/redis/context/multi.rb
-- lib/async/redis/context/nested.rb
+- lib/async/redis/context/generic.rb
+- lib/async/redis/context/pipeline.rb
 - lib/async/redis/context/subscribe.rb
-- lib/async/redis/methods/keys.rb
-- lib/async/redis/methods/lists.rb
-- lib/async/redis/methods/server.rb
-- lib/async/redis/methods/strings.rb
+- lib/async/redis/context/transaction.rb
+- lib/async/redis/key.rb
 - lib/async/redis/pool.rb
-- lib/async/redis/protocol/resp.rb
+- lib/async/redis/protocol/resp2.rb
 - lib/async/redis/version.rb
 homepage: https://github.com/socketry/async-redis
 licenses: []

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

@@ -1,140 +0,0 @@
-# Copyright, 2018, by Samuel G. D. Williams. <http://www.codeotaku.com>
-# Copyright, 2018, by Huba Nagy.
-# 
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-# 
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-# 
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
-
-require 'date'
-
-module Async
-	module Redis
-		module Methods
-			module Keys
-				def del(key, *keys)
-					return call('DEL', key, *keys)
-				end
-
-				def dump(key)
-					return call('DUMP', key)
-				end
-
-				def exists(key, *keys)
-					return call('EXISTS', key, *keys)
-				end
-
-				def expire(key, seconds)
-					return call('EXPIRE', key, seconds)
-				end
-
-				def expireat(key, time)
-					case time
-					when DateTime, Time, Date 
-						timestamp =  time.strftime('%s').to_i
-					else
-						timestamp = time
-					end
-
-					return call('EXPIREAT', key, timestamp)
-				end
-
-				def keys(pattern)
-					return call('KEYS', pattern)
-				end
-
-				def migrate
-
-				end
-
-				def move(key, db)
-					return call('MOVE', key, db)
-				end
-
-				def object
-
-				end
-
-				def persist(key)
-					return call('PERSIST', key)
-				end
-
-				def pexpire(key, milliseconds)
-					return call('PEXPIRE', milliseconds)
-				end
-
-				def pexpireat(key, time)
-					case time.class
-					when DateTime, Time, Date 
-						timestamp =  time.strftime('%Q').to_i
-					else
-						timestamp = time
-					end
-					
-					return call('PEXPIREAT', key, timestamp)
-				end
-
-				def pttl(key)
-					return call('PTTL', key)
-				end
-
-				def randomkey
-					return call('RANDOMKEY')
-				end
-
-				def rename(key, new_key)
-					return call('RENAME', key, new_key)
-				end
-
-				def renamenx(key, new_key)
-					return call('RENAMENX', key, new_key)
-				end
-
-				def restore(key, serialized_value, ttl=0)
-					return call('RESTORE', key, ttl, serialized_value)
-				end
-
-				def sort
-
-				end
-
-				def touch(key, *keys)
-					return call('TOUCH', key, *keys)
-				end
-
-				def ttl(key)
-					return call('TTL', key)
-				end
-
-				def type(key)
-					return call('TYPE', key)
-				end
-
-				def unlink(key)
-					return call('UNLINK', key)
-				end
-				
-				def wait(newreplicas, timeout)
-
-				end
-
-				def scan
-
-				end
-			end
-		end
-	end
-end

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

@@ -1,118 +0,0 @@
-# Copyright, 2018, by Samuel G. D. Williams. <http://www.codeotaku.com>
-# Copyright, 2018, by Huba Nagy.
-# 
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-# 
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-# 
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
-
-module Async
-	module Redis
-		module Methods
-			module Lists
-				def blpop(*keys, timeout: 0)
-					return call('BLPOP', *keys, timeout)
-				end
-
-				def brpop(*keys, timeout: 0)
-					return call('BRPOP', *keys, timeout)
-				end
-
-				def brpoplpush(source, destination, timeout)
-					return call('BRPOPLPUSH', source, destination, timeout)
-				end
-
-				def lindex(key, index)
-					return call('LINDEX', key, index)
-				end
-
-				def linsert(key, position=:before, index, value)
-					if position == :before
-						offset = 'BEFORE'
-					else
-						offset = 'AFTER'
-					end
-
-					return call('LINSERT', key, offset, index, value)
-				end
-
-				def llen(key)
-					return call('LLEN', key)
-				end
-
-				def lpop(key)
-					return call('LPOP', key)
-				end
-
-				def lpush(key, value, *values)
-					case value
-					when Array
-						values = value
-					else
-						values = [value] + values
-					end
-
-					return call('LPUSH', key, *values)
-				end
-
-				def lpushx(key, value)
-					return call('LPUSHX', key, value)
-				end
-
-				def lrange(key, start, stop)
-					return call('LRANGE', key, start, stop)
-				end
-
-				def lrem(key, count, value)
-					return call('LREM', key, count)
-				end
-
-				def lset(key, index, values)
-					return call('LSET', key, index, values)
-				end
-
-				def ltrim(key, start, stop)
-					return call('LTRIM', key, start, stop)
-				end
-
-				def rpop(key)
-					return call('RPOP', key)
-				end
-
-				def rpoplpush(source, destination=nil)
-					destination = source if destination.nil?
-
-					return call('RPOPLPUSH', source, destination)
-				end
-
-				def rpush(key, value, *values)
-					case value
-					when Array
-						values = value
-					else
-						values = [value] + values
-					end
-
-					return call('RPUSH', key, *values)
-				end
-
-				def rpushx(key, value)
-					return call('RPUSHX', key, value)
-				end
-			end
-		end
-	end
-end

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

@@ -1,132 +0,0 @@
-# Copyright, 2018, by Samuel G. D. Williams. <http://www.codeotaku.com>
-# Copyright, 2018, by Huba Nagy.
-# 
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-# 
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-# 
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
-
-module Async
-	module Redis
-		module Methods
-			module Strings
-				def append(key, value)
-					return call('APPEND', key, value)
-				end
-
-				def bitcount(key, *range)
-					return call('BITCOUNT', key, *range)
-				end
-
-				def decr(key)
-					return call('DECR', key)
-				end
-
-				def decrby(key, decrement)
-					return call('DECRBY', key, decrement)
-				end
-
-				def get(key)
-					return call('GET', key)
-				end
-
-				def getbit(key, offset)
-					return call('GETBIT', key, offset)
-				end
-
-				def getrange(key, start_index, end_index)
-					return call('GETRANGE', key, start_index, end_index)
-				end
-
-				def getset(key, value)
-					return call('GETSET', key, value)
-				end
-
-				def incr(key)
-					return call('INCR', key)
-				end
-
-				def incrby(key, increment)
-					return call('INCRBY', key, increment)
-				end
-
-				def incrbyfloat(key, increment)
-					return call('INCRBYFLOAT', key, increment)
-				end
-
-				def mget(key, *keys)
-					return call('MGET', key, *keys)
-				end
-
-				def mset(pairs)
-					flattened_pairs = pairs.keys.zip(pairs.values).flatten
-					return call('MSET', *flattened_pairs)
-				end
-
-				def msetnx(pairs)
-					flattened_pairs = pairs.keys.zip(pairs.values).flatten
-					return call('MSETNX', *flattened_pairs)
-				end
-
-				def psetex(key, milliseconds, value)
-					return set key, value, milliseconds: milliseconds
-				end
-
-				def set(key, value, **options)
-					arguments = []
-
-					if options.has_key? :seconds
-						arguments << 'EX'
-						arguments << options[:seconds]
-					end
-
-					if options.has_key? :milliseconds
-						arguments << 'PX'
-						arguments << options[:milliseconds]
-					end
-
-					if options[:condition] == :nx
-						arguments << 'NX'
-					elsif options[:condition] == :xx
-						arguments << 'XX'
-					end
-
-					return call('SET', key, value, *arguments)
-				end
-
-				def setbit(key, offset, value)
-					return call('SETBIT', key, offset, value)
-				end
-
-				def setex(key, seconds, value)
-					return set key, value, seconds: seconds
-				end
-
-				def setnx(key, value)
-					return set key, value, condition: :nx
-				end
-
-				def setrange(key, offset, value)
-					return call('SETRANGE', key, offset, value)
-				end
-
-				def strlen(key)
-					return call('STRLEN', key)
-				end
-			end
-		end
-	end
-end

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

@@ -1,143 +0,0 @@
-# Copyright, 2018, by Samuel G. D. Williams. <http://www.codeotaku.com>
-# 
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-# 
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-# 
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
-
-require 'async/io/protocol/line'
-
-module Async
-	module Redis
-		class ServerError < StandardError
-		end
-		
-		module Protocol
-			CRLF = "\r\n".freeze
-			
-			class RESP < Async::IO::Protocol::Line
-				class << self
-					alias client new
-				end
-				
-				def initialize(stream)
-					super(stream, CRLF)
-				end
-				
-				def closed?
-					@stream.closed?
-				end
-				
-				# The redis server doesn't want actual objects (e.g. integers) but only bulk strings. So, we inline it for performance.
-				def write_request(arguments)
-					write_lines("*#{arguments.count}")
-					
-					arguments.each do |argument|
-						string = argument.to_s
-						
-						write_lines("$#{string.bytesize}", string)
-					end
-					
-					@stream.flush
-				end
-				
-				def write_object(object)
-					case object
-					when String
-						write_lines("$#{object.bytesize}", object)
-					when Array
-						write_array(object)
-					when Integer
-						write_lines(":#{object}")
-					else
-						write_object(object.to_redis)
-					end
-				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
-					line = read_line
-					token = line.slice!(0, 1)
-					
-					case token
-					when '$'
-						length = line.to_i
-						
-						if length == -1
-							return nil
-						else
-							return read_data(length)
-						end
-					when '*'
-						count = line.to_i
-						
-						# Null array (https://redis.io/topics/protocol#resp-arrays):
-						return nil if count == -1
-						
-						array = Array.new(count) {read_object}
-						
-						return array
-					when ':'
-						return line.to_i
-					
-					when '-'
-						raise ServerError.new(line)
-					
-					when '+'
-						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
-
-				private
-
-				# Override Async::IO::Protocol::Line#write_line
-				# The original method performs a flush. This one does not and moves the
-				# responsibility of flushing to the caller of the method.
-				# In the case of Redis, we do not want to perform a flush in every line,
-				# because each Redis command contains several lines. Flushing once per
-				# command is more efficient because it avoids unnecessary writes to the
-				# socket.
-				def write_lines(*args)
-					if args.empty?
-						@stream.write(@eol)
-					else
-						args.each do |arg|
-							@stream.write(arg)
-							@stream.write(@eol)
-						end
-					end
-				end
-			end
-		end
-	end
-end