webdriver-user-agent 0.2.0 → 0.2.1

data/HISTORY.md

@@ -1,5 +1,9 @@
 # Gem History
 
+## 0.2.1 - 11 February 2012
+
+* Small changes for more compatibility alongside user-agent gem 
+
 ## 0.2.0 - 20 September 2012
 
 * Added support for a :random user agent (Idea based upon Christoph Pilka)

data/lib/webdriver-user-agent.rb

@@ -3,62 +3,64 @@ require 'facets/hash/except'
 require 'yaml'
 require 'json'
 
-module UserAgent
-  def self.driver options={} 
-    options[:browser] ||= :firefox
-    options[:agent] ||= :iphone
-    options[:orientation] ||= :portrait
-    
-    user_agent_string = agent_string_for options[:agent]
-    
-    case options[:browser]
-      when :firefox
-        options[:profile] ||= Selenium::WebDriver::Firefox::Profile.new
-        options[:profile]['general.useragent.override'] = user_agent_string
-      when :chrome
-        options[:switches] ||= []
-        options[:switches] << "--user-agent=#{user_agent_string}"
-      else
-        raise "WebDriver UserAgent currently only supports :firefox and :chrome."
+module Webdriver
+  module UserAgent
+    def self.driver options={} 
+      options[:browser] ||= :firefox
+      options[:agent] ||= :iphone
+      options[:orientation] ||= :portrait
+
+      user_agent_string = agent_string_for options[:agent]
+
+      case options[:browser]
+        when :firefox
+          options[:profile] ||= Selenium::WebDriver::Firefox::Profile.new
+          options[:profile]['general.useragent.override'] = user_agent_string
+        when :chrome
+          options[:switches] ||= []
+          options[:switches] << "--user-agent=#{user_agent_string}"
+        else
+          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, *resolution_for(options[:agent], options[:orientation])) unless (downcase_sym(options[:agent]) == :random)
+      driver
     end
-    driver = Selenium::WebDriver.for options[:browser], options.except(:browser, :agent, :orientation)
-    resize_inner_window(driver, *resolution_for(options[:agent], options[:orientation])) unless (downcase_sym(options[:agent]) == :random)
-    driver
-  end
 
-  def self.devices
-    @devices ||= YAML.load_file File.expand_path("../device-info/devices.yaml", __FILE__)
-  end
+    def self.devices
+      @devices ||= YAML.load_file File.expand_path("../device-info/devices.yaml", __FILE__)
+    end
 
-  def self.resolution_for device_name, orientation
-    device = devices[downcase_sym device_name][downcase_sym orientation]
-    [device[:width],device[:height]]
-  end
+    def self.resolution_for device_name, orientation
+      device = devices[downcase_sym device_name][downcase_sym orientation]
+      [device[:width],device[:height]]
+    end
 
-  def self.agent_string_for device
-    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 
+    def self.agent_string_for device
+      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 
 
-  private
+    private
 
-  def self.resize_inner_window driver, width, height
-    if driver.browser == :firefox or :chrome
-      driver.execute_script("window.open(#{driver.current_url.to_json},'_blank');")
-      driver.close
-      driver.switch_to.window driver.window_handles.first
+    def self.resize_inner_window driver, width, height
+      if driver.browser == :firefox or :chrome
+        driver.execute_script("window.open(#{driver.current_url.to_json},'_blank');")
+        driver.close
+        driver.switch_to.window driver.window_handles.first
+      end
+      driver.execute_script("window.innerWidth = #{width}; window.innerHeight = #{height};")
     end
-    driver.execute_script("window.innerWidth = #{width}; window.innerHeight = #{height};")
-  end
 
-  def self.downcase_sym sym
-    sym.to_s.downcase.to_sym #to support ruby 1.8.x
-  end
+    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
+    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
 end

data/spec/webdriver-user-agent_spec.rb

@@ -12,7 +12,7 @@ describe "webdriver user agent" do
   end
 
   it "can create a new webdriver driver using firefox and iphone (portrait) by default" do
-  	@driver = UserAgent.driver
+  	@driver = Webdriver::UserAgent.driver
   	@driver.browser.should == :firefox
   	@driver.execute_script('return navigator.userAgent').should include 'iPhone'
   	@driver.execute_script('return window.innerWidth').should == 320 
@@ -20,7 +20,7 @@ describe "webdriver user agent" do
   end
 
   it "can create a new webdriver driver using chrome and iPad (landscape)" do
-  	@driver = UserAgent.driver(:browser => :chrome, :agent => :iPad, :orientation => :landscape)
+  	@driver = Webdriver::UserAgent.driver(:browser => :chrome, :agent => :iPad, :orientation => :landscape)
   	@driver.browser.should == :chrome
   	@driver.execute_script('return navigator.userAgent').should include 'iPad'
   	@driver.execute_script('return window.innerWidth').should == 1024 
@@ -28,7 +28,7 @@ describe "webdriver user agent" do
   end
   
   it "can create a new webdriver driver using firefox and android phone (landscape)" do
-    @driver = UserAgent.driver(:browser => :chrome, :agent => :android_phone, :orientation => :landscape)
+    @driver = Webdriver::UserAgent.driver(:browser => :chrome, :agent => :android_phone, :orientation => :landscape)
     @driver.browser.should == :chrome
     @driver.execute_script('return navigator.userAgent').should include 'Android'
     @driver.execute_script('return window.innerWidth').should == 480 
@@ -36,7 +36,7 @@ describe "webdriver user agent" do
   end
 
   it "can create a new webdriver driver using firefox and android tablet (portrait)" do
-    @driver = UserAgent.driver(:browser => :chrome, :agent => :android_tablet, :orientation => :portrait)
+    @driver = Webdriver::UserAgent.driver(:browser => :chrome, :agent => :android_tablet, :orientation => :portrait)
     @driver.browser.should == :chrome
     @driver.execute_script('return navigator.userAgent').should include 'Android'
     @driver.execute_script('return window.innerWidth').should == 768
@@ -44,7 +44,7 @@ describe "webdriver user agent" do
   end
 
    it "can create a new webdriver driver using firefox and random user agent" do
-    @driver = UserAgent.driver(:agent => :random)
+    @driver = Webdriver::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 
@@ -52,7 +52,7 @@ describe "webdriver user agent" do
   end
 
   it "can create a new webdriver driver using chrome and random user agent" do
-    @driver = UserAgent.driver(:browser => :chrome, :agent => :random)
+    @driver = Webdriver::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 
@@ -62,7 +62,7 @@ describe "webdriver user agent" do
   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>"
-    @driver = UserAgent.driver(:browser => :firefox, :profile => profile)
+    @driver = Webdriver::UserAgent.driver(:browser => :firefox, :profile => profile)
     @driver.browser.should == :firefox
     @driver.execute_script('return navigator.userAgent').should include 'iPhone'
     @driver.execute_script('return window.innerWidth').should == 320 
@@ -71,7 +71,7 @@ describe "webdriver user agent" do
   end
 
   it "can allow using selenium driver for watir browser" do
-    @driver = UserAgent.driver(:browser => :firefox, :agent => :iphone, :orientation => :portrait)
+    @driver = Webdriver::UserAgent.driver(:browser => :firefox, :agent => :iphone, :orientation => :portrait)
     @browser = Watir::Browser.new @driver
     @browser.url.should == "about:blank" 
   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.2.0"
+  gem.version       = "0.2.1"
   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.2.0
+  version: 0.2.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-20 00:00:00.000000000 Z
+date: 2013-02-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: selenium-webdriver