webdriver-user-agent 6.6.6 → 7.0

data/.rspec

@@ -0,0 +1,2 @@
+--color
+--format doc

data/.ruby-gemset

@@ -0,0 +1 @@
+webdriver-user-agent

data/.ruby-version

@@ -0,0 +1 @@
+ruby-1.9.3-p429

data/Gemfile

@@ -1,4 +1,4 @@
-source :rubygems
+source 'https://rubygems.org'
 
 # Specify your gem's dependencies in webdriver-user-agent.gemspec
-gemspec
+gemspec

data/HISTORY.md

@@ -1,5 +1,13 @@
 # Gem History
 
+## 7.0 - 8 June 2013
+
+* Withdraw deprecation
+
+## 6.6.6 - 15 March 2013
+
+* Announce deprecation
+
 ## 0.2.2 - 15 March 2013
 
 * Updated iPad user agent
@@ -30,4 +38,4 @@
 
 ## 0.0.1 - 25 March 2012
 
-* Initial version of gem released
+* Initial version of gem released

data/README.md

@@ -1,3 +1,69 @@
 # Webdriver::User::Agent
 
-THIS HAS BEEN DEPRECATED
+A helper gem to emulate populate device user agents and resolutions when using webdriver
+
+## Installation
+
+Add this line to your application's Gemfile:
+
+    gem 'webdriver-user-agent'
+
+And then execute:
+
+    $ bundle
+
+Or install it yourself as:
+
+    $ gem install webdriver-user-agent
+
+## Usage
+
+provides a UserAgent.driver method to return a new web-driver with user agent and screen resolution mimicking a mobile device.
+
+### Options
+
+* :browser
+	* :firefox (default)
+	* :chrome
+* :agent
+	* :iphone (default)
+	* :ipad
+	* :android_phone
+	* :android_tablet
+	* :random
+* :orientation
+	* :portrait (default)
+	* :landscape
+
+### Example using selenium-webdriver
+
+	require 'selenium-webdriver'
+	require 'webdriver-user-agent'
+	driver = UserAgent.driver(:browser => :chrome, :agent => :iphone, :orientation => :landscape)
+	driver.get 'http://tiffany.com'
+	driver.current_url.should == 'http://m.tiffany.com/International.aspx'
+
+### Example using random user agent
+
+	require 'selenium-webdriber'
+	require 'webdriver-user-agent'
+	driver = UserAgent.driver(:agent => :random)
+	driver.execute_script('return navigator.userAgent')
+	# random agent like "Mozilla/5.0 (Windows; U; Windows NT 5.0; en-US; rv:0.9.2) Gecko/20010726 Netscape6/6.1"
+
+### Example using watir-webdriver
+
+	require 'watir-webdriver'
+	require 'webdriver-user-agent'
+	driver = UserAgent.driver(:browser => :chrome, :agent => :iphone, :orientation => :landscape)
+	browser = Watir::Browser.new driver
+	browser.goto 'tiffany.com'
+	browser.url.should == 'http://m.tiffany.com/International.aspx'
+
+## Contributing
+
+1. Fork it
+2. Create your feature branch (`git checkout -b my-new-feature`)
+3. Commit your changes (`git commit -am 'Added some feature'`)
+4. Push to the branch (`git push origin my-new-feature`)
+5. Create new Pull Request

data/lib/webdriver-user-agent.rb

@@ -1,66 +1,23 @@
-require 'selenium-webdriver'
-require 'facets/hash/except'
-require 'yaml'
-require 'json'
+require 'webdriver-user-agent/core_ext/symbol'
+require 'webdriver-user-agent/driver'
 
 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
+    def self.driver options={}
+      Driver.instance.for options
     end
 
     def self.devices
-      @devices ||= YAML.load_file File.expand_path("../device-info/devices.yaml", __FILE__)
+      Driver.instance.devices
     end
 
     def self.resolution_for device_name, orientation
-      device = devices[downcase_sym device_name][downcase_sym orientation]
-      [device[:width],device[:height]]
+      Driver.instance.resolution_for device_name, orientation
     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 
+      Driver.instance.agent_string_for device
     end 
 
-    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
-      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.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
+end

data/lib/webdriver-user-agent/browser_options.rb

@@ -0,0 +1,47 @@
+require 'facets/hash/except'
+
+module Webdriver
+  module UserAgent
+    class BrowserOptions
+
+      def initialize(opts, user_agent_string)
+        @options = opts
+        options[:browser] ||= :firefox
+        options[:agent] ||= :iphone
+        options[:orientation] ||= :portrait
+        initialize_for_browser(user_agent_string)
+      end
+
+      def method_missing(*args, &block)
+        m = args.first
+        value = options[m]
+        super unless value
+        value.downcase
+      end
+
+      def browser_options
+        options.except(:browser, :agent, :orientation)
+      end
+
+      private
+
+      def options
+        @options ||= {}
+      end
+
+      def initialize_for_browser(user_agent_string)
+        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
+        
+      end
+    end
+  end
+end

data/lib/webdriver-user-agent/core_ext/symbol.rb

@@ -0,0 +1,8 @@
+
+if RUBY_VERSION =~ /1\.8/
+  class Symbol
+    def downcase
+      self.to_s.downcase.to_sym
+    end
+  end
+end

data/lib/webdriver-user-agent/devices.rb

@@ -0,0 +1,40 @@
+require 'yaml'
+
+module Webdriver
+  module UserAgent
+    module Devices
+      
+      def devices
+        YAML.load_file devices_file
+      end
+
+      def resolution_for(device_name, orientation)
+        device = devices[device_name.downcase][orientation.downcase]
+        [device[:width],device[:height]]
+      end
+
+      def agent_string_for(device)
+        device = (device ? device.downcase : :iphone)
+        user_agent_string = (device == :random ? random_user_agent : devices[device][:user_agent])
+        raise "Unsupported user agent: '#{device}'." unless user_agent_string
+        user_agent_string
+      end
+
+      private
+      
+      def random_user_agent
+        File.foreach(user_agents_file).each_with_index.reduce(nil) do |picked,pair|
+          rand < 1.0/(1+pair[1]) ? pair[0] : picked
+        end
+      end
+
+      def user_agents_file
+        File.expand_path("../../device-info/user_agents.txt", __FILE__)
+      end
+
+      def devices_file
+        File.expand_path("../../device-info/devices.yaml", __FILE__)
+      end
+    end
+  end
+end

data/lib/webdriver-user-agent/driver.rb

@@ -0,0 +1,39 @@
+require 'json'
+require 'selenium-webdriver'
+require 'webdriver-user-agent/browser_options'
+require 'webdriver-user-agent/devices'
+
+module Webdriver
+  module UserAgent
+    class Driver
+      include Singleton
+      include Devices
+
+      def for(opts)
+        user_agent_string = agent_string_for opts[:agent]
+        options = BrowserOptions.new(opts, user_agent_string)
+        build_driver_using options
+      end
+
+      private
+
+      def 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
+
+      def build_driver_using(options)
+        driver = Selenium::WebDriver.for options.browser, options.browser_options
+        unless options.agent == :random
+          resize_inner_window(driver, *resolution_for(options.agent, options.orientation))
+        end
+        driver
+      end
+
+    end
+  end
+end

data/webdriver-user-agent.gemspec

@@ -1,8 +1,8 @@
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |gem|
-  gem.authors       = ["Alister Scott"]
-  gem.email         = ["alister.scott@gmail.com"]
+  gem.authors       = ["Alister Scott", "Jeff Morgan"]
+  gem.email         = ["alister.scott@gmail.com", "jeff.morgan@leandog.com"]
   gem.description   = %q{A helper gem to emulate populate device user agents and resolutions when using webdriver}
   gem.summary       = %q{A helper gem to emulate populate device user agents and resolutions when using webdriver}
   gem.homepage      = "https://github.com/alisterscott/webdriver-user-agent"
@@ -12,11 +12,11 @@ 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       = "6.6.6"
+  gem.version       = "7.0"
   gem.add_dependency 'selenium-webdriver'
   gem.add_dependency 'facets'
   gem.add_dependency 'json'
   gem.add_development_dependency 'rspec'
   gem.add_development_dependency 'watir-webdriver'
-  gem.post_install_message = "THIS GEM HAS BEEN DEPRECATED AND NO LONGER MAINTAINED"
-end
+
+end

metadata

@@ -1,18 +1,21 @@
 --- !ruby/object:Gem::Specification
 name: webdriver-user-agent
 version: !ruby/object:Gem::Version
-  version: 6.6.6
+  version: '7.0'
+  prerelease: 
 platform: ruby
 authors:
 - Alister Scott
+- Jeff Morgan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-15 00:00:00.000000000 Z
+date: 2013-06-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: selenium-webdriver
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -20,6 +23,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -27,6 +31,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: facets
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -34,6 +39,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -41,6 +47,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -48,6 +55,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -55,6 +63,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -62,6 +71,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -69,6 +79,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: watir-webdriver
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -76,6 +87,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -84,12 +96,15 @@ description: A helper gem to emulate populate device user agents and resolutions
   using webdriver
 email:
 - alister.scott@gmail.com
+- jeff.morgan@leandog.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
-- .rvmrc
+- .rspec
+- .ruby-gemset
+- .ruby-version
 - Gemfile
 - HISTORY.md
 - LICENSE
@@ -98,30 +113,35 @@ files:
 - lib/device-info/devices.yaml
 - lib/device-info/user_agents.txt
 - lib/webdriver-user-agent.rb
+- lib/webdriver-user-agent/browser_options.rb
+- lib/webdriver-user-agent/core_ext/symbol.rb
+- lib/webdriver-user-agent/devices.rb
+- lib/webdriver-user-agent/driver.rb
 - spec/webdriver-user-agent_spec.rb
 - webdriver-user-agent.gemspec
 homepage: https://github.com/alisterscott/webdriver-user-agent
 licenses: []
-metadata: {}
-post_install_message: THIS GEM HAS BEEN DEPRECATED AND NO LONGER MAINTAINED
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 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: 
-rubygems_version: 2.0.3
+rubygems_version: 1.8.25
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: A helper gem to emulate populate device user agents and resolutions when
   using webdriver
 test_files:

checksums.yaml

@@ -1,15 +0,0 @@
----
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    ZjYxMTkxODdmYjlmOTkyZTViMWUwNTM2OTljNGVlZmY0OGE4ODM1YQ==
-  data.tar.gz: !binary |-
-    ZjMzY2ZmMzg0YjU4ZGVjN2I3NjVlYWQ5NzE2YzYxZTIzYjA4NmFkZg==
-!binary "U0hBNTEy":
-  metadata.gz: !binary |-
-    MDk3OTAzOTlmNWYwNWI4ZDU3MWVmYzEzZmI0YjVlNDQzNmE1MjBhZGI1MjEz
-    Y2RiYmNlZjlhZWNhNmIxMGQ4MDU0MmQxZjQwZWUxYTRjZmYzYzQyYjkxYzIx
-    MTIxZTAyOGY3OWY5MjA0OWQ2NTUxYzEwZGY0OTI5OGY4MWU3MDM=
-  data.tar.gz: !binary |-
-    NTZiYjQ2NzdjZmRkOTlkODVlNjEyYjg1NmJkNzNkYzE5MGNjYTg5ZDNjYWEz
-    OTkwNWRiZWYyOTYyODZiYjg4NmIwYTc5ZDExYWUxZmQ4NWNmMGMyNmJlMDFi
-    MWVkZmNkNjk3YjI3ZTAzYmJhYTY2MGQ1YzM3NmMwNDA1NjZlZDc=

data/.rvmrc

@@ -1,2 +0,0 @@
-rvm_install_on_use_flag=1
-rvm --create use ruby-1.9.3@webdriver-user-agent