curb 0.8.4 → 0.8.5

data/ext/curb.c

@@ -951,6 +951,19 @@ void Init_curb_core() {
   CURB_DEFINE(CURLOPT_TELNETOPTIONS);
 #endif
 
+#if HAVE_CURLOPT_GSSAPI_DELEGATION
+  CURB_DEFINE(CURLOPT_GSSAPI_DELEGATION);
+#endif
+
+#if HAVE_CURLGSSAPI_DELEGATION_FLAG
+  CURB_DEFINE(CURLGSSAPI_DELEGATION_FLAG);
+#endif
+
+#if HAVE_CURLGSSAPI_DELEGATION_POLICY_FLAG
+  CURB_DEFINE(CURLGSSAPI_DELEGATION_POLICY_FLAG);
+#endif
+
+
   rb_define_const(mCurl, "HTTP_1_1", LONG2NUM(CURL_HTTP_VERSION_1_1));
   rb_define_const(mCurl, "HTTP_1_0", LONG2NUM(CURL_HTTP_VERSION_1_0));
   rb_define_const(mCurl, "HTTP_NONE", LONG2NUM(CURL_HTTP_VERSION_NONE));

data/ext/curb.h

@@ -20,11 +20,11 @@
 #include "curb_macros.h"
 
 // These should be managed from the Rake 'release' task.
-#define CURB_VERSION   "0.8.4"
-#define CURB_VER_NUM   804
+#define CURB_VERSION   "0.8.5"
+#define CURB_VER_NUM   805
 #define CURB_VER_MAJ   0
 #define CURB_VER_MIN   8
-#define CURB_VER_MIC   4
+#define CURB_VER_MIC   5
 #define CURB_VER_PATCH 0
 
 

data/ext/curb_easy.c

@@ -2578,6 +2578,29 @@ static VALUE ruby_curl_easy_connect_time_get(VALUE self) {
   return rb_float_new(time);
 }
 
+/*
+ * call-seq:
+ *   easy.app_connect_time                         => float
+ *
+ * Retrieve the time, in seconds, it took from the start until the SSL/SSH
+ * connect/handshake to the remote host was completed. This time is most often
+ * very near to the pre transfer time, except for cases such as HTTP
+ * pippelining where the pretransfer time can be delayed due to waits in line
+ * for the pipeline and more.
+ */
+#if defined(HAVE_CURLINFO_APPCONNECT_TIME)
+static VALUE ruby_curl_easy_app_connect_time_get(VALUE self) {
+  ruby_curl_easy *rbce;
+  double time;
+
+  Data_Get_Struct(self, ruby_curl_easy, rbce);
+  curl_easy_getinfo(rbce->curl, CURLINFO_APPCONNECT_TIME, &time);
+
+  return rb_float_new(time);
+}
+#endif
+
+
 /*
  * call-seq:
  *   easy.pre_transfer_time                           => float
@@ -3112,6 +3135,11 @@ static VALUE ruby_curl_easy_set_opt(VALUE self, VALUE opt, VALUE val) {
   case CURLOPT_FAILONERROR: {
     curl_easy_setopt(rbce->curl, CURLOPT_FAILONERROR, FIX2LONG(val));
     } break;
+#if HAVE_CURLOPT_GSSAPI_DELEGATION
+  case CURLOPT_GSSAPI_DELEGATION: {
+    curl_easy_setopt(rbce->curl, CURLOPT_GSSAPI_DELEGATION, FIX2LONG(val));
+    } break;
+#endif
   default:
     break;
   }
@@ -3364,6 +3392,9 @@ void init_curb_easy() {
   rb_define_method(cCurlEasy, "total_time", ruby_curl_easy_total_time_get, 0);
   rb_define_method(cCurlEasy, "name_lookup_time", ruby_curl_easy_name_lookup_time_get, 0);
   rb_define_method(cCurlEasy, "connect_time", ruby_curl_easy_connect_time_get, 0);
+#if defined(HAVE_CURLINFO_APPCONNECT_TIME)
+  rb_define_method(cCurlEasy, "app_connect_time", ruby_curl_easy_app_connect_time_get, 0);
+#endif
   rb_define_method(cCurlEasy, "pre_transfer_time", ruby_curl_easy_pre_transfer_time_get, 0);
   rb_define_method(cCurlEasy, "start_transfer_time", ruby_curl_easy_start_transfer_time_get, 0);
   rb_define_method(cCurlEasy, "redirect_time", ruby_curl_easy_redirect_time_get, 0);

data/ext/extconf.rb

@@ -59,6 +59,7 @@ def have_constant(name)
   end
 end
 
+have_constant "curlinfo_appconnect_time"
 have_constant "curlinfo_redirect_time"
 have_constant "curlinfo_response_code"
 have_constant "curlinfo_filetime"
@@ -351,6 +352,11 @@ have_constant "curle_not_built_in"
 
 have_constant "curle_obsolete" # removed in 7.24 ?
 
+# gssapi/spnego delegation related constants
+have_constant "curlopt_gssapi_delegation"
+have_constant "curlgssapi_delegation_policy_flag"
+have_constant "curlgssapi_delegation_flag"
+
 if try_compile('int main() { return 0; }','-Wall')
   $CFLAGS << ' -Wall'
 end

data/lib/curl.rb

@@ -8,6 +8,7 @@ module Curl
   
   def self.http(verb, url, post_body=nil, put_data=nil, &block)
     handle = Thread.current[:curb_curl] ||= Curl::Easy.new
+    handle.reset
     handle.url = url
     handle.post_body = post_body if post_body
     handle.put_data = put_data if put_data

data/lib/curl/easy.rb

@@ -3,6 +3,8 @@ module Curl
 
     alias post http_post
     alias put http_put
+    alias body body_str
+    alias head header_str
 
     #
     # call-seq:

data/tests/tc_curl_easy.rb

@@ -11,7 +11,9 @@ class TestCurbCurlEasy < Test::Unit::TestCase
         5.times do
           c = Curl.get($TEST_URL)
           assert_match(/^# DO NOT REMOVE THIS COMMENT/, c.body_str)
+          assert_match(/^# DO NOT REMOVE THIS COMMENT/, c.body)
           assert_equal "", c.header_str
+          assert_equal "", c.head
         end
       end
     end
@@ -22,6 +24,7 @@ class TestCurbCurlEasy < Test::Unit::TestCase
   def test_class_perform_01   
     assert_instance_of Curl::Easy, c = Curl::Easy.perform($TEST_URL)
     assert_match(/^# DO NOT REMOVE THIS COMMENT/, c.body_str)
+    assert_match(/^# DO NOT REMOVE THIS COMMENT/, c.body)
     assert_equal "", c.header_str
   end    
 
@@ -719,7 +722,9 @@ class TestCurbCurlEasy < Test::Unit::TestCase
     assert curl.http_put("message")
     assert_match /^PUT/, curl.body_str
     assert_match /message$/, curl.body_str
+    assert_match /message$/, curl.body
     assert_match /application\/json/, curl.header_str
+    assert_match /application\/json/, curl.head
   end 
   
   def test_put_data

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: curb
 version: !ruby/object:Gem::Version
-  version: 0.8.4
+  version: 0.8.5
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-20 00:00:00.000000000 Z
+date: 2013-06-05 00:00:00.000000000 Z
 dependencies: []
 description: Curb (probably CUrl-RuBy or something) provides Ruby-language bindings
   for the libcurl(3), a fully-featured client-side URL transfer library. cURL and
@@ -51,7 +51,6 @@ files:
 - tests/bug_curb_easy_blocks_ruby_threads.rb
 - tests/bug_curb_easy_post_with_string_no_content_length_header.rb
 - tests/bug_instance_post_differs_from_class_post.rb
-- tests/bug_issue102.rb
 - tests/bug_multi_segfault.rb
 - tests/bug_postfields_crash.rb
 - tests/bug_postfields_crash2.rb
@@ -85,18 +84,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -243569426931689339
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -243569426931689339
 requirements: []
 rubyforge_project: curb
 rubygems_version: 1.8.24
@@ -110,7 +103,6 @@ test_files:
 - tests/bug_curb_easy_blocks_ruby_threads.rb
 - tests/bug_curb_easy_post_with_string_no_content_length_header.rb
 - tests/bug_instance_post_differs_from_class_post.rb
-- tests/bug_issue102.rb
 - tests/bug_multi_segfault.rb
 - tests/bug_postfields_crash.rb
 - tests/bug_postfields_crash2.rb
@@ -129,3 +121,4 @@ test_files:
 - tests/timeout.rb
 - tests/timeout_server.rb
 - tests/unittests.rb
+has_rdoc: true

data/tests/bug_issue102.rb

@@ -1,17 +0,0 @@
-require File.expand_path(File.join(File.dirname(__FILE__), 'helper'))
-
-class BugIssue102 < Test::Unit::TestCase
-
-  def test_interface
-    test = "https://api.twitter.com/1/users/show.json?screen_name=TwitterAPI&include_entities=true"
-    ip = "192.168.1.61"
-
-    c = Curl::Easy.new do |curl|
-      curl.url = test
-      curl.interface = ip
-    end  
-
-    c.perform
-  end
-
-end