ghazel-curb 0.5.9.0 → 0.5.9.1

data/ext/curb.h

@@ -20,12 +20,12 @@
 #include "curb_macros.h"
 
 // These should be managed from the Rake 'release' task.
-#define CURB_VERSION   "0.5.9.0"
-#define CURB_VER_NUM   590
+#define CURB_VERSION   "0.5.9.1"
+#define CURB_VER_NUM   591
 #define CURB_VER_MAJ   0
 #define CURB_VER_MIN   5
 #define CURB_VER_MIC   9
-#define CURB_VER_PATCH 0
+#define CURB_VER_PATCH 1
 
 
 // Maybe not yet defined in Ruby

data/ext/curb_multi.c

@@ -32,7 +32,6 @@ static void rb_curl_multi_remove(ruby_curl_multi *rbcm, VALUE easy);
 static void rb_curl_multi_read_info(VALUE self, CURLM *mptr);
 
 static void rb_curl_multi_mark_all_easy(VALUE key, VALUE rbeasy, ruby_curl_multi *rbcm) {
-  //printf( "mark easy: 0x%X\n", (long)rbeasy );
   rb_gc_mark(rbeasy);
 }
 
@@ -42,20 +41,14 @@ static void curl_multi_mark(ruby_curl_multi *rbcm) {
 }
 
 static void curl_multi_flush_easy(VALUE key, VALUE easy, ruby_curl_multi *rbcm) {
-  //rb_curl_multi_remove(rbcm, easy);
   CURLMcode result;
   ruby_curl_easy *rbce;
-  VALUE r;
+
   Data_Get_Struct(easy, ruby_curl_easy, rbce);
   result = curl_multi_remove_handle(rbcm->handle, rbce->curl);
   if (result != 0) {
     raise_curl_multi_error_exception(result);
   }
-  // XXX: easy handle may not be finished yet... so don't clean it GC pass will get it next time
-  r = rb_hash_delete( rbcm->requests, easy );
-  if( r != easy || r == Qnil ) {
-    rb_raise(rb_eRuntimeError, "Critical:: Unable to remove easy from requests");
-  }
 }
 
 static int
@@ -65,7 +58,6 @@ rb_hash_clear_i(VALUE key, VALUE value, VALUE dummy) {
 
 static void curl_multi_free(ruby_curl_multi *rbcm) {
 
-  //printf("hash entries: %d\n", RHASH(rbcm->requests)->tbl->num_entries );
   if (rbcm && !rbcm->requests == Qnil && rb_type(rbcm->requests) == T_HASH && RHASH_LEN(rbcm->requests) > 0) {
 
     rb_hash_foreach( rbcm->requests, (int (*)())curl_multi_flush_easy, (VALUE)rbcm );
@@ -100,7 +92,7 @@ VALUE ruby_curl_multi_new(VALUE klass) {
   return new_curlm;
 }
 
-// Hash#foreach callback for ruby_curl_multi_requests
+/* Hash#foreach callback for ruby_curl_multi_requests */
 static int ruby_curl_multi_requests_callback(VALUE key, VALUE value, VALUE result_array) {
   rb_ary_push(result_array, value);
   
@@ -121,8 +113,8 @@ static VALUE ruby_curl_multi_requests(VALUE self) {
   
   result_array = rb_ary_new();
   
-  // iterate over the requests hash, and stuff references into the array.
-  rb_hash_foreach( rbcm->requests, ruby_curl_multi_requests_callback, result_array );
+  /* iterate over the requests hash, and stuff references into the array. */
+  rb_hash_foreach(rbcm->requests, ruby_curl_multi_requests_callback, result_array);
   
   return result_array;
 }

data/ext/extconf.rb

@@ -1,4 +1,5 @@
 require 'mkmf'
+puts $CFLAGS.inspect
 
 dir_config('curl')
 
@@ -24,15 +25,16 @@ elsif !have_library('curl') or !have_header('curl/curl.h')
 end
 
 # Check arch flags
-archs = $CFLAGS.scan(/-arch\s(.*?)\s/).first # get the first arch flag
-if archs and archs.size >= 1
-  # need to reduce the number of archs...
-  # guess the first one is correct... at least the first one is probably the ruby installed arch...
-  # this could lead to compiled binaries that crash at runtime...
-  $CFLAGS.gsub!(/-arch\s(.*?)\s/,' ')
-  $CFLAGS << " -arch #{archs.first}"
-  puts "Selected arch: #{archs.first}"
-end
+# TODO: detect mismatched arch types when libcurl mac ports is mixed with native mac ruby or vice versa
+#archs = $CFLAGS.scan(/-arch\s(.*?)\s/).first # get the first arch flag
+#if archs and archs.size >= 1
+#  # need to reduce the number of archs...
+#  # guess the first one is correct... at least the first one is probably the ruby installed arch...
+#  # this could lead to compiled binaries that crash at runtime...
+#  $CFLAGS.gsub!(/-arch\s(.*?)\s/,' ')
+#  $CFLAGS << " -arch #{archs.first}"
+#  puts "Selected arch: #{archs.first}"
+#end
 
 def define(s)
   $defs.push( format("-D HAVE_%s", s.to_s.upcase) )

data/lib/curb.rb

@@ -1,6 +1,7 @@
 require 'curb_core'
 
 module Curl
+
   class Easy
     class << self
     
@@ -54,6 +55,7 @@ module Curl
       self.cert
     end
   end
+
   class Multi
     class << self
       # call-seq:

data/tests/tc_curl_multi.rb

@@ -381,7 +381,7 @@ class TestCurbCurlMulti < Test::Unit::TestCase
 
   def test_remove_exception_is_descriptive
     m = Curl::Multi.new
-    c = Curl::Easy.new("http://blah.com")
+    c = Curl::Easy.new("http://127.9.9.9:999110")
     m.remove(c)
   rescue => e
     assert_equal 'Invalid easy handle', e.message
@@ -393,9 +393,9 @@ class TestCurbCurlMulti < Test::Unit::TestCase
 
     tries = 2
 
-    c1 = Curl::Easy.new('http://127.9.9.9') do |curl|
+    c1 = Curl::Easy.new('http://127.1.1.1:99911') do |curl|
       curl.on_failure {|c,e|
-        assert_equal [Curl::Err::ConnectionFailedError, "Couldn't connect to server"], e
+        assert_equal [Curl::Err::MalformedURLError, "URL using bad/illegal format or missing URL"], e
         if tries > 0
           tries -= 1
           m.add(c)
@@ -410,6 +410,7 @@ class TestCurbCurlMulti < Test::Unit::TestCase
       m.perform
     end
     assert_equal 0, tries
+    assert_equal 0, m.requests.size
   end
 
   include TestServerMethods

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: ghazel-curb
 version: !ruby/object:Gem::Version 
-  version: 0.5.9.0
+  version: 0.5.9.1
 platform: ruby
 authors: 
 - Ross Bamford
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-23 00:00:00 -08:00
+date: 2009-11-24 00:00:00 -08:00
 default_executable: 
 dependencies: []