em-http-request 1.1.1 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a80a1bc2ca4e1dda7527f249949cb056b0beb886
-  data.tar.gz: 4819cb821fa74543d537416994fbd65b0e0f676c
+  metadata.gz: 2b948340f81a9f7d6003e5c3c6d37fe37ee789f5
+  data.tar.gz: e0353d87fd172a5e9e31b8616e71de048cc6b23d
 SHA512:
-  metadata.gz: b7c257493787ea81e1c1b26287aa88e4e98eba7278fa4734bdf4efe136ef1184a9f7d464dc821f35775535c649204b2331a2518bdc02e92167e062e8d5f74919
-  data.tar.gz: 1e3f32f26b6bee0e85a11318e1cce1df5fbb9a1c5122e04e9d0610b18e2ce82ec92e04d33482d8981964b33fa36fb61090e8915be3027a86608166997b9549a3
+  metadata.gz: fef27697e763bf7a8147465576ec46fb7df653e867ee38265e02baae70d1a7a249fbef783dc3fe8c8cabc49906842406c2b04ea31a8a22ff3e7ccde743a8be7b
+  data.tar.gz: 9f85f4b4c04f81bff300adc9c0094d98b78bdf359cbb62581b1030eb4429a28a1e72a55ef2b8adb6ee559d148ea034e2c0745e9ed9ea75b12ce3b9b7cb64544d

data/em-http-request.gemspec

@@ -12,13 +12,14 @@ Gem::Specification.new do |s|
   s.homepage    = 'http://github.com/igrigorik/em-http-request'
   s.summary     = 'EventMachine based, async HTTP Request client'
   s.description = s.summary
+  s.license     = 'MIT'
   s.rubyforge_project = 'em-http-request'
 
   s.add_dependency 'addressable', '>= 2.3.4'
   s.add_dependency 'cookiejar'
   s.add_dependency 'em-socksify', '>= 0.3'
   s.add_dependency 'eventmachine', '>= 1.0.3'
-  s.add_dependency 'http_parser.rb', '>= 0.6.0.beta.2'
+  s.add_dependency 'http_parser.rb', '>= 0.6.0'
 
   s.add_development_dependency 'mongrel', '~> 1.2.0.pre2'
   s.add_development_dependency 'multi_json'

data/lib/em-http/http_client_options.rb

@@ -35,17 +35,14 @@ class HttpClientOptions
 
     @uri = uri
     @path = uri.path
+    @host = uri.host
+    @port = uri.port
 
     # Make sure the ports are set as Addressable::URI doesn't
     # set the port if it isn't there
-    if @uri.scheme == "https"
-      @uri.port ||= 443
-    else
-      @uri.port ||= 80
+    if @port.nil?
+      @port = @uri.scheme == "https" ? 443 : 80
     end
 
-    @host = @uri.host
-    @port = @uri.port
-
   end
 end

data/lib/em-http/http_encoding.rb

@@ -39,7 +39,7 @@ module EventMachine
     end
 
     def encode_host
-      if @req.uri.port == 80 || @req.uri.port == 443
+      if @req.uri.port.nil? || @req.uri.port == 80 || @req.uri.port == 443
         return @req.uri.host
       else
         @req.uri.host + ":#{@req.uri.port}"

data/lib/em-http/version.rb

@@ -1,5 +1,5 @@
 module EventMachine
   class HttpRequest
-    VERSION = "1.1.1"
+    VERSION = "1.1.2"
   end
 end

data/spec/client_spec.rb

@@ -42,7 +42,7 @@ describe EventMachine::HttpRequest do
         http.response.should match(/Hello/)
         EventMachine.stop
       }
-    }.should_not raise_error(ArgumentError)
+    }.should_not raise_error
 
     }
   end

data/spec/multi_spec.rb

@@ -37,8 +37,8 @@ describe EventMachine::MultiRequest do
 
   describe "#requests" do
     it "should return the added requests" do
-      request1 = stub('request1', :callback => nil, :errback => nil)
-      request2 = stub('request2', :callback => nil, :errback => nil)
+      request1 = double('request1', :callback => nil, :errback => nil)
+      request2 = double('request2', :callback => nil, :errback => nil)
 
       multi.add :a, request1
       multi.add :b, request2

data/spec/redirect_spec.rb

@@ -318,4 +318,48 @@ describe EventMachine::HttpRequest do
     }
   end
 
+  it "should not add default http port to redirect url that don't include it" do
+    EventMachine.run {
+      conn = EventMachine::HttpRequest.new('http://127.0.0.1:8090/redirect/http_no_port')
+      http = conn.get :redirects => 1
+      http.errback {
+        http.last_effective_url.to_s.should == 'http://host/'
+        EM.stop
+      }
+    }
+  end
+
+  it "should not add default https port to redirect url that don't include it" do
+    EventMachine.run {
+      conn = EventMachine::HttpRequest.new('http://127.0.0.1:8090/redirect/https_no_port')
+      http = conn.get :redirects => 1
+      http.errback {
+        http.last_effective_url.to_s.should == 'https://host/'
+        EM.stop
+      }
+    }
+  end
+
+  it "should keep default http port in redirect url that include it" do
+    EventMachine.run {
+      conn = EventMachine::HttpRequest.new('http://127.0.0.1:8090/redirect/http_with_port')
+      http = conn.get :redirects => 1
+      http.errback {
+        http.last_effective_url.to_s.should == 'http://host:80/'
+        EM.stop
+      }
+    }
+  end
+
+  it "should keep default https port in redirect url that include it" do
+    EventMachine.run {
+      conn = EventMachine::HttpRequest.new('http://127.0.0.1:8090/redirect/https_with_port')
+      http = conn.get :redirects => 1
+      http.errback {
+        http.last_effective_url.to_s.should == 'https://host:443/'
+        EM.stop
+      }
+    }
+  end
+
 end

data/spec/stallion.rb

@@ -185,6 +185,22 @@ Stallion.saddle :spec do |stable|
       stable.response.status = 301
       stable.response["Location"] = "http://$$$@$!%&^"
 
+    elsif stable.request.path_info == '/redirect/http_no_port'
+      stable.response.status = 301
+      stable.response["Location"] = "http://host/"
+
+    elsif stable.request.path_info == '/redirect/https_no_port'
+      stable.response.status = 301
+      stable.response["Location"] = "https://host/"
+
+    elsif stable.request.path_info == '/redirect/http_with_port'
+      stable.response.status = 301
+      stable.response["Location"] = "http://host:80/"
+
+    elsif stable.request.path_info == '/redirect/https_with_port'
+      stable.response.status = 301
+      stable.response["Location"] = "https://host:443/"
+
     elsif stable.request.path_info == '/gzip'
       io = StringIO.new
       gzip = Zlib::GzipWriter.new(io)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: em-http-request
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.2
 platform: ruby
 authors:
 - Ilya Grigorik
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-24 00:00:00.000000000 Z
+date: 2013-12-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -72,14 +72,14 @@ dependencies:
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 0.6.0.beta.2
+        version: 0.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 0.6.0.beta.2
+        version: 0.6.0
 - !ruby/object:Gem::Dependency
   name: mongrel
   requirement: !ruby/object:Gem::Requirement
@@ -217,7 +217,8 @@ files:
 - spec/stallion.rb
 - spec/stub_server.rb
 homepage: http://github.com/igrigorik/em-http-request
-licenses: []
+licenses:
+- MIT
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -260,4 +261,3 @@ test_files:
 - spec/ssl_spec.rb
 - spec/stallion.rb
 - spec/stub_server.rb
-has_rdoc: