blather 0.2.2 → 0.2.3

data/README.rdoc

@@ -67,7 +67,7 @@ There are 5 different types of guards:
   #   Equivalent to stanza.chat?
   message :chat?
 
-  # Hash with any value (:body => 'exit')
+  # Hash with value (:body => 'exit')
   #   Calls the key on the stanza and checks for equality
   #   Equivalent to stanza.body == 'exit'
   message :body => 'exit'
@@ -100,4 +100,4 @@ There are 5 different types of guards:
 = License
 
 Please see LICENSE
-The LibXML-Ruby license can be found in its directory
+The LibXML-Ruby license can be found in its directory

data/Rakefile

@@ -5,7 +5,7 @@ begin
   require 'jeweler'
   Jeweler::Tasks.new do |gem|
     gem.name = 'blather'
-    gem.description = gem.summary = 'An evented XMPP library written on EventMachine and libxml-ruby'
+    gem.summary = 'An evented XMPP library written on EventMachine and libxml-ruby'
 
     gem.email = 'sprsquish@gmail.com'
     gem.homepage = 'http://github.com/sprsquish/blather'
@@ -13,11 +13,13 @@ begin
 
     gem.rubyforge_project = 'squishtech'
 
-    gem.extensions = %w[ext/extconf.rb]
+    gem.extensions = ['Rakefile']
 
     gem.add_dependency 'eventmachine', '>= 0.12.6'
     gem.add_dependency 'libxml-ruby', '>= 1.1.3'
 
+    gem.files = FileList['examples/**/*', 'lib/**/*', 'ext/*'].to_a
+
     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
   end
 rescue LoadError
@@ -46,8 +48,6 @@ rescue LoadError
 end
 
 
-task :default => :test
-
 begin
   require 'hanna/rdoctask'
 
@@ -71,28 +71,40 @@ rescue LoadError
   end
 end
 
-desc 'Build extensions'
-task :build => :extensions
-task :extension => :build
+MAKE = ENV['MAKE'] || (RUBY_PLATFORM =~ /mswin/ ? 'nmake' : 'make')
 
-ext = Config::CONFIG["DLEXT"]
-task :extensions => ["ext/push_parser.#{ext}"]
-file "ext/push_parser.#{ext}" =>
-  ["Makefile"] + FileList["ext/*.{c,h}"].to_a do |t|
-  Dir.chdir("ext") { sh "make" }
-end
+namespace :ext do
+  ext_sources = FileList['ext/*.{rb,c}']
+
+  desc 'Compile the makefile'
+  file 'ext/Makefile' => ext_sources do
+    chdir('ext') { ruby 'extconf.rb' }
+  end
+
+  desc "make extension"
+  task :make => ext_sources + ['ext/Makefile'] do
+    chdir('ext') { sh MAKE }
+  end
+
+  desc 'Build push parser'
+  task :build => :make
 
-namespace :extensions do
   desc 'Clean extensions'
   task :clean do
-    Dir.chdir("ext") do
+    chdir 'ext' do
       sh "rm -f Makefile"
       sh "rm -f *.{o,so,bundle,log}"
     end
   end
 end
 
-file "Makefile" => %w[ext/extconf.rb] do
-  command = ["ruby"] + $:.map{|dir| "-I#{File.expand_path dir}"} + ["extconf.rb"]
-  Dir.chdir("ext") { sh(*command) }
+# If running under rubygems...
+__DIR__ ||= File.expand_path(File.dirname(__FILE__))
+if Gem.path.any? {|path| %r(^#{Regexp.escape path}) =~ __DIR__}
+  task :default => :gem_build
+else
+  task :default => ['ext:build', :test]
 end
+ 
+desc ":default build when running under rubygems."
+task :gem_build => 'ext:build'

data/ext/Makefile

@@ -0,0 +1,149 @@
+
+SHELL = /bin/sh
+
+#### Start of system configuration section. ####
+
+srcdir = .
+topdir = /System/Library/Frameworks/Ruby.framework/Versions/1.8/usr/lib/ruby/1.8/universal-darwin9.0
+hdrdir = $(topdir)
+VPATH = $(srcdir):$(topdir):$(hdrdir)
+prefix = $(DESTDIR)/System/Library/Frameworks/Ruby.framework/Versions/1.8/usr
+exec_prefix = $(prefix)
+sitedir = $(DESTDIR)/Library/Ruby/Site
+rubylibdir = $(libdir)/ruby/$(ruby_version)
+docdir = $(datarootdir)/doc/$(PACKAGE)
+dvidir = $(docdir)
+datarootdir = $(prefix)/share
+archdir = $(rubylibdir)/$(arch)
+sbindir = $(exec_prefix)/sbin
+psdir = $(docdir)
+localedir = $(datarootdir)/locale
+htmldir = $(docdir)
+datadir = $(datarootdir)
+includedir = $(prefix)/include
+infodir = $(DESTDIR)/usr/share/info
+sysconfdir = $(prefix)/etc
+mandir = $(DESTDIR)/usr/share/man
+libdir = $(exec_prefix)/lib
+sharedstatedir = $(prefix)/com
+oldincludedir = $(DESTDIR)/usr/include
+pdfdir = $(docdir)
+sitearchdir = $(sitelibdir)/$(sitearch)
+bindir = $(exec_prefix)/bin
+localstatedir = $(prefix)/var
+sitelibdir = $(sitedir)/$(ruby_version)
+libexecdir = $(exec_prefix)/libexec
+
+CC = gcc
+LIBRUBY = $(LIBRUBY_SO)
+LIBRUBY_A = lib$(RUBY_SO_NAME)-static.a
+LIBRUBYARG_SHARED = -l$(RUBY_SO_NAME)
+LIBRUBYARG_STATIC = -l$(RUBY_SO_NAME)
+
+RUBY_EXTCONF_H = 
+CFLAGS   =  -fno-common -arch ppc -arch i386 -Os -pipe -fno-common -DOS_UNIX -DBUILD_FOR_RUBY 
+INCFLAGS = -I. -I. -I/System/Library/Frameworks/Ruby.framework/Versions/1.8/usr/lib/ruby/1.8/universal-darwin9.0 -I. -I/usr/include/libxml2
+CPPFLAGS =  
+CXXFLAGS = $(CFLAGS) 
+DLDFLAGS = -L. -arch ppc -arch i386  
+LDSHARED = cc -arch ppc -arch i386 -pipe -bundle -undefined dynamic_lookup
+AR = ar
+EXEEXT = 
+
+RUBY_INSTALL_NAME = ruby
+RUBY_SO_NAME = ruby
+arch = universal-darwin9.0
+sitearch = universal-darwin9.0
+ruby_version = 1.8
+ruby = /System/Library/Frameworks/Ruby.framework/Versions/1.8/usr/bin/ruby
+RUBY = $(ruby)
+RM = rm -f
+MAKEDIRS = mkdir -p
+INSTALL = /usr/bin/install -c
+INSTALL_PROG = $(INSTALL) -m 0755
+INSTALL_DATA = $(INSTALL) -m 644
+COPY = cp
+
+#### End of system configuration section. ####
+
+preload = 
+
+libpath = . $(libdir)
+LIBPATH =  -L"." -L"$(libdir)"
+DEFFILE = 
+
+CLEANFILES = mkmf.log
+DISTCLEANFILES = 
+
+extout = 
+extout_prefix = 
+target_prefix = 
+LOCAL_LIBS = 
+LIBS = $(LIBRUBYARG_SHARED) -lxml2  -lpthread -ldl -lm  
+SRCS = push_parser.c
+OBJS = push_parser.o
+TARGET = push_parser
+DLLIB = $(TARGET).bundle
+EXTSTATIC = 
+STATIC_LIB = 
+
+RUBYCOMMONDIR = $(sitedir)$(target_prefix)
+RUBYLIBDIR    = $(sitelibdir)$(target_prefix)
+RUBYARCHDIR   = $(sitearchdir)$(target_prefix)
+
+TARGET_SO     = $(DLLIB)
+CLEANLIBS     = $(TARGET).bundle $(TARGET).il? $(TARGET).tds $(TARGET).map
+CLEANOBJS     = *.o *.a *.s[ol] *.pdb *.exp *.bak
+
+all:		$(DLLIB)
+static:		$(STATIC_LIB)
+
+clean:
+		@-$(RM) $(CLEANLIBS) $(CLEANOBJS) $(CLEANFILES)
+
+distclean:	clean
+		@-$(RM) Makefile $(RUBY_EXTCONF_H) conftest.* mkmf.log
+		@-$(RM) core ruby$(EXEEXT) *~ $(DISTCLEANFILES)
+
+realclean:	distclean
+install: install-so install-rb
+
+install-so: $(RUBYARCHDIR)
+install-so: $(RUBYARCHDIR)/$(DLLIB)
+$(RUBYARCHDIR)/$(DLLIB): $(DLLIB)
+	$(INSTALL_PROG) $(DLLIB) $(RUBYARCHDIR)
+install-rb: pre-install-rb install-rb-default
+install-rb-default: pre-install-rb-default
+pre-install-rb: Makefile
+pre-install-rb-default: Makefile
+$(RUBYARCHDIR):
+	$(MAKEDIRS) $@
+
+site-install: site-install-so site-install-rb
+site-install-so: install-so
+site-install-rb: install-rb
+
+.SUFFIXES: .c .m .cc .cxx .cpp .C .o
+
+.cc.o:
+	$(CXX) $(INCFLAGS) $(CPPFLAGS) $(CXXFLAGS) -c $<
+
+.cxx.o:
+	$(CXX) $(INCFLAGS) $(CPPFLAGS) $(CXXFLAGS) -c $<
+
+.cpp.o:
+	$(CXX) $(INCFLAGS) $(CPPFLAGS) $(CXXFLAGS) -c $<
+
+.C.o:
+	$(CXX) $(INCFLAGS) $(CPPFLAGS) $(CXXFLAGS) -c $<
+
+.c.o:
+	$(CC) $(INCFLAGS) $(CPPFLAGS) $(CFLAGS) -c $<
+
+$(DLLIB): $(OBJS)
+	@-$(RM) $@
+	$(LDSHARED) -o $@ $(OBJS) $(LIBPATH) $(DLDFLAGS) $(LOCAL_LIBS) $(LIBS)
+
+
+
+$(OBJS): ruby.h defines.h

data/ext/mkmf.log

@@ -0,0 +1,30 @@
+have_library: checking for main() in -lxml2... -------------------- yes
+
+"gcc -o conftest -I. -I/System/Library/Frameworks/Ruby.framework/Versions/1.8/usr/lib/ruby/1.8/universal-darwin9.0 -I.  -arch ppc -arch i386 -Os -pipe -fno-common conftest.c  -L"." -L"/System/Library/Frameworks/Ruby.framework/Versions/1.8/usr/lib" -L. -arch ppc -arch i386     -lruby -lxml2  -lpthread -ldl -lm  "
+checked program was:
+/* begin */
+1: /*top*/
+2: int main() { return 0; }
+3: int t() { void ((*volatile p)()); p = (void ((*)()))main; return 0; }
+/* end */
+
+--------------------
+
+find_header: checking for #include <libxml/parser.h>
+... -------------------- yes
+
+"gcc -E -I. -I/System/Library/Frameworks/Ruby.framework/Versions/1.8/usr/lib/ruby/1.8/universal-darwin9.0 -I.    -Os -pipe -fno-common  conftest.c -o conftest.i"
+conftest.c:1:27: error: libxml/parser.h: No such file or directory
+checked program was:
+/* begin */
+1: #include <libxml/parser.h>
+/* end */
+
+"gcc -E -I. -I/System/Library/Frameworks/Ruby.framework/Versions/1.8/usr/lib/ruby/1.8/universal-darwin9.0 -I.    -Os -pipe -fno-common -I/usr/include/libxml2 conftest.c -o conftest.i"
+checked program was:
+/* begin */
+1: #include <libxml/parser.h>
+/* end */
+
+--------------------
+

data/ext/push_parser.c

@@ -0,0 +1,231 @@
+/*
+ * Most of this was ripped from libxml-ruby's SAX handler
+ */
+
+#include <libxml/parser.h>
+#include <ruby.h>
+
+xmlSAXHandler saxHandler;
+
+static VALUE
+push_parser_raise_error (
+  xmlErrorPtr error)
+{
+  rb_raise(rb_eStandardError, "%s", rb_str_new2((const char*)error->message));
+  return Qnil;
+}
+
+static VALUE
+push_parser_initialize (
+  VALUE self,
+  VALUE handler)
+{
+  xmlParserCtxtPtr ctxt;
+  ctxt = xmlCreatePushParserCtxt(&saxHandler, (void *)handler, NULL, 0, NULL);
+  
+  if (!ctxt)
+    return push_parser_raise_error(&xmlLastError);
+
+  ctxt->sax2 = 1;
+
+  rb_iv_set(self, "@__libxml_push_parser", Data_Wrap_Struct(rb_cData, 0, xmlFreeParserCtxt, ctxt));
+
+  return self;
+}
+
+static VALUE
+push_parser_close (
+  VALUE self)
+{
+  xmlParserCtxtPtr ctxt;
+  Data_Get_Struct(rb_iv_get(self, "@__libxml_push_parser"), xmlParserCtxt, ctxt);
+  
+  if (xmlParseChunk(ctxt, "", 0, 1)) {
+    return push_parser_raise_error(&xmlLastError);
+  }
+  else {
+    return Qtrue;
+  }
+}
+
+static VALUE
+push_parser_receive (
+  VALUE self,
+  VALUE chunk)
+{
+  const char *data = StringValuePtr(chunk);
+  int length = RSTRING_LEN(chunk);
+
+  xmlParserCtxtPtr ctxt;
+  Data_Get_Struct(rb_iv_get(self, "@__libxml_push_parser"), xmlParserCtxt, ctxt);
+
+  // Chunk through in 4KB chunks so as not to overwhelm the buffers
+  int i;
+  int chunkSize = length < 4096 ? length : 4096;
+  for (i = 0; i < length; i += chunkSize) {
+    xmlParseChunk(ctxt, data+i, chunkSize, 0);
+  }
+  if ((i -= length) > 0)
+    xmlParseChunk(ctxt, data+(length-i), i, 0);
+
+  return self;
+}
+
+/*********
+ CALLBACKS
+**********/
+static void
+push_parser_start_document_callback (
+  void *ctx)
+{
+  VALUE handler = (VALUE) ctx;
+  if (handler != Qnil)
+    rb_funcall (handler, rb_intern("on_start_document"), 0);
+}
+
+static void
+push_parser_end_document_callback (
+  void *ctx)
+{
+  VALUE handler = (VALUE) ctx;
+  if (handler != Qnil)
+    rb_funcall (handler, rb_intern("on_end_document"), 0);
+}
+
+static void
+push_parser_start_element_ns_callback (
+  void * ctx,
+  const xmlChar * localname,
+  const xmlChar * prefix,
+  const xmlChar * URI,
+  int nb_namespaces,
+  const xmlChar ** namespaces,
+  int nb_attributes,
+  int nb_defaulted,
+  const xmlChar ** attributes)
+{
+  VALUE handler = (VALUE) ctx;
+  if (handler == Qnil)
+    return;
+
+  VALUE attrHash = rb_hash_new();
+  VALUE nsHash = rb_hash_new();
+
+  if (attributes)
+  {
+    /* Each attribute is an array of [localname, prefix, URI, value, end] */
+    int i;
+    for (i = 0; i < nb_attributes * 5; i += 5)
+    {
+      rb_hash_aset( attrHash,
+                    rb_str_new2((const char*)attributes[i+0]),
+                    rb_str_new((const char*)attributes[i+3], attributes[i+4] - attributes[i+3]));
+    }
+  }
+
+  if (namespaces)
+  {
+    int i;
+    for (i = 0; i < nb_namespaces * 2; i += 2)
+    {
+      rb_hash_aset( nsHash,
+                    namespaces[i+0] ? rb_str_new2((const char*)namespaces[i+0]) : Qnil,
+                    namespaces[i+1] ? rb_str_new2((const char*)namespaces[i+1]) : Qnil);
+    }
+  }
+
+  rb_funcall(handler, rb_intern("on_start_element_ns"), 5, 
+             rb_str_new2((const char*)localname),
+             attrHash,
+             prefix ? rb_str_new2((const char*)prefix) : Qnil,
+             URI ? rb_str_new2((const char*)URI) : Qnil,
+             nsHash);
+}
+
+static void
+push_parser_end_element_ns_callback (
+  void * ctx,
+  const xmlChar * localname,
+  const xmlChar * prefix,
+  const xmlChar * URI)
+{
+  VALUE handler = (VALUE) ctx;
+  if (handler == Qnil)
+    return;
+
+  rb_funcall(handler, rb_intern("on_end_element_ns"), 3, 
+             rb_str_new2((const char*)localname),
+             prefix ? rb_str_new2((const char*)prefix) : Qnil,
+             URI ? rb_str_new2((const char*)URI) : Qnil);
+}
+
+
+static void
+push_parser_characters_callback (
+  void *ctx,
+  const char *chars,
+  int len)
+{
+  VALUE handler = (VALUE) ctx;
+  if (handler != Qnil)
+    rb_funcall (handler, rb_intern("on_characters"), 1, rb_str_new(chars, len));
+}
+
+static void
+push_parser_structured_error_callback (
+  void *ctx,
+  xmlErrorPtr error)
+{
+  VALUE handler = (VALUE) ctx;
+  if (handler != Qnil)
+    rb_funcall (handler, rb_intern("on_error"), 1, rb_str_new2((const char*)error->message));
+}
+
+xmlSAXHandler saxHandler = {
+  0, //internalSubset
+  0, //isStandalone
+  0, //hasInternalSubset
+  0, //hasExternalSubset
+  0, //resolveEntity
+  0, //getEntity
+  0, //entityDecl
+  0, //notationDecl
+  0, //attributeDecl
+  0, //elementDecl
+  0, //unparsedEntityDecl
+  0, //setDocumentLocator
+  (startDocumentSAXFunc) push_parser_start_document_callback,
+  (endDocumentSAXFunc) push_parser_end_document_callback,
+  0, //startElement
+  0, //endElement
+  0, //reference
+  (charactersSAXFunc) push_parser_characters_callback,
+  0, //ignorableWhitespace
+  0, //processingInstruction
+  0, //comment
+  0, //warning
+  (errorSAXFunc) push_parser_structured_error_callback,
+  0, //fatalError
+  0, //getParameterEntity
+  0, //cdataBlock
+  0, //externalSubset
+  XML_SAX2_MAGIC,
+  0, //_private
+  (startElementNsSAX2Func) push_parser_start_element_ns_callback,
+  (endElementNsSAX2Func) push_parser_end_element_ns_callback,
+  (xmlStructuredErrorFunc) push_parser_structured_error_callback
+};
+
+void
+Init_push_parser()
+{
+  /* SaxPushParser */
+  VALUE mLibXML = rb_define_module("LibXML");
+  VALUE mXML = rb_define_module_under(mLibXML, "XML");
+  VALUE cXMLSaxPushParser = rb_define_class_under(mXML, "SaxPushParser", rb_cObject);
+
+  /* Instance Methods */
+  rb_define_method(cXMLSaxPushParser, "initialize", push_parser_initialize, 1);
+  rb_define_method(cXMLSaxPushParser, "receive", push_parser_receive, 1);
+  rb_define_method(cXMLSaxPushParser, "close", push_parser_close, 0);
+}