Merge pull request #16 from glaszig/master

fix memcache address handling

.github/workflows/ruby.yml

@@ -7,7 +7,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        ruby: [ '2.4.x', '2.5.x', '2.6.x', '2.7.x' ]
+        ruby: [ '2.5.x', '2.6.x', '2.7.x' ]
     steps:
     - name: Install memcache
       run: |

.ruby-version

@@ -0,0 +1 @@
+2.5.8

config.ru

@@ -6,5 +6,5 @@ require 'amnesia'
 Encoding.default_internal = 'utf-8'
 Encoding.default_external = 'utf-8'
 
-use Amnesia::Application, hosts: ['localhost:11211', 'example.local:10987']
+use Amnesia::Application, hosts: ['localhost', 'example.local:10987']
 run Sinatra::Application

lib/amnesia/host.rb

@@ -5,8 +5,14 @@ class Host
     FLOAT_STATS  = %w[ rusage_user rusage_system ]
     STRING_STATS = %w[ version libevent ]
 
+    def self.normalize_address address
+      return "#{address}:#{Dalli::Server::DEFAULT_PORT}" unless address.include? ":"
+
+      address
+    end
+
     def initialize(address)
-      @address = address
+      @address = self.class.normalize_address address
     end
 
     def alive?

spec/amnesia_spec.rb

@@ -21,10 +21,15 @@
     end
 
     it "should respond to /:host" do
-      get "/127.0.0.1:11211"
+      get "/localhost:11211"
       expect(last_response.status).to eq 200
     end
 
+    it "should respond to /:host without port with not found" do
+      get "/localhost"
+      expect(last_response.status).to eq 404
+    end
+
     it "should not display unknown host" do
       get "/unknown-host"
       expect(last_response.status).to eq 404

spec/spec_helper.rb

@@ -2,6 +2,7 @@
 
 ENV['RACK_ENV'] ||= 'test'
 ENV['AMNESIA_CREDS'] ||= 'admin:amnesia'
+ENV['MEMCACHE_SERVERS'] ||= 'localhost'
 
 require 'rack/test'
 require 'amnesia'