streamly 0.1.3 → 0.1.4

data/ext/streamly.h

@@ -8,25 +8,15 @@ VALUE sym_response_header_handler, sym_response_body_handler, sym_username, sym_
 
 #define GetInstance(obj, sval) (sval = (struct curl_instance*)DATA_PTR(obj));
 
-#ifdef HAVE_RBTRAP
-    #include <rubysig.h>
-#else
-    void rb_enable_interrupt(void);
-    void rb_disable_interrupt(void);
-
-    #define TRAP_BEG rb_enable_interrupt();
-    #define TRAP_END do { rb_disable_interrupt(); rb_thread_check_ints(); } while(0);
-#endif
-
 struct curl_instance {
-    CURL* handle;
-    char error_buffer[CURL_ERROR_SIZE];
-    struct curl_slist* request_headers;
-    VALUE request_payload_handler;
-    VALUE response_header_handler;
-    VALUE response_body_handler;
-    VALUE request_method;
-    VALUE options;
+  CURL* handle;
+  char error_buffer[CURL_ERROR_SIZE];
+  struct curl_slist* request_headers;
+  VALUE request_payload_handler;
+  VALUE response_header_handler;
+  VALUE response_body_handler;
+  VALUE request_method;
+  VALUE options;
 };
 
 // libcurl callbacks
@@ -36,8 +26,41 @@ static size_t data_handler(char * stream, size_t size, size_t nmemb, VALUE handl
 // 
 static VALUE select_error(CURLcode code);
 static VALUE each_http_header(VALUE header, VALUE header_array);
-void streamly_instance_mark(struct curl_instance * instance);
-void streamly_instance_free(struct curl_instance * instance);
+static void streamly_instance_mark(struct curl_instance * instance);
+static void streamly_instance_free(struct curl_instance * instance);
+
+static VALUE rb_streamly_new(int argc, VALUE * argv, VALUE klass);
+
+#if defined(__GNUC__) && (__GNUC__ >= 3)
+#define RB_STREAMLY_UNUSED __attribute__ ((unused))
+#else
+#define RB_STREAMLY_UNUSED
+#endif
+
+/*
+ * partial emulation of the 1.9 rb_thread_blocking_region under 1.8,
+ * this is enough for dealing with blocking I/O functions in the
+ * presence of threads.
+ */
+#ifndef HAVE_RB_THREAD_BLOCKING_REGION
+
+#include <rubysig.h>
+#define RUBY_UBF_IO ((rb_unblock_function_t *)-1)
+typedef void rb_unblock_function_t(void *);
+typedef VALUE rb_blocking_function_t(void *);
+static VALUE
+rb_thread_blocking_region(
+  rb_blocking_function_t *func, void *data1,
+  RB_STREAMLY_UNUSED rb_unblock_function_t *ubf,
+  RB_STREAMLY_UNUSED void *data2)
+{
+  VALUE rv;
+
+  TRAP_BEG;
+  rv = func(data1);
+  TRAP_END;
+
+  return rv;
+}
 
-VALUE rb_streamly_new(int argc, VALUE * argv, VALUE klass);
-VALUE rb_streamly_new(int argc, VALUE * argv, VALUE self);
+#endif /* ! HAVE_RB_THREAD_BLOCKING_REGION */

data/lib/streamly.rb

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

data/spec/requests/request_spec.rb

@@ -2,92 +2,282 @@
 require File.expand_path(File.dirname(__FILE__) + '/../spec_helper.rb')
 
 describe "Streamly's REST API" do
-  
+
   before(:all) do
     @response = "Hello, brian".strip
   end
-  
+
   context "HEAD" do
-    it "should perform a basic request" do
-      resp = Streamly.head('localhost:4567')
-      resp.should_not be_empty
+    context "basic" do
+      it "should perform a basic request" do
+        resp = Streamly.head('localhost:4567')
+        resp.should_not be_empty
+      end
+
+      if RUBY_VERSION =~ /^1.9/
+        it "should default to utf-8 if Encoding.default_internal is nil" do
+          Encoding.default_internal = nil
+          Streamly.head('localhost:4567').encoding.should eql(Encoding.find('utf-8'))
+        end
+
+        it "should use Encoding.default_internal" do
+          Encoding.default_internal = Encoding.find('utf-8')
+          Streamly.head('localhost:4567').encoding.should eql(Encoding.default_internal)
+          Encoding.default_internal = Encoding.find('us-ascii')
+          Streamly.head('localhost:4567').encoding.should eql(Encoding.default_internal)
+        end
+      end
     end
-    
-    it "should perform a basic request and stream the response to the caller" do
-      streamed_response = ''
-      resp = Streamly.head('localhost:4567') do |chunk|
-        chunk.should_not be_empty
-        streamed_response << chunk
-      end
-      resp.should be_nil
-      streamed_response.should_not be_nil
+
+    context "streaming" do
+      it "should perform a basic request and stream header chunks to the caller" do
+        streamed_response = ''
+        resp = Streamly.head('localhost:4567') do |chunk|
+          chunk.should_not be_empty
+          streamed_response << chunk
+        end
+        resp.should be_nil
+        streamed_response.should_not be_nil
+      end
+
+      if RUBY_VERSION =~ /^1.9/
+        it "should default to utf-8 if Encoding.default_internal is nil" do
+          Encoding.default_internal = nil
+          Streamly.head('localhost:4567') do |chunk|
+            chunk.encoding.should eql(Encoding.find('utf-8'))
+          end
+        end
+
+        it "should use Encoding.default_internal" do
+          Encoding.default_internal = Encoding.find('utf-8')
+          Streamly.head('localhost:4567') do |chunk|
+            chunk.encoding.should eql(Encoding.default_internal)
+          end
+          Encoding.default_internal = Encoding.find('us-ascii')
+          Streamly.head('localhost:4567') do |chunk|
+            chunk.encoding.should eql(Encoding.default_internal)
+          end
+        end
+      end
     end
   end
-  
+
   context "GET" do
-    it "should perform a basic request" do
-      resp = Streamly.get('localhost:4567/?name=brian')
-      resp.should eql(@response)
+    context "basic" do
+      it "should perform a basic request" do
+        resp = Streamly.get('localhost:4567/?name=brian')
+        resp.should eql(@response)
+      end
+
+      if RUBY_VERSION =~ /^1.9/
+        it "should default to utf-8 if Encoding.default_internal is nil" do
+          Encoding.default_internal = nil
+          Streamly.get('localhost:4567').encoding.should eql(Encoding.find('utf-8'))
+        end
+
+        it "should use Encoding.default_internal" do
+          Encoding.default_internal = Encoding.find('utf-8')
+          Streamly.get('localhost:4567').encoding.should eql(Encoding.default_internal)
+          Encoding.default_internal = Encoding.find('us-ascii')
+          Streamly.get('localhost:4567').encoding.should eql(Encoding.default_internal)
+        end
+      end
     end
-    
-    it "should perform a basic request and stream the response to the caller" do
-      streamed_response = ''
-      resp = Streamly.get('localhost:4567/?name=brian') do |chunk|
-        chunk.should_not be_empty
-        streamed_response << chunk
-      end
-      resp.should be_nil
-      streamed_response.should eql(@response)
+
+    context "streaming" do
+      it "should perform a basic request and stream the response to the caller" do
+        streamed_response = ''
+        resp = Streamly.get('localhost:4567/?name=brian') do |chunk|
+          chunk.should_not be_empty
+          streamed_response << chunk
+        end
+        resp.should be_nil
+        streamed_response.should eql(@response)
+      end
+
+      if RUBY_VERSION =~ /^1.9/
+        it "should default to utf-8 if Encoding.default_internal is nil" do
+          Encoding.default_internal = nil
+          Streamly.get('localhost:4567') do |chunk|
+            chunk.encoding.should eql(Encoding.find('utf-8'))
+          end
+        end
+
+        it "should use Encoding.default_internal" do
+          Encoding.default_internal = Encoding.find('utf-8')
+          Streamly.get('localhost:4567') do |chunk|
+            chunk.encoding.should eql(Encoding.default_internal)
+          end
+          Encoding.default_internal = Encoding.find('us-ascii')
+          Streamly.get('localhost:4567') do |chunk|
+            chunk.encoding.should eql(Encoding.default_internal)
+          end
+        end
+      end
     end
   end
-  
+
   context "POST" do
-    it "should perform a basic request" do
-      resp = Streamly.post('localhost:4567', 'name=brian')
-      resp.should eql(@response)
+    context "basic" do
+      it "should perform a basic request" do
+        resp = Streamly.post('localhost:4567', 'name=brian')
+        resp.should eql(@response)
+      end
+
+      if RUBY_VERSION =~ /^1.9/
+        it "should default to utf-8 if Encoding.default_internal is nil" do
+          Encoding.default_internal = nil
+          Streamly.post('localhost:4567', 'name=brian').encoding.should eql(Encoding.find('utf-8'))
+        end
+
+        it "should use Encoding.default_internal" do
+          Encoding.default_internal = Encoding.find('utf-8')
+          Streamly.post('localhost:4567', 'name=brian').encoding.should eql(Encoding.default_internal)
+          Encoding.default_internal = Encoding.find('us-ascii')
+          Streamly.post('localhost:4567', 'name=brian').encoding.should eql(Encoding.default_internal)
+        end
+      end
     end
-    
-    it "should perform a basic request and stream the response to the caller" do
-      streamed_response = ''
-      resp = Streamly.post('localhost:4567', 'name=brian') do |chunk|
-        chunk.should_not be_empty
-        streamed_response << chunk
-      end
-      resp.should be_nil
-      streamed_response.should eql(@response)
+
+    context "streaming" do
+      it "should perform a basic request and stream the response to the caller" do
+        streamed_response = ''
+        resp = Streamly.post('localhost:4567', 'name=brian') do |chunk|
+          chunk.should_not be_empty
+          streamed_response << chunk
+        end
+        resp.should be_nil
+        streamed_response.should eql(@response)
+      end
+
+      if RUBY_VERSION =~ /^1.9/
+        it "should default to utf-8 if Encoding.default_internal is nil" do
+          Encoding.default_internal = nil
+          Streamly.post('localhost:4567', 'name=brian') do |chunk|
+            chunk.encoding.should eql(Encoding.find('utf-8'))
+          end
+        end
+
+        it "should use Encoding.default_internal" do
+          Encoding.default_internal = Encoding.find('utf-8')
+          Streamly.post('localhost:4567', 'name=brian') do |chunk|
+            chunk.encoding.should eql(Encoding.default_internal)
+          end
+          Encoding.default_internal = Encoding.find('us-ascii')
+          Streamly.post('localhost:4567', 'name=brian') do |chunk|
+            chunk.encoding.should eql(Encoding.default_internal)
+          end
+        end
+      end
     end
   end
-  
+
   context "PUT" do
-    it "should perform a basic request" do
-      resp = Streamly.put('localhost:4567', 'name=brian')
-      resp.should eql(@response)
+    context "basic" do
+      it "should perform a basic request" do
+        resp = Streamly.put('localhost:4567', 'name=brian')
+        resp.should eql(@response)
+      end
+
+      if RUBY_VERSION =~ /^1.9/
+        it "should default to utf-8 if Encoding.default_internal is nil" do
+          Encoding.default_internal = nil
+          Streamly.put('localhost:4567', 'name=brian').encoding.should eql(Encoding.find('utf-8'))
+        end
+
+        it "should use Encoding.default_internal" do
+          Encoding.default_internal = Encoding.find('utf-8')
+          Streamly.put('localhost:4567', 'name=brian').encoding.should eql(Encoding.default_internal)
+          Encoding.default_internal = Encoding.find('us-ascii')
+          Streamly.put('localhost:4567', 'name=brian').encoding.should eql(Encoding.default_internal)
+        end
+      end
     end
-    
-    it "should perform a basic request and stream the response to the caller" do
-      streamed_response = ''
-      resp = Streamly.put('localhost:4567', 'name=brian') do |chunk|
-        chunk.should_not be_empty
-        streamed_response << chunk
-      end
-      resp.should be_nil
-      streamed_response.should eql(@response)
+
+    context "streaming" do
+      it "should perform a basic request and stream the response to the caller" do
+        streamed_response = ''
+        resp = Streamly.put('localhost:4567', 'name=brian') do |chunk|
+          chunk.should_not be_empty
+          streamed_response << chunk
+        end
+        resp.should be_nil
+        streamed_response.should eql(@response)
+      end
+
+      if RUBY_VERSION =~ /^1.9/
+        it "should default to utf-8 if Encoding.default_internal is nil" do
+          Encoding.default_internal = nil
+          Streamly.put('localhost:4567', 'name=brian') do |chunk|
+            chunk.encoding.should eql(Encoding.find('utf-8'))
+          end
+        end
+
+        it "should use Encoding.default_internal" do
+          Encoding.default_internal = Encoding.find('utf-8')
+          Streamly.put('localhost:4567', 'name=brian') do |chunk|
+            chunk.encoding.should eql(Encoding.default_internal)
+          end
+          Encoding.default_internal = Encoding.find('us-ascii')
+          Streamly.put('localhost:4567', 'name=brian') do |chunk|
+            chunk.encoding.should eql(Encoding.default_internal)
+          end
+        end
+      end
     end
   end
-  
+
   context "DELETE" do
-    it "should perform a basic request" do
-      resp = Streamly.delete('localhost:4567/?name=brian').should eql(@response)
+    context "basic" do
+      it "should perform a basic request" do
+        resp = Streamly.delete('localhost:4567/?name=brian').should eql(@response)
+      end
+
+      if RUBY_VERSION =~ /^1.9/
+        it "should default to utf-8 if Encoding.default_internal is nil" do
+          Encoding.default_internal = nil
+          Streamly.delete('localhost:4567/?name=brian').encoding.should eql(Encoding.find('utf-8'))
+        end
+
+        it "should use Encoding.default_internal" do
+          Encoding.default_internal = Encoding.find('utf-8')
+          Streamly.delete('localhost:4567/?name=brian').encoding.should eql(Encoding.default_internal)
+          Encoding.default_internal = Encoding.find('us-ascii')
+          Streamly.delete('localhost:4567/?name=brian').encoding.should eql(Encoding.default_internal)
+        end
+      end
     end
-    
-    it "should perform a basic request and stream the response to the caller" do
-      streamed_response = ''
-      resp = Streamly.delete('localhost:4567/?name=brian') do |chunk|
-        chunk.should_not be_empty
-        streamed_response << chunk
-      end
-      resp.should be_nil
-      streamed_response.should eql(@response)
+
+    context "streaming" do
+      it "should perform a basic request and stream the response to the caller" do
+        streamed_response = ''
+        resp = Streamly.delete('localhost:4567/?name=brian') do |chunk|
+          chunk.should_not be_empty
+          streamed_response << chunk
+        end
+        resp.should be_nil
+        streamed_response.should eql(@response)
+      end
+
+      if RUBY_VERSION =~ /^1.9/
+        it "should default to utf-8 if Encoding.default_internal is nil" do
+          Encoding.default_internal = nil
+          Streamly.delete('localhost:4567/?name=brian') do |chunk|
+            chunk.encoding.should eql(Encoding.find('utf-8'))
+          end
+        end
+
+        it "should use Encoding.default_internal" do
+          Encoding.default_internal = Encoding.find('utf-8')
+          Streamly.delete('localhost:4567/?name=brian') do |chunk|
+            chunk.encoding.should eql(Encoding.default_internal)
+          end
+          Encoding.default_internal = Encoding.find('us-ascii')
+          Streamly.delete('localhost:4567/?name=brian') do |chunk|
+            chunk.encoding.should eql(Encoding.default_internal)
+          end
+        end
+      end
     end
   end
 end

data/spec/spec_helper.rb

@@ -1,4 +1,5 @@
 # encoding: UTF-8
+$LOAD_PATH.unshift File.expand_path(File.dirname(__FILE__) + '/..')
 $LOAD_PATH.unshift File.expand_path(File.dirname(__FILE__) + '/../lib')
 
 require 'rubygems'

data/streamly.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{streamly}
-  s.version = "0.1.3"
+  s.version = "0.1.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Brian Lopez"]
-  s.date = %q{2010-02-11}
+  s.date = %q{2010-09-02}
   s.email = %q{seniorlopez@gmail.com}
   s.extensions = ["ext/extconf.rb"]
   s.extra_rdoc_files = [
@@ -40,7 +40,7 @@ Gem::Specification.new do |s|
      "lib/streamly.rb",
      "spec/rcov.opts",
      "spec/requests/request_spec.rb",
-     "spec/sinatra.rb",
+     "spec/server.rb",
      "spec/spec.opts",
      "spec/spec_helper.rb",
      "streamly.gemspec"
@@ -49,11 +49,11 @@ Gem::Specification.new do |s|
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib", "ext"]
   s.rubyforge_project = %q{streamly}
-  s.rubygems_version = %q{1.3.5}
+  s.rubygems_version = %q{1.3.7}
   s.summary = %q{A streaming REST client for Ruby, in C.}
   s.test_files = [
     "spec/requests/request_spec.rb",
-     "spec/sinatra.rb",
+     "spec/server.rb",
      "spec/spec_helper.rb",
      "examples/basic/delete.rb",
      "examples/basic/get.rb",
@@ -71,7 +71,7 @@ Gem::Specification.new do |s|
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
     else
     end
   else