introduced base_message class as a base for basic_openid_message

Signed-off-by: Michael Krelin <hacker@klever.net>

1 files changed, 28 insertions, 14 deletions

diff --git a/include/opkele/types.h b/include/opkele/types.h
index ffb9afb..64f165c 100644
--- a/include/opkele/types.h
+++ b/include/opkele/types.h
@@ -120,3 +120,3 @@ namespace opkele {
 
-    class basic_openid_message {
+    class basic_message {
         public:
@@ -127,7 +127,7 @@ namespace opkele {
 
-            basic_openid_message() { }
-            virtual ~basic_openid_message() { }
-            basic_openid_message(const basic_openid_message& x);
-            void copy_to(basic_openid_message& x) const;
-            void append_to(basic_openid_message& x) const;
+            basic_message() { }
+            virtual ~basic_message() { }
+            basic_message(const basic_message& x);
+            void copy_to(basic_message& x) const;
+            void append_to(basic_message& x) const;
 
@@ -136,5 +136,2 @@ namespace opkele {
 
-            virtual bool has_ns(const string& uri) const;
-            virtual string get_ns(const string& uri) const;
-
             virtual fields_iterator fields_begin() const = 0;
@@ -142,5 +139,4 @@ namespace opkele {
 
-            virtual string append_query(const string& url,const char *pfx="openid.") const;
-            virtual string query_string(const char *pfx="openid.") const;
-
+            virtual string append_query(const string& url,const char *pfx=0) const;
+            virtual string query_string(const char *pfx=0) const;
 
@@ -150,2 +146,22 @@ namespace opkele {
 
+    };
+
+    class basic_openid_message : public basic_message {
+        public:
+            typedef list<string> fields_t;
+            typedef util::forward_iterator_proxy<
+                string,const string&,const string*
+                > fields_iterator;
+
+            basic_openid_message() { }
+            basic_openid_message(const basic_openid_message& x);
+
+            virtual bool has_ns(const string& uri) const;
+            virtual string get_ns(const string& uri) const;
+
+            virtual string append_query(const string& url,const char *pfx="openid.") const {
+                return basic_message::append_query(url,pfx); }
+            virtual string query_string(const char *pfx="openid.") const {
+                return basic_message::query_string(pfx); }
+
             virtual void from_keyvalues(const string& kv);
@@ -166,4 +182,2 @@ namespace opkele {
 
-            void copy_to(basic_openid_message& x) const;
-
             bool has_field(const string& n) const;