Fix order of protocols in endpoint construction.

Author: ioquatix

lib/async/redis/endpoint.rb

@@ -118,14 +118,14 @@ def secure?
 			def protocol
 				protocol = @options.fetch(:protocol, Protocol::RESP2)
 
-				if database = self.database
-					protocol = Protocol::Selected.new(database, protocol)
-				end
-				
 				if credentials = self.credentials
 					protocol = Protocol::Authenticated.new(credentials, protocol)
 				end
 
+				if database = self.database
+					protocol = Protocol::Selected.new(database, protocol)
+				end
+				
 				return protocol
 			end
 
@@ -151,7 +151,13 @@ def scheme
 			end
 
 			def database
-				@options[:database] || @url.path[1..-1].to_i
+				@options[:database] || extract_database(@url.path)
+			end
+			
+			private def extract_database(path)
+				if path =~ /\/(\d+)$/
+					return $1.to_i
+				end
 			end
 
 			def credentials

lib/async/redis/protocol/authenticated.rb

@@ -23,6 +23,8 @@ def initialize(credentials, protocol = Async::Redis::Protocol::RESP2)
 					@protocol = protocol
 				end
 
+				attr :credentials
+				
 				# Create a new client and authenticate it.
 				def client(stream)
 					client = @protocol.client(stream)

lib/async/redis/protocol/selected.rb

@@ -23,6 +23,8 @@ def initialize(index, protocol = Async::Redis::Protocol::RESP2)
 					@protocol = protocol
 				end
 
+				attr :index
+				
 				# Create a new client and authenticate it.
 				def client(stream)
 					client = @protocol.client(stream)

test/async/redis/endpoint.rb

@@ -7,37 +7,33 @@
 require 'async/redis/protocol/authenticated'
 require 'sus/fixtures/async'
 
-describe Async::Redis::Protocol::Authenticated do
+describe Async::Redis::Endpoint do
 	include Sus::Fixtures::Async::ReactorContext
 
 	let(:endpoint) {Async::Redis.local_endpoint}
-	let(:credentials) {["testuser", "testpassword"]}
-	let(:protocol) {subject.new(credentials)}
-	let(:client) {Async::Redis::Client.new(endpoint, protocol: protocol)}
 
-	before do
-		# Setup ACL user with limited permissions for testing.
-		admin_client = Async::Redis::Client.new(endpoint)
-		admin_client.call("ACL", "SETUSER", "testuser", "on", ">" + credentials[1], "+ping", "+auth")
-	ensure
-		admin_client.close
-	end
-	
-	after do
-		# Cleanup ACL user after tests.
-		admin_client = Async::Redis::Client.new(endpoint)
-		admin_client.call("ACL", "DELUSER", "testuser")
-		admin_client.close
-	end
-	
-	it "can authenticate and send allowed commands" do
-		response = client.call("PING")
-		expect(response).to be == "PONG"
-	end
-	
-	it "rejects commands not allowed by ACL" do
-		expect do
-			client.call("SET", "key", "value")
-		end.to raise_exception(Protocol::Redis::ServerError, message: be =~ /NOPERM/)
+	with '#protocol' do
+		it "defaults to RESP2" do
+			expect(endpoint.protocol).to be == Async::Redis::Protocol::RESP2
+		end
+		
+		with 'database selection' do
+			let(:endpoint) {Async::Redis.local_endpoint(database: 1)}
+			
+			it "selects the database" do
+				expect(endpoint.protocol).to be_a(Async::Redis::Protocol::Selected)
+				expect(endpoint.protocol.index).to be == 1
+			end
+		end
+		
+		with 'credentials' do
+			let(:credentials) {["testuser", "testpassword"]}
+			let(:endpoint) {Async::Redis.local_endpoint(credentials: credentials)}
+			
+			it "authenticates with credentials" do
+				expect(endpoint.protocol).to be_a(Async::Redis::Protocol::Authenticated)
+				expect(endpoint.protocol.credentials).to be == credentials
+			end
+		end
 	end
 end