webdrivers 3.2.0 → 3.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2aa8499f7225e17c17d4653cfcdbb5d0387805fa
-  data.tar.gz: 8036fcb9040fc3852a04f6d4ec0dc688fa6ce8ff
+  metadata.gz: 9d9e5fa3b0bb58f58355559ad96a2915d089aeea
+  data.tar.gz: 9bed1f9723c15044589a1e514db681fa28190f47
 SHA512:
-  metadata.gz: 3b87bb262f00d419f4eb347582dc93d689484ccabc189433b2631d0d21b4a0e419ba2a6b4f7b94b38ce6b181f95b952c92064cea96128d2500ccac204893c8bd
-  data.tar.gz: 036b3660764a74fc2daa9cf5162c0d6f5aeda2c154a9cf59d675448c73b982d22316f5ecb2b9242a32edaf11c836b01651f6d1867903ae4f18deb1323b7106d2
+  metadata.gz: 22d871b657056542a63a7f8a336b2d2877a5426ea291ca23bb3c2d1fa01a9992015da95a49860276f7d563e079eb960ee7ead2f423df591bd646c92ab67c8086
+  data.tar.gz: ac8b1ba73a0c7e037419d13ddb3d18d77179265584d907001a1e14736544863b3dab6b1a72626c1399f1a961696c2c60a27943138f0a93fd83653c37a74946bc

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+### 3.2.1 (2017-09-06)
+
+* Fixed Proxy support so it actually works (thanks Cheezy) 
+
 ### 3.2.0 (2017-08-21)
 
 * Implemented Proxy support 

data/README.md

@@ -24,7 +24,19 @@ in your Gemfile:
 
 in your project:
 
-`require 'webdrivers'`
+`require 'webdrivers'
+
+If there is a proxy between you and the Internet then you will need to configure
+the gem to use the proxy.  You can do this by calling the `configure` method.
+
+````ruby
+Webdrivers.configure do |config|
+  config.proxy_addr = 'myproxy_address.com'
+  config.proxy_port = '8080'
+  config.proxy_user = 'username'
+  config.proxy_pass = 'password'
+end
+````
 
 # License
 

data/lib/webdrivers.rb

@@ -7,7 +7,17 @@ require "webdrivers/iedriver"
 require "webdrivers/mswebdriver"
 
 module Webdrivers
-  def self.logger
-    @logger ||= Webdrivers::Logger.new
+
+  class << self
+
+    attr_accessor :proxy_addr, :proxy_port, :proxy_user, :proxy_pass
+
+    def logger
+      @logger ||= Webdrivers::Logger.new
+    end
+
+    def configure
+      yield self
+    end
   end
 end

data/lib/webdrivers/chromedriver.rb

@@ -31,7 +31,7 @@ module Webdrivers
         Webdrivers.logger.debug "Versions previously located on downloads site: #{@downloads.keys}" if @downloads
 
         @downloads ||= begin
-          doc = Nokogiri::XML.parse(OpenURI.open_uri(base_url, proxy_opt))
+          doc = Nokogiri::XML.parse(get(base_url))
           items = doc.css("Contents Key").collect(&:text)
           items.select! {|item| item.include?(platform)}
           ds = items.each_with_object({}) do |item, hash|

data/lib/webdrivers/common.rb

@@ -1,5 +1,4 @@
 require 'rubygems/package'
-require 'open-uri'
 require 'zip'
 
 module Webdrivers
@@ -31,7 +30,7 @@ module Webdrivers
         Dir.chdir install_dir do
           FileUtils.rm_f filename
           open(filename, "wb") do |file|
-            file.print open(url, proxy_opt, &:read)
+            file.print get(url)
           end
           raise "Could not download #{url}" unless File.exists? filename
           Webdrivers.logger.debug "Successfully downloaded #{filename}"
@@ -52,20 +51,37 @@ module Webdrivers
         binary
       end
 
-      private
+      protected
+
+      def get(url, limit = 10)
+        raise StandardError, 'Too many HTTP redirects' if limit == 0
+
+        response = http.get_response(URI(url))
+
+        case response
+          when Net::HTTPSuccess then
+            response.body
+          when Net::HTTPRedirection
+            location = response['location']
+            Webdrivers.logger.debug "Redirected to #{location}"
+            get(location, limit - 1)
+          else
+            response.value
+        end
+      end
 
-      def proxy_opt
-        proxy_uri = ENV['WD_PROXY_URI']
-        proxy_user = ENV['WD_PROXY_USER']
-        proxy_pass = ENV['WD_PROXY_PASS']
-
-        if proxy_uri && proxy_user
-          {proxy_http_basic_authentication: [proxy_uri, proxy_user, proxy_pass]}
-        elsif proxy_uri
-          {proxy: proxy_uri}
-        else
-          {}
+      def http
+        if using_proxy
+          return Net::HTTP.Proxy(Webdrivers.proxy_addr, Webdrivers.proxy_port,
+                          Webdrivers.proxy_user, Webdrivers.proxy_pass)
         end
+        return Net::HTTP
+      end
+
+      private
+
+      def using_proxy
+        Webdrivers.proxy_addr && Webdrivers.proxy_port
       end
 
       def download_url(version)
@@ -84,7 +100,7 @@ module Webdrivers
 
       # TODO - specify what gets rescued
       def site_available?
-        open(base_url)
+        get(base_url)
         Webdrivers.logger.debug "Found Site: #{base_url}"
         true
       rescue
@@ -95,30 +111,30 @@ module Webdrivers
       def platform
         cfg = RbConfig::CONFIG
         case cfg['host_os']
-        when /linux/
-          cfg['host_cpu'] =~ /x86_64|amd64/ ? "linux64" : "linux32"
-        when /darwin/
-          "mac"
-        else
-          "win"
+          when /linux/
+            cfg['host_cpu'] =~ /x86_64|amd64/ ? "linux64" : "linux32"
+          when /darwin/
+            "mac"
+          else
+            "win"
         end
       end
 
       def decompress_file(filename)
         case filename
-        when /tar\.gz$/
-          Webdrivers.logger.debug "Decompressing tar"
-          untargz_file(filename)
-        when /tar\.bz2$/
-          Webdrivers.logger.debug "Decompressing bz2"
-          system "tar xjf #{filename}"
-          filename.gsub('.tar.bz2', '')
-        when /\.zip$/
-          Webdrivers.logger.debug "Decompressing zip"
-          unzip_file(filename)
-        else
-          Webdrivers.logger.debug "No Decompression needed"
-          nil
+          when /tar\.gz$/
+            Webdrivers.logger.debug "Decompressing tar"
+            untargz_file(filename)
+          when /tar\.bz2$/
+            Webdrivers.logger.debug "Decompressing bz2"
+            system "tar xjf #{filename}"
+            filename.gsub('.tar.bz2', '')
+          when /\.zip$/
+            Webdrivers.logger.debug "Decompressing zip"
+            unzip_file(filename)
+          else
+            Webdrivers.logger.debug "No Decompression needed"
+            nil
         end
       end
 

data/lib/webdrivers/geckodriver.rb

@@ -23,7 +23,7 @@ module Webdrivers
         Webdrivers.logger.debug "Versions previously located on downloads site: #{@downloads.keys}" if @downloads
 
         @downloads ||= begin
-          doc = Nokogiri::XML.parse(OpenURI.open_uri(base_url, proxy_opt))
+          doc = Nokogiri::XML.parse(get(base_url))
           items = doc.css(".release-downloads a").collect {|item| item["href"]}
           items.reject! {|item| item.include?('archive')}
           items.select! {|item| item.include?(platform)}

data/lib/webdrivers/iedriver.rb

@@ -31,7 +31,7 @@ module Webdrivers
         Webdrivers.logger.debug "Versions previously located on downloads site: #{@downloads.keys}" if @downloads
 
         @downloads ||= begin
-          doc = Nokogiri::XML.parse(OpenURI.open_uri(base_url, proxy_opt))
+          doc = Nokogiri::XML.parse(get(base_url))
           items = doc.css("Key").collect(&:text)
           items.select! { |item| item.include?('IEDriverServer_Win32') }
           ds = items.each_with_object({}) do |item, hash|

data/spec/proxy_support_spec.rb

@@ -0,0 +1,45 @@
+require 'spec_helper'
+
+class FakeDriver < Webdrivers::Common
+  def self.http_object
+    self.http
+  end
+end
+
+describe "Support for proxies" do
+  let(:http_object) { FakeDriver.http_object }
+
+  before do
+    Webdrivers.proxy_addr = nil
+    Webdrivers.proxy_port = nil
+    Webdrivers.proxy_user = nil
+    Webdrivers.proxy_pass = nil
+  end
+
+  it 'should allow the proxy values to be set via configuration' do
+    Webdrivers.configure do |config|
+      config.proxy_addr = 'proxy_addr'
+      config.proxy_port = '8888'
+      config.proxy_user = 'proxy_user'
+      config.proxy_pass = 'proxy_pass'
+    end
+
+    expect(Webdrivers.proxy_addr).to eql 'proxy_addr'
+    expect(Webdrivers.proxy_port).to eql '8888'
+    expect(Webdrivers.proxy_user).to eql 'proxy_user'
+    expect(Webdrivers.proxy_pass).to eql 'proxy_pass'
+  end
+
+  it 'should use the Proxy when the proxy_addr is set' do
+    Webdrivers.configure do |config|
+      config.proxy_addr = 'proxy_addr'
+      config.proxy_port = '8080'
+    end
+
+    expect(http_object.instance_variable_get('@is_proxy_class')).to be true
+  end
+
+  it 'should not use the Proxy when proxy is not configured' do
+    expect(http_object.instance_variable_get('@is_proxy_class')).to be false
+  end
+end

data/webdrivers.gemspec

@@ -3,7 +3,7 @@ $:.push File.expand_path("../lib", __FILE__)
 
 Gem::Specification.new do |s|
   s.name        = "webdrivers"
-  s.version     = "3.2.0"
+  s.version     = "3.2.1"
   s.authors     = ["Titus Fortner"]
   s.email       = ["titusfortner@gmail.com"]
   s.homepage    = "https://github.com/titusfortner/webdrivers"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: webdrivers
 version: !ruby/object:Gem::Version
-  version: 3.2.0
+  version: 3.2.1
 platform: ruby
 authors:
 - Titus Fortner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-21 00:00:00.000000000 Z
+date: 2017-09-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -107,6 +107,7 @@ files:
 - spec/geckodriver_spec.rb
 - spec/iedriver_spec.rb
 - spec/mswebdriver_spec.rb
+- spec/proxy_support_spec.rb
 - spec/spec_helper.rb
 - webdrivers.gemspec
 homepage: https://github.com/titusfortner/webdrivers
@@ -138,4 +139,5 @@ test_files:
 - spec/geckodriver_spec.rb
 - spec/iedriver_spec.rb
 - spec/mswebdriver_spec.rb
+- spec/proxy_support_spec.rb
 - spec/spec_helper.rb