stropheruby 0.1.5 → 0.2

data/ext/thread.h

@@ -1,7 +1,7 @@
 /* thread.h
 ** strophe XMPP client library -- thread abstraction header
 **
-** Copyright (C) 2005-2008 OGG, LLC. All rights reserved.
+** Copyright (C) 2005-2009 Collecta, Inc. 
 **
 **  This software is provided AS-IS with no warranty, either express
 **  or implied.
@@ -14,7 +14,7 @@
 
 /** @file
  *  Threading abstraction API.
-*/
+ */
 
 #ifndef __LIBSTROPHE_THREAD_H__
 #define __LIBSTROPHE_THREAD_H__

data/ext/tls.h

@@ -1,7 +1,7 @@
 /* tls.h
 ** strophe XMPP client library -- TLS abstraction header
 **
-** Copyright (C) 2005-2008 OGG, LLC. All rights reserved.
+** Copyright (C) 2005-2009 Collecta, Inc. 
 **
 **  This software is provided AS-IS with no warranty, either express
 **  or implied.

data/ext/tls_dummy.c

@@ -1,7 +1,7 @@
 /* tls_dummy.c
 ** strophe XMPP client library -- TLS abstraction dummy impl.
 **
-** Copyright (C) 2005-2008 OGG, LLC. All rights reserved.
+** Copyright (C) 2005-2009 Collecta, Inc. 
 **
 **  This software is provided AS-IS with no warranty, either express
 **  or implied.
@@ -14,7 +14,7 @@
 
 /** @file
  *  TLS dummy implementation.
-*/
+ */
 
 #include "common.h"
 #include "tls.h"

data/ext/util.c

@@ -1,7 +1,7 @@
 /* util.c
 ** strophe XMPP client library -- various utility functions
 **
-** Copyright (C) 2005-2008 OGG, LLC. All rights reserved.
+** Copyright (C) 2005-2009 Collecta, Inc. 
 **
 **  This software is provided AS-IS with no warranty, either express
 **  or implied.
@@ -14,7 +14,7 @@
 
 /** @file
  *  Utility functions.
-*/
+ */
 
 #include <stdio.h>
 #include <string.h>

data/ext/util.h

@@ -1,7 +1,7 @@
 /* util.h
 ** strophe XMPP client library -- various utility functions
 **
-** Copyright (C) 2005-2008 OGG, LLC. All rights reserved.
+** Copyright (C) 2005-2009 Collecta, Inc. 
 **
 **  This software is provided AS-IS with no warranty, either express
 **  or implied.
@@ -14,7 +14,7 @@
 
 /** @file
  *  Internally used utility functions.
-*/
+ */
 
 #ifndef __LIBSTROPHE_UTIL_H__
 #define __LIBSTROPHE_UTIL_H__

metadata

@@ -4,11 +4,12 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 1
-  - 5
-  version: 0.1.5
+  - 2
+  version: "0.2"
 platform: ruby
 authors: 
+- Dingding Ye
+- Xue Yong Zhi
 - "Fran\xC3\xA7ois Lamontagne"
 autorequire: 
 bindir: bin
@@ -33,6 +34,8 @@ dependencies:
   version_requirements: *id001
 description: 
 email: 
+- yedingding@gmail.com
+- xue.yong.zhi@gmail.com
 - flamontagne@gmail.com
 executables: []
 
@@ -50,7 +53,8 @@ files:
 - README.txt
 - Rakefile
 - ext/md5.c
-- ext/parser.c
+- ext/parser.h
+- ext/parser_expat.c
 - ext/util.c
 - ext/strophe_ruby.c
 - ext/conn.c

data/ext/parser.c

@@ -1,208 +0,0 @@
-/* parser.c
-** strophe XMPP client library -- xml parser handlers and utility functions
-**
-** Copyright (C) 2005-2008 OGG, LLC. All rights reserved.
-**
-**  This software is provided AS-IS with no warranty, either express
-**  or implied.
-**
-**  This software is distributed under license and may not be copied,
-**  modified or distributed except as expressly authorized under the
-**  terms of the license contained in the file LICENSE.txt in this
-**  distribution.
-*/
-
-/** @file
- *  XML parser handlers.
-*/
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include "expat.h"
-
-#include "strophe.h"
-#include "common.h"
-
-static void _log_open_tag(xmpp_conn_t * const conn,
-			  const XML_Char **attr)
-{
-    char buf[4096];
-    size_t len, pos;
-    int i;
-
-    pos = 0;
-    len = xmpp_snprintf(buf, 4096, "<stream:stream");
-    if (len < 0) return;
-
-    pos += len;
-
-    for (i = 0; attr[i]; i += 2) {
-	len = xmpp_snprintf(&buf[pos], 4096 - pos, " %s=\"%s\"", 
-			    attr[i], attr[i+1]);
-	if (len < 0) return;
-
-	pos += len;
-    }
-
-    len = xmpp_snprintf(&buf[pos], 4096 - pos, ">");
-    if (len < 0) return;
-
-    xmpp_debug(conn->ctx, "xmpp", "RECV: %s", buf);
-}
-
-void parser_handle_start(void *userdata,
-			 const XML_Char *name,
-			 const XML_Char **attr)
-{
-    xmpp_conn_t *conn = (xmpp_conn_t *)userdata;
-    xmpp_stanza_t *child;
-
-    if (conn->depth == 0) {
-	/* we're expecting a stream:stream tag. */
-	if (strcmp(name, "stream:stream") != 0) {
-	    xmpp_error(conn->ctx, "xmpp",
-		       "Server did not open valid stream.");
-	    conn->error = -3;
-	    conn_disconnect(conn);
-	} else {
-	    _log_open_tag(conn, attr);
-
-	    if (conn->stream_id) xmpp_free(conn->ctx, conn->stream_id);
-	    conn->stream_id = xmpp_strdup(conn->ctx, "foo");
-	    if (!conn->stream_id) {
-		xmpp_error(conn->ctx, "xmpp",
-			   "Memory allocation failure.");
-		conn->error = -2;
-		conn_disconnect(conn);
-	    }
-
-	    /* call stream open handler */
-	    conn->open_handler(conn);
-	}
-    } else {
-	/* build stanzas at depth 1 */
-	if (!conn->stanza && conn->depth != 1) {
-	    /* something terrible happened */
-	    /* FIXME: shutdown disconnect */
-	    xmpp_debug(conn->ctx, "xmpp", "oops, where did our stanza go?");
-	} else if (!conn->stanza) {
-	    /* starting a new toplevel stanza */
-	    conn->stanza = xmpp_stanza_new(conn->ctx);
-	    if (!conn->stanza) {
-		/* FIXME: can't allocate, disconnect */
-	    }
-	    xmpp_stanza_set_name(conn->stanza, name);
-	    xmpp_stanza_set_attributes(conn->stanza, attr);
-	} else {
-	    /* starting a child of conn->stanza */
-	    child = xmpp_stanza_new(conn->ctx);
-	    if (!child) {
-		/* FIXME: can't allocate, disconnect */
-	    }
-	    xmpp_stanza_set_name(child, name);
-	    xmpp_stanza_set_attributes(child, attr);
-
-	    /* add child to parent */
-	    xmpp_stanza_add_child(conn->stanza, child);
-	    
-	    /* the child is owned by the toplevel stanza now */
-	    xmpp_stanza_release(child);
-
-	    /* make child the current stanza */
-	    conn->stanza = child;
-	}
-    }
-
-    conn->depth++;
-}
-
-void parser_handle_end(void *userdata, const XML_Char *name)
-{
-    xmpp_conn_t *conn = (xmpp_conn_t *)userdata;
-    char *buf;
-    size_t len;
-    xmpp_stanza_t *stanza;
-
-    conn->depth--;
-
-    if (conn->depth == 0) {
-	/* got a closing stream tag */
-	xmpp_debug(conn->ctx, "xmpp", "RECV: </stream:stream>");
-	conn_disconnect_clean(conn);
-    } else {
-	if (conn->stanza->parent) {
-	    /* we're finishing a child stanza, so set current to the parent */
-	    conn->stanza = conn->stanza->parent;
-	} else {
-	    /* we're finishing a toplevel stanza, so fire off handler */
-	    if (xmpp_stanza_to_text(conn->stanza, &buf, &len) == 0) {
-		xmpp_debug(conn->ctx, "xmpp", "RECV: %s", buf);
-		xmpp_free(conn->ctx, buf);
-	    }
-
-	    stanza = xmpp_stanza_clone(conn->stanza);
-	    xmpp_stanza_release(conn->stanza);
-	    conn->stanza = NULL;
-
-	    /* fire handlers */
-	    handler_fire_stanza(conn, stanza);
-
-	    xmpp_stanza_release(stanza);
-	}
-    }
-}
-
-void parser_handle_character(void *userdata, const XML_Char *s, int len)
-{
-    xmpp_conn_t *conn = (xmpp_conn_t *)userdata;
-    xmpp_stanza_t *stanza;
-
-    if (conn->depth < 2) return;
-
-    /* create and populate stanza */
-    stanza = xmpp_stanza_new(conn->ctx);
-    if (!stanza) {
-	/* FIXME: allocation error, disconnect */
-	return;
-    }
-    xmpp_stanza_set_text_with_size(stanza, s, len);
-
-    xmpp_stanza_add_child(conn->stanza, stanza);
-    xmpp_stanza_release(stanza);
-}
-
-/* prepares a parser reset.  this is called from handlers.  we can't
- * reset the parser immediately as it is not reentrant. */
-void parser_prepare_reset(xmpp_conn_t * const conn, 
-			  xmpp_open_handler handler)
-{
-    conn->reset_parser = 1;
-    conn->open_handler = handler;
-}
-
-/* shuts down and restarts XML parser.  true on success */
-int parser_reset(xmpp_conn_t * const conn)
-{
-    conn->reset_parser = 0;
-
-    if (conn->parser)
-	XML_ParserFree(conn->parser);
-
-    if (conn->stanza) 
-	xmpp_stanza_release(conn->stanza);
-
-    conn->parser = XML_ParserCreate(NULL);
-    if (!conn->parser) return 0;
-
-    conn->depth = 0;
-    conn->stanza = NULL;
-    XML_SetUserData(conn->parser, conn);
-    XML_SetElementHandler(conn->parser, parser_handle_start, 
-			  parser_handle_end);
-    XML_SetCharacterDataHandler(conn->parser, parser_handle_character);
-
-    return 1;
-}
-