watir-webdriver-performance 0.1.3.1 → 0.2.0

data/.rvmrc

@@ -1,2 +1,2 @@
 rvm_install_on_use_flag=1
-rvm --create use ruby-1.9.2-p180@watir-webdriver-performance
+rvm --create use ruby-1.9.3-p194@watir-webdriver-performance

data/Gemfile

@@ -2,10 +2,9 @@ source "http://rubygems.org"
 gem "watir-webdriver"
 
 group :development do
-  gem "rspec", "~> 2.3.0"
-  gem "bundler", "~> 1.0.0"
-  gem "jeweler", "~> 1.5.2"
-  gem "rcov", ">= 0"
-  gem "zomg", ">= 0"
-  gem "rdoc", ">= 0"
+  gem "rspec"
+  gem "bundler"
+  gem "jeweler"
+  gem "zomg"
+  gem "rdoc"
 end

data/Gemfile.lock

@@ -1,41 +1,46 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    childprocess (0.1.9)
-      ffi (~> 1.0.6)
-    diff-lcs (1.1.2)
-    ffi (1.0.9)
+    addressable (2.3.1)
+    childprocess (0.3.4)
+      ffi (~> 1.0, >= 1.0.6)
+    diff-lcs (1.1.3)
+    ffi (1.1.0)
     git (1.2.5)
-    jeweler (1.5.2)
-      bundler (~> 1.0.0)
+    jeweler (1.8.4)
+      bundler (~> 1.0)
       git (>= 1.2.5)
       rake
-    json_pure (1.5.3)
-    rake (0.9.2)
-    rcov (0.9.9)
-    rdoc (3.8)
-    rspec (2.3.0)
-      rspec-core (~> 2.3.0)
-      rspec-expectations (~> 2.3.0)
-      rspec-mocks (~> 2.3.0)
-    rspec-core (2.3.1)
-    rspec-expectations (2.3.0)
-      diff-lcs (~> 1.1.2)
-    rspec-mocks (2.3.0)
-    ruby2ruby (1.2.5)
+      rdoc
+    json (1.7.3)
+    libwebsocket (0.1.4)
+      addressable
+    multi_json (1.3.6)
+    rake (0.9.2.2)
+    rdoc (3.12)
+      json (~> 1.4)
+    rspec (2.11.0)
+      rspec-core (~> 2.11.0)
+      rspec-expectations (~> 2.11.0)
+      rspec-mocks (~> 2.11.0)
+    rspec-core (2.11.1)
+    rspec-expectations (2.11.1)
+      diff-lcs (~> 1.1.3)
+    rspec-mocks (2.11.1)
+    ruby2ruby (1.3.1)
       ruby_parser (~> 2.0)
       sexp_processor (~> 3.0)
-    ruby_parser (2.0.6)
+    ruby_parser (2.3.1)
       sexp_processor (~> 3.0)
-    rubyzip (0.9.4)
-    selenium-webdriver (2.1.0)
-      childprocess (>= 0.1.9)
-      ffi (>= 1.0.7)
-      json_pure
+    rubyzip (0.9.9)
+    selenium-webdriver (2.25.0)
+      childprocess (>= 0.2.5)
+      libwebsocket (~> 0.1.3)
+      multi_json (~> 1.0)
       rubyzip
-    sexp_processor (3.0.5)
-    watir-webdriver (0.2.6)
-      selenium-webdriver (>= 0.2.2)
+    sexp_processor (3.2.0)
+    watir-webdriver (0.6.1)
+      selenium-webdriver (>= 2.18.0)
     zomg (1.0.2)
       ruby2ruby
 
@@ -43,10 +48,9 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  bundler (~> 1.0.0)
-  jeweler (~> 1.5.2)
-  rcov
+  bundler
+  jeweler
   rdoc
-  rspec (~> 2.3.0)
+  rspec
   watir-webdriver
   zomg

data/VERSION

@@ -1 +1 @@
-0.1.3.1
+0.2.0

data/lib/watir-webdriver-performance.rb

@@ -17,6 +17,7 @@ module Watir
           next
         end
         hash[key.to_sym] = {}
+        next unless @data[key].respond_to? :each
         @data[key].each do |k,v|
           if k == '__fxdriver_unwrapped'
             next
@@ -85,7 +86,12 @@ module Watir
 
   class Browser
     def performance
-      data = driver.execute_script("return window.performance || window.webkitPerformance || window.mozPerformance || window.msPerformance;")
+      data = case driver.browser
+      when :internet_explorer
+        JSON.parse(driver.execute_script("return JSON.stringify(window.performance.toJSON());"))
+      else
+        driver.execute_script("return window.performance || window.webkitPerformance || window.mozPerformance || window.msPerformance;")
+      end
       raise 'Could not collect performance metrics from your current browser. Please ensure the browser you are using supports collecting performance metrics.' if data.nil?
       PerformanceHelper.new(data).munge
     end

data/spec/watir-webdriver-performance-non-supported-browser_spec.rb

@@ -5,24 +5,24 @@ describe "WatirWebdriverPerformance-NonSupportedBrowser" do
   let!(:b) { @b }
 
   before(:all) do
-    @b ||= Watir::Browser.new :firefox
+    @b ||= Watir::Browser.new :safari
   end
 
   after(:all) do
     @b.close
   end
 
-  it "should raise an error when a non supported browser is encountered" do
+  pending "should raise an error when a non supported browser is encountered" do
     b.goto "google.com"
     lambda {  b.performance }.should raise_error RuntimeError, 'Could not collect performance metrics from your current browser. Please ensure the browser you are using supports collecting performance metrics.'
   end
 
-  it "should return false for firefox supported" do
+  pending "should return false for supported" do
     b.goto "google.com"
     b.should_not be_performance_supported
   end
 
-  it "should not support performance as block" do
+  pending "should not support performance as block" do
     b.goto "google.com"
     b.with_performance {|performance| performance.should be_nil }
   end

data/spec/watir-webdriver-performance_spec.rb

@@ -5,7 +5,7 @@ describe "WatirWebdriverPerformance" do
   let!(:b) { @b }
 
   before(:all) do
-    @b ||= Watir::Browser.new :chrome
+    @b ||= Watir::Browser.new
   end
 
   after(:all) do
@@ -28,21 +28,10 @@ describe "WatirWebdriverPerformance" do
     b.performance.summary.should include(:dom_processing)
   end
 
-   pending "should get summary data from the performance metrics for redirects" do
-    b.goto "http://watirgrid.com"
-    b.performance.summary.should include(:redirect)
-  end
-
-   it "should get summary data from the performance metrics for secure connections" do
-    b.goto "https://github.com/90kts/watirgrid"
-    b.performance.summary.should include(:tcp_connection_secure)
-  end
-
   it "should get the summary metrics such as Response Time, TTLB and TTFB" do
     b.performance.summary.should include(:time_to_first_byte) # aka "server time"
     b.performance.summary.should include(:time_to_last_byte) # aka "network + server time"
     b.performance.summary.should include(:response_time)
-    puts "Page took #{b.performance.summary[:response_time]/1000} seconds to load"
   end
 
   it "should return true for chrome supported" do

data/watir-webdriver-performance.gemspec

@@ -4,14 +4,14 @@
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
-  s.name = %q{watir-webdriver-performance}
-  s.version = "0.1.3.1"
+  s.name = "watir-webdriver-performance"
+  s.version = "0.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = [%q{Tim Koopmans}]
-  s.date = %q{2011-10-03}
-  s.description = %q{This gem collects and summarises metrics speficied in the W3C Navigation web performance specifications at http://w3c-test.org/webperf/specs/NavigationTiming/ when using watir-webdriver and a compatible browser}
-  s.email = %q{tim.koops@gmail.com}
+  s.authors = ["Tim Koopmans"]
+  s.date = "2012-07-24"
+  s.description = "This gem collects and summarises metrics speficied in the W3C Navigation web performance specifications at http://w3c-test.org/webperf/specs/NavigationTiming/ when using watir-webdriver and a compatible browser"
+  s.email = "tim.koops@gmail.com"
   s.extra_rdoc_files = [
     "LICENSE.txt",
     "README.rdoc"
@@ -31,33 +31,24 @@ Gem::Specification.new do |s|
     "lib/performance.rb",
     "lib/watir-webdriver-performance.rb",
     "spec/spec_helper.rb",
-    "spec/watir-webdriver-performance-browser-ff7_spec.rb",
     "spec/watir-webdriver-performance-non-supported-browser_spec.rb",
     "spec/watir-webdriver-performance_spec.rb",
     "watir-webdriver-performance.gemspec"
   ]
-  s.homepage = %q{http://github.com/90kts/watir-webdriver-performance}
-  s.licenses = [%q{MIT}]
-  s.require_paths = [%q{lib}]
-  s.rubygems_version = %q{1.8.6}
-  s.summary = %q{A simple helper gem for watir-webdriver performance metrics}
-  s.test_files = [
-    "examples/basic.rb",
-    "spec/spec_helper.rb",
-    "spec/watir-webdriver-performance-browser-ff7_spec.rb",
-    "spec/watir-webdriver-performance-non-supported-browser_spec.rb",
-    "spec/watir-webdriver-performance_spec.rb"
-  ]
+  s.homepage = "http://github.com/90kts/watir-webdriver-performance"
+  s.licenses = ["MIT"]
+  s.require_paths = ["lib"]
+  s.rubygems_version = "1.8.24"
+  s.summary = "A simple helper gem for watir-webdriver performance metrics"
 
   if s.respond_to? :specification_version then
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<watir-webdriver>, [">= 0"])
-      s.add_development_dependency(%q<rspec>, ["~> 2.3.0"])
-      s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
-      s.add_development_dependency(%q<jeweler>, ["~> 1.5.2"])
-      s.add_development_dependency(%q<rcov>, [">= 0"])
+      s.add_development_dependency(%q<rspec>, [">= 0"])
+      s.add_development_dependency(%q<bundler>, [">= 0"])
+      s.add_development_dependency(%q<jeweler>, [">= 0"])
       s.add_development_dependency(%q<zomg>, [">= 0"])
       s.add_development_dependency(%q<rdoc>, [">= 0"])
       s.add_runtime_dependency(%q<watir-webdriver>, [">= 0"])
@@ -67,10 +58,9 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<active_support>, [">= 0"])
     else
       s.add_dependency(%q<watir-webdriver>, [">= 0"])
-      s.add_dependency(%q<rspec>, ["~> 2.3.0"])
-      s.add_dependency(%q<bundler>, ["~> 1.0.0"])
-      s.add_dependency(%q<jeweler>, ["~> 1.5.2"])
-      s.add_dependency(%q<rcov>, [">= 0"])
+      s.add_dependency(%q<rspec>, [">= 0"])
+      s.add_dependency(%q<bundler>, [">= 0"])
+      s.add_dependency(%q<jeweler>, [">= 0"])
       s.add_dependency(%q<zomg>, [">= 0"])
       s.add_dependency(%q<rdoc>, [">= 0"])
       s.add_dependency(%q<watir-webdriver>, [">= 0"])
@@ -81,10 +71,9 @@ Gem::Specification.new do |s|
     end
   else
     s.add_dependency(%q<watir-webdriver>, [">= 0"])
-    s.add_dependency(%q<rspec>, ["~> 2.3.0"])
-    s.add_dependency(%q<bundler>, ["~> 1.0.0"])
-    s.add_dependency(%q<jeweler>, ["~> 1.5.2"])
-    s.add_dependency(%q<rcov>, [">= 0"])
+    s.add_dependency(%q<rspec>, [">= 0"])
+    s.add_dependency(%q<bundler>, [">= 0"])
+    s.add_dependency(%q<jeweler>, [">= 0"])
     s.add_dependency(%q<zomg>, [">= 0"])
     s.add_dependency(%q<rdoc>, [">= 0"])
     s.add_dependency(%q<watir-webdriver>, [">= 0"])

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: watir-webdriver-performance
 version: !ruby/object:Gem::Version
-  version: 0.1.3.1
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-10-03 00:00:00.000000000Z
+date: 2012-07-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: watir-webdriver
-  requirement: &70144565168140 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,54 +21,63 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70144565168140
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70144565169580 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.3.0
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70144565169580
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70144565171020 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70144565171020
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &70144565185700 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.5.2
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70144565185700
-- !ruby/object:Gem::Dependency
-  name: rcov
-  requirement: &70144565189620 !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: *70144565189620
 - !ruby/object:Gem::Dependency
   name: zomg
-  requirement: &70144565191060 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +85,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70144565191060
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &70144565289240 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +101,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70144565289240
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: watir-webdriver
-  requirement: &70144565397520 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +117,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70144565397520
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70144565437960 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +133,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70144565437960
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: zomg
-  requirement: &70144565514120 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,10 +149,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70144565514120
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &70144565572260 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -131,10 +165,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70144565572260
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: active_support
-  requirement: &70144565638320 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -142,7 +181,12 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70144565638320
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: This gem collects and summarises metrics speficied in the W3C Navigation
   web performance specifications at http://w3c-test.org/webperf/specs/NavigationTiming/
   when using watir-webdriver and a compatible browser
@@ -167,7 +211,6 @@ files:
 - lib/performance.rb
 - lib/watir-webdriver-performance.rb
 - spec/spec_helper.rb
-- spec/watir-webdriver-performance-browser-ff7_spec.rb
 - spec/watir-webdriver-performance-non-supported-browser_spec.rb
 - spec/watir-webdriver-performance_spec.rb
 - watir-webdriver-performance.gemspec
@@ -186,7 +229,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2409606481077121061
+      hash: 575132701200813434
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -195,13 +238,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.6
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: A simple helper gem for watir-webdriver performance metrics
-test_files:
-- examples/basic.rb
-- spec/spec_helper.rb
-- spec/watir-webdriver-performance-browser-ff7_spec.rb
-- spec/watir-webdriver-performance-non-supported-browser_spec.rb
-- spec/watir-webdriver-performance_spec.rb
+test_files: []

data/spec/watir-webdriver-performance-browser-ff7_spec.rb

@@ -1,20 +0,0 @@
-require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
-
-describe "WatirWebdriverPerformance" do
-
-  let!(:b) { @b }
-
-  before(:all) do
-    @b ||= Watir::Browser.new :chrome
-  end
-
-  after(:all) do
-    @b.close
-  end
-
-  pending "should open and get performance metrics from the FF7 browser" do
-    b.goto "google.com"
-    b.performance.should be_an_instance_of(OpenStruct)
-  end
-
-end