webdriver-user-agent 0.1.0 → 0.2.0

data/lib/webdriver-user-agent.rb

@@ -10,8 +10,7 @@ module UserAgent
     options[:orientation] ||= :portrait
     
     user_agent_string = agent_string_for options[:agent]
-    device_resolution = resolution_for options[:agent], options[:orientation]
-
+    
     case options[:browser]
       when :firefox
         options[:profile] ||= Selenium::WebDriver::Firefox::Profile.new
@@ -23,7 +22,7 @@ module UserAgent
         raise "WebDriver UserAgent currently only supports :firefox and :chrome."
     end
     driver = Selenium::WebDriver.for options[:browser], options.except(:browser, :agent, :orientation)
-    resize_inner_window driver, *device_resolution
+    resize_inner_window(driver, *resolution_for(options[:agent], options[:orientation])) unless (downcase_sym(options[:agent]) == :random)
     driver
   end
 
@@ -37,7 +36,7 @@ module UserAgent
   end
 
   def self.agent_string_for device
-    user_agent_string = devices[downcase_sym device][:user_agent]
+    user_agent_string = downcase_sym(device) == :random ? random_user_agent : devices[downcase_sym device][:user_agent]
     raise "Unsupported user agent: '#{options[:agent]}'." unless user_agent_string
     user_agent_string 
   end 
@@ -56,4 +55,10 @@ module UserAgent
   def self.downcase_sym sym
     sym.to_s.downcase.to_sym #to support ruby 1.8.x
   end
+
+  def self.random_user_agent
+    File.foreach(File.expand_path("../device-info/user_agents.txt", __FILE__)).each_with_index.reduce(nil) { |picked,pair| 
+    rand < 1.0/(1+pair[1]) ? pair[0] : picked }
+  end
+
 end

data/spec/webdriver-user-agent_spec.rb

@@ -43,6 +43,22 @@ describe "webdriver user agent" do
     @driver.execute_script('return window.innerHeight').should == 946
   end
 
+   it "can create a new webdriver driver using firefox and random user agent" do
+    @driver = UserAgent.driver(:agent => :random)
+    @driver.browser.should == :firefox
+    @driver.execute_script('return navigator.userAgent').should_not be_nil
+    @driver.execute_script('return window.innerWidth').should_not == 320 
+    @driver.execute_script('return window.innerHeight').should_not == 356
+  end
+
+  it "can create a new webdriver driver using chrome and random user agent" do
+    @driver = UserAgent.driver(:browser => :chrome, :agent => :random)
+    @driver.browser.should == :chrome
+    @driver.execute_script('return navigator.userAgent').should_not be_nil
+    @driver.execute_script('return window.innerWidth').should_not == 320 
+    @driver.execute_script('return window.innerHeight').should_not == 356
+  end
+
   it "can create a new webdriver driver using an existing firefox profile" do
     profile = Selenium::WebDriver::Firefox::Profile.new
     profile['browser.startup.homepage'] = "data:text/html,<title>hello</title>"
@@ -59,4 +75,8 @@ describe "webdriver user agent" do
     @browser = Watir::Browser.new @driver
     @browser.url.should == "about:blank" 
   end
+
+
+
+
 end

data/webdriver-user-agent.gemspec

@@ -12,7 +12,7 @@ Gem::Specification.new do |gem|
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.name          = "webdriver-user-agent"
   gem.require_paths = ["lib"]
-  gem.version       = "0.1.0"
+  gem.version       = "0.2.0"
   gem.add_dependency 'selenium-webdriver'
   gem.add_dependency 'facets'
   gem.add_dependency 'json'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: webdriver-user-agent
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-13 00:00:00.000000000 Z
+date: 2012-09-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: selenium-webdriver
@@ -107,6 +107,7 @@ files:
 - README.md
 - Rakefile
 - lib/device-info/devices.yaml
+- lib/device-info/user_agents.txt
 - lib/webdriver-user-agent.rb
 - spec/webdriver-user-agent_spec.rb
 - webdriver-user-agent.gemspec