stropheruby 0.2 → 0.2.1

data/ext/strophe.h

@@ -1,7 +1,7 @@
 /* strophe.h
 ** strophe XMPP client library C API
 **
-** Copyright (C) 2005-2009 Collecta, Inc.
+** Copyright (C) 2005-2008 OGG, LLC.
 **
 **  This software is provided AS-IS with no warranty, either express or
 **  implied.
@@ -14,7 +14,7 @@
 
 /** @file
  *  Strophe public C API definitions.
- */
+*/
 
 #ifndef __LIBSTROPHE_STROPHE_H__
 #define __LIBSTROPHE_STROPHE_H__
@@ -212,19 +212,16 @@ xmpp_conn_t * xmpp_conn_clone(xmpp_conn_t * const conn);
 int xmpp_conn_release(xmpp_conn_t * const conn);
 
 const char *xmpp_conn_get_jid(const xmpp_conn_t * const conn);
-const char *xmpp_conn_get_bound_jid(const xmpp_conn_t * const conn);
 void xmpp_conn_set_jid(xmpp_conn_t * const conn, const char * const jid);
 const char *xmpp_conn_get_pass(const xmpp_conn_t * const conn);
 void xmpp_conn_set_pass(xmpp_conn_t * const conn, const char * const pass);
-unsigned int xmpp_conn_get_connect_timeout(const xmpp_conn_t * const conn);
-void xmpp_conn_set_connect_timeout(xmpp_conn_t * const conn, const unsigned int timeout);     
 xmpp_ctx_t* xmpp_conn_get_context(xmpp_conn_t * const conn);
 
-int xmpp_connect_client(xmpp_conn_t * const conn, 
+int xmpp_connect_client(xmpp_conn_t * const conn,
 			  const char * const altdomain,
 			  unsigned short altport,
-			  xmpp_conn_handler callback,
-			  void * const userdata);
+			xmpp_conn_handler callback,
+			void * const userdata);
 
 /*
 int xmpp_connect_component(conn, name)

data/ext/thread.c

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

data/ext/thread.h

@@ -1,7 +1,7 @@
 /* thread.h
 ** strophe XMPP client library -- thread abstraction header
 **
-** Copyright (C) 2005-2009 Collecta, Inc. 
+** Copyright (C) 2005-2008 OGG, LLC. All rights reserved.
 **
 **  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-2009 Collecta, Inc. 
+** Copyright (C) 2005-2008 OGG, LLC. All rights reserved.
 **
 **  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-2009 Collecta, Inc. 
+** Copyright (C) 2005-2008 OGG, LLC. All rights reserved.
 **
 **  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-2009 Collecta, Inc. 
+** Copyright (C) 2005-2008 OGG, LLC. All rights reserved.
 **
 **  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-2009 Collecta, Inc. 
+** Copyright (C) 2005-2008 OGG, LLC. All rights reserved.
 **
 **  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

@@ -1,30 +1,34 @@
 --- !ruby/object:Gem::Specification 
 name: stropheruby
 version: !ruby/object:Gem::Version 
+  hash: 21
   prerelease: false
   segments: 
   - 0
   - 2
-  version: "0.2"
+  - 1
+  version: 0.2.1
 platform: ruby
 authors: 
-- Dingding Ye
-- Xue Yong Zhi
 - "Fran\xC3\xA7ois Lamontagne"
+- Yongzhi Xue
+- Dingding Ye
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2010-02-26 00:00:00 +08:00
+date: 2010-09-19 00:00:00 +08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: hoe
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 49
         segments: 
         - 1
         - 8
@@ -32,11 +36,11 @@ dependencies:
         version: 1.8.3
   type: :development
   version_requirements: *id001
-description: 
+description: Stropheruby is a ruby bindings for Strophe, a C library for writing XMPP clients.
 email: 
-- yedingding@gmail.com
-- xue.yong.zhi@gmail.com
 - flamontagne@gmail.com
+- xue.yong.zhi@gmail.com
+- yedingding@gmail.com
 executables: []
 
 extensions: 
@@ -53,8 +57,7 @@ files:
 - README.txt
 - Rakefile
 - ext/md5.c
-- ext/parser.h
-- ext/parser_expat.c
+- ext/parser.c
 - ext/util.c
 - ext/strophe_ruby.c
 - ext/conn.c
@@ -89,7 +92,7 @@ files:
 - ext/extconf.rb
 - examples/xmpp_client.rb
 has_rdoc: true
-homepage: 
+homepage: http://github.com/yong/stropheruby
 licenses: []
 
 post_install_message: 
@@ -100,23 +103,27 @@ require_paths:
 - lib
 - ext
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: strophe_ruby
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 2
 summary: strophe_ruby

data/ext/parser.h

@@ -1,43 +0,0 @@
-/* parser.h
-** strophe XMPP client library -- parser structures and functions
-**
-** Copyright (C) 2005-2009 Collecta, Inc. 
-**
-**  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
- *  Internally used functions and structures.
- */
-
-#ifndef __LIBSTROPHE_PARSER_H__
-#define __LIBSTROPHE_PARSER_H__
-
-#include "strophe.h"
-
-typedef struct _parser_t parser_t;
-
-typedef void (*parser_start_callback)(char *name,
-                                      char **attrs,
-                                      void * const userdata);
-typedef void (*parser_end_callback)(char *name, void * const userdata);
-typedef void (*parser_stanza_callback)(xmpp_stanza_t *stanza,
-                                       void * const userdata);
-
-
-parser_t *parser_new(xmpp_ctx_t *ctx, 
-                     parser_start_callback startcb,
-                     parser_end_callback endcb,
-                     parser_stanza_callback stanzacb,
-                     void *userdata);
-void parser_free(parser_t * const parser);
-int parser_reset(parser_t *parser);
-int parser_feed(parser_t *parser, char *chunk, int len);
-
-#endif /* __LIBSTROPHE_PARSER_H__ */

data/ext/parser_expat.c

@@ -1,202 +0,0 @@
-/* parser.c
-** strophe XMPP client library -- xml parser handlers and utility functions
-**
-** Copyright (C) 2005-2009 Collecta, Inc. 
-**
-**  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"
-#include "parser.h"
-
-struct _parser_t {
-    xmpp_ctx_t *ctx;
-    XML_Parser expat;
-    parser_start_callback startcb;
-    parser_end_callback endcb;
-    parser_stanza_callback stanzacb;
-    void *userdata;
-    int depth;
-    xmpp_stanza_t *stanza;
-};
-
-static void _set_attributes(xmpp_stanza_t *stanza, const XML_Char **attrs)
-{
-    int i;
-
-    if (!attrs) return;
-
-    for (i = 0; attrs[i]; i += 2) {
-        xmpp_stanza_set_attribute(stanza, attrs[i], attrs[i+1]);
-    }
-}
-
-static void _start_element(void *userdata,
-                           const XML_Char *name,
-                           const XML_Char **attrs)
-{
-    parser_t *parser = (parser_t *)userdata;
-    xmpp_stanza_t *child;
-
-    if (parser->depth == 0) {
-        /* notify the owner */
-        if (parser->startcb)
-            parser->startcb((char *)name, (char **)attrs, 
-                            parser->userdata);
-    } else {
-	/* build stanzas at depth 1 */
-	if (!parser->stanza && parser->depth != 1) {
-	    /* something terrible happened */
-	    /* FIXME: shutdown disconnect */
-	    xmpp_error(parser->ctx, "parser", "oops, where did our stanza go?");
-	} else if (!parser->stanza) {
-	    /* starting a new toplevel stanza */
-	    parser->stanza = xmpp_stanza_new(parser->ctx);
-	    if (!parser->stanza) {
-		/* FIXME: can't allocate, disconnect */
-	    }
-	    xmpp_stanza_set_name(parser->stanza, name);
-	    _set_attributes(parser->stanza, attrs);
-	} else {
-	    /* starting a child of parser->stanza */
-	    child = xmpp_stanza_new(parser->ctx);
-	    if (!child) {
-		/* FIXME: can't allocate, disconnect */
-	    }
-	    xmpp_stanza_set_name(child, name);
-	    _set_attributes(child, attrs);
-
-	    /* add child to parent */
-	    xmpp_stanza_add_child(parser->stanza, child);
-	    
-	    /* the child is owned by the toplevel stanza now */
-	    xmpp_stanza_release(child);
-
-	    /* make child the current stanza */
-	    parser->stanza = child;
-	}
-    }
-
-    parser->depth++;
-}
-
-static void _end_element(void *userdata, const XML_Char *name)
-{
-    parser_t *parser = (parser_t *)userdata;
-
-    parser->depth--;
-
-    if (parser->depth == 0) {
-        /* notify the owner */
-        if (parser->endcb)
-            parser->endcb((char *)name, parser->userdata);
-    } else {
-	if (parser->stanza->parent) {
-	    /* we're finishing a child stanza, so set current to the parent */
-	    parser->stanza = parser->stanza->parent;
-	} else {
-            if (parser->stanzacb)
-                parser->stanzacb(parser->stanza,
-                                 parser->userdata);
-	    xmpp_stanza_release(parser->stanza);
-	    parser->stanza = NULL;
-	}
-    }
-}
-
-static void _characters(void *userdata, const XML_Char *s, int len)
-{
-    parser_t *parser = (parser_t *)userdata;
-    xmpp_stanza_t *stanza;
-
-    if (parser->depth < 2) return;
-
-    /* create and populate stanza */
-    stanza = xmpp_stanza_new(parser->ctx);
-    if (!stanza) {
-	/* FIXME: allocation error, disconnect */
-	return;
-    }
-    xmpp_stanza_set_text_with_size(stanza, s, len);
-
-    xmpp_stanza_add_child(parser->stanza, stanza);
-    xmpp_stanza_release(stanza);
-}
-
-parser_t *parser_new(xmpp_ctx_t *ctx,
-                     parser_start_callback startcb,
-                     parser_end_callback endcb,
-                     parser_stanza_callback stanzacb,
-                     void *userdata)
-{
-    parser_t *parser;
-
-    parser = xmpp_alloc(ctx, sizeof(parser_t));
-    if (parser != NULL) {
-        parser->ctx = ctx;
-        parser->expat = NULL;
-        parser->startcb = startcb;
-        parser->endcb = endcb;
-        parser->stanzacb = stanzacb;
-        parser->userdata = userdata;
-        parser->depth = 0;
-        parser->stanza = NULL;
-
-        parser_reset(parser);
-    }
-
-    return parser;
-}
-
-/* free a parser */
-void parser_free(parser_t *parser)
-{
-    if (parser->expat)
-        XML_ParserFree(parser->expat);
-
-    xmpp_free(parser->ctx, parser);
-}
-
-/* shuts down and restarts XML parser.  true on success */
-int parser_reset(parser_t *parser)
-{
-    if (parser->expat)
-	XML_ParserFree(parser->expat);
-
-    if (parser->stanza) 
-	xmpp_stanza_release(parser->stanza);
-
-    parser->expat = XML_ParserCreate(NULL);
-    if (!parser->expat) return 0;
-
-    parser->depth = 0;
-    parser->stanza = NULL;
-
-    XML_SetUserData(parser->expat, parser);
-    XML_SetElementHandler(parser->expat, _start_element, _end_element);
-    XML_SetCharacterDataHandler(parser->expat, _characters);
-
-    return 1;
-}
-
-int parser_feed(parser_t *parser, char *chunk, int len)
-{
-    return XML_Parse(parser->expat, chunk, len, 0);
-}