From 6557a866ef2cb55b6a2ac1dd23f015ef8acca819 Mon Sep 17 00:00:00 2001
From: john stone <john@tuxcode.org>
Date: Sun, 26 Jan 2014 13:02:12 +0100
Subject: [PATCH] refactoring s/MediocreSimple//, Vererbung muss weg!

---
 Makefile.am                                   |  5 ++---
 src/MediocreSimpleStaticFileHandler.H         | 14 --------------
 src/MediocreSimpleStaticFileHandler.cc        | 17 -----------------
 src/Routerin.H                                |  4 ++--
 src/Routerin.cc                               |  5 +----
 src/StaticFileHandler.H                       | 16 +++++++++++++---
 src/StaticFileHandler.cc                      | 17 +++++++++++++++++
 src/old/StaticFileHandler.H                   |  9 +++++++++
 src/{ => old}/UltraSimpleStaticFileHandler.H  |  0
 src/{ => old}/UltraSimpleStaticFileHandler.cc |  0
 10 files changed, 44 insertions(+), 43 deletions(-)
 delete mode 100644 src/MediocreSimpleStaticFileHandler.H
 delete mode 100644 src/MediocreSimpleStaticFileHandler.cc
 create mode 100644 src/StaticFileHandler.cc
 create mode 100644 src/old/StaticFileHandler.H
 rename src/{ => old}/UltraSimpleStaticFileHandler.H (100%)
 rename src/{ => old}/UltraSimpleStaticFileHandler.cc (100%)

diff --git a/Makefile.am b/Makefile.am
index 07b7722..27ed199 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -13,9 +13,8 @@ siccc_SOURCES = \
 				src/Routerin.H \
 				src/Routerin.cc \
 				src/sicmain.cc \
-				src/MediocreSimpleStaticFileHandler.H \
-				src/MediocreSimpleStaticFileHandler.cc \
-				src/UltraSimpleStaticFileHandler.cc \
+				src/StaticFileHandler.H \
+				src/StaticFileHandler.cc \
 				mongoose/mongoose.c
 siccc_CFLAGS =
 siccc_CXXFLAGS = ${AM_CXXFLAGS} -DDEBUG -ggdb -I./mongoose/
diff --git a/src/MediocreSimpleStaticFileHandler.H b/src/MediocreSimpleStaticFileHandler.H
deleted file mode 100644
index a8251b6..0000000
--- a/src/MediocreSimpleStaticFileHandler.H
+++ /dev/null
@@ -1,14 +0,0 @@
-#pragma once
-
-#include "StaticFileHandler.H"
-#include <string>
-
-class MediocreSimpleStaticFileHandler :public StaticFileHandler
-{
-    public:
-        int answer_pathreq(const char * const path, struct mg_connection *conn);
-        std::string cleanpath(const char * const);
-	MediocreSimpleStaticFileHandler() {};
-	~MediocreSimpleStaticFileHandler() {};
-
-};
diff --git a/src/MediocreSimpleStaticFileHandler.cc b/src/MediocreSimpleStaticFileHandler.cc
deleted file mode 100644
index fa129c5..0000000
--- a/src/MediocreSimpleStaticFileHandler.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-#include "MediocreSimpleStaticFileHandler.H"
-
-std::string
-MediocreSimpleStaticFileHandler::cleanpath (const char * const path)
-{
-    //adds no security at all
-    return "static/"+std::string(path);
-}
-
-int 
-MediocreSimpleStaticFileHandler::answer_pathreq(const char * const path,
-        struct mg_connection *conn)
-{
-    mg_send_file(conn,cleanpath(path).c_str());
-    return 0;
-}
-	
diff --git a/src/Routerin.H b/src/Routerin.H
index 9598a9d..9a41ecf 100644
--- a/src/Routerin.H
+++ b/src/Routerin.H
@@ -3,7 +3,7 @@
 #include <memory>
 
 #include <mongoose.h>
-#include "MediocreSimpleStaticFileHandler.H"
+#include "StaticFileHandler.H"
 
 class Routerin
 {
@@ -40,7 +40,7 @@ public:
     }
 private:
 	explicit Routerin();
-	std::unique_ptr<MediocreSimpleStaticFileHandler> sfh;
+	std::unique_ptr<StaticFileHandler> sfh;
 	bool hasInstance = false;
 
 	int event_request_route   ( struct mg_event *event);
diff --git a/src/Routerin.cc b/src/Routerin.cc
index caa26cf..14af063 100644
--- a/src/Routerin.cc
+++ b/src/Routerin.cc
@@ -6,16 +6,13 @@ using std::strcmp;
 #include "Foohash.H"
 #include "Routerin.H"
 
-//#include "StaticFileHandler.H"
-//#include "UltraSimpleStaticFileHandler.H"
-
 
 using std::cout;
 using std::endl;
 
 
 Routerin::Routerin():
-	sfh( new MediocreSimpleStaticFileHandler())
+	sfh( new StaticFileHandler())
 {
 	cout << "Konstr Routering" << std::endl;
 }
diff --git a/src/StaticFileHandler.H b/src/StaticFileHandler.H
index ad51fe5..c57144c 100644
--- a/src/StaticFileHandler.H
+++ b/src/StaticFileHandler.H
@@ -1,9 +1,19 @@
 #pragma once
+
 #include <mongoose.h>
 
+#include <string>
+
 class StaticFileHandler
 {
-	public:
-	virtual int answer_pathreq(const char * const path,struct mg_connection *conn)=0;
-};
+    public:
+        int answer_pathreq(const char * const path, struct mg_connection *conn);
+        std::string cleanpath(const char * const);
+	StaticFileHandler() {};
+	~StaticFileHandler() {};
 
+    private:
+	std::string _cleanpath (const char * const path);
+
+
+};
diff --git a/src/StaticFileHandler.cc b/src/StaticFileHandler.cc
new file mode 100644
index 0000000..7ee18c6
--- /dev/null
+++ b/src/StaticFileHandler.cc
@@ -0,0 +1,17 @@
+#include "StaticFileHandler.H"
+
+std::string
+StaticFileHandler::_cleanpath (const char * const path)
+{
+    //adds no security at all
+    return "static/"+std::string(path);
+}
+
+int 
+StaticFileHandler::answer_pathreq(const char * const path,
+        struct mg_connection *conn)
+{
+    mg_send_file(conn,_cleanpath(path).c_str());
+    return 0;
+}
+	
diff --git a/src/old/StaticFileHandler.H b/src/old/StaticFileHandler.H
new file mode 100644
index 0000000..ad51fe5
--- /dev/null
+++ b/src/old/StaticFileHandler.H
@@ -0,0 +1,9 @@
+#pragma once
+#include <mongoose.h>
+
+class StaticFileHandler
+{
+	public:
+	virtual int answer_pathreq(const char * const path,struct mg_connection *conn)=0;
+};
+
diff --git a/src/UltraSimpleStaticFileHandler.H b/src/old/UltraSimpleStaticFileHandler.H
similarity index 100%
rename from src/UltraSimpleStaticFileHandler.H
rename to src/old/UltraSimpleStaticFileHandler.H
diff --git a/src/UltraSimpleStaticFileHandler.cc b/src/old/UltraSimpleStaticFileHandler.cc
similarity index 100%
rename from src/UltraSimpleStaticFileHandler.cc
rename to src/old/UltraSimpleStaticFileHandler.cc