operawatir 0.4.3.pre1-jruby → 0.5-jruby

data/lib/operawatir/desktop_enums.rb

@@ -8,7 +8,7 @@ module OperaWatir
       acc[const.to_s.downcase.to_sym] = SystemInputProtos::ModifierPressed.const_get(const)
       acc
     end
-    
+
     # Enum for the mouse buttons
     MOUSEBUTTON_ENUM_MAP = SystemInputProtos::MouseInfo::MouseButton.constants.inject({}) do |acc, const|
       acc[const.to_s.downcase.to_sym] = SystemInputProtos::MouseInfo::MouseButton.const_get(const)
@@ -20,13 +20,13 @@ module OperaWatir
       acc[const.to_s.downcase.to_sym] = DesktopWmProtos::QuickWidgetInfo::QuickWidgetType.const_get(const)
       acc
     end
-    
+
     # Enum for window types
     WINDOW_ENUM_MAP = DesktopWmProtos::DesktopWindowInfo::DesktopWindowType.constants.inject({}) do |acc, const|
       acc[const.to_s.downcase.to_sym] = DesktopWmProtos::DesktopWindowInfo::DesktopWindowType.const_get(const)
       acc
     end
-    
+
     # Enum for search types
     WIDGET_SEARCHTYPE_ENUM_MAP = DesktopWmProtos::QuickWidgetSearch::QuickWidgetSearchType.constants.inject({}) do |acc, const|
       acc[const.to_s.downcase.to_sym] = DesktopWmProtos::QuickWidgetSearch::QuickWidgetSearchType.const_get(const)
@@ -37,6 +37,6 @@ module OperaWatir
     DROPPOSITION_ENUM_MAP = QuickWidget::DropPosition.constants.inject({}) do |acc, const|
       acc[const.to_s.downcase.to_sym] = QuickWidget::DropPosition.const_get(const)
       acc
-    end 
+    end
 end
 end

data/lib/operawatir/desktop_exceptions.rb

@@ -6,11 +6,11 @@ module OperaWatir::DesktopExceptions
   #     ...
   #   rescue OperaWatirException
   #   end
-  
+
   # Raised when a method is called on a control that is not visible
   # corresponding element.
   class WidgetNotVisibleException < OperaWatirException; end
   class UnsupportedActionException < OperaWatirException; end
   class WidgetDisabledException < OperaWatirException; end
-  
+
 end

data/lib/operawatir/desktop_helper.rb

@@ -12,28 +12,50 @@ require File.expand_path('../../../spec/operawatir/matchers', __FILE__)
 
 module OperaWatir::DesktopHelper
   extend self
-  
+  @@files = []
+
   def settings
     OperaWatir::DesktopBrowser.settings
   end
-  
+
   def browser
     @browser ||= OperaWatir::DesktopBrowser.new
   end
-  
+
+  def mac?
+    Config::CONFIG['target_os'] == "darwin"
+  end
+
+  def linux?
+    Config::CONFIG['target_os'] == "linux"
+  end
+
   def configure_rspec!
     RSpec.configure do |config|
-      
+
+
+
+      if mac?
+        config.filter_run_excluding :nonmac? => true
+      end
+
+      if linux? == false
+        config.filter_run_excluding :nix? => true
+      end
+
       # Set every RSpec option
       settings.each do |key, value|
         config.send("#{key}=", value) if config.respond_to?("#{key}=")
         if key.to_s.eql?("files_to_run")
           @@files = value
         end
+        if key.to_s.eql?("files_or_directories_to_run")
+          @@files = value
+        end
       end
-            
+
       config.include SpecHelpers
-      
+
       config.before(:all) {
         if OperaWatir::DesktopHelper::settings[:no_restart] == false
           unless @@files.empty?
@@ -46,9 +68,10 @@ module OperaWatir::DesktopHelper
           # test is run before Opera has been launched
           browser
         end
+        browser.set_preference("User Prefs", "Enable UI Animations", 0)
       }
 
-      config.after(:suite) { 
+      config.after(:suite) {
         # Use the @browser directly because we don't want
         # to launch Opera here if it's not running
         if @browser
@@ -71,7 +94,7 @@ module OperaWatir::DesktopHelper
     configure_rspec!
     RSpec::Core::Runner.autorun
   end
-  
+
 private
 
   module SpecHelpers

data/lib/operawatir/element.rb

@@ -125,7 +125,7 @@ class OperaWatir::Element
   # @param [Integer] y The offset from the top of the element.
   #
 
-  def click(x=0, y=0)
+  def click(x=1, y=1)
     node.click(x.to_i, y.to_i)
   end
 
@@ -149,6 +149,10 @@ class OperaWatir::Element
     node.rightClick
   end
 
+  def middle_click
+    node.middleClick
+  end
+
   def drag_and_drop_on(other)
     node.dragAndDropOn other.node
   end
@@ -196,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/exceptions.rb

@@ -8,7 +8,7 @@ module OperaWatir::Exceptions
   #   rescue OperaWatirException
   #   end
   class OperaWatirException < RuntimeError; end
-  
+
   # Raised when a method is called on an object which doesn't have a
   # corresponding element.
   class UnknownObjectException < OperaWatirException; end
@@ -17,7 +17,7 @@ module OperaWatir::Exceptions
   #
   # @example browser.divs(:weird_method, 10)
   class MissingWayOfFindingObjectException < OperaWatirException; end
-  
+
   # Raised when trying to switch to an unknown frame.
   class UnknownFrameException < OperaWatirException; end
 
@@ -31,7 +31,7 @@ module OperaWatir::Exceptions
   # Raised when trying to perform an action on an element which is
   # disabled.
   class ObjectDisabledException < OperaWatirException; end
-  
+
   # Raised when trying to access a table cell that doesn't exist.
   class UnknownCellException < OperaWatirException; end
 
@@ -40,5 +40,5 @@ module OperaWatir::Exceptions
 
   # Raised when an exception occurs in Preferences.
   class PreferencesException < OperaWatirException; end
-  
+
 end

data/lib/operawatir/helper.rb

@@ -10,25 +10,25 @@ require 'rbconfig'
 
 module OperaWatir::Helper
   extend self
-  
+
   def settings
     OperaWatir::Browser.settings
   end
-  
+
   def browser
     @browser ||= OperaWatir::Browser.new
   end
-  
+
   def configure_rspec!
     RSpec.configure do |config|
-      
+
       # Set every RSpec option
       settings.each do |key, value|
         config.send("#{key}=", value) if config.respond_to?("#{key}=")
       end
 
       config.include SpecHelpers
-      
+
       config.after(:suite) do
         browser.quit if @browser
         abort
@@ -41,7 +41,7 @@ module OperaWatir::Helper
     configure_rspec!
     RSpec::Core::Runner.autorun
   end
-  
+
 private
 
   module SpecHelpers

data/lib/operawatir/keys.rb

@@ -13,16 +13,16 @@ class OperaWatir::Keys
   # @param [Symbol, String] *args  Arbitrary list of symbols (modification)
   #                                keys or strings (regular keys) to be
   #                                pressed down.
-  #                               
+  #
   # @example
   #
   #   browser.keys.down 'a'
   #   browser.keys.down 'a', :right
-  #  
+  #
   # @seealso up
   # @seealso send
   #
-  
+
   def down(*args)
     args.each { |key| driver.keyDown(key) }
   end
@@ -109,7 +109,7 @@ class OperaWatir::Keys
 private
 
   def driver
-    browser.driver    
+    browser.driver
   end
 
   def key(key)

data/lib/operawatir/preferences.rb

@@ -106,19 +106,6 @@ class OperaWatir::Preferences
 
   attr_accessor :browser, :driver
 
-  # FIXME This should be retrievable from OperaDriver
-  SECTIONS = ['Author Display Mode', 'Auto Update', 'BitTorrent',
-              'CSS Generic Font Family', 'Cache', 'Clear Private Data Dialog',
-              'Colors', 'Developer Tools', 'Disk Cache', 'Extensions',
-              'File Selector', 'File Types Section Info', 'Fonts', 'Geolocation',
-              'Handheld', 'HotListWindow', 'ISP', 'Install', 'Interface Colors',
-              'Java', 'Link', 'Mail', 'MailBox', 'Multimedia', 'Network', 'News',
-              'OEM', 'Opera Account', 'Opera Sync', 'Performance', 'Persistent Storage',
-              'Personal Info', 'Printer', 'Proxy', 'SVG', 'Saved Settings',
-              'Security Prefs', 'Sounds', 'Special', 'Transfer Window',
-              'User Agent', 'User Display Mode', 'User Prefs', 'Visited Link',
-              'Visited Link', 'Web Server', 'Widgets', 'Workspace']
-
   #
   # The OperaWatir::Preferences object is created automatically when you
   # create an OperaWatir::Browser object, and is available as
@@ -133,8 +120,22 @@ class OperaWatir::Preferences
 
   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 }
+
+    @old_prefs = _prefs
   end
 
+  def_delegators :_prefs, :[],
+                          :each,
+                          :length,
+                          :size,
+                          :first,
+                          :last,
+                          :empty?
+
   #
   # When calling Preferences#any_method_name, the `any_method_name` will
   # be caught by this method.
@@ -149,34 +150,25 @@ class OperaWatir::Preferences
   #   browser.preferences.interface_colors
   #   # will return section “Interface Colors”
   #
-  # @param           section  Method to look up in preferences.
-  # @return [Object]          A Preferences::Entry (section) object.
+  # @param           section  method to look up in preferences
+  # @return [Object]          a Preferences::Section object
   #
 
-  def method_missing(section)
-    if _prefs.any? { |s| s.method == section.to_s }
-      _prefs.find { |s| s.method == section.to_s }
-    else
-      _prefs << Entry.new(self, section)
-      _prefs.last
+  def method_missing(method)
+    method = method.to_s
+
+    if _prefs.any? { |s| s.method == method }
+      _prefs.find { |s| s.method == method }
     end
   end
 
-  def_delegators :_prefs, :[],
-                          :each,
-                          :length,
-                          :size,
-                          :first,
-                          :last,
-                          :empty?
-
   #
   # 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.
   #
-  # @return [String]          List of preferences.
+  # @return [String] list of preferences
   #
 
   def to_s
@@ -190,7 +182,10 @@ class OperaWatir::Preferences
         text << "    type:     #{k.type.inspect}\n"
         text << "    value:    #{k.value.inspect}\n"
         text << "    default:  #{k.default.inspect}\n"
+        text << "    enabled:  #{k.enabled?.inspect}\n"
       end
+
+      text << "\n"
     end
 
     text
@@ -199,10 +194,10 @@ class OperaWatir::Preferences
   #
   # 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
+  # the list of preferences, consider using the built-in Ruby iterator
   # #each (with friends).
   #
-  # @return [Array]           List of preferences.
+  # @return [Array] list of preferences
   #
 
   def to_a
@@ -213,48 +208,70 @@ class OperaWatir::Preferences
   # Checks if any preferences exists in your Opera build.  If true,
   # there are preferences available, false otherwise.
   #
-  # @return [Boolean]         Whether any preferences exists.
+  # @return [Boolean] whether any preference exists
   #
 
   def exists?
     !_prefs.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 ||= SECTIONS.map { |s| Entry.new(self, s.methodize, s) }
+    @_prefs
   end
 
+  #
+  # OperaWatir::Preferences::Section represents a section in Opera
+  # configuration.
+  #
 
-  class Entry
+  class Section
     extend Forwardable
     include Enumerable
 
-    attr_accessor :parent, :method, :key, :value, :type, :default, :driver
+    attr_accessor :parent, :driver, :method, :key
 
-    #
-    # OperaWatir::Preferences::Entry is the object that represents
-    # either a section or a section's entry.
-    #
-    # It's created automatically when you query for entries using the
-    # Preference object itself.
-    #
-    # @return [Object] An OperaWatir::Preferences::Entry object.
-    #
+    def initialize(parent, raw_section)
+      self.parent, self.driver = parent, parent.driver
+      self.method, self.key    = raw_section.first.methodize, raw_section.first
 
-    def initialize(parent, method, key=nil, type=nil)
-      self.parent = parent
-      self.method = method.to_s
-      self.key    = key ? key : method.to_s.keyize
-      self.type   = type
-      self.driver = parent.driver
+      @_keys = raw_section[1].map { |k| Key.new(self, k) }.sort_by { |k| k.key }
+    end
+
+    def_delegators :_keys, :[],
+                           :length,
+                           :size,
+                           :first,
+                           :last,
+                           :empty?
+
+    def each
+      return unless block_given?
+      _keys.each { |k| yield k }
     end
 
     #
-    # When calling Preferences::Entry#any_method_name, the
+    # When calling Preferences::Section#any_method_name, the
     # `any_method_name` will be caught by this method.
     #
     # This is the standard way of looking up preference entries.
@@ -267,135 +284,89 @@ 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::Entry (entry) object.
+    # @param           method  method to look up in section
+    # @return [Object]         a Preferences::Section::Key (entry) object
     #
 
     def method_missing(method)
       method = method.to_s
-      
+
       if _keys.any? { |k| k.method == method }
         _keys.find { |k| k.method == method }
-      else
-        _keys << Entry.new(self, method)
-        _keys.last
       end
     end
 
-    #
-    # Returns the value of an entry in a section.  Note that it's not
-    # possible to retrieve the value for sections.
-    #
-    # @return [String] Value of the entry.
-    #
-
-    def value
-      raise OperaWatir::Exceptions::PreferencesException, 'Sections do not have values' if section?
-      @value ||= driver.getPref(parent.key, key)
-    end
-
-    #
-    # Sets the entry's value to the specified string.  Note that it's
-    # not possible to set a section's value.
-    #
-    # @param [String] value  Value you wish to set for the entry.
-    #
+  private
 
-    def value=(value)
-      raise OperaWatir::Exceptions::PreferencesException, 'Sections cannot have values' if section?
-      value = value.truthy? ? '1' : '0' if type.include?('Boolean')
-      driver.setPref parent.key, key, value.to_s
-      @value = value
+    def _keys
+      @_keys
     end
 
-    #
-    # Returns entry's default value.  Note that it's not possible to
-    # return a section's default value.
-    #
-    # @return [String]       The default value of the entry.
-    #
+    class Key
+      extend Forwardable
+      include Enumerable
 
-    def default
-      raise OperaWatir::Exceptions::PreferencesException, 'Sections do not have defaults' if section?
-      @default ||= driver.getDefaultPref parent.key, key
-    end
+      attr_accessor :parent, :driver, :method, :key, :type, :value
 
-    #
-    # Returns and sets the default value of the entry.  Note that it's
-    # not possible to return and set a section's default value.
-    #
-    # @return [String]       The default value of the entry.
-    #
+      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 default!
-      self.value=(default)  # WTF?  Bug in Ruby?
-    end
+        raw_data =~ /^type: ([A-Z]+)$/
+        self.type = $1.to_s.capitalize
 
-    #
-    # Is the current node a section?
-    #
-    # @return [Boolean]      True/false based on whether you're
-    #                        interacting with a section or entry.
-    #
+        raw_data =~ /^value: \"(.*)\"$/
+        @value = $1.to_s
 
-    def section?
-      parent.kind_of? OperaWatir::Preferences
-    end
+        # Ruby doesn't support attr_accessor's with question mark in their
+        # name.
+        raw_data =~ /^enabled: (true|false)$/
+        @enabled = $1.truthy?
+      end
 
-    #
-    # Does this entry/section exist?
-    #
-    # @return [Boolean]      True/false based on whether the method you
-    #                        are attempting to access exists as a
-    #                        preference entry/section.
-    #
+      #
+      # Whether the current key entry is enabled inside Opera or not.
+      #
+      # @return [Boolean] true if enabled, false if otherwise
+      #
 
-    def exists?
-      section? ? SECTIONS.include?(key) : !type.empty?
-    end
+      def enabled?
+        !!@enabled
+      end
 
-    alias_method :exist?, :exists?  # LOL Ruby
+      #
+      # Sets the key's value to the specified string.
+      #
+      # @param [String] value  the value you wish to set for the key
+      #
 
-    def each
-      return unless block_given?
-      _keys.each { |k| yield k }
-    end
+      def value=(value)
+        value = value.truthy? ? '1' : '0' if type.include?('Boolean')
+        driver.setPref parent.key, key, value.to_s
+        @value = value
+      end
 
-    def_delegators :_keys, :[],
-                           :length,
-                           :size,
-                           :first,
-                           :last,
-                           :empty?
+      #
+      # Returns key's default value.
+      #
+      # @return [String] the default value of the key
+      #
 
-  private
+      def default
+        @default ||= driver.getDefaultPref parent.key, key
+      end
 
-    def _keys
-      raise OperaWatir::Exceptions::PreferencesException, 'Keys are not iteratable objects' if not section?
-      @_keys ||= all_keys
-    end
+      #
+      # Returns and sets the default value of the key.
+      #
+      # @return [String] the default value of the key
+      #
 
-    def all_keys
-      return if not section?
-      keys = []
-
-      driver.listPrefs(true, key).to_a.each do |p|
-        p = p.to_s
-        
-        p =~ /^key: \"([a-zA-Z0-9\(\)\\\.\-\s]*)\"$/
-        key = $1.to_s.gsub(/^\\t/, "\t")  # Workaround for double-encoded tabs:
-                                          # We get \\t, but it only accepts \t.
-        
-        p =~ /^type: ([A-Z]+)$/
-        type = $1.to_s.capitalize
-
-        next if key.empty?  # “Opera Widgets/Unite Style File” is bugged, workaround.
-        keys << Entry.new(self, key.methodize, key, type)
+      def default!
+        self.value=(default)
       end
-
-      keys
     end
-
   end
 
 end