browsermob-proxy 0.0.6 → 0.0.7

data/browsermob-proxy.gemspec

@@ -16,7 +16,7 @@ Gem::Specification.new do |s|
 
   s.add_runtime_dependency "rest-client"
   s.add_runtime_dependency "childprocess"
-  s.add_runtime_dependency "json"
+  s.add_runtime_dependency "multi_json", "~> 1.0"
   s.add_runtime_dependency "har"
 
   s.add_development_dependency "rspec", ">= 2.5.0"

data/lib/browsermob/proxy.rb

@@ -1,5 +1,5 @@
 require 'restclient'
-require 'json'
+require 'multi_json'
 require 'har'
 
 require 'browsermob/proxy/client'

data/lib/browsermob/proxy/client.rb

@@ -5,7 +5,8 @@ module BrowserMob
       attr_reader :host, :port
 
       def self.from(server_url)
-        port = JSON.parse(
+        decode_method = MultiJson.respond_to?(:load) ? :load : :decode
+        port = MultiJson.send(decode_method,
           RestClient.post(URI.join(server_url, "proxy").to_s, '')
         ).fetch('port')
 
@@ -34,9 +35,17 @@ module BrowserMob
         HAR::Archive.from_string @resource["har"].get
       end
 
-      def selenium_proxy
+      def selenium_proxy(*protocols)
         require 'selenium-webdriver' unless defined?(Selenium)
-        Selenium::WebDriver::Proxy.new(:http => "#{@host}:#{@port}")
+
+        protocols += [:http] if protocols.empty?
+        unless (protocols - [:http, :ssl, :ftp]).empty?
+          raise "Invalid protocol specified.  Must be one of: :http, :ssl, or :ftp."
+        end
+
+        proxy_mapping = {}
+        protocols.each { |proto| proxy_mapping[proto] = "#{@host}:#{@port}" }
+        Selenium::WebDriver::Proxy.new(proxy_mapping)
       end
 
       def whitelist(regexp, status_code)

data/lib/browsermob/proxy/server.rb

@@ -49,7 +49,7 @@ module BrowserMob
 
 
       def listening?
-        TCPSocket.new("localhost", port).close
+        TCPSocket.new("127.0.0.1", port).close
         true
       rescue
         false

data/lib/browsermob/proxy/version.rb

@@ -1,5 +1,5 @@
 module BrowserMob
   module Proxy
-    VERSION = "0.0.6"
+    VERSION = "0.0.7"
   end
 end

data/spec/spec_helper.rb

@@ -8,7 +8,11 @@ module BrowserMob
   module Proxy
     module SpecHelper
       def server
-        $_bm_server ||= Server.new(File.join(home, "bin", "browsermob-proxy"), :log => true).start
+        $_bm_server ||= Server.new(
+          File.join(home, "bin", "browsermob-proxy"),
+          :port => Selenium::WebDriver::PortProber.random,
+          :log => true
+        ).start
       end
 
       def new_proxy
@@ -35,7 +39,6 @@ module BrowserMob
   end
 end
 
-
 RSpec.configure do |c|
   c.include(BrowserMob::Proxy::SpecHelper)
   c.after(:suite) { $_bm_server.stop if $_bm_server }

data/spec/unit/client_spec.rb

@@ -102,6 +102,38 @@ module BrowserMob
 
         client.headers(:foo => "bar")
       end
+
+      context "#selenium_proxy" do
+        it "defaults to HTTP proxy only" do
+          proxy = client.selenium_proxy
+
+          proxy.http.should == "#{client.host}:#{client.port}"
+          proxy.ssl.should be_nil
+          proxy.ftp.should be_nil
+        end
+
+        it "allows multiple protocols" do
+          proxy = client.selenium_proxy(:http, :ssl)
+
+          proxy.http.should == "#{client.host}:#{client.port}"
+          proxy.ssl.should == "#{client.host}:#{client.port}"
+          proxy.ftp.should be_nil
+        end
+
+        it "allows disabling HTTP proxy" do
+          proxy = client.selenium_proxy(:ssl)
+
+          proxy.ssl.should == "#{client.host}:#{client.port}"
+          proxy.http.should be_nil
+          proxy.ftp.should be_nil
+        end
+
+        it "raises an error when a bad protocol is used" do
+          lambda {
+            client.selenium_proxy(:htp)
+          }.should raise_error
+        end
+      end
     end
 
   end

metadata

@@ -1,129 +1,135 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: browsermob-proxy
-version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 0
-  - 6
-  segments_generated: true
-  version: 0.0.6
+version: !ruby/object:Gem::Version
+  version: 0.0.7
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - jari.bakken
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-03-22 00:00:00 -05:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        segments_generated: true
-        version: "0"
-  requirement: *id001
+date: 2012-04-24 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: rest-client
-  prerelease: false
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        segments_generated: true
-        version: "0"
-  requirement: *id002
-  name: childprocess
   prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: childprocess
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        segments_generated: true
-        version: "0"
-  requirement: *id003
-  name: json
   prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: multi_json
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.0'
   type: :runtime
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id004 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        segments_generated: true
-        version: "0"
-  requirement: *id004
-  name: har
   prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: har
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id005 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 2
-        - 5
-        - 0
-        segments_generated: true
-        version: 2.5.0
-  requirement: *id005
-  name: rspec
   prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !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: 2.5.0
   type: :development
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id006 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 2
-        - 7
-        segments_generated: true
-        version: "2.7"
-  requirement: *id006
-  name: selenium-webdriver
   prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.5.0
+- !ruby/object:Gem::Dependency
+  name: selenium-webdriver
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.7'
   type: :development
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id007 !ruby/object:Gem::Requirement 
-    requirements: 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 9
-        - 2
-        segments_generated: true
-        version: 0.9.2
-  requirement: *id007
+      - !ruby/object:Gem::Version
+        version: '2.7'
+- !ruby/object:Gem::Dependency
   name: rake
-  prerelease: false
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.9.2
   type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.9.2
 description: Ruby client for the BrowserMob Proxy REST API
-email: 
+email:
 - jari.bakken@gmail.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - .travis.yml
 - Gemfile
@@ -146,39 +152,31 @@ files:
 - spec/spec_helper.rb
 - spec/unit/client_spec.rb
 - spec/unit/webdriver_listener_spec.rb
-has_rdoc: true
 homepage: http://github.com/jarib/browsermob-proxy-rb
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      segments_generated: true
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      segments_generated: true
-      version: "0"
+required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: browsermob-proxy-rb
-rubygems_version: 1.3.6
+rubygems_version: 1.8.21
 signing_key: 
 specification_version: 3
 summary: Ruby client for the BrowserMob Proxy REST API
-test_files: 
+test_files:
 - spec/e2e/listener_spec.rb
 - spec/e2e/selenium_spec.rb
 - spec/fixtures/1.html
@@ -188,3 +186,4 @@ test_files:
 - spec/spec_helper.rb
 - spec/unit/client_spec.rb
 - spec/unit/webdriver_listener_spec.rb
+has_rdoc: