From 0a27394cca05f6598de0dbf8c69d0bf75983ecbc Mon Sep 17 00:00:00 2001
From: antao <antao2002@gmail.com>
Date: Sun, 5 May 2019 15:43:17 +0800
Subject: [PATCH] Change version to 0.9.33

---
 drogon_ctl/templates/plugin_h.csp | 3 +--
 get_version.sh                    | 2 +-
 lib/inc/drogon/HttpAppFramework.h | 4 ++--
 lib/inc/drogon/plugins/Plugin.h   | 2 +-
 test.sh                           | 9 +++++++++
 5 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/drogon_ctl/templates/plugin_h.csp b/drogon_ctl/templates/plugin_h.csp
index 7a835e89..488d3e5e 100644
--- a/drogon_ctl/templates/plugin_h.csp
+++ b/drogon_ctl/templates/plugin_h.csp
@@ -7,7 +7,6 @@
 #pragma once
 
 #include <drogon/plugins/Plugin.h>
-using namespace drogon;
 <%c++
 auto namespaceVector=@@.get<std::vector<std::string>>("namespaceVector");
 if(namespaceVector.empty())
@@ -18,7 +17,7 @@ namespace {%namespaceName%}
 {
 <%c++}
 $$<<"\n";%>
-class [[className]] : public Plugin<[[className]]>
+class [[className]] : public drogon::Plugin<[[className]]>
 {
   public:
     [[className]]() {}
diff --git a/get_version.sh b/get_version.sh
index a8738187..5e9574f4 100755
--- a/get_version.sh
+++ b/get_version.sh
@@ -3,7 +3,7 @@
 GIT_VER=$(git log|grep ^commit|wc -l|sed -e "s/^ *//")
 MD5=$(git log|head -1|awk '{printf $2}')
 TMP_FILE=/tmp/version
-echo "#define VERSION \"0.9.32.$GIT_VER\"" > ${TMP_FILE}
+echo "#define VERSION \"0.9.33.$GIT_VER\"" > ${TMP_FILE}
 echo "#define VERSION_MD5 \"$MD5\"" >> ${TMP_FILE}
 if [ ! -f $1 ];then
 mv -f ${TMP_FILE} $1
diff --git a/lib/inc/drogon/HttpAppFramework.h b/lib/inc/drogon/HttpAppFramework.h
index a24d8b7a..ffa72b51 100755
--- a/lib/inc/drogon/HttpAppFramework.h
+++ b/lib/inc/drogon/HttpAppFramework.h
@@ -122,7 +122,7 @@ public:
     ///Get the plugin object registered in the framework
     /**
      * NOTE:
-     * This method is usually called after the framework is run.
+     * This method is usually called after the framework runs.
      * Calling this method in the initAndStart() method of plugins is also valid. 
      */
     template <typename T>
@@ -138,7 +138,7 @@ public:
      * @param name: is the class name of the plugin.
      * 
      * NOTE:
-     * This method is usually called after the framework is run.
+     * This method is usually called after the framework runs.
      * Calling this method in the initAndStart() method of plugins is also valid. 
      */
     virtual PluginBase *getPlugin(const std::string &name) = 0;
diff --git a/lib/inc/drogon/plugins/Plugin.h b/lib/inc/drogon/plugins/Plugin.h
index 0b9134ee..77501dbf 100644
--- a/lib/inc/drogon/plugins/Plugin.h
+++ b/lib/inc/drogon/plugins/Plugin.h
@@ -57,7 +57,7 @@ class PluginBase : public virtual DrObjectBase, public trantor::NonCopyable
         }
         else
         {
-            LOG_FATAL << "There are a loop-dependency within plugins.";
+            LOG_FATAL << "There are a circular dependency within plugins.";
             abort();
         }
     }
diff --git a/test.sh b/test.sh
index 6b6deed8..ea073696 100755
--- a/test.sh
+++ b/test.sh
@@ -71,6 +71,15 @@ if [ ! -f "Test_TestFilter.h" -o ! -f "Test_TestFilter.cc" ];then
     exit -1
 fi
 
+cd ../plugins
+
+drogon_ctl create plugin Test::TestPlugin
+
+if [ ! -f "Test_TestPlugin.h" -o ! -f "Test_TestPlugin.cc" ];then
+    echo "Failed to create plugins"
+    exit -1
+fi
+
 cd ../build
 cmake ..