renamed basic_message to basic_fields

since oauth fieldsets aren't really messages

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

4 files changed, 97 insertions, 91 deletions

diff --git a/include/opkele/types.h b/include/opkele/types.h
index bf50e2b..f63bf5d 100644
--- a/include/opkele/types.h
+++ b/include/opkele/types.h
@@ -117,19 +117,19 @@ namespace opkele {
      * the shared_ptr<> for association_t object type
      */
     typedef tr1mem::shared_ptr<association_t> assoc_t;
 
-    class basic_message {
+    class basic_fields {
 	public:
 	    typedef util::forward_iterator_proxy<
 		string,const string&,const string*
 		> fields_iterator;
 
-	    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;
+	    basic_fields() { }
+	    virtual ~basic_fields() { }
+	    basic_fields(const basic_fields& x);
+	    void copy_to(basic_fields& x) const;
+	    void append_to(basic_fields& x) const;
 
 	    virtual bool has_field(const string& n) const = 0;
 	    virtual const string& get_field(const string& n) const = 0;
 
@@ -144,25 +144,21 @@ namespace opkele {
 	    virtual void reset_field(const string& n);
 
     };
 
-    class basic_openid_message : public basic_message {
+    class basic_openid_message : public basic_fields {
 	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); }
+		return basic_fields::append_query(url,pfx); }
 	    virtual string query_string(const char *pfx="openid.") const {
-		return basic_message::query_string(pfx); }
+		return basic_fields::query_string(pfx); }
 
 	    virtual void from_keyvalues(const string& kv);
 	    virtual void to_keyvalues(ostream& o) const;
 
diff --git a/lib/Makefile.am b/lib/Makefile.am
index 9b25b42..20d15b8 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -27,8 +27,8 @@ libopkele_la_SOURCES = \
 		       extension_chain.cc \
 		       curl.cc expat.cc \
 		       discovery.cc \
 		       basic_rp.cc prequeue_rp.cc \
-		       message.cc \
+		       fields.cc message.cc \
 		       basic_op.cc verify_op.cc
 libopkele_la_LDFLAGS = \
 	-version-info 2:0:0
diff --git a/lib/fields.cc b/lib/fields.cc
new file mode 100644
index 0000000..d494098
--- a/dev/null
+++ b/lib/fields.cc
@@ -0,0 +1,86 @@
+#include <opkele/types.h>
+#include <opkele/exception.h>
+#include <opkele/util.h>
+
+namespace opkele {
+    using std::unary_function;
+
+    struct __om_copier : public unary_function<const string&,void> {
+	public:
+	    const basic_fields& from;
+	    basic_fields& to;
+
+	    __om_copier(basic_fields& t,const basic_fields& f)
+		: from(f), to(t) { }
+
+	    result_type operator()(argument_type f) {
+		to.set_field(f,from.get_field(f)); }
+    };
+
+    basic_fields::basic_fields(const basic_fields& x) {
+	x.copy_to(*this);
+    }
+    void basic_fields::copy_to(basic_fields& x) const {
+	x.reset_fields();
+	for_each(fields_begin(),fields_end(),
+		__om_copier(x,*this) );
+    }
+    void basic_fields::append_to(basic_fields& x) const {
+	for_each(fields_begin(),fields_end(),
+		__om_copier(x,*this) );
+    }
+
+    struct __om_query_builder : public unary_function<const string&,void> {
+	public:
+	    const basic_fields& om;
+	    bool first;
+	    string& rv;
+	    const char *pfx;
+
+	    __om_query_builder(const char *p,string& r,const basic_fields& m)
+		: om(m), first(true), rv(r), pfx(p) {
+		    for_each(om.fields_begin(),om.fields_end(),*this);
+		}
+	    __om_query_builder(const char *p,string& r,const basic_fields& m,const string& u)
+		: om(m), first(true), rv(r), pfx(p) {
+		    rv = u;
+		    if(rv.find('?')==string::npos)
+			rv += '?';
+		    else
+			first = false;
+		    for_each(om.fields_begin(),om.fields_end(),*this);
+		}
+
+	    result_type operator()(argument_type f) {
+		if(first)
+		    first = false;
+		else
+		    rv += '&';
+		if(pfx) rv += pfx;
+		rv+= f;
+		rv += '=';
+		rv += util::url_encode(om.get_field(f));
+	    }
+    };
+
+    string basic_fields::append_query(const string& url,const char *pfx) const {
+	string rv;
+	return __om_query_builder(pfx,rv,*this,url).rv;
+    }
+    string basic_fields::query_string(const char *pfx) const {
+	string rv;
+	return __om_query_builder(pfx,rv,*this).rv;
+    }
+
+    void basic_fields::reset_fields() {
+	throw not_implemented(OPKELE_CP_ "reset_fields() not implemented");
+    }
+    void basic_fields::set_field(const string&,const string&) {
+	throw not_implemented(OPKELE_CP_ "set_field() not implemented");
+    }
+    void basic_fields::reset_field(const string&) {
+	throw not_implemented(OPKELE_CP_ "reset_field() not implemented");
+    }
+
+
+}
diff --git a/lib/message.cc b/lib/message.cc
index 78f20f4..b2324b7 100644
--- a/lib/message.cc
+++ b/lib/message.cc
@@ -9,84 +9,8 @@
 namespace opkele {
     using std::input_iterator_tag;
     using std::unary_function;
 
-    struct __om_copier : public unary_function<const string&,void> {
-	public:
-	    const basic_message& from;
-	    basic_message& to;
-
-	    __om_copier(basic_message& t,const basic_message& f)
-		: from(f), to(t) { }
-
-	    result_type operator()(argument_type f) {
-		to.set_field(f,from.get_field(f)); }
-    };
-
-    basic_message::basic_message(const basic_message& x) {
-	x.copy_to(*this);
-    }
-    void basic_message::copy_to(basic_message& x) const {
-	x.reset_fields();
-	for_each(fields_begin(),fields_end(),
-		__om_copier(x,*this) );
-    }
-    void basic_message::append_to(basic_message& x) const {
-	for_each(fields_begin(),fields_end(),
-		__om_copier(x,*this) );
-    }
-
-    struct __om_query_builder : public unary_function<const string&,void> {
-	public:
-	    const basic_message& om;
-	    bool first;
-	    string& rv;
-	    const char *pfx;
-
-	    __om_query_builder(const char *p,string& r,const basic_message& m)
-		: om(m), first(true), rv(r), pfx(p) {
-		    for_each(om.fields_begin(),om.fields_end(),*this);
-		}
-	    __om_query_builder(const char *p,string& r,const basic_message& m,const string& u)
-		: om(m), first(true), rv(r), pfx(p) {
-		    rv = u;
-		    if(rv.find('?')==string::npos)
-			rv += '?';
-		    else
-			first = false;
-		    for_each(om.fields_begin(),om.fields_end(),*this);
-		}
-
-	    result_type operator()(argument_type f) {
-		if(first)
-		    first = false;
-		else
-		    rv += '&';
-		if(pfx) rv += pfx;
-		rv+= f;
-		rv += '=';
-		rv += util::url_encode(om.get_field(f));
-	    }
-    };
-
-    string basic_message::append_query(const string& url,const char *pfx) const {
-	string rv;
-	return __om_query_builder(pfx,rv,*this,url).rv;
-    }
-    string basic_message::query_string(const char *pfx) const {
-	string rv;
-	return __om_query_builder(pfx,rv,*this).rv;
-    }
-
-    void basic_message::reset_fields() {
-	throw not_implemented(OPKELE_CP_ "reset_fields() not implemented");
-    }
-    void basic_message::set_field(const string&,const string&) {
-	throw not_implemented(OPKELE_CP_ "set_field() not implemented");
-    }
-    void basic_message::reset_field(const string&) {
-	throw not_implemented(OPKELE_CP_ "reset_field() not implemented");
-    }
 
     struct __om_ns_finder : public unary_function<const string&,bool> {
 	public:
 	    const basic_openid_message& om;
@@ -128,9 +52,9 @@ namespace opkele {
 	    string::size_type nl = kv.find('\n',co+1);
 	    if(nl==string::npos)
 		throw bad_input(OPKELE_CP_ "malformed input");
 	    if(nl>co)
-		insert(value_type(kv.substr(p,co-p),kv.substr(co+1,nl-co-1)));
+		set_field(kv.substr(p,co-p),kv.substr(co+1,nl-co-1));
 	    p = nl+1;
 #else /* POSTELS_LAW */
 	    string::size_type lb = kv.find_first_of("\r\n",co+1);
 	    if(lb==string::npos) {