pacproxy 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 344940c273c8b3d3e9c2fa2be653bd7d9bbc3d77
-  data.tar.gz: 777d69da2bad17eb52abae7bf9e916aaccb53c84
+  metadata.gz: c6a4c4d49256abefe3d1058dc41f485f0cc9bab5
+  data.tar.gz: a64708a9332cbe508a0caae11006fd57dbfdba4d
 SHA512:
-  metadata.gz: 9619344c5b572ca71a437e639aace729e8a7e5660cda9873ad951e8fd363d8a064f2294cf49ce92059ddabbe7f8467abcfb177c8f9b25ce64ab54737d6ec2592
-  data.tar.gz: 563eb0de823d1e40777d9bdcd60283aa7c976de1ec1802bece21fa66dec307cb94f38cac4b3c1028a00655eda33ac00305b97ad08e04b9d3f33e8a07bc6cba9b
+  metadata.gz: 309c7a012f364fb3116104c274fe8969b6f27fd85f9a67bffadfb82aac10631fb7570099df829b28c90fa0a9e2b1bb56872c46620ec1d94e1c9450c4e3aef18a
+  data.tar.gz: b1547a897a53e42b067fb11d8e6ac666f1178d9542b5adf23afb4068da40132324f0ff7f8faeee4d858cb90f55544cd798f97b4171293d209e90df3bbff7cb2e

data/README.md

@@ -18,7 +18,7 @@ Or install it yourself as:
 
 ## Usage
 
-    $ bundle exec ruby bin/pacproxy -P proxy.pac -p 3128
+    $ bundle exec pacproxy -P proxy.pac -p 3128
 
 
 ## Contributing

data/lib/pacproxy/pacproxy.rb

@@ -26,7 +26,8 @@ module Pacproxy
       when /^DIRECT/
         uri = nil
       when /PROXY/
-        proxy = /PROXY (.*);/.match(proxy_line)[1]
+        primary_proxy = proxy_line.split(';')[0]
+        proxy = /PROXY (.*)/.match(primary_proxy)[1]
         uri = URI.parse("http://#{proxy}")
       end
     end

data/lib/pacproxy/version.rb

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

data/pacproxy.gemspec

@@ -18,10 +18,12 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_dependency 'webrick', '~> 1.3.1'
   spec.add_dependency 'therubyracer', '~> 0.12.1'
   spec.add_dependency 'pac', '~> 1.0.0'
 
   spec.add_development_dependency 'bundler', '~> 1.6'
-  spec.add_development_dependency 'rake'
+  spec.add_development_dependency 'rspec', '~> 3.0.0'
+  spec.add_development_dependency 'rake', '~> 10.3.2'
+  spec.add_development_dependency 'httpclient', '~> 2.4.0'
+  spec.add_development_dependency 'byebug'
 end

data/proxy.pac

@@ -1,4 +1,3 @@
 function FindProxyForURL(url, host) {
-    return "PROXY localhost:3128; PROXY 7.8.9.10:8080";
-    // return "DIRECT";
+    return "PROXY localhost:3128; 
 }

data/spec/all_direct.pac

@@ -0,0 +1,3 @@
+function FindProxyForURL(url, host) {
+    return "DIRECT";
+}

data/spec/all_proxy.pac

@@ -0,0 +1,3 @@
+function FindProxyForURL(url, host) {
+    return "PROXY localhost:13081";
+}

data/spec/pacproxy_spec.rb

@@ -0,0 +1,106 @@
+require 'spec_helper'
+require 'httpclient'
+
+def wait_server_status(servers, status)
+  return unless (servers or status)
+  servers = [servers] unless servers.respond_to?(:all?)
+  return unless servers.all? { |s| s.respond_to?(:status) }
+  sleep(0.5) until servers.all? { |s| s.status; s.status == status }
+end
+
+describe Pacproxy do
+  describe 'Pacproxy::VERSION' do
+    it 'have a version number' do
+      expect(Pacproxy::VERSION).not_to be_nil
+    end
+  end
+
+  describe 'Pacproxy#initialize' do
+    before(:each) do
+      $stdout, $stderr = StringIO.new, StringIO.new
+    end
+
+    after(:each) do
+      $stdout, $stderr = STDOUT, STDERR
+    end
+
+    it 'have @pac variable' do
+      s = Pacproxy::Pacproxy.new(Port: 3128)
+      expect(s.instance_variable_defined?(:@pac)).to eq(true)
+      s.shutdown
+    end
+
+    it 'have @pac with nil if not given' do
+      s = Pacproxy::Pacproxy.new(Port: 3128)
+      expect(s.instance_variable_get(:@pac)).to be_nil
+      s.shutdown
+    end
+
+    it 'set @pac by :Proxypac' do
+      pacfile = 'proxy.pac'
+      s = Pacproxy::Pacproxy.new(Port: 3128, Proxypac: pacfile)
+      expect(s.instance_variable_get(:@pac)).to eq(pacfile)
+      s.shutdown
+    end
+  end
+
+  describe 'Pacproxy#proxy_uri' do
+    before(:each) do
+      $stdout, $stderr = StringIO.new, StringIO.new
+      $http_server = WEBrick::HTTPServer.new(Port: 13080)
+      $http_server.mount_proc('/') { |req, res| res.status = 200}
+      $http_server.mount_proc('/noproxy/') { |req, res| res.status = 200}
+      $proxy_server = WEBrick::HTTPProxyServer.new(Port: 13081)
+      Thread.new { $http_server.start }
+      Thread.new { $proxy_server.start }
+      wait_server_status([$http_server,$proxy_server], :Running)
+    end
+
+    after(:each) do
+      $stdout, $stderr = STDOUT, STDERR
+      $http_server.shutdown
+      $proxy_server.shutdown
+      $pacproxy_server.shutdown
+      wait_server_status([$http_server,$proxy_server,$pacproxy_server], :Stop)
+    end
+
+    it 'transfer request to server directly' do
+      $pacproxy_server = Pacproxy::Pacproxy.new(Port: 13128, Proxypac: 'spec/all_direct.pac')
+      Thread.new { $pacproxy_server.start }
+      wait_server_status($pacproxy_server, :Running)
+
+      c = HTTPClient.new('http://127.0.0.1:13128')
+      res = c.get('http://127.0.0.1:13080/')
+      expect(res.status).to eq(200)
+
+      res = c.get('http://127.0.0.1:13080/noproxy/')
+      expect(res.status).to eq(200)
+    end
+
+    it 'transfer request to server via parent proxy' do
+      $pacproxy_server = Pacproxy::Pacproxy.new(Port: 13128, Proxypac: 'spec/all_proxy.pac')
+      Thread.new { $pacproxy_server.start }
+      wait_server_status($pacproxy_server, :Running)
+
+      c = HTTPClient.new('http://127.0.0.1:13128')
+      res = c.get('http://127.0.0.1:13080/')
+      expect(res.status).to eq(200)
+
+      res = c.get('http://127.0.0.1:13080/noproxy/')
+      expect(res.status).to eq(200)
+    end
+
+    it 'transfer request to server via parent proxy partially' do
+      $pacproxy_server = Pacproxy::Pacproxy.new(Port: 13128, Proxypac: 'spec/partial_proxy.pac')
+      Thread.new { $pacproxy_server.start }
+      wait_server_status($pacproxy_server, :Running)
+
+      c = HTTPClient.new('http://127.0.0.1:13128')
+      res = c.get('http://127.0.0.1:13080/')
+      expect(res.status).to eq(200)
+
+      res = c.get('http://127.0.0.1:13080/noproxy/')
+      expect(res.status).to eq(200)
+    end
+  end
+end

data/spec/partial_proxy.pac

@@ -0,0 +1,4 @@
+function FindProxyForURL(url, host) {
+    if(shExpMatch ( url, "*noproxy*")) return "DIRECT";
+    return "PROXY localhost:13081";
+}

data/spec/spec_helper.rb

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

metadata

@@ -1,73 +1,101 @@
 --- !ruby/object:Gem::Specification
 name: pacproxy
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - OTA Hiroshi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-05 00:00:00.000000000 Z
+date: 2014-07-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: webrick
+  name: therubyracer
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.3.1
+        version: 0.12.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.3.1
+        version: 0.12.1
 - !ruby/object:Gem::Dependency
-  name: therubyracer
+  name: pac
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.12.1
+        version: 1.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.12.1
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
-  name: pac
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.0.0
-  type: :runtime
+        version: '1.6'
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: '1.6'
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: 3.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 10.3.2
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 10.3.2
+- !ruby/object:Gem::Dependency
+  name: httpclient
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.4.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.4.0
+- !ruby/object:Gem::Dependency
+  name: byebug
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
@@ -100,6 +128,11 @@ files:
 - pacproxy.gemspec
 - pacproxy/.gitignore
 - proxy.pac
+- spec/all_direct.pac
+- spec/all_proxy.pac
+- spec/pacproxy_spec.rb
+- spec/partial_proxy.pac
+- spec/spec_helper.rb
 homepage: ''
 licenses:
 - MIT
@@ -124,4 +157,9 @@ rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
 summary: A proxy server works with proxy.pac
-test_files: []
+test_files:
+- spec/all_direct.pac
+- spec/all_proxy.pac
+- spec/pacproxy_spec.rb
+- spec/partial_proxy.pac
+- spec/spec_helper.rb