curb 0.8.5 → 0.8.6

data/tests/bug_crash_on_progress.rb

@@ -5,7 +5,7 @@ class ::WEBrick::BasicLog ; def log(level, data) ; end ; end
 
 class BugCrashOnDebug < Test::Unit::TestCase
   
-  def test_on_debug
+  def test_on_progress_raise
     server = WEBrick::HTTPServer.new( :Port => 9999 )
     server.mount_proc("/test") do|req,res|
       res.body = "hi"
@@ -30,4 +30,44 @@ class BugCrashOnDebug < Test::Unit::TestCase
   ensure
     server.shutdown
   end
+
+  def test_on_progress_abort
+    server = WEBrick::HTTPServer.new( :Port => 9999 )
+    server.mount_proc("/test") do|req,res|
+      res.body = "hi"
+      res['Content-Type'] = "text/html"
+    end
+
+    thread = Thread.new(server) do|srv|
+      srv.start
+    end
+
+    # see: https://github.com/taf2/curb/issues/192,
+    # to pass:
+    # 
+    # c = Curl::Easy.new('http://127.0.0.1:9999/test')
+    # c.on_progress do|x|
+    #   puts "we're in the progress callback"
+    #   false
+    # end
+    # c.perform
+    # 
+    #  notice no return keyword
+    #
+    c = Curl::Easy.new('http://127.0.0.1:9999/test')
+    c.on_progress do|x|
+      puts "we're in the progress callback"
+      return false
+    end
+    c.perform
+
+    assert false, "should not reach this point"
+
+  rescue => e
+    assert_equal 'Curl::Err::AbortedByCallbackError', e.class.to_s
+    c.close
+  ensure
+    server.shutdown
+  end
+
 end

data/tests/bug_issue102.rb

@@ -0,0 +1,17 @@
+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 = "0.0.0.0"
+
+    c = Curl::Easy.new do |curl|
+      curl.url = test
+      curl.interface = ip
+    end  
+
+    c.perform
+  end
+
+end

data/tests/helper.rb

@@ -10,7 +10,12 @@ $:.unshift($LIBDIR)
 $:.unshift($EXTDIR)
 
 require 'curb'
-require 'test/unit'
+begin
+  require 'test/unit'
+rescue LoadError
+  gem 'test/unit'
+  require 'test/unit'
+end
 require 'fileutils'
 
 $TEST_URL = "file://#{URI.escape(File.expand_path(__FILE__).tr('\\','/').tr(':','|'))}"

data/tests/tc_curl_download.rb

@@ -6,7 +6,7 @@ class TestCurbCurlDownload < Test::Unit::TestCase
   def setup
     server_setup
   end
-  
+
   def test_download_url_to_file_via_string
     dl_url = "http://127.0.0.1:9129/ext/curb_easy.c"
     dl_path = File.join(Dir::tmpdir, "dl_url_test.file")

data/tests/tc_curl_easy.rb

@@ -645,8 +645,8 @@ class TestCurbCurlEasy < Test::Unit::TestCase
     curl = Curl::Easy.new(TestServlet.url)
     curl.multipart_form_post = true
     fields = [
-      Curl::PostField.file('foo', File.expand_path(File.join(File.dirname(__FILE__),'..','README'))),
-      Curl::PostField.file('bar', File.expand_path(File.join(File.dirname(__FILE__),'..','README')))
+      Curl::PostField.file('foo', File.expand_path(File.join(File.dirname(__FILE__),'..','README.markdown'))),
+      Curl::PostField.file('bar', File.expand_path(File.join(File.dirname(__FILE__),'..','README.markdown')))
     ]
     curl.http_post(fields)
     assert_match /HTTP POST file upload/, curl.body_str
@@ -674,7 +674,7 @@ class TestCurbCurlEasy < Test::Unit::TestCase
   def test_post_multipart_file_remote
     curl = Curl::Easy.new(TestServlet.url)
     curl.multipart_form_post = true
-    pf = Curl::PostField.file('readme', File.expand_path(File.join(File.dirname(__FILE__),'..','README')))
+    pf = Curl::PostField.file('readme', File.expand_path(File.join(File.dirname(__FILE__),'..','README.markdown')))
     curl.http_post(pf)
     assert_match /HTTP POST file upload/, curl.body_str
     assert_match /Content-Disposition: form-data/, curl.body_str
@@ -855,7 +855,7 @@ class TestCurbCurlEasy < Test::Unit::TestCase
   end
 
   def test_post_streaming
-    readme = File.expand_path(File.join(File.dirname(__FILE__),'..','README'))
+    readme = File.expand_path(File.join(File.dirname(__FILE__),'..','README.markdown'))
     
     pf = Curl::PostField.file("filename", readme)
 
@@ -1022,6 +1022,13 @@ class TestCurbCurlEasy < Test::Unit::TestCase
     end
   end
 
+  def test_set_unsupported_options
+    curl = Curl::Easy.new
+    assert_raises TypeError do
+      curl.set(99999, 1)
+    end
+  end
+
   include TestServerMethods 
 
   def setup

data/tests/tc_curl_multi.rb

@@ -466,7 +466,7 @@ class TestCurbCurlMulti < Test::Unit::TestCase
     m.add(c)
     m.add(c)
   rescue => e
-    assert_equal Curl::Err::MultiBadEasyHandle, e.class
+    assert Curl::Err::MultiBadEasyHandle == e.class || Curl::Err::MultiAddedAlready == e.class
   end
 
   def test_multi_default_timeout

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: curb
 version: !ruby/object:Gem::Version
-  version: 0.8.5
+  version: 0.8.6
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-05 00:00:00.000000000 Z
+date: 2014-07-22 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
@@ -21,10 +21,10 @@ extensions:
 - ext/extconf.rb
 extra_rdoc_files:
 - LICENSE
-- README
+- README.markdown
 files:
 - LICENSE
-- README
+- README.markdown
 - Rakefile
 - doc.rb
 - ext/extconf.rb
@@ -51,6 +51,7 @@ 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
@@ -74,7 +75,7 @@ licenses: []
 post_install_message: 
 rdoc_options:
 - --main
-- README
+- README.markdown
 require_paths:
 - lib
 - ext
@@ -103,6 +104,7 @@ 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

data/README

@@ -1,194 +0,0 @@
-# Curb - Libcurl bindings for Ruby
-
-+ [rubyforge rdoc](http://curb.rubyforge.org/)
-+ [rubyforge project](http://rubyforge.org/projects/curb)
-+ [github project](http://github.com/taf2/curb/tree/master)
-
-Curb (probably CUrl-RuBy or something) provides Ruby-language bindings for the
-libcurl(3), a fully-featured client-side URL transfer library.
-cURL and libcurl live at [http://curl.haxx.se/](http://curl.haxx.se/) .
-
-Curb is a work-in-progress, and currently only supports libcurl's 'easy' and 'multi' modes.
-
-## License
-
-Curb is copyright (c)2006 Ross Bamford, and released under the terms of the 
-Ruby license. See the LICENSE file for the gory details. 
-
-## You will need
-
-+ A working Ruby installation (1.8+, tested with 1.8.6, 1.8.7, 1.9.1, and 1.9.2)
-+ A working (lib)curl installation, with development stuff (7.5+, tested with 7.19.x)
-+ A sane build environment (e.g. gcc, make)
-
-## Installation...
-
-... will usually be as simple as:
-
-    $ gem install curb
-	
-Or, if you downloaded the archive:	
-
-    $ rake install 
-
-If you have a wierd setup, you might need extconf options. In this case, pass
-them like so:
-
-    $ rake install EXTCONF_OPTS='--with-curl-dir=/path/to/libcurl --prefix=/what/ever'
-	
-Curb is tested only on GNU/Linux x86 and Mac OSX - YMMV on other platforms.
-If you do use another platform and experience problems, or if you can 
-expand on the above instructions, please report the issue at http://github.com/taf2/curb/issues
-
-On Ubuntu, the dependencies can be satisfied by installing the following packages:
-
-    $ sudo apt-get install libcurl3 libcurl3-gnutls libcurl4-openssl-dev
-
-Curb has fairly extensive RDoc comments in the source. You can build the
-documentation with:
-
-    $ rake doc
-
-## Usage & examples
-
-Curb provides two classes:
-
-+ Curl::Easy - simple API, for day-to-day tasks.
-+ Curl::Multi - more advanced API, for operating on multiple URLs simultaneously.
-
-### Super simple API (less typing)
-
-    http = Curl.get("http://www.google.com/")
-    puts http.body_str
-
-    http = Curl.post("http://www.google.com/", {:foo => "bar"})
-    puts http.body_str
-
-    http = Curl.get("http://www.google.com/") do|http|
-      http.headers['Cookie'] = 'foo=1;bar=2'
-    end
-    puts http.body_str
-
-### Simple fetch via HTTP:
-
-    c = Curl::Easy.perform("http://www.google.co.uk")
-    puts c.body_str
-
-Same thing, more manual:
-
-    c = Curl::Easy.new("http://www.google.co.uk")
-    c.perform
-    puts c.body_str
-
-### Additional config:
-
-    Curl::Easy.perform("http://www.google.co.uk") do |curl| 
-      curl.headers["User-Agent"] = "myapp-0.0"
-      curl.verbose = true
-    end
-
-Same thing, more manual:
-
-    c = Curl::Easy.new("http://www.google.co.uk") do |curl| 
-      curl.headers["User-Agent"] = "myapp-0.0"
-      curl.verbose = true
-    end
-  
-    c.perform
-
-### HTTP basic authentication:
-
-    c = Curl::Easy.new("http://github.com/")
-    c.http_auth_types = :basic
-    c.username = 'foo'
-    c.password = 'bar'
-    c.perform
-
-### Supplying custom handlers:
-
-    c = Curl::Easy.new("http://www.google.co.uk")
-  
-    c.on_body { |data| print(data) }
-    c.on_header { |data| print(data) }
-  
-    c.perform
-
-### Reusing Curls:
-
-    c = Curl::Easy.new
-
-    ["http://www.google.co.uk", "http://www.ruby-lang.org/"].map do |url|
-      c.url = url
-      c.perform
-      c.body_str
-    end
-
-### HTTP POST form:
-
-    c = Curl::Easy.http_post("http://my.rails.box/thing/create",
-                             Curl::PostField.content('thing[name]', 'box'),
-                             Curl::PostField.content('thing[type]', 'storage'))
-
-### HTTP POST file upload:
-
-    c = Curl::Easy.new("http://my.rails.box/files/upload")
-    c.multipart_form_post = true
-    c.http_post(Curl::PostField.file('thing[file]', 'myfile.rb'))
-
-### Multi Interface (Basic HTTP GET):
-
-    # make multiple GET requests
-    easy_options = {:follow_location => true}
-    multi_options = {:pipeline => true}
-
-    Curl::Multi.get('url1','url2','url3','url4','url5', easy_options, multi_options) do|easy|
-      # do something interesting with the easy response
-      puts easy.last_effective_url
-    end
-
-### Multi Interface (Basic HTTP POST):
-
-    # make multiple POST requests
-    easy_options = {:follow_location => true, :multipart_form_post => true}
-    multi_options = {:pipeline => true}
-
-    url_fields = [
-      { :url => 'url1', :post_fields => {'f1' => 'v1'} },
-      { :url => 'url2', :post_fields => {'f1' => 'v1'} },
-      { :url => 'url3', :post_fields => {'f1' => 'v1'} }
-    ]
-
-    Curl::Multi.post(url_fields, easy_options, multi_options) do|easy|
-      # do something interesting with the easy response
-      puts easy.last_effective_url
-    end
-
-### Multi Interface (Advanced):
-
-    responses = {}
-    requests = ["http://www.google.co.uk/", "http://www.ruby-lang.org/"]
-    m = Curl::Multi.new
-    # add a few easy handles
-    requests.each do |url|
-      responses[url] = ""
-      c = Curl::Easy.new(url) do|curl|
-        curl.follow_location = true
-        curl.on_body{|data| responses[url] << data; data.size }
-        curl.on_success {|easy| puts "success, add more easy handles" }
-      end
-      m.add(c)
-    end
-   
-    m.perform do
-      puts "idling... can do some work here"
-    end
-   
-    requests.each do|url|
-      puts responses[url]
-    end
-
-### Easy Callbacks
-
-on_success:  is called when the response code is 20x
-on_failure: is called when the response code is not success, including redirects e.g. 30x
-on_complete: is called in all cases.