Merge pull request #37 from mamantoha/develop

change project structure

CHANGELOG.md

@@ -1,5 +1,7 @@
 # Changelog
 
+* **(breaking-change)** Rename `HTTP::Proxy::Server::BasicAuth` to `HTTP::Proxy::Server::BasicAuthHandler` ([#37](https://github.com/mamantoha/http_proxy/pull/37))
+
 ## 0.11.0
 
 * Make `HTTP::Proxy::Server` independent ([#35](https://github.com/mamantoha/http_proxy/pull/35))

README.md

@@ -66,7 +66,7 @@ server.listen
 ```crystal
 server = HTTP::Proxy::Server.new(handlers: [
   HTTP::LogHandler.new,
-  HTTP::Proxy::Server::BasicAuth.new("user", "passwd"),
+  HTTP::Proxy::Server::BasicAuthHandler.new("user", "passwd"),
 ]) do |context|
   context.request.headers.add("X-Forwarded-For", "127.0.0.1")
   context.perform

samples/server_with_authentication.cr

@@ -26,7 +26,7 @@ end
 
 server = HTTP::Proxy::Server.new(handlers: [
   HTTP::LogHandler.new,
-  HTTP::Proxy::Server::BasicAuth.new(username, password),
+  HTTP::Proxy::Server::BasicAuthHandler.new(username, password),
 ]) do |context|
   context.request.headers.add("X-Forwarded-For", host)
   context.perform

samples/with_proxy_server.cr

@@ -5,7 +5,7 @@ def with_proxy_server(host = "127.0.0.1", port = 8080, username = "user", passwo
 
   server = HTTP::Proxy::Server.new(handlers: [
     HTTP::LogHandler.new,
-    HTTP::Proxy::Server::BasicAuth.new(username, password),
+    HTTP::Proxy::Server::BasicAuthHandler.new(username, password),
   ]) do |context|
     context.request.headers.add("X-Forwarded-For", host)
   end

spec/server_spec.cr

@@ -7,9 +7,9 @@ describe HTTP::Proxy::Server do
       server.should be_a(HTTP::Proxy::Server)
     end
 
-    it "with BasicAuth handler" do
+    it "with BasicAuthHandler handler" do
       server = HTTP::Proxy::Server.new([
-        HTTP::Proxy::Server::BasicAuth.new("user", "passwd"),
+        HTTP::Proxy::Server::BasicAuthHandler.new("user", "passwd"),
       ])
       server.should be_a(HTTP::Proxy::Server)
     end

spec/spec_helper.cr

@@ -24,7 +24,7 @@ def with_proxy_server(host = "127.0.0.1", port = 8080, username : String? = nil,
 
   server =
     if username && password
-      HTTP::Proxy::Server.new(handlers: [HTTP::Proxy::Server::BasicAuth.new(username, password)])
+      HTTP::Proxy::Server.new(handlers: [HTTP::Proxy::Server::BasicAuthHandler.new(username, password)])
     else
       HTTP::Proxy::Server.new
     end

src/http/proxy/server.cr

@@ -1,5 +1,9 @@
+require "socket"
 require "./server/handler"
-require "./server/basic_auth"
+require "./server/context"
+{% if !flag?(:without_openssl) %}
+  require "openssl"
+{% end %}
 
 # A concurrent Proxy server implementation.
 #

src/http/proxy/server/handler.cr

@@ -11,3 +11,5 @@ class HTTP::Proxy::Server::Handler
 
   alias HandlerProc = HTTP::Proxy::Server::Context ->
 end
+
+require "./handlers/*"

src/http/proxy/server/basic_auth.cr → src/http/proxy/server/handlers/basic_auth_handler.cr

@@ -1,5 +1,5 @@
 class HTTP::Proxy::Server
-  class BasicAuth
+  class BasicAuthHandler
     include HTTP::Handler
 
     def initialize(@username : String, @password : String)

src/http_proxy.cr

@@ -1,5 +1,4 @@
 require "http"
-require "socket"
 require "base64"
 
 require "./http/proxy/server"