excon 0.0.5 → 0.0.7

data/Gemfile

@@ -0,0 +1,14 @@
+disable_system_gems
+
+only :test do
+  gem 'shindo'
+  gem 'open4'
+end
+
+only :test_server do
+  gem 'sinatra', :require_as => 'sinatra/base'
+end
+
+only :benchmarks do
+  gem 'eventmachine'
+end

data/VERSION

@@ -1 +1 @@
-0.0.5
+0.0.7

data/benchmarks/excon_vs.rb

@@ -1,3 +1,5 @@
+Bundler.require_env(:benchmarks)
+
 require File.join(File.dirname(__FILE__), '..', 'lib/excon')
 
 require 'benchmark'
@@ -36,4 +38,25 @@ Benchmark.bmbm(25) do |bench|
       open('http://www.google.com/').read
     end
   end
+  bench.report('em') do
+    module DumbHttpClient
+      @@responses = 0
+      def post_init
+        send_data "GET / HTTP/1.1\r\nHost: _\r\n\r\n"
+      end
+
+      def receive_data(*)
+        @@responses += 1
+        if @@responses == COUNT
+          EM.stop
+        end
+      end
+    end
+
+    EM.run{
+      COUNT.times do
+        EM.connect 'www.google.com', 80, DumbHttpClient
+      end
+    }
+  end
 end

data/bin/rackup

@@ -0,0 +1,3 @@
+#!/System/Library/Frameworks/Ruby.framework/Versions/1.8/usr/bin/ruby
+require File.join(File.dirname(__FILE__), "../vendor/gems/environment")
+load File.join(File.dirname(__FILE__), "../vendor/gems/gems/rack-1.0.1/bin/rackup")

data/bin/shindo

@@ -0,0 +1,3 @@
+#!/System/Library/Frameworks/Ruby.framework/Versions/1.8/usr/bin/ruby
+require File.join(File.dirname(__FILE__), "../vendor/gems/environment")
+load File.join(File.dirname(__FILE__), "../vendor/gems/gems/shindo-0.0.4/bin/shindo")

data/excon.gemspec

@@ -5,19 +5,21 @@
 
 Gem::Specification.new do |s|
   s.name = %q{excon}
-  s.version = "0.0.5"
+  s.version = "0.0.7"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Wesley Beary"]
-  s.date = %q{2009-11-17}
+  s.date = %q{2009-11-21}
   s.description = %q{speed, persistence, http(s)}
   s.email = %q{wbeary@engineyard.com}
+  s.executables = ["rackup", "shindo"]
   s.extra_rdoc_files = [
     "README.rdoc"
   ]
   s.files = [
     ".document",
      ".gitignore",
+     "Gemfile",
      "README.rdoc",
      "Rakefile",
      "VERSION",
@@ -29,16 +31,16 @@ Gem::Specification.new do |s|
      "lib/excon/connection.rb",
      "lib/excon/errors.rb",
      "lib/excon/response.rb",
-     "test/test.rb"
+     "tests/config.ru",
+     "tests/mock_tests.rb",
+     "tests/test_helper.rb",
+     "tests/threaded_tests.rb"
   ]
   s.homepage = %q{http://github.com/geemus/excon}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
   s.rubygems_version = %q{1.3.5}
   s.summary = %q{EXtended http(s) CONnections}
-  s.test_files = [
-    "test/test.rb"
-  ]
 
   if s.respond_to? :specification_version then
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION

data/lib/excon/connection.rb

@@ -92,19 +92,25 @@ unless Excon.mocking?
       private
 
       def connection
-        if !@connection || @connection.closed?
-          @connection = TCPSocket.open(@uri.host, @uri.port)
-          if @uri.scheme == 'https'
-            @ssl_context = OpenSSL::SSL::SSLContext.new
-            @ssl_context.verify_mode = OpenSSL::SSL::VERIFY_NONE
-            @connection = OpenSSL::SSL::SSLSocket.new(@connection, @ssl_context)
-            @connection.sync_close = true
-            @connection.connect
-          end
+        if !Thread.current[:_excon_connection] || Thread.current[:_excon_connection].closed?
+          Thread.current[:_excon_connection] = establish_connection
         end
-        @connection
+        Thread.current[:_excon_connection]
       end
 
+      def establish_connection
+        connection = TCPSocket.open(@uri.host, @uri.port)
+
+        if @uri.scheme == 'https'
+          @ssl_context = OpenSSL::SSL::SSLContext.new
+          @ssl_context.verify_mode = OpenSSL::SSL::VERIFY_NONE
+          connection = OpenSSL::SSL::SSLSocket.new(connection, @ssl_context)
+          connection.sync_close = true
+          connection.connect
+        end
+
+        connection
+      end
     end
   end
 

data/tests/config.ru

@@ -0,0 +1,10 @@
+Bundler.require_env(:test_server)
+
+class App < Sinatra::Base
+  get '/id/:id/wait/:wait' do |id, wait|
+    sleep wait.to_i
+    id.to_s
+  end
+end
+
+run App

data/tests/mock_tests.rb

@@ -0,0 +1,40 @@
+require File.expand_path(File.join(File.dirname(__FILE__), 'test_helper'))
+
+Excon.mock!
+
+request = {
+  :host   => 'www.google.com',
+  :method => 'GET',
+  :path   => '/'
+}
+response = Excon::Response.new({
+  :status   => 200,
+  :headers  => { 'Content-Length' => '11' },
+  :body     => 'Hello World'
+})
+Excon.mocks[request] = response
+
+Shindo.tests do
+
+  before do
+    @connection = Excon.new('http://www.google.com')
+    @response = @connection.request({
+      :host   => 'www.google.com',
+      :method => 'GET',
+      :path   => '/'
+    })
+  end
+
+  test("status => 200") do
+    @response.status == 200
+  end
+
+  test("headers => { 'Content-Length' => '11' }") do
+    @response.headers == { 'Content-Length' => '11' }
+  end
+
+  test("body => 'Hello World") do
+    @response.body == 'Hello World'
+  end
+
+end

data/tests/test_helper.rb

@@ -0,0 +1,14 @@
+require File.expand_path(File.join(File.dirname(__FILE__), '..', 'lib/excon'))
+
+Bundler.require_env(:test)
+
+def local_file(*parts)
+  File.expand_path(File.join(File.dirname(__FILE__), *parts))
+end
+
+def with_rackup(configru = local_file('config.ru'), rackup = local_file('..', 'bin', 'rackup'))
+  pid, w, r, e = Open4.popen4("#{rackup} #{configru}")
+  while `lsof -p #{pid} -P -i | grep ruby | grep TCP`.chomp.empty?; end
+  yield
+  Process.kill(9, pid)
+end

data/tests/threaded_tests.rb

@@ -0,0 +1,24 @@
+require File.expand_path(File.join(File.dirname(__FILE__), 'test_helper'))
+
+with_rackup do
+  Shindo.tests do
+    test('threaded requests') do
+      connection = Excon.new('http://127.0.0.1:9292')
+
+      long_thread = Thread.new {
+        response = connection.request(:method => 'GET', :path => '/id/1/wait/2')
+        Thread.current[:success] = response.body == '1'
+      }
+
+      short_thread = Thread.new {
+        response = connection.request(:method => 'GET', :path => '/id/2/wait/1')
+        Thread.current[:success] = response.body == '2'
+      }
+
+      long_thread.join
+      short_thread.join
+
+      long_thread[:success] && short_thread[:success]
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: excon
 version: !ruby/object:Gem::Version 
-  version: 0.0.5
+  version: 0.0.7
 platform: ruby
 authors: 
 - Wesley Beary
@@ -9,14 +9,15 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-17 00:00:00 -08:00
+date: 2009-11-21 00:00:00 -08:00
 default_executable: 
 dependencies: []
 
 description: speed, persistence, http(s)
 email: wbeary@engineyard.com
-executables: []
-
+executables: 
+- rackup
+- shindo
 extensions: []
 
 extra_rdoc_files: 
@@ -24,6 +25,7 @@ extra_rdoc_files:
 files: 
 - .document
 - .gitignore
+- Gemfile
 - README.rdoc
 - Rakefile
 - VERSION
@@ -35,7 +37,10 @@ files:
 - lib/excon/connection.rb
 - lib/excon/errors.rb
 - lib/excon/response.rb
-- test/test.rb
+- tests/config.ru
+- tests/mock_tests.rb
+- tests/test_helper.rb
+- tests/threaded_tests.rb
 has_rdoc: true
 homepage: http://github.com/geemus/excon
 licenses: []
@@ -64,5 +69,5 @@ rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
 summary: EXtended http(s) CONnections
-test_files: 
-- test/test.rb
+test_files: []
+

data/test/test.rb

@@ -1,30 +0,0 @@
-require File.join(File.dirname(__FILE__), '..', 'lib/excon')
-
-Excon.mock!
-
-request = {
-  :host   => 'www.google.com',
-  :method => 'GET',
-  :path   => '/'
-}
-response = {
-  :status   => 200,
-  :headers  => { 'Content-Length' => '11' },
-  :body     => 'Hello World'
-}
-Excon.mocks[request] = response
-
-x = Excon.new('http://www.google.com')
-
-10.times do
-p x.request(
-  :host   => 'www.google.com',
-  :method => 'GET',
-  :path   => '/'
-)
-end
-
-# require 'open-uri'
-# 10.times do
-#   p open('http://www.google.com').read
-# end