soup-ruby 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3b6f79d07024077398f62ac29da32e2d358ae063
-  data.tar.gz: 94da43e7166aeda83d6f10f9bd3bddc01347f1bd
+  metadata.gz: 8417f165649590d2812c9f23b1d8d835403f8659
+  data.tar.gz: 7bd581fed65b6d943d944ee432bafdb1fc9920fe
 SHA512:
-  metadata.gz: d0ee1db8550bf30b6dba97cfe8ef168415ef5869f8f74665f1e23fb7f23985b54dde1b3dc675660f85f0ef3b502ea228a8e8382757b745fdcb16272acb06f015
-  data.tar.gz: 23d36e2112e3814e676b6a5604418f402cf3fa9ae8350e52ad689a01ce487ab72d4f2309222488d6145eae84550dee37959b949c184184bf03759778fa654611
+  metadata.gz: afec2298738caaa47d3956326fde54b703e8712b1965ea06f8dbfc491d8534106b16ab20895a417307b49487891896d058e95a58e14584d189c22b65c319deb0
+  data.tar.gz: 5a731a4d5fbba390463b418ab0bcc4a7fc5b708b73fbd1a5d60eb59635d0f5352b5105020ee30f53ca79434082994f7ac2c06ff0915ec815cc31ccd16c08310f

data/Rakefile

@@ -31,7 +31,8 @@ spec = Gem::Specification.new do |s|
 	s.add_dependency("rubber-generate", ">= 0.0.17")
 	s.platform = Gem::Platform::RUBY
 	s.extensions = FileList["ext/*/extconf.rb"]
-	s.files = FileList['ext/*/*.{c,h,cr,rd}'] + ['Rakefile', 'README.md'] + FileList['lib/**/*.rb']
+  s.licenses = ['The Ruby License']
+	s.files = FileList['ext/*/*.{c,h,cr,rd,rb}'] + ['Rakefile', 'README.md'] + FileList['lib/**/*.rb']
 s.description = <<-EOF
 Libsoup bindings for ruby.  Partial coverage sufficient to allow HTTP requests to be handled without blocking the mainloop.
 

data/ext/soup/extconf.rb

@@ -0,0 +1,103 @@
+require 'mkmf'
+use_gems = false
+begin
+  require 'mkmf-gnome2'
+rescue LoadError
+  use_gems = true
+end
+
+if use_gems or Object.const_defined?('Gem')
+  require 'rubygems'
+  gem 'glib2'
+  require 'mkmf-gnome2'
+  %w[rbglib.h rbgtk.h rbpango.h rbatk.h].each do |header|
+  	Gem.find_files(header).each do |f|
+		$CFLAGS += " '-I#{File.dirname(f)}'"
+	end
+  end
+end
+# Look for headers in {gem_root}/ext/{package}
+if use_gems
+  %w[
+ glib2 gdk_pixbuf2 atk gtk2    ].each do |package|
+      require package
+      $CFLAGS += " -I"+Gem.loaded_specs[package].full_gem_path+"/ext/"+package
+  end
+end
+if RbConfig::CONFIG.has_key?('rubyhdrdir')
+$CFLAGS += " -I" + RbConfig::CONFIG['rubyhdrdir']+'/ruby'
+end
+
+$CFLAGS += " -I."
+have_func("rb_errinfo")
+PKGConfig.have_package("gtk+-2.0") or exit(-1)
+PKGConfig.have_package("libsoup-2.4") or exit(-1)
+have_header("libsoup/soup.h") or exit(-1)
+
+STDOUT.print("checking for new allocation framework... ") # for ruby-1.7
+if Object.respond_to? :allocate
+  STDOUT.print "yes
+"
+  $defs << "-DHAVE_OBJECT_ALLOCATE"
+else
+  STDOUT.print "no
+"
+end
+
+top = File.expand_path(File.dirname(__FILE__) + '/..') # XXX
+$CFLAGS += " " + ['glib/src'].map{|d|
+  "-I" + File.join(top, d)
+}.join(" ")
+
+have_func("rb_define_alloc_func") # for ruby-1.8
+
+#set_output_lib('libruby-soup.a')
+if /cygwin|mingw/ =~ RUBY_PLATFORM
+  top = "../.."
+  [
+    ["glib/src", "ruby-glib2"],
+  ].each{|d,l|
+    $LDFLAGS << sprintf(" -L%s/%s", top, d)
+    $libs << sprintf(" -l%s", l)
+  }
+end
+begin
+  srcdir = File.expand_path(File.dirname($0))
+
+  begin
+
+    obj_ext = "."+$OBJEXT
+
+    $libs = $libs.split(/ /).uniq.join(' ')
+    $source_files = Dir.glob(sprintf("%s/*.c", srcdir)).map{|fname|
+      fname[0, srcdir.length+1] = ''
+      fname
+    }
+    $objs = $source_files.collect do |item|
+      item.gsub(/.c$/, obj_ext)
+    end
+
+    #
+    # create Makefile
+    #
+    $defs << "-DRUBY_SOUP_COMPILATION"
+    # $CFLAGS << $defs.join(' ')
+    create_makefile("soup", srcdir)
+    raise Interrupt if not FileTest.exist? "Makefile"
+
+    File.open("Makefile", "a") do |mfile|
+      $source_files.each do |e|
+        mfile.print sprintf("%s: %s
+", e.gsub(/.c$/, obj_ext), e)
+      end
+    end
+  ensure
+    #Dir.chdir ".."
+  end
+
+  #create_top_makefile()
+rescue Interrupt
+  print "  [error] " + $!.to_s + "
+"
+end
+

data/ext/soup/soup.c

@@ -0,0 +1,381 @@
+#pragma GCC diagnostic ignored "-Wunused-but-set-variable"
+/* Includes */
+#include <ruby.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
+#include "libsoup/soup.h"
+
+/* Setup types */
+/* Try not to clash with other definitions of bool... */
+typedef int rubber_bool;
+#define bool rubber_bool
+
+/* Prototypes */
+#include "rbglib.h"
+
+#include "rbgtk.h"
+
+#if defined(G_PLATFORM_WIN32) && !defined(RUBY_GTK2_STATIC_COMPILATION)
+#  ifdef RUBY_GTK2_COMPILATION
+#    define RUBY_GTK2_VAR __declspec(dllexport)
+#  else
+#    define RUBY_GTK2_VAR extern __declspec(dllimport)
+#  endif
+#else
+#  define RUBY_GTK2_VAR extern
+#endif
+
+RUBY_GTK2_VAR VALUE mGtk;
+RUBY_GTK2_VAR VALUE mGdk;
+
+#define RBGTK_INITIALIZE(obj,gtkobj) (rbgtk_initialize_gtkobject(obj, GTK_OBJECT(gtkobj)))
+static VALUE mSoup;
+static VALUE cSession;
+static VALUE
+Session_queue(VALUE self, VALUE __v_message);
+static VALUE
+Session_send(VALUE self, VALUE __v_msg);
+static VALUE
+Session_pause(VALUE self, VALUE __v_msg);
+static VALUE
+Session_unpause(VALUE self, VALUE __v_msg);
+static VALUE
+Session_abort(VALUE self);
+static VALUE cSessionAsync;
+static VALUE
+SessionAsync_initialize(VALUE self);
+static VALUE cURI;
+static VALUE
+URI_initialize(VALUE self, VALUE __v_uri_string);
+static VALUE
+URI_to_s(VALUE self);
+static VALUE cMessage;
+static VALUE
+Message_initialize(VALUE self, VALUE __v_method, VALUE __v_uri);
+static VALUE
+Message_set_request_header(VALUE self, VALUE __v_name, VALUE __v_value);
+static VALUE
+Message_unset_request_header(VALUE self, VALUE __v_name);
+static VALUE
+Message_set_request_body(VALUE self, VALUE __v_type, VALUE body);
+static VALUE
+Message_get_response_header(VALUE self, VALUE __v_name);
+static VALUE
+Message_each_response_header(VALUE self);
+static VALUE
+Message_response_body(VALUE self);
+static VALUE _gcpool_RubyFunc = Qnil;
+static void __gcpool_RubyFunc_add(VALUE val);
+static void __gcpool_RubyFunc_del(VALUE val);
+#define RUBYFUNC_ADD(val) __gcpool_RubyFunc_add(val)
+#define RUBYFUNC_DEL(val) __gcpool_RubyFunc_del(val)
+
+/* Inline C code */
+
+#include <intern.h>
+
+#define INIT(obj, gobj) __my_init(obj, G_OBJECT(gobj))
+
+static inline void __my_init(VALUE obj, GObject *gobj) {
+	g_object_ref(gobj);
+	g_object_ref_sink(gobj);
+	G_INITIALIZE(obj, gobj);
+}
+
+static inline VALUE strOrNil(const char *str) {
+	if (str) {
+		return rb_str_new2(str);
+	} else {
+		return Qnil;
+	}
+}
+
+static void queue_callback(SoupSession *session, SoupMessage *message, gpointer user_data) {
+	VALUE block = (VALUE)user_data;
+	volatile VALUE ary = rb_ary_new3(2, GOBJ2RVAL(session), GOBJ2RVAL(message));
+	if (RTEST(rb_proc_call(block, ary))) {
+		// Truthy - requeue
+		soup_session_requeue_message(session, message);
+	} else {
+		RUBYFUNC_DEL(block);
+	}
+}
+
+static void each_header(const char *name, const char *value, gpointer user_data) {
+	VALUE block = (VALUE)user_data;
+	volatile VALUE ary = rb_ary_new3(2, rb_str_new2(name), rb_str_new2(value));
+	rb_proc_call(block, ary);
+}
+
+
+/* Code */
+static VALUE
+Session_queue(VALUE self, VALUE __v_message)
+{
+  SoupMessage * message; SoupMessage * __orig_message;
+  SoupSession *_self = ((SoupSession*)RVAL2GOBJ(self));
+  __orig_message = message = RVAL2GOBJ(__v_message);
+
+#line 52 "/home/geoff/Projects/soup/ext/soup/soup.cr"
+
+  do {
+  if (rb_block_given_p()) { VALUE  block  =
+ rb_block_proc();
+  RUBYFUNC_ADD(block);
+  soup_session_queue_message(_self, message, queue_callback, (void*)block);
+  } else { soup_session_queue_message(_self, message, NULL, NULL);
+  }
+
+  } while(0);
+
+  return Qnil;
+}
+
+static VALUE
+Session_send(VALUE self, VALUE __v_msg)
+{
+  VALUE __p_retval = Qnil;
+  SoupMessage * msg; SoupMessage * __orig_msg;
+  SoupSession *_self = ((SoupSession*)RVAL2GOBJ(self));
+  __orig_msg = msg = RVAL2GOBJ(__v_msg);
+
+#line 62 "/home/geoff/Projects/soup/ext/soup/soup.cr"
+  do { __p_retval =  UINT2NUM(soup_session_send_message(_self, msg)); goto out; } while(0);
+out:
+  return __p_retval;
+}
+
+static VALUE
+Session_pause(VALUE self, VALUE __v_msg)
+{
+  SoupMessage * msg; SoupMessage * __orig_msg;
+  SoupSession *_self = ((SoupSession*)RVAL2GOBJ(self));
+  __orig_msg = msg = RVAL2GOBJ(__v_msg);
+
+#line 66 "/home/geoff/Projects/soup/ext/soup/soup.cr"
+  soup_session_pause_message(_self, msg);
+ 
+  return Qnil;
+}
+
+static VALUE
+Session_unpause(VALUE self, VALUE __v_msg)
+{
+  SoupMessage * msg; SoupMessage * __orig_msg;
+  SoupSession *_self = ((SoupSession*)RVAL2GOBJ(self));
+  __orig_msg = msg = RVAL2GOBJ(__v_msg);
+
+#line 70 "/home/geoff/Projects/soup/ext/soup/soup.cr"
+  soup_session_unpause_message(_self, msg);
+ 
+  return Qnil;
+}
+
+static VALUE
+Session_abort(VALUE self)
+{
+  SoupSession *_self = ((SoupSession*)RVAL2GOBJ(self));
+
+#line 74 "/home/geoff/Projects/soup/ext/soup/soup.cr"
+  soup_session_abort(_self);
+ 
+  return Qnil;
+}
+
+static VALUE
+SessionAsync_initialize(VALUE self)
+{
+
+#line 81 "/home/geoff/Projects/soup/ext/soup/soup.cr"
+  INIT(self, soup_session_async_new());
+ 
+  return Qnil;
+}
+
+static VALUE
+URI_initialize(VALUE self, VALUE __v_uri_string)
+{
+  char * uri_string; char * __orig_uri_string;
+  __orig_uri_string = uri_string = ( NIL_P(__v_uri_string) ? NULL : StringValuePtr(__v_uri_string) );
+
+#line 88 "/home/geoff/Projects/soup/ext/soup/soup.cr"
+  INIT(self, soup_uri_new(uri_string));
+ 
+  return Qnil;
+}
+
+static VALUE
+URI_to_s(VALUE self)
+{
+  VALUE __p_retval = Qnil;
+  SoupURI * _self = ((SoupURI *)RVAL2BOXED(self, SOUP_TYPE_URI));
+
+#line 91 "/home/geoff/Projects/soup/ext/soup/soup.cr"
+  do { __p_retval =  rb_str_new2(soup_uri_to_string(_self, FALSE)); goto out; } while(0);
+out:
+  return __p_retval;
+}
+
+static VALUE
+Message_initialize(VALUE self, VALUE __v_method, VALUE __v_uri)
+{
+  char * method; char * __orig_method;
+  char * uri; char * __orig_uri;
+  __orig_method = method = ( NIL_P(__v_method) ? NULL : StringValuePtr(__v_method) );
+  __orig_uri = uri = ( NIL_P(__v_uri) ? NULL : StringValuePtr(__v_uri) );
+
+#line 98 "/home/geoff/Projects/soup/ext/soup/soup.cr"
+  INIT(self, soup_message_new(method, uri));
+ 
+  return Qnil;
+}
+
+static VALUE
+Message_set_request_header(VALUE self, VALUE __v_name, VALUE __v_value)
+{
+  char * name; char * __orig_name;
+  char * value; char * __orig_value;
+  SoupMessage *_self = ((SoupMessage*)RVAL2GOBJ(self));
+  __orig_name = name = ( NIL_P(__v_name) ? NULL : StringValuePtr(__v_name) );
+  __orig_value = value = ( NIL_P(__v_value) ? NULL : StringValuePtr(__v_value) );
+
+#line 102 "/home/geoff/Projects/soup/ext/soup/soup.cr"
+  soup_message_headers_replace(_self->request_headers, name, value);
+ 
+  return self;
+}
+
+static VALUE
+Message_unset_request_header(VALUE self, VALUE __v_name)
+{
+  char * name; char * __orig_name;
+  SoupMessage *_self = ((SoupMessage*)RVAL2GOBJ(self));
+  __orig_name = name = ( NIL_P(__v_name) ? NULL : StringValuePtr(__v_name) );
+
+#line 106 "/home/geoff/Projects/soup/ext/soup/soup.cr"
+  soup_message_headers_remove(_self->request_headers, name);
+ 
+  return Qnil;
+}
+
+static VALUE
+Message_set_request_body(VALUE self, VALUE __v_type, VALUE body)
+{
+  char * type; char * __orig_type;
+  SoupMessage *_self = ((SoupMessage*)RVAL2GOBJ(self));
+  __orig_type = type = ( NIL_P(__v_type) ? NULL : StringValuePtr(__v_type) );
+  Check_Type(body, T_STRING);
+
+#line 110 "/home/geoff/Projects/soup/ext/soup/soup.cr"
+  soup_message_set_request(_self, type, SOUP_MEMORY_COPY, RSTRING_PTR(body), RSTRING_LEN(body));
+ 
+  return self;
+}
+
+static VALUE
+Message_get_response_header(VALUE self, VALUE __v_name)
+{
+  VALUE __p_retval = Qnil;
+  char * name; char * __orig_name;
+  SoupMessage *_self = ((SoupMessage*)RVAL2GOBJ(self));
+  __orig_name = name = ( NIL_P(__v_name) ? NULL : StringValuePtr(__v_name) );
+
+#line 114 "/home/geoff/Projects/soup/ext/soup/soup.cr"
+  do { __p_retval =  rb_str_new2(soup_message_headers_get_one(_self->response_headers, name)); goto out; } while(0);
+out:
+  return __p_retval;
+}
+
+static VALUE
+Message_each_response_header(VALUE self)
+{
+  SoupMessage *_self = ((SoupMessage*)RVAL2GOBJ(self));
+
+#line 118 "/home/geoff/Projects/soup/ext/soup/soup.cr"
+
+  do {
+  VALUE  block  =
+ rb_block_proc();
+  rb_need_block();
+  soup_message_headers_foreach(_self->response_headers, each_header, (gpointer)block);
+ 
+
+  } while(0);
+
+  return Qnil;
+}
+
+static VALUE
+Message_response_body(VALUE self)
+{
+  VALUE __p_retval = Qnil;
+  SoupMessage *_self = ((SoupMessage*)RVAL2GOBJ(self));
+
+#line 124 "/home/geoff/Projects/soup/ext/soup/soup.cr"
+
+  do {
+  SoupBuffer * buffer  =
+ soup_message_body_flatten(_self->response_body);
+  volatile VALUE  str  =
+ rb_str_new(buffer->data, buffer->length);
+  soup_buffer_free(buffer);
+  do { __p_retval = str; goto out; } while(0);
+
+  } while(0);
+
+out:
+  return __p_retval;
+}
+
+static void __gcpool_RubyFunc_add(VALUE val)
+    {
+      if (_gcpool_RubyFunc == Qnil)
+      {
+        _gcpool_RubyFunc = rb_ary_new3(1, val);
+      }
+      else
+      {
+        rb_ary_push(_gcpool_RubyFunc, val);
+      }
+    }
+    
+    static void __gcpool_RubyFunc_del(VALUE val)
+    {
+      if (_gcpool_RubyFunc == Qnil)
+      {
+        rb_warn("Trying to remove object from empty GC queue RubyFunc");
+        return;
+      }
+      rb_ary_delete(_gcpool_RubyFunc, val);
+      // If nothing is referenced, don't keep an empty array in the pool...
+      if (RARRAY_LEN(_gcpool_RubyFunc) == 0)
+        _gcpool_RubyFunc = Qnil;
+    }
+    
+/* Init */
+void
+Init_soup(void)
+{
+  mSoup = rb_define_module("Soup");
+  cSession = G_DEF_CLASS(SOUP_TYPE_SESSION, "Session", mSoup);
+  rb_define_method(cSession, "queue", Session_queue, 1);
+  rb_define_method(cSession, "send", Session_send, 1);
+  rb_define_method(cSession, "pause", Session_pause, 1);
+  rb_define_method(cSession, "unpause", Session_unpause, 1);
+  rb_define_method(cSession, "abort", Session_abort, 0);
+  cSessionAsync = G_DEF_CLASS(SOUP_TYPE_SESSION_ASYNC, "SessionAsync", mSoup);
+  rb_define_method(cSessionAsync, "initialize", SessionAsync_initialize, 0);
+  cURI = G_DEF_CLASS(SOUP_TYPE_URI, "URI", mSoup);
+  rb_define_method(cURI, "initialize", URI_initialize, 1);
+  rb_define_method(cURI, "to_s", URI_to_s, 0);
+  cMessage = G_DEF_CLASS(SOUP_TYPE_MESSAGE, "Message", mSoup);
+  rb_define_method(cMessage, "initialize", Message_initialize, 2);
+  rb_define_method(cMessage, "set_request_header", Message_set_request_header, 2);
+  rb_define_method(cMessage, "unset_request_header", Message_unset_request_header, 1);
+  rb_define_method(cMessage, "set_request_body", Message_set_request_body, 2);
+  rb_define_method(cMessage, "get_response_header", Message_get_response_header, 1);
+  rb_define_method(cMessage, "each_response_header", Message_each_response_header, 0);
+  rb_define_method(cMessage, "response_body", Message_response_body, 0);
+rb_gc_register_address(&_gcpool_RubyFunc);
+}

data/ext/soup/soup.rd

@@ -0,0 +1,45 @@
+= module Soup
+== class Soup::Session
+--- Soup::Session#queue(SoupMessage* message)
+
+
+--- Soup::Session#send(SoupMessage* msg)
+
+
+--- Soup::Session#pause(SoupMessage* msg)
+
+
+--- Soup::Session#unpause(SoupMessage* msg)
+
+
+--- Soup::Session#abort
+
+== class Soup::SessionAsync
+--- Soup::SessionAsync.new
+
+== class Soup::URI
+--- Soup::URI.new(String uri_string)
+
+
+--- Soup::URI#to_s
+
+== class Soup::Message
+--- Soup::Message.new(String method, String uri)
+
+
+--- Soup::Message#set_request_header(String name, String value)
+
+
+--- Soup::Message#unset_request_header(String name)
+
+
+--- Soup::Message#set_request_body(String type, String body)
+
+
+--- Soup::Message#get_response_header(String name)
+
+
+--- Soup::Message#each_response_header
+
+--- Soup::Message#response_body
+

data/lib/soup/version.rb

@@ -1,5 +1,5 @@
 module Soup
-  BINDINGS_VERSION= [0,0,1]
+  BINDINGS_VERSION= [0,0,2]
   def BINDINGS_VERSION.to_s
     join('.')
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: soup-ruby
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Geoff Youngs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-01 00:00:00.000000000 Z
+date: 2013-03-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubber-generate
@@ -33,15 +33,20 @@ description: |+
 
 email: git@intersect-uk.co.uk
 executables: []
-extensions: []
+extensions:
+- ext/soup/extconf.rb
 extra_rdoc_files: []
 files:
+- ext/soup/extconf.rb
+- ext/soup/soup.c
 - ext/soup/soup.cr
+- ext/soup/soup.rd
 - Rakefile
 - README.md
 - lib/soup/version.rb
 homepage: http://github.com/geoffyoungs/soup-ruby
-licenses: []
+licenses:
+- The Ruby License
 metadata: {}
 post_install_message: 
 rdoc_options: []