watir-webdriver-performance 0.1.0 → 0.1.1

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.1.1

data/lib/watir-webdriver-performance.rb

@@ -4,41 +4,17 @@ module Watir
   # Adds helper for window.performance to Watir::Browser.
   # @see http://dev.w3.org/2006/webapi/WebTiming/
 
-  module PerformanceHelper
+  class PerformanceHelper
 
-    def underscored(camel_cased_word)
-      word = camel_cased_word.to_s.dup
-      word.gsub!(/::/, '/')
-      word.gsub!(/([A-Z]+)([A-Z][a-z])/,'\1_\2')
-      word.gsub!(/([a-z\d])([A-Z])/,'\1_\2')
-      word.tr!("-", "_")
-      word.downcase!
-      word
-    end
-
-    def earliest_timestamp(hash)
-      return hash[:timing][:navigation_start] if hash[:timing][:navigation_start] > 0
-      return hash[:timing][:redirect_start] if hash[:timing][:redirect_start] > 0
-      return hash[:timing][:redirect_end] if hash[:timing][:redirect_end] > 0
-      return hash[:timing][:fetch_start] if hash[:timing][:fetch_start] > 0
+    def initialize(data)
+      @data = data
     end
 
-    def latest_timestamp(hash)
-      return hash[:timing][:load_event_end] if hash[:timing][:load_event_end] > 0
-      return hash[:timing][:load_event_start] if hash[:timing][:load_event_start] > 0
-      return hash[:timing][:dom_complete] if hash[:timing][:dom_complete] > 0
-      return hash[:timing][:dom_content_loaded_event_end] if hash[:timing][:dom_content_loaded_event_end] > 0
-      return hash[:timing][:dom_content_loaded_event_start] if hash[:timing][:dom_content_loaded_event_start] > 0
-      return hash[:timing][:dom_interactive] if hash[:timing][:dom_interactive] > 0
-      return hash[:timing][:response_end] if hash[:timing][:response_end] > 0
-    end
-
-
-    def munge(data)
+    def munge
       hash = {}
-      data.each_key do |key|
+      @data.each_key do |key|
         hash[key.to_sym] = {}
-        data[key].each do |k,v|
+        @data[key].each do |k,v|
           hash[key.to_sym][underscored(k).to_sym] = v
         end
       end
@@ -64,18 +40,45 @@ module Watir
       hash[:summary][:time_to_last_byte] = hash[:timing][:response_end] -
         hash[:timing][:domain_lookup_start] if hash[:timing][:domain_lookup_start] > 0
       hash[:summary][:response_time] = latest_timestamp(hash) - earliest_timestamp(hash)
-      hash
+      OpenStruct.new(hash)
     end
 
-    def performance
-      data = driver.execute_script("return window.performance || window.webkitPerformance || window.mozPerformance || window.msPerformance;")
-      OpenStruct.new(munge(data))
+    private
+
+    def underscored(camel_cased_word)
+      word = camel_cased_word.to_s.dup
+      word.gsub!(/::/, '/')
+      word.gsub!(/([A-Z]+)([A-Z][a-z])/,'\1_\2')
+      word.gsub!(/([a-z\d])([A-Z])/,'\1_\2')
+      word.tr!("-", "_")
+      word.downcase!
+      word
+    end
+
+    def earliest_timestamp(hash)
+      return hash[:timing][:navigation_start] if hash[:timing][:navigation_start] > 0
+      return hash[:timing][:redirect_start] if hash[:timing][:redirect_start] > 0
+      return hash[:timing][:redirect_end] if hash[:timing][:redirect_end] > 0
+      return hash[:timing][:fetch_start] if hash[:timing][:fetch_start] > 0
+    end
+
+    def latest_timestamp(hash)
+      return hash[:timing][:load_event_end] if hash[:timing][:load_event_end] > 0
+      return hash[:timing][:load_event_start] if hash[:timing][:load_event_start] > 0
+      return hash[:timing][:dom_complete] if hash[:timing][:dom_complete] > 0
+      return hash[:timing][:dom_content_loaded_event_end] if hash[:timing][:dom_content_loaded_event_end] > 0
+      return hash[:timing][:dom_content_loaded_event_start] if hash[:timing][:dom_content_loaded_event_start] > 0
+      return hash[:timing][:dom_interactive] if hash[:timing][:dom_interactive] > 0
+      return hash[:timing][:response_end] if hash[:timing][:response_end] > 0
     end
 
   end
 
   class Browser
-    include PerformanceHelper
+    def performance
+      data = driver.execute_script("return window.performance || window.webkitPerformance || window.mozPerformance || window.msPerformance;")
+      PerformanceHelper.new(data).munge
+    end
   end
 end
 

data/watir-webdriver-performance.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{watir-webdriver-performance}
-  s.version = "0.1.0"
+  s.version = "0.1.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Tim Koopmans"]
-  s.date = %q{2011-04-19}
+  s.date = %q{2011-04-20}
   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.extra_rdoc_files = [

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: watir-webdriver-performance
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: 
   segments: 
   - 0
   - 1
-  - 0
-  version: 0.1.0
+  - 1
+  version: 0.1.1
 platform: ruby
 authors: 
 - Tim Koopmans
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-19 00:00:00 +10:00
+date: 2011-04-20 00:00:00 +10:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency