operawatir 0.6.pre1-jruby → 0.7.pre1-jruby

data/Gemfile.lock

@@ -0,0 +1,58 @@
+GEM
+  remote: http://rubygems.org/
+  specs:
+    BlueCloth (1.0.1)
+    builder (3.0.0)
+    ci_reporter (1.7.0)
+      builder (>= 2.1.2)
+    clipboard (1.0.1)
+    deprecated (3.0.0)
+    diff-lcs (1.1.3)
+    gem_plugin (0.2.3)
+    git (1.2.5)
+    jeweler (1.8.3)
+      bundler (~> 1.0)
+      git (>= 1.2.5)
+      rake
+      rdoc
+    json (1.6.5-java)
+    mongrel (1.1.5-java)
+      gem_plugin (>= 0.2.3)
+    rack (1.4.1)
+    rack-protection (1.2.0)
+      rack
+    rake (0.8.7)
+    rdoc (3.12)
+      json (~> 1.4)
+    rr (1.0.4)
+    rspec (2.6.0)
+      rspec-core (~> 2.6.0)
+      rspec-expectations (~> 2.6.0)
+      rspec-mocks (~> 2.6.0)
+    rspec-core (2.6.4)
+    rspec-expectations (2.6.0)
+      diff-lcs (~> 1.1.2)
+    rspec-mocks (2.6.0)
+    sinatra (1.3.2)
+      rack (~> 1.3, >= 1.3.6)
+      rack-protection (~> 1.2)
+      tilt (~> 1.3, >= 1.3.3)
+    tilt (1.3.3)
+    yard (0.7.5)
+
+PLATFORMS
+  java
+
+DEPENDENCIES
+  BlueCloth (= 1.0.1)
+  builder
+  bundler (~> 1.0.0)
+  ci_reporter
+  clipboard
+  deprecated
+  jeweler
+  mongrel (>= 1.1.5)
+  rr
+  rspec (~> 2.6.0)
+  sinatra (>= 1.1)
+  yard

data/Rakefile

@@ -4,10 +4,20 @@ require 'jeweler'
 require 'rspec/core/rake_task'
 require 'yard'
 require 'ci/reporter/rake/rspec'
+require 'rake'
+
 
 require './lib/operawatir/version'
 
 Jeweler::Tasks.new do |gem|
+
+  gem.files = FileList['utils/**/*.rb', '.*', 'lib/operadriver/*LICENSE.txt', 'spec/**/*.rb', 'spec/**/**/*.*', 'lib/**/*.rb', 'lib/**/*.jar', 'bin/*', '[A-Z]*', 'test/**/*'].to_a
+  gem.files.exclude '*.gem'
+  gem.files.exclude '.gitignore'
+  gem.files.exclude '*.xml'
+  gem.files.exclude '*.bat'
+  gem.files.exclude '*.py'
+
   gem.name    = 'operawatir'
   gem.version = OperaWatir.version
   gem.date    = Date.today.to_s
@@ -43,7 +53,6 @@ EOF
   gem.add_development_dependency 'rr'
   gem.add_development_dependency 'clipboard'
 
-  gem.files.exclude '.gitignore'
 end
 
 CLEAN.add 'pkg'

data/VERSION

@@ -1 +1 @@
-0.6.pre1
+0.7.pre1

data/lib/operawatir.rb

@@ -5,17 +5,15 @@ require 'java'
 include Java
 
 %w(commons-jxpath-1.3.jar commons-exec-1.1.jar protobuf-java-2.4.1.jar
-    selenium-java-2.13.0.jar operalaunchers-0.3.jar operadriver-v0.8.1.jar
-    guava-10.0.1.jar).each { |jar| require "operadriver/#{jar}" }
+    selenium-java-2.17.jar operalaunchers-0.6.jar operadriver-v0.11.jar
+    guava-11.0.1.jar ini4j-0.5.2.jar json-20080701.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
 
 # Desktop stuff
 include_class com.opera.core.systems.OperaDesktopDriver

data/lib/operawatir/actions.rb

@@ -63,7 +63,7 @@ class OperaWatir::Actions
   end
 
   def double_click(element = nil)
-    element ? @actions.double_click(element.node) : @actions.double_click()
+    element ? @actions.doubleClick(element.node) : @actions.doubleClick()
     self
   end
 

data/lib/operawatir/browser.rb

@@ -2,7 +2,7 @@
 class OperaWatir::Browser
   include Deprecated
 
-  attr_accessor :driver, :active_window, :preferences, :keys, :spatnav, :utils
+  attr_reader :driver, :active_window, :preferences, :keys, :spatnav, :utils
 
   def self.settings=(settings={})
     @desired_capabilities = nil  # Bust cache
@@ -22,12 +22,12 @@ class OperaWatir::Browser
   def initialize
     OperaWatir.compatibility! unless OperaWatir.api >= 3
 
-    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)
+    @driver        = OperaDriver.new(self.class.desired_capabilities)
+    @active_window = OperaWatir::Window.new(self)
+    @preferences   = OperaWatir::Preferences.new(driver)
+    @keys          = OperaWatir::Keys.new(self)
+    @spatnav       = OperaWatir::Spatnav.new(self)
+    @utils         = OperaWatir::Utils.new(self)
   end
 
   alias_method :window, :active_window
@@ -168,28 +168,33 @@ class OperaWatir::Browser
   # Keyboard
 
   def key(key)
-    driver.key(key)
+    keys.key(key)
+
+    if key =~ /enter/
+      sleep Java::ComOperaCoreSystems::OperaIntervals.EXEC_SLEEP.getValue
+      driver.waitForLoadToComplete
+    end
   end
 
   deprecated :key, 'browser.keys.send'
 
   def key_down(key)
-    driver.keyDown(key)
+    keys.down(key)
   end
 
-  deprecated :key, 'browser.keys.down'
+  deprecated :key_down, 'browser.keys.down'
 
   def key_up(key)
-    driver.keyUp(key)
+    keys.up(key)
   end
 
-  deprecated :key, 'browser.keys.up or browser.keys.release'
+  deprecated :key_up, 'browser.keys.up or browser.keys.release'
 
   def type(text)
-    driver.type(text)
+    keys.send(text)
   end
 
-  deprecated :key, 'browser.keys.send'
+  deprecated :type, 'browser.keys.send'
 
   # actions
 
@@ -197,6 +202,10 @@ class OperaWatir::Browser
     OperaWatir::Actions.new(browser)
   end
 
+  def inspect
+    "#<OperaWatir::Browser:#{object_id}>" # @settings=#{@settings.insepct}, @active_window=#{@active_window.inspect}"
+  end
+
 private
 
   def self.desired_capabilities(desktopwatir = false)

data/lib/operawatir/compat/element.rb

@@ -39,7 +39,7 @@ class OperaWatir::Element
 
   def text
     if node.tag_name =~ /input|textarea|select/i
-      node.value.strip
+      node.getAttribute('value').strip
     else
       node.getText.strip
     end

data/lib/operawatir/desktop_helper.rb

@@ -9,6 +9,7 @@ require 'rspec'
 require 'rbconfig'
 
 require File.expand_path('../../../spec/operawatir/matchers', __FILE__)
+$LOAD_PATH.unshift File.expand_path('../../../utils/formatters', __FILE__)
 
 module OperaWatir::DesktopHelper
   extend self

data/lib/operawatir/element.rb

@@ -1,8 +1,10 @@
 class OperaWatir::Element
   extend Forwardable
 
+  attr_reader :node
+
   def initialize(node)
-    self.node = node
+    @node = node
   end
 
   # TODO Need support for this in Webdriver
@@ -68,9 +70,12 @@ class OperaWatir::Element
   def_delegator :node, :getText, :text
   def_delegator :node, :getHTML, :html
 
-  def_delegator :node, :getElementName, :tag_name
   def_delegator :node, :clear, :clear
 
+  def tag_name
+    node.callMethod('locator.nodeName')
+  end
+
   # On elements of type `input`, `textarea` or `select` it will fetch
   # the texteditable `value` attribute, on every other element type it
   # returns the DOM attribute `value`.
@@ -87,7 +92,8 @@ class OperaWatir::Element
     end
 =end
 
-    node.getValue
+    #node.getValue
+    attr('value')
   end
 
   #
@@ -232,8 +238,6 @@ class OperaWatir::Element
 
 private
 
-  attr_accessor :node
-
   # Finders
 
   def find_elements_by_id(value)

data/lib/operawatir/keys.rb

@@ -24,7 +24,7 @@ class OperaWatir::Keys
   #
 
   def down(*args)
-    args.each { |key| driver.keyDown(key) }
+    args.each { |key| key_down(key) }
   end
 
   #
@@ -40,7 +40,7 @@ class OperaWatir::Keys
   #
 
   def up(*args)
-    args.each { |key| driver.keyUp(key) }
+    args.each { |key| key_up(key) }
   end
 
   #
@@ -52,7 +52,7 @@ class OperaWatir::Keys
   #
 
   def release
-    driver.releaseKeys
+    exec.releaseKeys
   end
 
   #
@@ -92,7 +92,7 @@ class OperaWatir::Keys
           when :access
             access_key item[index + 1]
           when Symbol
-            down key
+            key_down key
           else
             key key
           end
@@ -106,24 +106,37 @@ class OperaWatir::Keys
     end
   end
 
+  def key(key)
+    key_down(key)
+    key_up(key)
+  end
+
 private
 
-  def driver
-    browser.driver
+  def key_down(key)
+    exec.key(key.to_s, false)
   end
 
-  def key(key)
-    driver.key key
+  def key_up(key)
+    exec.key(key.to_s, true)
   end
 
   def type(text)
-    driver.type text
+    exec.type(text.to_s)
   end
 
   def access_key(key)
     driver.operaAction 'Enter access key mode'
-    send key
+    send key.to_s
     driver.operaAction 'Leave access key mode'
   end
 
-end
+  def exec
+    driver.getExecService
+  end
+
+  def driver
+    browser.driver
+  end
+
+end

data/lib/operawatir/preferences.rb

@@ -1,31 +1,38 @@
 # -*- coding: utf-8 -*-
-class String
+class Array
 
   #
-  # Translates an Opera preferences key string into a Ruby method name.
-  # It will remove tabs and spaces at beginning of string, replace
-  # further spaces with an underscore and make the string lower-case.
-  #
-  # The method extends the String object and can be called as a regular
-  # method on any string in Ruby.
+  # Gets the unique entries in an array.
   #
 
-  def methodize
-    self.gsub(/^\\t(\s+)/, '').gsub(/\s+/, '_').downcase
+  def uniq_by(&blk)
+    transforms = {}
+    select do |el|
+      t = blk[el]
+      should_keep = !transforms[t]
+      transforms[t] = true
+      should_keep
+    end
   end
 
+end
+
+class String
+
   #
-  # Translates a previously keyized Opera preferences method string into
-  # an Opera preferences key string.  This is done by replacing
-  # underscores with spaces and capitalizing each word in the string.
+  # Translates a preference key into a Ruby method name.  It will
+  # remove tabs and spaces at beginning and the end of the string, remove
+  # paranthesis, replace further spaces and dots with underscores and make
+  # the final string lower-case.
   #
   # The method extends the String object and can be called as a regular
   # method on any string in Ruby.
   #
 
-  def keyize
-    self.gsub(/_/, ' ').gsub(/\b('?[a-z])/) { $1.capitalize }
+  def methodize
+    self.strip.gsub(/\(|\)/, '').gsub(/\s+|-+|\./, '_').downcase
   end
+
 end
 
 #
@@ -104,8 +111,6 @@ class OperaWatir::Preferences
   extend Forwardable
   include Enumerable
 
-  attr_accessor :browser, :driver
-
   #
   # The OperaWatir::Preferences object is created automatically when you
   # create an OperaWatir::Browser object, and is available as
@@ -118,55 +123,53 @@ class OperaWatir::Preferences
   # @param [Object] browser  An OperaWatir::Browser object.
   #
 
-  def initialize(browser)
-    self.browser, self.driver = browser, browser.driver
-
-    raw_prefs = driver.listAllPrefs.to_a
-    @_prefs = {}
-    @_prefs = raw_prefs.map { |s| Section.new(self, s) }.sort_by { |s| s.key }
+  def initialize(driver)
+    raw_prefs = driver.preferences.all.to_a
 
-    @old_prefs = _prefs
+    @sections = []
+    raw_prefs.collect { |p| p.get_section }.uniq.each do |section|
+       @sections << Section.new(raw_prefs.find_all { |p| p.get_section == section })
+    end
   end
 
-  def_delegators :_prefs, :[],
-                          :each,
-                          :length,
-                          :size,
-                          :first,
-                          :last,
-                          :empty?
+  def_delegators :@sections, :[],
+                            :each,
+                            :length,
+                            :size,
+                            :first,
+                            :last,
+                            :empty?
 
   #
-  # When calling Preferences#any_method_name, the `any_method_name` will
-  # be caught by this method.
+  # When calling Preferences#any_method_name the `any_method_name` will
+  # be caught by this meta method.
   #
   # This is the standard way of looking up sections.  `any_method_name`
-  # should be replaced by a methodized version of the section as it
+  # should be replaced by a methodize version of the secion as it
   # appears in the Opera preferences list which you can find at
   # `opera:config`.
   #
   # @example
   #
   #   browser.preferences.interface_colors
-  #   # will return section “Interface Colors”
+  #   # will return section "Interface Colors"
   #
-  # @param           section  method to look up in preferences
-  # @return [Object]          a Preferences::Section object
+  # @param section method to look up in preferences
+  # @return [Object] a Preferences::Section object
+  # @throws PreferencesException if section does not exist
   #
 
   def method_missing(method)
     method = method.to_s
-
-    if _prefs.any? { |s| s.method == method }
-      _prefs.find { |s| s.method == method }
-    end
+    raise OperaWatir::Exceptions::PreferencesException, "Section does not exist: #{method}" unless @sections.any? { |s| s.method == method }
+    @sections.find { |s| s.method == method }
   end
 
   #
   # Retrieves a human-readable list of Opera preferences available.
   # This is used for convenience and should never be parsed.  Consider
-  # using the built-in Ruby iterator #each (with friends) or
-  # Preferences#to_a for that.
+  # using the iterator #each (with friends) or Preferences#to_a for
+  # that.
   #
   # @return [String] list of preferences
   #
@@ -174,12 +177,11 @@ class OperaWatir::Preferences
   def to_s
     text = ''
 
-    _prefs.each do |s|
+    @sections.each do |s|
       text << "#{s.method}\n"
 
       s.each do |k|
         text << "  #{k.method}\n"
-        text << "    type:     #{k.type.inspect}\n"
         text << "    value:    #{k.value.inspect}\n"
         text << "    default:  #{k.default.inspect}\n"
         text << "    enabled:  #{k.enabled?.inspect}\n"
@@ -192,16 +194,16 @@ class OperaWatir::Preferences
   end
 
   #
-  # Returns a list of all preferences in array form.  This can be used
-  # for external parsing.  If you wish to manipulate or iterate through
-  # the list of preferences, consider using the built-in Ruby iterator
-  # #each (with friends).
+  # Returns a duplicate list of all preferences in array form.  This
+  # can be used for external parsing.  If you wish to manipulate or
+  # iterate through the list of preferences, consider using the
+  # iterator #each (with friends).
   #
   # @return [Array] list of preferences
   #
 
   def to_a
-    _prefs.dup
+    @sections.dup
   end
 
   #
@@ -212,36 +214,13 @@ class OperaWatir::Preferences
   #
 
   def exists?
-    !_prefs.empty?
+    !@sections.empty?
   end
 
   alias_method :exist?, :exists?  # LOL Ruby
 
-=begin
-  def cleanup
-    @old_prefs.dup
-  end
-
-  def cleanup!
-    @old_prefs.each do |old_section|
-      old_section.each do |old_key|
-        #self.send(old_section.method).send(old_key.method).send(:value, old_key.value)
-        puts "#{old_section.method}.#{old_key.method}.value = #{old_key.value}"
-      end
-    end
-
-    _prefs
-  end
-=end
-
-private
-
-  def _prefs
-    @_prefs
-  end
-
   #
-  # OperaWatir::Preferences::Section represents a section in Opera
+  # OperaWatir::Preferences::Section represents a section in the Opera
   # configuration.
   #
 
@@ -249,30 +228,29 @@ private
     extend Forwardable
     include Enumerable
 
-    attr_accessor :parent, :driver, :method, :key
+    attr_reader :key, :method
 
-    def initialize(parent, raw_section)
-      self.parent, self.driver = parent, parent.driver
-      self.method, self.key    = raw_section.first.methodize, raw_section.first
-
-      @_keys = raw_section[1].map { |k| Key.new(self, k) }.sort_by { |k| k.key }
+    def initialize(raw_section)
+      @key = raw_section.first.get_section
+      @method = @key.methodize
+      @keys ||= raw_section.collect { |p| Key.new(self, p) }.sort_by { |p| p.key }
     end
 
-    def_delegators :_keys, :[],
-                           :length,
-                           :size,
-                           :first,
-                           :last,
-                           :empty?
+    def_delegators :@keys, :[],
+                          :length,
+                          :size,
+                          :first,
+                          :last,
+                          :empty?
 
     def each
       return unless block_given?
-      _keys.each { |k| yield k }
+      @keys.each { |k| yield k }
     end
 
     #
     # When calling Preferences::Section#any_method_name, the
-    # `any_method_name` will be caught by this method.
+    # `any_method_name` will be caught by this meta method.
     #
     # This is the standard way of looking up preference entries.
     # `any_method_name` should be replaced by a methodized version of
@@ -284,68 +262,58 @@ private
     #   browser.preferences.interface_colors.background
     #   # will return the “Background” entry in section “Interface Colors”
     #
-    # @param           method  method to look up in section
-    # @return [Object]         a Preferences::Section::Key (entry) object
+    # @param method method to look up in section
+    # @return [Object] a Preferences::Section::Key (entry) object
+    # @throws PreferencesException if key does not exist
     #
 
-    def method_missing(method)
-      method = method.to_s
-
-      if _keys.any? { |k| k.method == method }
-        _keys.find { |k| k.method == method }
-      end
+    def method_missing(m)
+      m = m.to_s
+      raise OperaWatir::Exceptions::PreferencesException, "No such preference: #{method}.#{m}" unless @keys.any? { |k| k.method == m }
+      @keys.find { |k| k.method == m }
     end
 
-  private
-
-    def _keys
-      @_keys
+    def inspect
+      "#<OperaWatir::Preferences::Section:#{object_id}> @key=#{key.inspect}, @method=#{method.to_sym.inspect}, @keys=[...]"
     end
 
     class Key
       extend Forwardable
       include Enumerable
 
-      attr_accessor :parent, :driver, :method, :key, :type, :value
+      attr_reader :parent, :method
 
-      def initialize(parent, raw_key)
-        self.parent, self.driver = parent, parent.driver
-        self.method, self.key = raw_key.first.methodize, raw_key.first
-        raw_data = raw_key[1].to_s
+      def initialize(parent, raw_pref)
+        @parent = parent
+        @pref   = raw_pref
+        @method = key.methodize
+      end
 
-        raw_data =~ /^type: ([A-Z]+)$/
-        self.type = $1.to_s.capitalize
+      def method
+        @method
+      end
 
-        raw_data =~ /^value: \"(.*)\"$/
-        @value = $1.to_s
+      def_delegator :@pref, :get_key, :key
 
-        # Ruby doesn't support attr_accessor's with question mark in their
-        # name.
-        raw_data =~ /^enabled: (true|false)$/
-        @enabled = $1.truthy?
+      def value
+        ruby_idiomatic(@pref.get_value)
       end
 
       #
-      # Whether the current key entry is enabled inside Opera or not.
+      # Sets the key's value to the specified string.
       #
-      # @return [Boolean] true if enabled, false if otherwise
+      # @param [String] value  the value you wish to set for the key
       #
 
-      def enabled?
-        !!@enabled
-      end
+      def_delegator :@pref, :set_value, :value=
 
       #
-      # Sets the key's value to the specified string.
+      # Whether the current key entry is enabled inside Opera or not.
       #
-      # @param [String] value  the value you wish to set for the key
+      # @return [Boolean] true if enabled, false if otherwise
       #
 
-      def value=(value)
-        value = value.truthy? ? '1' : '0' if type.include?('Boolean')
-        driver.setPref parent.key, key, value.to_s
-        @value = value
-      end
+      def_delegator :@pref, :is_enabled, :enabled?
 
       #
       # Returns key's default value.
@@ -354,7 +322,7 @@ private
       #
 
       def default
-        @default ||= driver.getDefaultPref parent.key, key
+        ruby_idiomatic(@pref.get_default_value)
       end
 
       #
@@ -364,9 +332,29 @@ private
       #
 
       def default!
-        self.value=(default)
+        @pref.reset
+        @pref.value
       end
+
+      def inspect
+        "#<OperaWatir::Preferences::Section::Key:#{object_id}> @key=#{key.inspect}, @method=#{method.to_sym.inspect}, @parent=#{parent.inspect}, @value=#{value.inspect}, @enabled=#{enabled?.inspect}, @default=#{default.inspect}"
+      end
+
+    private
+
+      def ruby_idiomatic(value)
+        case @pref.get_type.to_string
+        when /Integer/:
+          value.to_i
+        when /Boolean/:
+          !!value
+        else
+          value.to_s
+        end
+      end
+
     end
+
   end
 
-end
+end