streamly_ffi 0.2.4 → 0.2.6

data/Gemfile.lock

@@ -1,15 +1,16 @@
 PATH
   remote: .
   specs:
-    streamly_ffi (0.2.4)
+    streamly_ffi (0.2.6)
       curl_ffi
 
 GEM
   remote: http://rubygems.org/
   specs:
-    curl_ffi (0.0.6)
+    curl_ffi (0.0.8)
       ffi
     diff-lcs (1.1.2)
+    fakeweb (1.3.0)
     ffi (0.6.3)
       rake (>= 0.8.7)
     rake (0.8.7)
@@ -27,6 +28,7 @@ PLATFORMS
 
 DEPENDENCIES
   curl_ffi
+  fakeweb
   rspec
   rspec-core
   streamly_ffi!

data/Rakefile

@@ -26,7 +26,7 @@ require 'rspec/core'
 require 'rspec/core/rake_task'
 
 desc "Run all examples with RCov"
-Rspec::Core::RakeTask.new('spec:rcov') do |t|
+RSpec::Core::RakeTask.new('spec:rcov') do |t|
 #Spec::Rake::SpecTask.new('spec:rcov') do |t|
   t.pattern   = "spec/requests/**/*_spec.rb"
   t.rcov      = true
@@ -36,7 +36,7 @@ Rspec::Core::RakeTask.new('spec:rcov') do |t|
     }.flatten
   end
 end
-Rspec::Core::RakeTask.new(:spec) do |t|
+RSpec::Core::RakeTask.new(:spec) do |t|
 #Spec::Rake::SpecTask.new('spec') do |t|
   t.pattern   = "spec/streamly_ffi/**/*_spec.rb"
 #  t.opts  << '--options' << 'spec/spec.opts'

data/lib/streamly_ffi.rb

@@ -5,10 +5,14 @@ $:.unshift(File.dirname(__FILE__)) unless
 require 'streamly_ffi/version'
 
 module StreamlyFFI
-  autoload :Base,               "streamly_ffi/base"
-  autoload :Connection,         "streamly_ffi/connection"
-  autoload :Request,            "streamly_ffi/request"
-  autoload :PersistentRequest,  "streamly_ffi/persistent_request"
+#  autoload :Base,               "streamly_ffi/base"
+require "streamly_ffi/base"
+require "streamly_ffi/connection"
+require "streamly_ffi/request"
+require "streamly_ffi/persistent_request"
+#  autoload :Connection,         "streamly_ffi/connection"
+#  autoload :Request,            "streamly_ffi/request"
+#  autoload :PersistentRequest,  "streamly_ffi/persistent_request"
 
   class Error               < StandardError; end
   class UnsupportedProtocol < StandardError; end

data/lib/streamly_ffi/base.rb

@@ -4,13 +4,14 @@ module StreamlyFFI
 
     attr_accessor :url, :method, :default_write_handler, :default_header_handler
 
+    DEFAULT_CURL_ENCODING = "identity, deflate, gzip"
+
     def execute(options={})
+      connection.reset
       set_options(options).perform
 
       CurlFFI.slist_free_all(@request_headers) if @request_headers
 
-      connection.reset
-
       resp  = if(options.has_key?(:response_header_handler) or options.has_key?(:response_body_handler))
                 nil
               elsif(options[:method] == :head && response_header.respond_to?(:to_str))
@@ -28,10 +29,29 @@ module StreamlyFFI
       connection.perform
     end
 
+    # Set/add request headers in Curl's slist
+    #   @param [Hash, Array<Hash>, Set<Hash>] headers Any number of headers to be added to curl's slist. Ultimate form
+    #     must be a Hash; multiple Hashes with the same key (and different value) can be placed in an Array, if desired.
+    def set_headers(headers)
+      case headers
+      when Hash
+        headers.each_pair do |k_v|
+          self.request_headers = CurlFFI.slist_append(self.request_headers, k_v.join(": "))
+        end
+      when Array, Set
+        headers.each do |header|
+          header.each_pair do |k_v|
+            self.request_headers = CurlFFI.slist_append(self.request_headers, k_v.join(": "))
+          end
+        end
+      end
+      return self.request_headers
+    end # def set_headers
+
     def set_options(options={})
-      @url      = options[:url]     if options.has_key?(:url)     # Make sure @url is set, if not
-      @method   = options[:method]  if options.has_key?(:method)  # Make sure @method is set, if not
-      @payload  = options[:payload]
+      @url      = options[:url].dup     if options.has_key?(:url)     # Make sure @url is set, if not
+      @method   = options[:method]      if options.has_key?(:method)  # Make sure @method is set, if not
+      @payload  = options[:payload].dup if options.has_key?(:payload)
 
       @response_body          = nil
       @response_header        = nil
@@ -56,17 +76,15 @@ module StreamlyFFI
       # else I WILL CUT YOU
       end
 
-      if options.has_key?(:headers) and not options[:headers].nil?
-        options[:headers].each_pair do |key_and_value|
-          self.request_headers = CurlFFI.slist_append(self.request_headers, key_and_value.join(": "))
-        end
-        connection.setopt :HTTPHEADER, @request_headers
+      if options.has_key?(:headers)
+        connection.setopt(:HTTPHEADER, set_headers(options[:headers])) unless options[:headers].nil?
       end
 
       if options.has_key?(:response_header_handler)
         @custom_header_handler = options[:response_header_handler]
         set_header_handler(:custom_header_callback)
       else
+        @response_header = ""
         set_header_handler
       end
 
@@ -74,10 +92,11 @@ module StreamlyFFI
         @custom_write_handler = options[:response_body_handler]
         set_write_handler(:custom_write_callback)
       else
+        @response_body = ""
         set_write_handler
       end
 
-      connection.setopt :ENCODING,        "identity, deflate, gzip" unless @method == :head
+      connection.setopt :ENCODING,        DEFAULT_CURL_ENCODING unless @method == :head
       connection.setopt :URL,             @url
 
       # Other common options (blame streamly guy)
@@ -102,7 +121,7 @@ module StreamlyFFI
     alias :error    :error_buffer
 
     def request_headers
-      @request_headers ||= FFI::MemoryPointer.from_string("")
+      @request_headers ||= FFI::MemoryPointer.new(:pointer)
     end
 
     def response_body
@@ -117,37 +136,42 @@ module StreamlyFFI
     alias :headers  :response_header
 
     def set_write_handler(_callback=:default_write_callback)
-      connection.setopt(:WRITEFUNCTION, FFI::Function.new(:size_t, [:pointer, :size_t, :size_t,], &self.__method__(_callback)))
+      @_write_handler = FFI::Function.new(:size_t, [:pointer, :size_t, :size_t,], &self.__method__(_callback))
+
+      connection.setopt(:WRITEFUNCTION, @_write_handler)
     end
 
     def set_header_handler(_callback=:default_header_callback)
-      connection.setopt(:HEADERFUNCTION, FFI::Function.new(:size_t, [:pointer, :size_t, :size_t], &self.__method__(_callback)))
+      @_header_handler = FFI::Function.new(:size_t, [:pointer, :size_t, :size_t], &self.__method__(_callback))
+      connection.setopt(:HEADERFUNCTION, @_header_handler)
     end
 
     def default_write_callback(string_ptr, size, nmemb)
-      length = size * nmemb
-      response_body << string_ptr.read_string(length)
+      length  = size * nmemb
+      @response_body << string_ptr.read_string(length).dup
 
       return length
     end
 
     def default_header_callback(string_ptr, size, nmemb)
-      length = size * nmemb
-      response_header << string_ptr.read_string(length)
+      length  = size * nmemb
+      @response_header << string_ptr.read_string(length).dup
 
       return length
     end
 
     def custom_write_callback(string_ptr, size, nmemb)
-      length = size * nmemb
-      @custom_write_handler.call(string_ptr.read_string(length))
+      length  = size * nmemb
+      @_wcall = string_ptr.read_string(length)
+      @custom_write_handler.call(string_ptr.read_string(length).dup)
 
       return length
     end
 
     def custom_header_callback(string_ptr, size, nmemb)
-      length = size * nmemb
-      @custom_header_handler.call(string_ptr.read_string(length))
+      length  = size * nmemb
+      @_hcall = string_ptr.read_string(length)
+      @custom_header_handler.call(string_ptr.read_string(length).dup)
 
       return length
     end

data/lib/streamly_ffi/persistent_request.rb

@@ -8,7 +8,7 @@ module StreamlyFFI
     include StreamlyFFI::Base
 
     def [](_sym)
-        send _sym
+      send _sym
     end
 
     def escape(_string)

data/lib/streamly_ffi/version.rb

@@ -1,3 +1,3 @@
 module StreamlyFFI
-  VERSION = "0.2.4"
+  VERSION = "0.2.6"
 end

data/spec/spec_helper.rb

@@ -4,4 +4,5 @@ $LOAD_PATH.unshift(File.dirname(__FILE__))
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 
 require 'streamly_ffi'
+require 'fakeweb'
 require 'rspec'

data/spec/streamly_ffi/request_spec.rb

@@ -8,27 +8,22 @@ describe StreamlyFFI::Request do
   end
 
   describe "HEAD" do
+    before :each do
+      @response = StreamlyFFI.head('http://localhost/')
+    end
+
     describe "basic" do
       it "should perform a basic request" do
-        resp = StreamlyFFI.head('localhost:4567')
-        resp.should_not be_nil
+        @response.should_not be_nil
       end
-=begin
-      if RUBY_VERSION =~ /^1.9/
-        it "should default to utf-8 if Encoding.default_internal is nil" do
-          Encoding.default_internal = nil
-          StreamlyFFI.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')
-          StreamlyFFI.head('localhost:4567').encoding.should eql(Encoding.default_internal)
-          Encoding.default_internal = Encoding.find('us-ascii')
-          StreamlyFFI.head('localhost:4567').encoding.should eql(Encoding.default_internal)
-        end
+      it "should contain common header data" do
+        (@response =~ /HTTP.+200 OK/).should_not  be_nil
+        (@response =~ /Date/).should_not          be_nil
+        (@response =~ /Content-Type/).should_not  be_nil
+        (@response =~ /Hullo/).should             be_nil
       end
-=end
-    end
+    end # describe "basic"
 
     describe "streaming" do
       it "should perform a basic request and stream header chunks to the caller" do
@@ -40,29 +35,8 @@ describe StreamlyFFI::Request do
         resp.should be_nil
         streamed_response.should_not be_nil
       end
-=begin
-      if RUBY_VERSION =~ /^1.9/
-        it "should default to utf-8 if Encoding.default_internal is nil" do
-          Encoding.default_internal = nil
-          StreamlyFFI.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')
-          StreamlyFFI.head('localhost:4567') do |chunk|
-            chunk.encoding.should eql(Encoding.default_internal)
-          end
-          Encoding.default_internal = Encoding.find('us-ascii')
-          StreamlyFFI.head('localhost:4567') do |chunk|
-            chunk.encoding.should eql(Encoding.default_internal)
-          end
-        end
-      end
-=end
-    end
-  end
+    end # describe "streaming"
+  end # describe "HEAD"
 
   describe "GET" do
     describe "basic" do
@@ -70,21 +44,6 @@ describe StreamlyFFI::Request do
         resp = StreamlyFFI.get('localhost:4567/?name=brian')
         resp.should eql(@response)
       end
-=begin
-      if RUBY_VERSION =~ /^1.9/
-        it "should default to utf-8 if Encoding.default_internal is nil" do
-          Encoding.default_internal = nil
-          StreamlyFFI.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')
-          StreamlyFFI.get('localhost:4567').encoding.should eql(Encoding.default_internal)
-          Encoding.default_internal = Encoding.find('us-ascii')
-          StreamlyFFI.get('localhost:4567').encoding.should eql(Encoding.default_internal)
-        end
-      end
-=end
     end
 
     describe "streaming" do
@@ -97,27 +56,6 @@ describe StreamlyFFI::Request do
         resp.should be_nil
         streamed_response.should eql(@response)
       end
-=begin
-      if RUBY_VERSION =~ /^1.9/
-        it "should default to utf-8 if Encoding.default_internal is nil" do
-          Encoding.default_internal = nil
-          StreamlyFFI.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')
-          StreamlyFFI.get('localhost:4567') do |chunk|
-            chunk.encoding.should eql(Encoding.default_internal)
-          end
-          Encoding.default_internal = Encoding.find('us-ascii')
-          StreamlyFFI.get('localhost:4567') do |chunk|
-            chunk.encoding.should eql(Encoding.default_internal)
-          end
-        end
-      end
-=end
     end
   end
 
@@ -127,21 +65,6 @@ describe StreamlyFFI::Request do
         resp = StreamlyFFI.post('localhost:4567', 'name=brian')
         resp.should eql(@response)
       end
-=begin
-      if RUBY_VERSION =~ /^1.9/
-        it "should default to utf-8 if Encoding.default_internal is nil" do
-          Encoding.default_internal = nil
-          StreamlyFFI.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')
-          StreamlyFFI.post('localhost:4567', 'name=brian').encoding.should eql(Encoding.default_internal)
-          Encoding.default_internal = Encoding.find('us-ascii')
-          StreamlyFFI.post('localhost:4567', 'name=brian').encoding.should eql(Encoding.default_internal)
-        end
-      end
-=end
     end
 
     describe "streaming" do
@@ -154,27 +77,6 @@ describe StreamlyFFI::Request do
         resp.should be_nil
         streamed_response.should eql(@response)
       end
-=begin
-      if RUBY_VERSION =~ /^1.9/
-        it "should default to utf-8 if Encoding.default_internal is nil" do
-          Encoding.default_internal = nil
-          StreamlyFFI.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')
-          StreamlyFFI.post('localhost:4567', 'name=brian') do |chunk|
-            chunk.encoding.should eql(Encoding.default_internal)
-          end
-          Encoding.default_internal = Encoding.find('us-ascii')
-          StreamlyFFI.post('localhost:4567', 'name=brian') do |chunk|
-            chunk.encoding.should eql(Encoding.default_internal)
-          end
-        end
-      end
-=end
     end
   end
 
@@ -184,21 +86,6 @@ describe StreamlyFFI::Request do
         resp = StreamlyFFI.put('localhost:4567', 'name=brian')
         resp.should eql(@response)
       end
-=begin
-      if RUBY_VERSION =~ /^1.9/
-        it "should default to utf-8 if Encoding.default_internal is nil" do
-          Encoding.default_internal = nil
-          StreamlyFFI.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')
-          StreamlyFFI.put('localhost:4567', 'name=brian').encoding.should eql(Encoding.default_internal)
-          Encoding.default_internal = Encoding.find('us-ascii')
-          StreamlyFFI.put('localhost:4567', 'name=brian').encoding.should eql(Encoding.default_internal)
-        end
-      end
-=end
     end
 
     describe "streaming" do
@@ -211,27 +98,6 @@ describe StreamlyFFI::Request do
         resp.should be_nil
         streamed_response.should eql(@response)
       end
-=begin
-      if RUBY_VERSION =~ /^1.9/
-        it "should default to utf-8 if Encoding.default_internal is nil" do
-          Encoding.default_internal = nil
-          StreamlyFFI.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')
-          StreamlyFFI.put('localhost:4567', 'name=brian') do |chunk|
-            chunk.encoding.should eql(Encoding.default_internal)
-          end
-          Encoding.default_internal = Encoding.find('us-ascii')
-          StreamlyFFI.put('localhost:4567', 'name=brian') do |chunk|
-            chunk.encoding.should eql(Encoding.default_internal)
-          end
-        end
-      end
-=end
     end
   end
 
@@ -240,21 +106,6 @@ describe StreamlyFFI::Request do
       it "should perform a basic request" do
         resp = StreamlyFFI.delete('localhost:4567/?name=brian').should eql(@response)
       end
-=begin
-      if RUBY_VERSION =~ /^1.9/
-        it "should default to utf-8 if Encoding.default_internal is nil" do
-          Encoding.default_internal = nil
-          StreamlyFFI.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')
-          StreamlyFFI.delete('localhost:4567/?name=brian').encoding.should eql(Encoding.default_internal)
-          Encoding.default_internal = Encoding.find('us-ascii')
-          StreamlyFFI.delete('localhost:4567/?name=brian').encoding.should eql(Encoding.default_internal)
-        end
-      end
-=end
     end
 
     describe "streaming" do
@@ -267,27 +118,6 @@ describe StreamlyFFI::Request do
         resp.should be_nil
         streamed_response.should eql(@response)
       end
-=begin
-      if RUBY_VERSION =~ /^1.9/
-        it "should default to utf-8 if Encoding.default_internal is nil" do
-          Encoding.default_internal = nil
-          StreamlyFFI.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')
-          StreamlyFFI.delete('localhost:4567/?name=brian') do |chunk|
-            chunk.encoding.should eql(Encoding.default_internal)
-          end
-          Encoding.default_internal = Encoding.find('us-ascii')
-          StreamlyFFI.delete('localhost:4567/?name=brian') do |chunk|
-            chunk.encoding.should eql(Encoding.default_internal)
-          end
-        end
-      end
-=end
     end
   end
 end

data/streamly_ffi.gemspec

@@ -18,8 +18,8 @@ Gem::Specification.new do |s|
   s.email           = %q{seniorlopez@gmail.com}
   s.homepage        = %q{http://github.com/aitrus/streamly_ffi}
 
-  s.add_dependency    "curl_ffi"
-  s.add_development_dependency "rspec"
+  s.add_dependency              "curl_ffi"
+  s.add_development_dependency  "rspec"
 
   s.files           = `git ls-files`.split("\n")
   s.test_files      = `git ls-files -- {test,spec,features}/*`.split("\n")

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 2
-  - 4
-  version: 0.2.4
+  - 6
+  version: 0.2.6
 platform: ruby
 authors: 
 - Brian Lopez
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-10 00:00:00 -08:00
+date: 2010-11-23 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency