http_proxy_from_env 0.0.1 → 0.0.2

data/.travis.yml

@@ -0,0 +1,6 @@
+language: ruby
+rvm:
+  - "1.9.3"
+  - "2.0.0"
+
+script: bundle exec rspec

data/README.md

@@ -1,6 +1,7 @@
 # HttpProxyFromEnv
 
 Net::HTTP automatically detects and uses proxies from the environment.
+
 http\_proxy\_from\_env is made from https://bugs.ruby-lang.org/projects/ruby-trunk/repository/revisions/36476
 
 ## Installation

data/Rakefile

@@ -1 +1,6 @@
 require "bundler/gem_tasks"
+require "rspec/core/rake_task"
+
+RSpec::Core::RakeTask.new(:spec)
+
+task :default => :spec

data/http_proxy_from_env.gemspec

@@ -10,7 +10,7 @@ Gem::Specification.new do |spec|
   spec.email         = ["mechamosura@gmail.com"]
   spec.description   = %q{Net::HTTP automatically detects and uses proxies from the environment.}
   spec.summary       = %q{Net::HTTP automatically detects and uses proxies from the environment.}
-  spec.homepage      = ""
+  spec.homepage      = "https://github.com/mechamogera/http_proxy_from_env"
   spec.license       = "MIT"
 
   spec.files         = `git ls-files`.split($/)
@@ -20,4 +20,5 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"
+  spec.add_development_dependency "rspec"
 end

data/lib/http_proxy_from_env/net/http.rb

@@ -109,7 +109,7 @@ class Net::HTTP
 
   def proxy_user
     if @proxy_from_env then
-      proxy_uri && proxy_uri.user
+      @proxy_user ||  proxy_uri && proxy_uri.user
     else
       @proxy_user
     end
@@ -117,7 +117,7 @@ class Net::HTTP
 
   def proxy_pass
     if @proxy_from_env then
-      proxy_uri && proxy_uri.password
+      @proxy_pass || proxy_uri && proxy_uri.password
     else
       @proxy_pass
     end

data/lib/http_proxy_from_env/version.rb

@@ -1,3 +1,3 @@
 module HttpProxyFromEnv
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/spec/http_proxy_from_env_spec.rb

@@ -0,0 +1,7 @@
+require 'spec_helper'
+
+describe HttpProxyFromEnv do
+  it 'should have a version number' do
+    expect(HttpProxyFromEnv::VERSION).to be_truthy
+  end
+end

data/spec/net/http_spec.rb

@@ -0,0 +1,144 @@
+require_relative '../spec_helper'
+
+describe Net::HTTP do
+  let(:address) { 'address' }
+  let(:proxy_address) { 'proxy.example' }
+  let(:proxy_port) { 8080 }
+  let(:proxy_user) { "proxy_user" }
+  let(:proxy_pass) { "proxy_pass" }
+  let(:proxy_uri) { "http://#{proxy_address}:#{proxy_port}" }
+  let(:proxy_uri_with_auth) { "http://#{proxy_user}:#{proxy_pass}@#{proxy_address}:#{proxy_port}" }
+
+  context 'proxy env' do
+    before do
+      ENV.delete('http_proxy')
+      ENV.delete('HTTP_PROXY')
+    end
+    
+    describe "HTTP.new" do
+      let(:http) { http = Net::HTTP.new(address) }
+
+      it { expect(http.proxy?).to be_falsey }
+      it { expect(http.proxy_uri).to be_nil }
+      it { expect(http.proxy_from_env?).to be_truthy }
+      it { expect(http.proxy_address).to be_nil }
+      it { expect(http.proxy_port).to be_nil }
+      it { expect(http.proxy_user).to be_nil }
+      it { expect(http.proxy_pass).to be_nil }
+    end
+
+    describe "Proxy.new" do
+      let(:http) { Net::HTTP::Proxy().new(address) }
+
+      it { expect(http.proxy?).to be_falsey }
+      it { expect(http.proxy_uri).to be_nil }
+      it { expect(http.proxy_from_env?).to be_truthy }
+      it { expect(http.proxy_address).to be_nil }
+      it { expect(http.proxy_port).to be_nil }
+      it { expect(http.proxy_user).to be_nil }
+      it { expect(http.proxy_pass).to be_nil }
+    end
+  end
+
+  context 'proxy env' do
+    before do
+      ENV['http_proxy'] = proxy_uri
+    end
+
+    describe "HTTP.new" do
+      let(:http) { http = Net::HTTP.new(address) }
+
+      it { expect(http.proxy?).to be_truthy }
+      it { expect(http.proxy_uri).to eq(URI(proxy_uri)) }
+      it { expect(http.proxy_from_env?).to be_truthy }
+      it { expect(http.proxy_address).to eq(proxy_address) }
+      it { expect(http.proxy_port).to eq(proxy_port) }
+      it { expect(http.proxy_user).to be_nil }
+      it { expect(http.proxy_pass).to be_nil }
+    end
+
+    describe "Proxy.new" do
+      let(:http) { Net::HTTP::Proxy().new(address) }
+
+      it { expect(http.proxy?).to be_truthy }
+      it { expect(http.proxy_uri).to eq(URI(proxy_uri)) }
+      it { expect(http.proxy_from_env?).to be_truthy }
+      it { expect(http.proxy_address).to eq(proxy_address) }
+      it { expect(http.proxy_port).to eq(proxy_port) }
+      it { expect(http.proxy_user).to be_nil }
+      it { expect(http.proxy_pass).to be_nil }
+    end
+
+    describe "Proxy.new with auth" do
+      let(:http) { http = Net::HTTP::Proxy(:ENV, nil, proxy_user, proxy_pass).new(address) }
+
+      it { expect(http.proxy?).to be_truthy }
+      it { expect(http.proxy_uri).to eq(URI(proxy_uri)) }
+      it { expect(http.proxy_from_env?).to be_truthy }
+      it { expect(http.proxy_address).to eq(proxy_address) }
+      it { expect(http.proxy_port).to eq(proxy_port) }
+      it { expect(http.proxy_user).to eq(proxy_user) }
+      it { expect(http.proxy_pass).to eq(proxy_pass) }
+    end
+
+    describe "Proxy.new with proxy" do
+      let(:force_proxy_address) { "hoge_address" }
+      let(:force_proxy_port) { 1234 }
+      let(:force_proxy_user) { "hoge_user" }
+      let(:force_proxy_pass) { "hoge_pass" }
+      let(:http) { http = Net::HTTP::Proxy(force_proxy_address, force_proxy_port, force_proxy_user, force_proxy_pass).new(address) }
+
+      it { expect(http.proxy?).to be_truthy }
+      it { expect(http.proxy_uri).to eq(URI(proxy_uri)) }
+      it { expect(http.proxy_from_env?).to be_falsey }
+      it { expect(http.proxy_address).to eq(force_proxy_address) }
+      it { expect(http.proxy_port).to eq(force_proxy_port) }
+      it { expect(http.proxy_user).to eq(force_proxy_user) }
+      it { expect(http.proxy_pass).to eq(force_proxy_pass) }
+    end
+  end
+
+  context 'auth proxy env' do
+    before do
+      ENV['http_proxy'] = proxy_uri_with_auth
+    end
+
+    describe "HTTP.new" do
+      let(:http) { http = Net::HTTP.new(address) }
+
+      it { expect(http.proxy?).to be_truthy }
+      it { expect(http.proxy_uri).to eq(URI(proxy_uri_with_auth)) }
+      it { expect(http.proxy_from_env?).to be_truthy }
+      it { expect(http.proxy_address).to eq(proxy_address) }
+      it { expect(http.proxy_port).to eq(proxy_port) }
+      it { expect(http.proxy_user).to eq(proxy_user) }
+      it { expect(http.proxy_pass).to eq(proxy_pass) }
+    end
+
+    describe "Proxy.new" do
+      let(:http) { Net::HTTP::Proxy().new(address) }
+
+      it { expect(http.proxy?).to be_truthy }
+      it { expect(http.proxy_uri).to eq(URI(proxy_uri_with_auth)) }
+      it { expect(http.proxy_from_env?).to be_truthy }
+      it { expect(http.proxy_address).to eq(proxy_address) }
+      it { expect(http.proxy_port).to eq(proxy_port) }
+      it { expect(http.proxy_user).to eq(proxy_user) }
+      it { expect(http.proxy_pass).to eq(proxy_pass) }
+    end
+
+    describe "Proxy.new with auth" do
+      let(:force_proxy_user) { "hoge_user" }
+      let(:force_proxy_pass) { "hoge_pass" }
+      let(:http) { http = Net::HTTP::Proxy(:ENV, nil, force_proxy_user, force_proxy_pass).new(address) }
+
+      it { expect(http.proxy?).to be_truthy }
+      it { expect(http.proxy_uri).to eq(URI(proxy_uri_with_auth)) }
+      it { expect(http.proxy_from_env?).to be_truthy }
+      it { expect(http.proxy_address).to eq(proxy_address) }
+      it { expect(http.proxy_port).to eq(proxy_port) }
+      it { expect(http.proxy_user).to eq(force_proxy_user) }
+      it { expect(http.proxy_pass).to eq(force_proxy_pass) }
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -0,0 +1,2 @@
+$LOAD_PATH.unshift File.expand_path('../../lib', __FILE__)
+require 'http_proxy_from_env'

data/spec/uri/generic_spec.rb

@@ -0,0 +1,74 @@
+require_relative '../spec_helper'
+
+describe URI::Generic do
+  def with_env(envs = {}, &block)
+    ENV.clear
+    envs.each { |key, value| ENV[key] = value }
+    block.call if block
+  end
+
+  def env_from_description
+    a = self.class.description.split(/\s+\=\>\s+|\s*,\s*/)
+    Hash[*a]
+  end
+
+
+  describe "#find_proxy" do
+    let(:proxy_uri) { "http://192.168.0.1" }
+
+    context "request to other"
+      let(:request_uri) { "http://192.168.2.1" }
+
+      subject { with_env(env_from_description) { URI(request_uri).find_proxy } }
+
+      context "" do
+        it { is_expected.to be_nil }
+      end
+
+      context "http_proxy => http://192.168.0.1/" do
+        it { is_expected.to eq(URI(proxy_uri)) }
+      end
+
+      context "HTTP_PROXY => http://192.168.0.1/" do
+        it { is_expected.to eq(URI(proxy_uri)) }
+      end
+
+      context "REQUEST_METHOD => GET" do
+        it { is_expected.to be_nil }
+      end
+
+      context "CGI_HTTP_PROXY => http://192.168.0.1, REQUEST_METHOD => GET" do
+        it { is_expected.to eq(URI(proxy_uri)) }
+      end
+
+      context "http_proxy => http://192.168.0.1/, no_proxy => 192.168.2.1" do
+        it { is_expected.to be_nil }
+      end
+
+      context "http_proxy => http://192.168.0.1/, no_proxy => 192.168.2.1:8080" do
+        it { is_expected.to eq(URI(proxy_uri)) }
+      end
+
+      context "http_proxy => http://192.168.0.1/, no_proxy => 192.168.2.1:80" do
+        it { is_expected.to be_nil }
+      end
+
+      context "http_proxy => http://192.168.0.1/, no_proxy => 2.1:80" do
+        it { is_expected.to be_nil }
+      end
+
+      context "CGI_HTTP_PROXY => http://192.168.0.1, REQUEST_METHOD => GET, no_proxy => 192.168.2.1" do
+        it { is_expected.to be_nil }
+      end
+  end
+
+  context "request to own" do
+    let(:request_uri) { "http://localhost" }
+
+    subject { with_env(env_from_description) { URI(request_uri).find_proxy } }
+
+    context "http_proxy => http://192.168.0.1/" do
+      it { is_expected.to be_nil }
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: http_proxy_from_env
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-23 00:00:00.000000000 Z
+date: 2014-06-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -43,6 +43,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Net::HTTP automatically detects and uses proxies from the environment.
 email:
 - mechamosura@gmail.com
@@ -51,6 +67,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .travis.yml
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -61,7 +78,11 @@ files:
 - lib/http_proxy_from_env/open_uri.rb
 - lib/http_proxy_from_env/uri/generic.rb
 - lib/http_proxy_from_env/version.rb
-homepage: ''
+- spec/http_proxy_from_env_spec.rb
+- spec/net/http_spec.rb
+- spec/spec_helper.rb
+- spec/uri/generic_spec.rb
+homepage: https://github.com/mechamogera/http_proxy_from_env
 licenses:
 - MIT
 post_install_message: 
@@ -76,7 +97,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2997952803154654772
+      hash: 4065806883800370426
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -85,11 +106,15 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2997952803154654772
+      hash: 4065806883800370426
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: Net::HTTP automatically detects and uses proxies from the environment.
-test_files: []
+test_files:
+- spec/http_proxy_from_env_spec.rb
+- spec/net/http_spec.rb
+- spec/spec_helper.rb
+- spec/uri/generic_spec.rb