noderb-http 0.0.3 → 0.0.4

data/ext/noderb_http_extension/extconf.rb

@@ -1,3 +1,5 @@
 require "mkmf"
 
+$CFLAGS = CONFIG['CFLAGS'] = " -fPIC -shared "
+
 create_makefile("noderb_http_extension")

data/ext/noderb_http_extension/noderb_http.c

@@ -1,73 +1,62 @@
 #include <noderb_http.h>
 
 typedef struct {
-    long parser;
+    VALUE parser;
     int pre_headers;
 } nodeRb_http;
 
 VALUE nodeRbHttpParser;
 VALUE nodeRbHttpPointer;
 
-VALUE nodeRb_get_object_from_id(long id) {
-    return rb_funcall(rb_const_get(rb_cObject, rb_intern("ObjectSpace")), rb_intern("_id2ref"), 1, rb_int2inum(id));
-}
-
 int nodeRb_http_on_message_begin(http_parser* parser) {
     nodeRb_http* client = parser->data;
-    VALUE self = nodeRb_get_object_from_id(client->parser);
-    rb_funcall(self, rb_intern("on_message_begin"), 0);
+    rb_funcall(client->parser, rb_intern("on_message_begin"), 0);
     return 0;
 }
 
 int nodeRb_http_on_url(http_parser* parser, const char *buf, size_t len) {
     nodeRb_http* client = parser->data;
-    VALUE self = nodeRb_get_object_from_id(client->parser);
     if(parser->type == HTTP_REQUEST){
-        rb_funcall(self, rb_intern("on_method"), 1, rb_str_new2(http_method_str(parser->method)));
+        rb_funcall(client->parser, rb_intern("on_method"), 1, rb_str_new2(http_method_str(parser->method)));
     }
-    rb_funcall(self, rb_intern("on_url"), 1, rb_str_new(buf, len));
+    rb_funcall(client->parser, rb_intern("on_url"), 1, rb_str_new(buf, len));
     return 0;
 }
 
 int nodeRb_http_on_header_field(http_parser* parser, const char *buf, size_t len) {
     nodeRb_http* client = parser->data;
-    VALUE self = nodeRb_get_object_from_id(client->parser);
-    rb_funcall(self, rb_intern("on_header_field"), 1, rb_str_new(buf, len));
+    rb_funcall(client->parser, rb_intern("on_header_field"), 1, rb_str_new(buf, len));
     return 0;
 }
 
 int nodeRb_http_on_header_value(http_parser* parser, const char *buf, size_t len) {
     nodeRb_http* client = parser->data;
-    VALUE self = nodeRb_get_object_from_id(client->parser);
-    rb_funcall(self, rb_intern("on_header_value"), 1, rb_str_new(buf, len));
+    rb_funcall(client->parser, rb_intern("on_header_value"), 1, rb_str_new(buf, len));
     return 0;
 }
 
 int nodeRb_http_on_headers_complete(http_parser* parser) {
     nodeRb_http* client = parser->data;
-    VALUE self = nodeRb_get_object_from_id(client->parser);
-    rb_funcall(self, rb_intern("on_version"), 2, rb_int2inum(parser->http_major), rb_int2inum(parser->http_minor));
+    rb_funcall(client->parser, rb_intern("on_version"), 2, rb_int2inum(parser->http_major), rb_int2inum(parser->http_minor));
     if(parser->type == HTTP_RESPONSE){
-        rb_funcall(self, rb_intern("on_status_code"), 1, rb_int2inum(parser->status_code));
+        rb_funcall(client->parser, rb_intern("on_status_code"), 1, rb_int2inum(parser->status_code));
     }
     if (http_should_keep_alive(parser)) {       
-        rb_funcall(self, rb_intern("on_keep_alive"), 1, Qtrue);
+        rb_funcall(client->parser, rb_intern("on_keep_alive"), 1, Qtrue);
     }
-    rb_funcall(self, rb_intern("on_headers_complete"), 0);
+    rb_funcall(client->parser, rb_intern("on_headers_complete"), 0);
     return 0;
 }
 
 int nodeRb_http_on_body(http_parser* parser, const char *buf, size_t len) {
     nodeRb_http* client = parser->data;
-    VALUE self = nodeRb_get_object_from_id(client->parser);
-    rb_funcall(self, rb_intern("on_body"), 1, rb_str_new(buf, len));
+    rb_funcall(client->parser, rb_intern("on_body"), 1, rb_str_new(buf, len));
     return 0;
 }
 
 int nodeRb_http_on_message_complete(http_parser* parser) {
     nodeRb_http* client = parser->data;
-    VALUE self = nodeRb_get_object_from_id(client->parser);
-    rb_funcall(self, rb_intern("on_message_complete"), 0);
+    rb_funcall(client->parser, rb_intern("on_message_complete"), 0);
     return 0;
 }
 
@@ -96,12 +85,13 @@ VALUE nodeRb_http_setup(VALUE self, VALUE type) {
     }   
 
     nodeRb_http* client = malloc(sizeof (nodeRb_http));
+    client->parser = self;
     parser->data = client;
 
-    client->parser = rb_num2long(rb_obj_id(self));
-
-    rb_iv_set(self, "@settings", Data_Wrap_Struct(nodeRbHttpPointer, 0, NULL, settings));
-    rb_iv_set(self, "@parser", Data_Wrap_Struct(nodeRbHttpPointer, 0, NULL, parser));
+    rb_iv_set(self, "settings", Data_Wrap_Struct(nodeRbHttpPointer, 0, NULL, settings));
+    rb_iv_set(self, "parser", Data_Wrap_Struct(nodeRbHttpPointer, 0, NULL, parser));
+    
+    return self;
 };
 
 VALUE nodeRb_http_parse(VALUE self, VALUE data) {
@@ -109,15 +99,12 @@ VALUE nodeRb_http_parse(VALUE self, VALUE data) {
     http_parser_settings* settings;
     http_parser* parser;
 
-    VALUE rsettings = rb_iv_get(self, "@settings");
-    VALUE rparser = rb_iv_get(self, "@parser");
-
+    VALUE rsettings = rb_iv_get(self, "settings");
+    VALUE rparser = rb_iv_get(self, "parser");
 
     Data_Get_Struct(rsettings, http_parser_settings, settings);
     Data_Get_Struct(rparser, http_parser, parser);
 
-    nodeRb_http* client = parser->data;
-
     size_t parsed = http_parser_execute(parser, settings, rb_string_value_cstr(&data), RSTRING_LEN(data));
 
     if (parser->upgrade) {
@@ -125,18 +112,21 @@ VALUE nodeRb_http_parse(VALUE self, VALUE data) {
     } else if (parsed != (unsigned) RSTRING_LEN(data)) {
         rb_funcall(self, rb_intern("on_error"), 2, rb_str_new2(http_errno_name(parser->http_errno)), rb_str_new2(http_errno_description(parser->http_errno)));
     };
+
+    return self;
 };
 
 VALUE nodeRb_http_dispose(VALUE self) {
     http_parser_settings* settings;
     http_parser* parser;
 
-    Data_Get_Struct(rb_iv_get(self, "@settings"), http_parser_settings, settings);
-    Data_Get_Struct(rb_iv_get(self, "@parser"), http_parser, parser);
+    Data_Get_Struct(rb_iv_get(self, "settings"), http_parser_settings, settings);
+    Data_Get_Struct(rb_iv_get(self, "parser"), http_parser, parser);
 
     free(parser->data);
     free(settings);
     free(parser);
+    return self;
 };
 
 void Init_noderb_http_extension() {

data/lib/noderb/modules/http/version.rb

@@ -2,7 +2,7 @@ module NodeRb
   module Modules
     module Http
       
-      VERSION = "0.0.3" unless const_defined?(:VERSION)
+      VERSION = "0.0.4" unless const_defined?(:VERSION)
     
     end
   end

data/test/init.rb

@@ -1,10 +1,10 @@
-$: << File.expand_path("../../ext/noderb_http_extension", __FILE__)
-$: << File.expand_path("../../lib", __FILE__)
-
+#$: << File.expand_path("../../ext/noderb_http_extension", __FILE__)
+#$: << File.expand_path("../../lib", __FILE__)
+require "rubygems"
 require "noderb-http"
 
 class TestParser
-  
+
   include NodeRb::Modules::Http::Parser
   
   attr_accessor :headers, :version_major, :version_minor, :method, :url, :body, :keep_alive, :upgrade
@@ -41,6 +41,7 @@ Dir.glob(File.expand_path("../cases/*.rb", __FILE__)) do |file|
     require file
 end
 
+puts "** Testing noderb-http"
 failed = false
 CASES.each do |test|
   parser = TestParser.new
@@ -57,6 +58,7 @@ CASES.each do |test|
     puts "** Test <#{test[:name]}> failed on #{result}" if result != "OK"
     failed = true
   end
+  parser.dispose
 end
 
-puts "** All test passed OK" unless failed
+puts "** All test passed OK" unless failed

metadata

@@ -1,24 +1,33 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: noderb-http
-version: !ruby/object:Gem::Version
-  version: 0.0.3
+version: !ruby/object:Gem::Version 
+  hash: 23
   prerelease: 
+  segments: 
+  - 0
+  - 0
+  - 4
+  version: 0.0.4
 platform: ruby
-authors:
+authors: 
 - Marek Jelen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-08-10 00:00:00.000000000Z
+
+date: 2011-10-01 00:00:00 Z
 dependencies: []
+
 description: Fast and full-featured HTTP parser.
-email:
+email: 
 - marek@jelen.biz
 executables: []
-extensions:
+
+extensions: 
 - ext/noderb_http_extension/extconf.rb
 extra_rdoc_files: []
-files:
+
+files: 
 - lib/noderb/modules/http/parser.rb
 - lib/noderb/modules/http/version.rb
 - lib/noderb/modules/http.rb
@@ -26,12 +35,8 @@ files:
 - ext/noderb_http_extension/extconf.rb
 - ext/noderb_http_extension/http_parser.c
 - ext/noderb_http_extension/http_parser.h
-- ext/noderb_http_extension/http_parser.o
-- ext/noderb_http_extension/Makefile
 - ext/noderb_http_extension/noderb_http.c
 - ext/noderb_http_extension/noderb_http.h
-- ext/noderb_http_extension/noderb_http.o
-- ext/noderb_http_extension/noderb_http_extension.bundle
 - test/cases/curl_get.rb
 - test/cases/patch_request.rb
 - test/cases/response.rb
@@ -41,26 +46,38 @@ files:
 - README.md
 homepage: http://github.com/noderb/noderb-http
 licenses: []
+
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
+  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
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 23
+      segments: 
+      - 1
+      - 3
+      - 6
       version: 1.3.6
 requirements: []
+
 rubyforge_project: 
-rubygems_version: 1.8.5
+rubygems_version: 1.8.8
 signing_key: 
 specification_version: 3
 summary: Fast and full-featured HTTP parser
 test_files: []
+

data/ext/noderb_http_extension/Makefile

@@ -1,187 +0,0 @@
-
-SHELL = /bin/sh
-
-#### Start of system configuration section. ####
-
-srcdir = .
-topdir = /Users/marek/.rvm/rubies/ruby-1.9.2-p290/include/ruby-1.9.1
-hdrdir = /Users/marek/.rvm/rubies/ruby-1.9.2-p290/include/ruby-1.9.1
-arch_hdrdir = /Users/marek/.rvm/rubies/ruby-1.9.2-p290/include/ruby-1.9.1/$(arch)
-VPATH = $(srcdir):$(arch_hdrdir)/ruby:$(hdrdir)/ruby
-prefix = $(DESTDIR)/Users/marek/.rvm/rubies/ruby-1.9.2-p290
-rubylibprefix = $(libdir)/$(RUBY_BASE_NAME)
-exec_prefix = $(prefix)
-vendorhdrdir = $(rubyhdrdir)/vendor_ruby
-sitehdrdir = $(rubyhdrdir)/site_ruby
-rubyhdrdir = $(includedir)/$(RUBY_BASE_NAME)-$(ruby_version)
-vendordir = $(rubylibprefix)/vendor_ruby
-sitedir = $(rubylibprefix)/site_ruby
-ridir = $(datarootdir)/$(RI_BASE_NAME)
-mandir = $(datarootdir)/man
-localedir = $(datarootdir)/locale
-libdir = $(exec_prefix)/lib
-psdir = $(docdir)
-pdfdir = $(docdir)
-dvidir = $(docdir)
-htmldir = $(docdir)
-infodir = $(datarootdir)/info
-docdir = $(datarootdir)/doc/$(PACKAGE)
-oldincludedir = $(DESTDIR)/usr/include
-includedir = $(prefix)/include
-localstatedir = $(prefix)/var
-sharedstatedir = $(prefix)/com
-sysconfdir = $(prefix)/etc
-datadir = $(datarootdir)
-datarootdir = $(prefix)/share
-libexecdir = $(exec_prefix)/libexec
-sbindir = $(exec_prefix)/sbin
-bindir = $(exec_prefix)/bin
-rubylibdir = $(rubylibprefix)/$(ruby_version)
-archdir = $(rubylibdir)/$(arch)
-sitelibdir = $(sitedir)/$(ruby_version)
-sitearchdir = $(sitelibdir)/$(sitearch)
-vendorlibdir = $(vendordir)/$(ruby_version)
-vendorarchdir = $(vendorlibdir)/$(sitearch)
-
-CC = gcc
-CXX = g++
-LIBRUBY = $(LIBRUBY_SO)
-LIBRUBY_A = lib$(RUBY_SO_NAME)-static.a
-LIBRUBYARG_SHARED = -l$(RUBY_SO_NAME)
-LIBRUBYARG_STATIC = -l$(RUBY_SO_NAME)-static
-OUTFLAG = -o 
-COUTFLAG = -o 
-
-RUBY_EXTCONF_H = 
-cflags   =  $(optflags) $(debugflags) $(warnflags)
-optflags = -O3
-debugflags = -ggdb
-warnflags = -Wextra -Wno-unused-parameter -Wno-parentheses -Wpointer-arith -Wwrite-strings -Wno-missing-field-initializers -Wshorten-64-to-32 -Wno-long-long
-CFLAGS   = -fno-common $(cflags)  -fno-common -pipe 
-INCFLAGS = -I. -I$(arch_hdrdir) -I$(hdrdir)/ruby/backward -I$(hdrdir) -I$(srcdir)
-DEFS     = 
-CPPFLAGS =  -D_XOPEN_SOURCE -D_DARWIN_C_SOURCE $(DEFS) $(cppflags)
-CXXFLAGS = $(CFLAGS) $(cxxflags)
-ldflags  = -L. -L/usr/local/lib
-dldflags = -Wl,-undefined,dynamic_lookup -Wl,-multiply_defined,suppress -Wl,-flat_namespace
-ARCH_FLAG = 
-DLDFLAGS = $(ldflags) $(dldflags)
-LDSHARED = $(CC) -dynamic -bundle
-LDSHAREDXX = $(CXX) -dynamic -bundle
-AR = ar
-EXEEXT = 
-
-RUBY_BASE_NAME = ruby
-RUBY_INSTALL_NAME = ruby
-RUBY_SO_NAME = ruby.1.9.1
-arch = x86_64-darwin10.8.0
-sitearch = $(arch)
-ruby_version = 1.9.1
-ruby = /Users/marek/.rvm/rubies/ruby-1.9.2-p290/bin/ruby
-RUBY = $(ruby)
-RM = rm -f
-RM_RF = $(RUBY) -run -e rm -- -rf
-RMDIRS = $(RUBY) -run -e rmdir -- -p
-MAKEDIRS = /usr/local/bin/gmkdir -p
-INSTALL = /usr/local/bin/ginstall -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 = 
-DISTCLEANDIRS = 
-
-extout = 
-extout_prefix = 
-target_prefix = 
-LOCAL_LIBS = 
-LIBS = $(LIBRUBYARG_SHARED)  -lpthread -ldl -lobjc 
-SRCS = http_parser.c noderb_http.c
-OBJS = http_parser.o noderb_http.o
-TARGET = noderb_http_extension
-DLLIB = $(TARGET).bundle
-EXTSTATIC = 
-STATIC_LIB = 
-
-BINDIR        = $(bindir)
-RUBYCOMMONDIR = $(sitedir)$(target_prefix)
-RUBYLIBDIR    = $(sitelibdir)$(target_prefix)
-RUBYARCHDIR   = $(sitearchdir)$(target_prefix)
-HDRDIR        = $(rubyhdrdir)/ruby$(target_prefix)
-ARCHHDRDIR    = $(rubyhdrdir)/$(arch)/ruby$(target_prefix)
-
-TARGET_SO     = $(DLLIB)
-CLEANLIBS     = $(TARGET).bundle 
-CLEANOBJS     = *.o  *.bak
-
-all:    $(DLLIB)
-static: $(STATIC_LIB)
-.PHONY: all install static install-so install-rb
-.PHONY: clean clean-so clean-rb
-
-clean-rb-default::
-clean-rb::
-clean-so::
-clean: clean-so clean-rb-default clean-rb
-		@-$(RM) $(CLEANLIBS) $(CLEANOBJS) $(CLEANFILES)
-
-distclean-rb-default::
-distclean-rb::
-distclean-so::
-distclean: clean distclean-so distclean-rb-default distclean-rb
-		@-$(RM) Makefile $(RUBY_EXTCONF_H) conftest.* mkmf.log
-		@-$(RM) core ruby$(EXEEXT) *~ $(DISTCLEANFILES)
-		@-$(RMDIRS) $(DISTCLEANDIRS)
-
-realclean: distclean
-install: install-so install-rb
-
-install-so: $(RUBYARCHDIR)
-install-so: $(RUBYARCHDIR)/$(DLLIB)
-$(RUBYARCHDIR)/$(DLLIB): $(DLLIB)
-	@-$(MAKEDIRS) $(@D)
-	$(INSTALL_PROG) $(DLLIB) $(@D)
-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) $(COUTFLAG)$@ -c $<
-
-.cxx.o:
-	$(CXX) $(INCFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(COUTFLAG)$@ -c $<
-
-.cpp.o:
-	$(CXX) $(INCFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(COUTFLAG)$@ -c $<
-
-.C.o:
-	$(CXX) $(INCFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(COUTFLAG)$@ -c $<
-
-.c.o:
-	$(CC) $(INCFLAGS) $(CPPFLAGS) $(CFLAGS) $(COUTFLAG)$@ -c $<
-
-$(DLLIB): $(OBJS) Makefile
-	@-$(RM) $(@)
-	$(LDSHARED) -o $@ $(OBJS) $(LIBPATH) $(DLDFLAGS) $(LOCAL_LIBS) $(LIBS)
-
-
-
-$(OBJS): $(hdrdir)/ruby.h $(hdrdir)/ruby/defines.h $(arch_hdrdir)/ruby/config.h