brianmario-streamly 0.1.2 → 0.1.3

data/CHANGELOG.md

@@ -1,7 +1,10 @@
 # Changelog
 
+## 0.1.3 (August 19th, 2009)
+* Fixed a bug where a username or password was specified, but not both
+
 ## 0.1.2 (July 28th, 2009)
-* Fixed a bug regarding user credentials being forcefully set to NULL even if they weren't being used.
+* removing call to set CURLOPT_USERPWD to NULL as it would crash in linux
 
 ## 0.1.1 (July 27th, 2009)
 * Version bump for Github's gem builder

data/README.rdoc

@@ -14,26 +14,76 @@ Install it like any other gem hosted at the Githubs like so:
 
 == Example of use
 
+=== A basic HEAD request
+
+ Streamly.head('www.somehost.com')
+
+Or streaming
+
+ Streamly.head('www.somehost.com') do |header_chunk|
+   # do something with header_chunk
+ end
+
+You can also pass a Hash of headers
+
+ Streamly.head('www.somehost.com', {"User-Agent" => "all your base are belong to us"})
+
 === A basic GET request
 
  Streamly.get('www.somehost.com')
 
-=== A streaming GET request
+Or streaming
 
- Streamly.get('www.somehost.com') do |chunk|
-   # do something with _chunk_
+ Streamly.get('www.somehost.com') do |body_chunk|
+   # do something with body_chunk
  end
 
+You can also pass a Hash of headers
+
+ Streamly.get('www.somehost.com', {"User-Agent" => "all your base are belong to us"})
+
 === A basic POST request
 
  Streamly.post('www.somehost.com', 'blah=foo')
 
-=== A streaming POST request
+Or streaming
 
- Streamly.post('www.somehost.com', 'blah=foo') do |chunk|
-   # do something with _chunk_
+ Streamly.post('www.somehost.com', 'blah=foo') do |body_chunk|
+   # do something with body_chunk
  end
 
+You can also pass a Hash of headers
+
+ Streamly.post('www.somehost.com', 'blah=foo', {"User-Agent" => "all your base are belong to us"})
+
+=== A basic PUT request
+
+ Streamly.put('www.somehost.com', 'blah=foo')
+
+Or streaming
+
+ Streamly.put('www.somehost.com', 'blah=foo') do |body_chunk|
+   # do something with body_chunk
+ end
+
+You can also pass a Hash of headers
+
+ Streamly.put('www.somehost.com', 'blah=foo', {"User-Agent" => "all your base are belong to us"})
+
+=== A basic DELETE request
+
+ Streamly.delete('www.somehost.com')
+
+Or streaming
+
+ Streamly.delete('www.somehost.com') do |body_chunk|
+   # do something with body_chunk
+ end
+
+You can also pass a Hash of headers
+
+ Streamly.delete('www.somehost.com', {"User-Agent" => "all your base are belong to us"})
+
 == Benchmarks
 
 Fetching 2,405,005 bytes of JSON from a local lighttpd server

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
 :minor: 1
-:patch: 2
+:patch: 3
 :major: 0

data/benchmark/basic_request.rb

@@ -10,17 +10,17 @@ require 'benchmark'
 url = ARGV[0]
 
 Benchmark.bm do |x|
-  puts "Shell out to curl"
+  puts "Streamly"
   x.report do
     (ARGV[1] || 1).to_i.times do
-      `curl -s --compressed #{url}`
+      Streamly.get(url)
     end
   end
   
-  puts "Streamly"
+  puts "Shell out to curl"
   x.report do
     (ARGV[1] || 1).to_i.times do
-      Streamly.get(url)
+      `curl -s --compressed #{url}`
     end
   end
   

data/benchmark/streaming_json_request.rb

@@ -11,27 +11,29 @@ require 'benchmark'
 url = ARGV[0]
 
 Benchmark.bm do |x|
-  puts "Shell out to curl"
+  puts "Streamly"
   parser = Yajl::Parser.new
+  parser.on_parse_complete = lambda {|obj| }
   x.report do
     (ARGV[1] || 1).to_i.times do
-      parser.parse `curl -s --compressed #{url}`
+      Streamly.get(url) do |chunk|
+        parser << chunk
+      end
     end
   end
   
-  puts "Streamly"
+  puts "Shell out to curl"
   parser = Yajl::Parser.new
   parser.on_parse_complete = lambda {|obj| }
   x.report do
     (ARGV[1] || 1).to_i.times do
-      Streamly.get(url) do |chunk|
-        parser << chunk
-      end
+      parser.parse `curl -s --compressed #{url}`
     end
   end
   
   puts "rest-client"
   parser = Yajl::Parser.new
+  parser.on_parse_complete = lambda {|obj| }
   x.report do
     (ARGV[1] || 1).to_i.times do
       parser.parse RestClient.get(url, {"Accept-Encoding" => "identity, deflate, gzip"})

data/ext/streamly.c

@@ -1,4 +1,4 @@
-// static size_t put_data_handler(char * stream, size_t size, size_t nmemb, VALUE upload_stream) {
+// static size_t upload_data_handler(char * stream, size_t size, size_t nmemb, VALUE upload_stream) {
 //     size_t result = 0;
 //     
 //     // TODO
@@ -62,17 +62,13 @@ void streamly_instance_free(struct curl_instance * instance) {
 static VALUE each_http_header(VALUE header, VALUE self) {
     struct curl_instance * instance;
     GetInstance(self, instance);
-    VALUE name, value, header_str = Qnil;
-
-    name = rb_obj_as_string(rb_ary_entry(header, 0));
-    value = rb_obj_as_string(rb_ary_entry(header, 1));
-
-    header_str = rb_str_plus(name, rb_str_new2(": "));
-    header_str = rb_str_plus(header_str, value);
+    VALUE header_str = rb_str_new2("");
+    
+    rb_str_buf_cat(header_str, RSTRING_PTR(rb_ary_entry(header, 0)), RSTRING_LEN(rb_ary_entry(header, 0)));
+    rb_str_buf_cat(header_str, ": ", 2);
+    rb_str_buf_cat(header_str, RSTRING_PTR(rb_ary_entry(header, 1)), RSTRING_LEN(rb_ary_entry(header, 1)));
 
     instance->request_headers = curl_slist_append(instance->request_headers, RSTRING_PTR(header_str));
-    rb_gc_mark(name);
-    rb_gc_mark(value);
     rb_gc_mark(header_str);
     return Qnil;
 }
@@ -230,7 +226,7 @@ VALUE rb_streamly_init(int argc, VALUE * argv, VALUE self) {
         // curl_easy_setopt(instance->handle, CURLOPT_HTTPPOST, 1);
         
         // TODO: get streaming upload working
-        // curl_easy_setopt(instance->handle, CURLOPT_READFUNCTION, &put_data_handler);
+        // curl_easy_setopt(instance->handle, CURLOPT_READFUNCTION, &upload_data_handler);
         // curl_easy_setopt(instance->handle, CURLOPT_READDATA, &instance->upload_stream);
         // curl_easy_setopt(instance->handle, CURLOPT_INFILESIZE, len);
     } else if (instance->request_method == sym_put) {
@@ -240,7 +236,7 @@ VALUE rb_streamly_init(int argc, VALUE * argv, VALUE self) {
         
         // TODO: get streaming upload working
         // curl_easy_setopt(instance->handle, CURLOPT_UPLOAD, 1);
-        // curl_easy_setopt(instance->handle, CURLOPT_READFUNCTION, &put_data_handler);
+        // curl_easy_setopt(instance->handle, CURLOPT_READFUNCTION, &upload_data_handler);
         // curl_easy_setopt(instance->handle, CURLOPT_READDATA, &instance->upload_stream);
         // curl_easy_setopt(instance->handle, CURLOPT_INFILESIZE, len);
     } else if (instance->request_method == sym_delete) {
@@ -263,12 +259,16 @@ VALUE rb_streamly_init(int argc, VALUE * argv, VALUE self) {
         curl_easy_setopt(instance->handle, CURLOPT_WRITEDATA, instance->response_body_handler);
     }
     
-    // curl_easy_setopt(instance, CURLOPT_USERPWD, NULL);
+    curl_easy_setopt(instance, CURLOPT_USERPWD, NULL);
     if (!NIL_P(username) || !NIL_P(password)) {
         credentials = rb_str_new2("");
-        rb_str_buf_cat(credentials, RSTRING_PTR(username), RSTRING_LEN(username));
+        if (!NIL_P(username)) {
+            rb_str_buf_cat(credentials, RSTRING_PTR(username), RSTRING_LEN(username));
+        }
         rb_str_buf_cat(credentials, credential_sep, 1);
-        rb_str_buf_cat(credentials, RSTRING_PTR(password), RSTRING_LEN(password));
+        if (!NIL_P(password)) {
+            rb_str_buf_cat(credentials, RSTRING_PTR(password), RSTRING_LEN(password));
+        }
         curl_easy_setopt(instance->handle, CURLOPT_HTTPAUTH, CURLAUTH_BASIC | CURLAUTH_DIGEST);
         curl_easy_setopt(instance->handle, CURLOPT_USERPWD, RSTRING_PTR(credentials));
         rb_gc_mark(credentials);

data/lib/streamly.rb

@@ -2,7 +2,7 @@
 require 'streamly_ext'
 
 module Streamly
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
   
   class Request
     # A helper method to make your fire-and-forget requests easier

data/streamly.gemspec

@@ -1,12 +1,15 @@
+# Generated by jeweler
+# DO NOT EDIT THIS FILE
+# Instead, edit Jeweler::Tasks in Rakefile, and run `rake gemspec`
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{streamly}
-  s.version = "0.1.2"
+  s.version = "0.1.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Brian Lopez"]
-  s.date = %q{2009-07-28}
+  s.date = %q{2009-08-19}
   s.email = %q{seniorlopez@gmail.com}
   s.extensions = ["ext/extconf.rb"]
   s.extra_rdoc_files = [

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: brianmario-streamly
 version: !ruby/object:Gem::Version 
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors: 
 - Brian Lopez
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-07-28 00:00:00 -07:00
+date: 2009-08-19 00:00:00 -07:00
 default_executable: 
 dependencies: []