operawatir 0.5.pre1-jruby → 0.5.pre2-jruby

data/CHANGES

@@ -1,4 +1,57 @@
-v0.5.pre1    2011-09-31
+v0.5.pre2    2011-09-06
+
+  [NEW FEATURES]
+
+  * Added browser utility service as Browser#utils, implementing the following
+    new method calls:
+
+      Utils#core_version, returning the core version
+      Utils#os, returning the browser's OS
+      Utils#product, returning product type (desktop/core/mobile)
+      Utils#binary_path, returning full path to Opera binary
+      Utils#user_agent, returning User-Agent string
+      Utils#pid, returning the browser's PID if available
+
+    (andreastt)
+
+  * Implementing ability to enable verbose logging in operawatir.  Added
+    following new command-line switches to the operawatir binary:
+
+      --debug=LEVEL (or -d for short), for specifying logging level
+      --log=FILE, for specifying sending the logging to a file
+
+    Available logging levels are: SEVERE (highest), WARNING, INFO, CONFIG,
+    FINE, FINER, FINEST (lowest), ALL.  Default is INFO.  See `operawatir
+    --help` for more information.
+
+    (andreastt)
+
+  [ENHANCEMENTS]
+
+  * Now using DesiredCapabilities from OperaDriver v0.7 instead of
+    OperaDriverSettings.  (andreastt)
+
+  [BUG FIXES]
+
+  * initMouseEvent in Element#fire_event is now clicking clientX and clientY
+    instead of relying on internal driver locators.  (andreastt)
+
+  * Compat::Window#show_frames now returns a string instead of writing to
+    STDOUT.  (andreastt)
+
+  * Browser#quit was calling OperaDriver.shutdown() which is now deprecated.
+    Fixed by now calling OperaDriver.quit() instead.  (andreastt)
+
+  * `operawatir --help` was broken, fixed by converting OptionParse object to a
+    String.  (andreastt)
+
+  [OTHER]
+
+  * Upgraded to OperaDriver v0.7.1.  (andreastt)
+
+  * Added tests for new Utils interface.  (andreastt)
+
+v0.5.pre1    2011-08-31
 
   [API CHANGES]
 

data/VERSION

@@ -1 +1 @@
-0.5.pre1
+0.5.pre2

data/bin/operawatir

@@ -27,7 +27,7 @@ begin
 Usage: operawatir [-m|--manual] [-l|--launcher=BINARY] [--binary=BINARY]
        [-a|--args=ARGUMENTS] [-q|--no-quit] [--opera-idle] [-b|--backtrace]
        [--no-color] [-t|--tag=TAG] [-f|--format=FORMAT] [-o|--out=FILE]
-       [-h|--help] [-v|--version] FILES
+       [-d|--debug=LEVEL] [--log=FILE] [-h|--help] [-v|--version] FILES
 EOS
 
     opts.separator ''
@@ -90,16 +90,28 @@ EOS
     opts.separator ''
     opts.separator 'Common options:'
 
+    opts.on_tail('-d', '--debug=LEVEL', 'The logging level to use.  Available levels: SEVERE',
+                 '(highest),  WARNING, INFO (default), CONFIG, FINE,',
+                 'FINER, FINEST (lowest), ALL') do |l|
+      available_levels = ['SEVERE', 'WARNING', 'INFO', 'CONFIG', 'FINE', 'FINER', 'FINEST', 'ALL']
+      raise OptionParser::InvalidArgument, l.to_s.inspect unless available_levels.include?(l)
+      @options[:logging_level] = l
+    end
+
+    opts.on_tail('--log=FILE', 'Output the log to a file') do |f|
+      @options[:logging_file] = f
+    end
+
     opts.on_tail('-h', '--help', 'Show this message') do
-      abort opts
+      abort opts.to_s
     end
 
     opts.on_tail('-v', '--version', 'Show version') do
       abort "OperaWatir version #{OperaWatir.version}"
     end
   end.parse!(ARGV)
-rescue OptionParser::InvalidOption => e
-  abort "operawatir: Unknown option `#{e.to_s.sub(/invalid option:\s+/, '')}'"
+rescue OptionParser::ParseError => e
+  abort "operawatir: #{e}"
 end
 
 if ARGV.empty?

data/lib/operawatir.rb

@@ -5,12 +5,13 @@ require 'java'
 include Java
 
 %w(commons-jxpath-1.3.jar protobuf-java-2.3.0.jar selenium-java-head.jar
-   operadriver-v0.6.1.jar commons-io-2.0.1.jar guava-r09.jar).each { |jar| require "operadriver/#{jar}" }
+   operadriver-v0.7.1.jar commons-io-2.0.1.jar guava-r09.jar).each { |jar| require "operadriver/#{jar}" }
 
 include_class org.openqa.selenium.WebDriver
 include_class org.openqa.selenium.remote.RemoteWebElement
 include_class org.openqa.selenium.NoSuchElementException
 include_class org.openqa.selenium.interactions.Actions
+include_class org.openqa.selenium.remote.DesiredCapabilities
 include_class com.opera.core.systems.OperaDriver
 include_class com.opera.core.systems.OperaWebElement
 include_class com.opera.core.systems.settings.OperaDriverSettings
@@ -60,6 +61,7 @@ require 'operawatir/screenshot'
 require 'operawatir/preferences'
 require 'operawatir/spatnav'
 require 'operawatir/actions'
+require 'operawatir/utils'
 
 require 'operawatir/exceptions'
 require 'operawatir/selector'

data/lib/operawatir/browser.rb

@@ -2,10 +2,10 @@
 class OperaWatir::Browser
   include Deprecated
 
-  attr_accessor :driver, :active_window, :preferences, :keys, :spatnav
+  attr_accessor :driver, :active_window, :preferences, :keys, :spatnav, :utils
 
   def self.settings=(settings={})
-    @opera_driver_settings = nil  # Bust cache
+    @desired_capabilities = nil  # Bust cache
     @settings = settings
   end
 
@@ -22,11 +22,12 @@ class OperaWatir::Browser
   def initialize
     OperaWatir.compatibility! unless OperaWatir.api >= 3
 
-    self.driver        = OperaDriver.new(self.class.opera_driver_settings)
+    self.driver        = OperaDriver.new(self.class.desired_capabilities)
     self.active_window = OperaWatir::Window.new(self)
     self.preferences   = OperaWatir::Preferences.new(self)
     self.keys          = OperaWatir::Keys.new(self)
     self.spatnav       = OperaWatir::Spatnav.new(self)
+    self.utils         = OperaWatir::Utils.new(self)
   end
 
   alias_method :window, :active_window
@@ -48,7 +49,7 @@ class OperaWatir::Browser
 
   # Instruct the browser instance to quit and shut down.
   def quit
-    driver.shutdown
+    driver.quit
   end
 
   # Get the version number of the driver.  This _is not_ the same as
@@ -99,6 +100,7 @@ class OperaWatir::Browser
   def opera_action(name, *args)
     driver.operaAction(name, args.to_java(:string))
   end
+
   deprecated :opera_action
 
   # Full list of available Opera actions in the Opera build you're
@@ -111,6 +113,7 @@ class OperaWatir::Browser
   def opera_action_list
     driver.getOperaActionList.to_a
   end
+
   deprecated :opera_action_list
 
   # Selects all content in the currently focused element.  Equivalent
@@ -196,14 +199,16 @@ class OperaWatir::Browser
 
 private
 
-  def self.opera_driver_settings
-    @opera_driver_settings ||= OperaDriverSettings.new.tap { |s|
-      s.setAutostart false if self.settings[:manual]
-      s.setOperaLauncherBinary self.settings[:launcher] if self.settings[:launcher]
-      s.setOperaBinaryLocation self.settings[:path] if self.settings[:path]
-      s.setOperaBinaryArguments self.settings[:args].to_s if self.settings[:args]
-      s.setNoQuit true if self.settings[:no_quit]
-      s.setUseOperaIdle true if self.settings[:opera_idle] or ENV['OPERA_IDLE'].truthy?
+  def self.desired_capabilities
+    @desired_capabilities ||= DesiredCapabilities.new.tap { |s|
+      s.setCapability('opera.logging.level', self.settings[:logging_level]) if self.settings[:logging_level]
+      s.setCapability('opera.logging.file', self.settings[:logging_file]) if self.settings[:logging_file]
+      s.setCapability('opera.autostart', false) if self.settings[:manual]
+      s.setCapability('opera.launcher', self.settings[:launcher]) if self.settings[:launcher]
+      s.setCapability('opera.binary', self.settings[:path]) if self.settings[:path]
+      s.setCapability('opera.arguments', self.settings[:args].to_s) if self.settings[:args]
+      s.setCapability('opera.no_quit', true) if self.settings[:no_quit]
+      s.setCapability('opera.idle', true) if self.settings[:opera_idle] or ENV['OPERA_IDLE'].truthy?
     }
   end
 

data/lib/operawatir/compat/window.rb

@@ -67,8 +67,9 @@ module OperaWatir
 
       def show_frames
         frames = driver.list_frames
-        puts "There are #{frames.length.to_s} frames"
-        frames.each_with_index { |frame, i| puts "frame index: #{(i.to_i + 1).to_s} name: #{frame.to_s}" }
+        text = "There are #{frames.length.to_s} frames\n"
+        frames.each_with_index { |frame, i| text << "frame index: #{(i.to_i + 1).to_s} name: #{frame.to_s}\n" }
+        text
       end
 
     end

data/lib/operawatir/element.rb

@@ -200,7 +200,7 @@ class OperaWatir::Element
       init = "initEvent(\"#{event.to_s}\", true, true)"
     when :click, :dblclick, :mousedown, :mousemove, :mouseout, :mouseover, :mouseup
       type = 'MouseEvents'
-      init = "initMouseEvent(\"#{event.to_s}\", true, true, window, 1, 0, 0, 0, 0, false, false, false, false, 0, null)"
+      init = "initMouseEvent(\"#{event.to_s}\", true, true, window, 1, 0, 0, #{x}, #{y}, false, false, false, false, 0, null)"
     else
       raise Exceptions::NotImplementedException, "Event on#{event} is not a valid ECMAscript event for OperaWatir."
     end

data/lib/operawatir/utils.rb

@@ -0,0 +1,31 @@
+class OperaWatir::Utils
+
+  def initialize(browser)
+    @utils = browser.driver.utils
+  end
+
+  def core_version
+    @utils.getCoreVersion
+  end
+
+  def os
+    @utils.getOS
+  end
+
+  def product
+    @utils.getProduct
+  end
+
+  def binary_path
+    @utils.getBinaryPath
+  end
+
+  def user_agent
+    @utils.getUserAgent
+  end
+
+  def pid
+    @utils.getPID
+  end
+
+end

data/operawatir.gemspec

@@ -5,12 +5,12 @@
 
 Gem::Specification.new do |s|
   s.name = %q{operawatir}
-  s.version = "0.5.pre1"
+  s.version = "0.5.pre2"
   s.platform = %q{jruby}
 
   s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
   s.authors = ["Andreas Tolf Tolfsen", "Chris Lloyd", "Stuart Knightley", "Deniz Turkoglu"]
-  s.date = %q{2011-08-31}
+  s.date = %q{2011-09-06}
   s.description = %q{    OperaWatir is a part of the Watir (pronounced water) family of
     free software Ruby libraries for automating web browsers.
     OperaWatir provides a querying engine and Ruby bindings for a
@@ -40,7 +40,7 @@ Gem::Specification.new do |s|
     "lib/operadriver/commons-io-2.0.1.jar",
     "lib/operadriver/commons-jxpath-1.3.jar",
     "lib/operadriver/guava-r09.jar",
-    "lib/operadriver/operadriver-v0.6.1.jar",
+    "lib/operadriver/operadriver-v0.7.1.jar",
     "lib/operadriver/protobuf-java-2.3.0.jar",
     "lib/operadriver/selenium-java-head.jar",
     "lib/operawatir.rb",
@@ -94,6 +94,7 @@ Gem::Specification.new do |s|
     "lib/operawatir/screenshot.rb",
     "lib/operawatir/selector.rb",
     "lib/operawatir/spatnav.rb",
+    "lib/operawatir/utils.rb",
     "lib/operawatir/version.rb",
     "lib/operawatir/window.rb",
     "operawatir.gemspec",
@@ -117,6 +118,7 @@ Gem::Specification.new do |s|
     "spec/operawatir/core/preferences_spec.rb",
     "spec/operawatir/core/screenshot_spec.rb",
     "spec/operawatir/core/spatnav_spec.rb",
+    "spec/operawatir/core/utils_spec.rb",
     "spec/operawatir/core/window_spec.rb",
     "spec/operawatir/desktop/desktopbrowser_spec.rb",
     "spec/operawatir/desktop/quickaddressfield_spec.rb",

data/spec/operawatir/core/utils_spec.rb

@@ -0,0 +1,47 @@
+require File.expand_path('../../watirspec_helper', __FILE__)
+
+describe OperaWatir::Utils do
+
+  before(:all) { @utils = browser.utils }
+
+  describe '#core_version' do
+    it 'it matches a core version number' do
+      @utils.core_version.should match /\d+\.\d+\.\d+/
+    end
+  end
+
+  describe '#os' do
+    it 'is not empty' do
+      @utils.os.should_not be_empty
+    end
+  end
+
+  describe '#product' do
+    it 'is not unknown' do
+      @utils.product.should_not include 'unknown'
+    end
+
+    it 'is known' do
+      @utils.product.should match /core-gogi|desktop/
+    end
+  end
+
+  describe '#binary_path' do
+    it 'is not empty' do
+      @utils.binary_path.should_not be_empty
+    end
+  end
+
+  describe '#user_agent' do
+    it 'is a User-Agent string' do
+      @utils.user_agent.should match /Opera\/\d+\.\d+.+/
+    end
+  end
+
+  describe '#pid' do
+    it 'is greater than zero' do
+      @utils.pid.should > 0
+    end
+  end
+
+end

metadata

@@ -2,7 +2,7 @@
 name: operawatir
 version: !ruby/object:Gem::Version 
   prerelease: 4
-  version: 0.5.pre1
+  version: 0.5.pre2
 platform: jruby
 authors: 
   - Andreas Tolf Tolfsen
@@ -13,7 +13,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-31 00:00:00 +02:00
+date: 2011-09-06 00:00:00 +02:00
 default_executable: 
 dependencies: 
   - !ruby/object:Gem::Dependency 
@@ -288,7 +288,7 @@ files:
   - lib/operadriver/commons-io-2.0.1.jar
   - lib/operadriver/commons-jxpath-1.3.jar
   - lib/operadriver/guava-r09.jar
-  - lib/operadriver/operadriver-v0.6.1.jar
+  - lib/operadriver/operadriver-v0.7.1.jar
   - lib/operadriver/protobuf-java-2.3.0.jar
   - lib/operadriver/selenium-java-head.jar
   - lib/operawatir.rb
@@ -342,6 +342,7 @@ files:
   - lib/operawatir/screenshot.rb
   - lib/operawatir/selector.rb
   - lib/operawatir/spatnav.rb
+  - lib/operawatir/utils.rb
   - lib/operawatir/version.rb
   - lib/operawatir/window.rb
   - operawatir.gemspec
@@ -365,6 +366,7 @@ files:
   - spec/operawatir/core/preferences_spec.rb
   - spec/operawatir/core/screenshot_spec.rb
   - spec/operawatir/core/spatnav_spec.rb
+  - spec/operawatir/core/utils_spec.rb
   - spec/operawatir/core/window_spec.rb
   - spec/operawatir/desktop/desktopbrowser_spec.rb
   - spec/operawatir/desktop/quickaddressfield_spec.rb