added htmltidy dependency

- added libtidy detection to configure
- added tidy flags to libopkele.pc.in
- added primitive wrapper classes
- added tidy exception class

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

3 files changed, 85 insertions, 1 deletions

diff --git a/include/Makefile.am b/include/Makefile.am
index 1076c12..51dcea1 100644
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -7,15 +7,15 @@ nobase_include_HEADERS = \
 	opkele/server.h \
 	opkele/consumer.h \
 	opkele/extension.h \
 	opkele/sreg.h \
 	opkele/extension_chain.h \
 	opkele/xconsumer.h \
 	opkele/xserver.h \
 	opkele/discovery.h \
 	opkele/uris.h \
 	opkele/tr1-mem.h
 EXTRA_DIST = \
 	opkele/data.h \
-	opkele/curl.h opkele/expat.h \
+	opkele/curl.h opkele/expat.h opkele/tidy.h \
 	opkele/util.h \
 	opkele/debug.h
diff --git a/include/opkele/exception.h b/include/opkele/exception.h
index c200a13..a8c3339 100644
--- a/include/opkele/exception.h
+++ b/include/opkele/exception.h
@@ -244,24 +244,35 @@ namespace opkele {
      * libcurl
      */
     class exception_curl : public exception_network {
 	public:
 	    CURLcode _error;
 	    string _curl_string;
 	    exception_curl(OPKELE_E_PARS);
 	    exception_curl(OPKELE_E_PARS,CURLcode e);
 	    ~exception_curl() throw() { }
     };
 
     /**
+     * htmltidy related error occured
+     */
+    class exception_tidy : public exception {
+	public:
+	    int _rc;
+	    exception_tidy(OPKELE_E_PARS);
+	    exception_tidy(OPKELE_E_PARS,int r);
+	    ~exception_tidy() throw() { }
+    };
+
+    /**
      * exception thrown in case of failed discovery
      */
     class failed_discovery : public exception {
 	public:
 	    failed_discovery(OPKELE_E_PARS)
 		: exception(OPKELE_E_CONS) { }
     };
 
     /**
      * unsuccessfull xri resolution
      */
     class failed_xri_resolution : public failed_discovery {
diff --git a/include/opkele/tidy.h b/include/opkele/tidy.h
new file mode 100644
index 0000000..888e7d4
--- a/dev/null
+++ b/include/opkele/tidy.h
@@ -0,0 +1,73 @@
+#ifndef __OPKELE_TIDY_H
+#define __OPKELE_TIDY_H
+
+#include <cassert>
+#include <tidy.h>
+#include <buffio.h>
+
+namespace opkele {
+    namespace util {
+
+	class tidy_buf_t {
+	    public:
+		TidyBuffer _x;
+
+		tidy_buf_t() { tidyBufInit(&_x); }
+		virtual ~tidy_buf_t() throw() {
+		    tidyBufFree(&_x); }
+
+		inline operator const TidyBuffer&(void) const { return _x; }
+		inline operator TidyBuffer&(void) { return _x; }
+
+		inline operator const char*(void) const { return (const char*)_x.bp; }
+		inline operator char*(void) { return (char*)_x.bp; }
+
+		inline const char *c_str() const {
+		    return (const char*)_x.bp; }
+		inline size_t size() const {
+		    return _x.size; }
+	};
+
+	class tidy_doc_t {
+	    public:
+		TidyDoc _x;
+
+		tidy_doc_t() : _x(0) { }
+		tidy_doc_t(TidyDoc x) : _x(x) { }
+		virtual ~tidy_doc_t() throw() {
+		    if(_x) tidyRelease(_x); }
+
+		tidy_doc_t& operator=(TidyDoc x) {
+		    if(_x) tidyRelease(_x);
+		    _x = x;
+		    return *this;
+		}
+
+		operator const TidyDoc(void) const { return _x; }
+		operator TidyDoc(void) { return _x; }
+
+		inline bool opt_set(TidyOptionId o,bool v) {
+		    assert(_x);
+		    return tidyOptSetBool(_x,o,v?yes:no); }
+		inline bool opt_set(TidyOptionId o,int v) {
+		    assert(_x);
+		    return tidyOptSetInt(_x,o,v); }
+
+		inline int parse_string(const string& s) {
+		    assert(_x);
+		    return tidyParseString(_x,s.c_str()); }
+		inline int clean_and_repair() {
+		    assert(_x);
+		    return tidyCleanAndRepair(_x); }
+		inline int save_buffer(TidyBuffer& ob) {
+		    assert(_x);
+		    return tidySaveBuffer(_x,&ob); }
+
+		static inline TidyDoc create() {
+		    return tidyCreate(); }
+	};
+
+    }
+}
+
+#endif /* __OPKELE_TIDY_H */