glebtv-httpclient 3.2.7 → 3.2.8

data/spec/keepalive_spec.rb

@@ -87,7 +87,7 @@ describe 'KeepAlive' do
     (0...10).to_a.map {
       Thread.new {
         Thread.abort_on_exception = true
-        client.get(endpoint).content.should eq "12345"
+        expect(client.get(endpoint).content).to eq "12345"
       }
     }.each { |th| th.join }
     # send 5 requests, which should get KeepAliveDesconnected.
@@ -95,14 +95,14 @@ describe 'KeepAlive' do
     (0...5).to_a.map {
       Thread.new {
         Thread.abort_on_exception = true
-        client.get(endpoint).content.should eq "23456"
+        expect(client.get(endpoint).content).to eq "23456"
       }
     }.each { |th| th.join }
     # rest requests won't get KeepAliveDisconnected; how can I check this?
     (0...10).to_a.map {
       Thread.new {
         Thread.abort_on_exception = true
-        client.get(endpoint).content.should eq "34567"
+        expect(client.get(endpoint).content).to eq "34567"
       }
     }.each { |th| th.join }
   end
@@ -118,11 +118,11 @@ describe 'KeepAlive' do
     url = "http://127.0.0.1:#{server.addr[1]}/"
     # content-length
     5.times do
-      client.get(url).body.should eq '12345'
+      expect(client.get(url).body).to eq '12345'
     end
     # chunked
     5.times do
-      client.get(url + 'chunked').body.should eq 'abcdefghijklmnopqrstuvwxyz1234567890abcdef'
+      expect(client.get(url + 'chunked').body).to eq 'abcdefghijklmnopqrstuvwxyz1234567890abcdef'
     end
     server_thread.join
   end

data/spec/lru_spec.rb

@@ -3,20 +3,14 @@ require 'spec_helper'
 
 describe HTTPClient::LRUCache do
   before :each do
-    @cache = subject.class.new(ttl: 3, max_size: 2, soft_ttl: 2)
+    @cache = subject.class.new(ttl: 1, max_size: 2, soft_ttl: 2)
   end
   
   it 'expires values' do
-    @cache.fetch 'test' do
-      2
-    end.should eq 2
-    @cache.fetch 'test' do
-      3
-    end.should eq 2
-    sleep 4
-    @cache.fetch 'test' do
-      4
-    end.should eq 4
+    expect(@cache.fetch('test') { 2 }).to eq(2)
+    expect(@cache.fetch('test') { 3 }).to eq(2)
+    sleep 2
+    expect(@cache.fetch('test') { 4 }).to eq(4)
   end
 end
 

data/test/test_auth.rb

@@ -110,7 +110,6 @@ class TestAuth < Test::Unit::TestCase
   def test_BASIC_auth
     c = HTTPClient.new
     webrick_backup = @basic_auth.instance_eval { @auth_scheme }
-    #httpaccess2_backup = c.www_auth.basic_auth.instance_eval { @scheme }
     begin
       @basic_auth.instance_eval { @auth_scheme = "BASIC" }
       c.www_auth.basic_auth.instance_eval { @scheme = "BASIC" }
@@ -118,7 +117,35 @@ class TestAuth < Test::Unit::TestCase
       assert_equal('basic_auth OK', c.get_content("http://localhost:#{serverport}/basic_auth"))
     ensure
       @basic_auth.instance_eval { @auth_scheme = webrick_backup }
-      #c.www_auth.basic_auth.instance_eval { @scheme = httpaccess2_backup }
+    end
+  end
+
+  # To work this test consistently on CRuby you can to add 'Thread.pass' in
+  # @challenge iteration at BasicAuth#get like;
+  #
+  # return nil unless @challenge.find { |uri, ok|
+  #   Thread.pass
+  #   Util.uri_part_of(target_uri, uri) and ok
+  # }
+  def test_BASIC_auth_multi_thread
+    c = HTTPClient.new
+    webrick_backup = @basic_auth.instance_eval { @auth_scheme }
+    begin
+      @basic_auth.instance_eval { @auth_scheme = "BASIC" }
+      c.www_auth.basic_auth.instance_eval { @scheme = "BASIC" }
+      c.set_auth("http://localhost:#{serverport}/", 'admin', 'admin')
+
+      threads = 100.times.map { |idx|
+        Thread.new(idx) { |idx2|
+          Thread.abort_on_exception = true
+          Thread.pass
+          c.get("http://localhost:#{serverport}/basic_auth?#{idx2}")
+        }
+      }.map { |t|
+        t.join
+      }
+    ensure
+      @basic_auth.instance_eval { @auth_scheme = webrick_backup }
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: glebtv-httpclient
 version: !ruby/object:Gem::Version
-  version: 3.2.7
+  version: 3.2.8
 platform: ruby
 authors:
 - glebtv
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-19 00:00:00.000000000 Z
+date: 2014-08-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: lru_redux
@@ -53,20 +53,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: test-unit
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -123,20 +109,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: rspecify
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 description: 
 email: glebtv@gmail.com
 executables: