operawatir 0.3-jruby → 0.3.2-jruby

data/Gemfile

@@ -1,9 +1,13 @@
 source :rubygems
-#gemspec
 
 group :development do
   gem "bundler", "~> 1.0.0"
   gem "jeweler", "~> 1.5.1"
   gem "rcov", ">= 0"
+  gem "yard", ">= 0.6.3"
+  gem "bluecloth", "= 1.0.1"
+  gem "rspec", ">= 2.4"
+  gem "sinatra", ">= 1.0.0"
+  gem "mongrel", ">= 1.1.5"
+  gem "rr", ">= 1.0.2"
 end
-

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2010 Opera Software ASA
+Copyright (c) 2010-2011 Opera Software ASA
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without

data/Rakefile

@@ -2,7 +2,7 @@
 require 'rake/clean'
 require 'jeweler'
 require 'rspec/core/rake_task'
-require 'yard/rake/yardoc_task'
+require 'yard'
 
 require './lib/operawatir/version'
 
@@ -26,11 +26,12 @@ EOF
 
   gem.rubyforge_project = gem.name
 
-  gem.platform         = 'jruby'
-  gem.has_rdoc         = true
-  gem.extra_rdoc_files = ['README.md']
+  gem.platform              = 'jruby'
+  gem.required_ruby_version = '>= 1.8.7'
+  gem.has_rdoc              = true
+  gem.extra_rdoc_files      = ['README.md']
 
-  gem.add_dependency 'rspec', '>= 2'
+  gem.add_dependency 'rspec', '>= 2.4'
 
   gem.add_development_dependency 'jeweler'
   gem.add_development_dependency 'rake'
@@ -40,9 +41,7 @@ EOF
   gem.add_development_dependency 'rr'
 
   gem.files.exclude '.gitignore'
-  gem.files.exclude 'bin/desktopwatir'
-  gem.files.exclude 'lib/operawatir/desktop*.rb'
-  gem.files.exclude 'lib/operawatir/quickwidgets'
+  gem.files.exclude '.gitmodules'
 end
 
 CLEAN.add 'pkg'

data/VERSION

@@ -1 +1 @@
-0.3
+0.3.2

data/bin/desktopwatir

@@ -8,6 +8,9 @@ require 'rbconfig'
 require 'rspec'
 require 'operawatir'
 
+# Encoding fix
+$KCODE = "UTF8"
+
 class Options
 
   def self.parse(args)

data/bin/operawatir

@@ -10,7 +10,7 @@ require 'operawatir/helper'
   :ng            => false,
   :color_enabled => Config::CONFIG['host_os'] =~ /mswin|mingw|bccwin|wince|emx/ ? false : true,
   :check_syntax  => false,
-  :formatter     => 'progress'
+  :format        => 'progress'
 }
 
 # TODO
@@ -53,7 +53,7 @@ EOS
     #        'own JVM') do |ng|
     #  @options[:ng] = ng
     #end
-  
+
     opts.on('-f', '--format=FORMAT',
             'Specify RSpec output formatter (documentation, html, ',
             'progress (default), textmate)') do |formatter|

data/lib/operawatir.rb

@@ -19,22 +19,28 @@ $KCODE = 'u'  # UTF-8 support
 # TODO This should be replaced when we decide upon a better way of
 # enabling the Watir 2 API.
 module OperaWatir
-  @shiny = false
+  @current_api = 1
 
-  # Activates the Watir 2 API.
-  def self.newandshinyplease!
-    @shiny = true
+  # Set the API version you wish to use.  Please note that setting
+  # this after OperaWatir::Browser has been initialized will have no
+  # affect.
+  #
+  # @param number [Integer] API version to use
+  def self.api=(number)
+    @current_api = number.to_i
   end
 
-  # Queries whether the Watir 2 API is enabled.
+  # Queries which API to use.
   #
-  # @return [Boolean] whether or not Watir 2 API is enabled.
-  def self.newandshinyplease?
-    @shiny
+  # @return [Integer] Desired API version
+  def self.api
+    @current_api
   end
 end
 
 require 'operawatir/version'
+require 'operawatir/platform'
+require 'operawatir/keys'
 
 require 'operawatir/exceptions'
 require 'operawatir/selector'

data/lib/operawatir/browser.rb

@@ -4,10 +4,10 @@ class OperaWatir::Browser
   attr_accessor :driver, :active_window
 
   def self.settings=(settings={})
-    @opera_driver_settings = nil # Bust cache
-    @settings = settings.merge! :launcher => ENV['OPERA_LAUNCHER'] || '',
-                                :path     => ENV['OPERA_PATH'] || '',
-                                :args     => ENV['OPERA_ARGS'] || ''
+    @opera_driver_settings = nil  # Bust cache
+    @settings = settings.merge! :launcher => OperaWatir::Platform.launcher,
+                                :path     => OperaWatir::Platform.opera,
+                                :args     => OperaWatir::Platform.args
   end
 
   def self.settings
@@ -15,7 +15,7 @@ class OperaWatir::Browser
   end
 
   def initialize
-    OperaWatir.compatibility! unless OperaWatir.newandshinyplease?
+    OperaWatir.compatibility! unless OperaWatir.api >= 2
 
     self.driver = OperaDriver.new(self.class.opera_driver_settings)
     self.active_window = OperaWatir::Window.new(self)
@@ -62,6 +62,48 @@ class OperaWatir::Browser
     driver.closeAll
   end
 
+  # Accesses the keys API in OperaWatir::Keys.
+  def keys
+    OperaWatir::Keys.new(self)
+  end
+
+  # Set preference pref in prefs section prefs_section to value
+  # specified.
+  #
+  # TODO: This needs to be moved to a separate preference section.
+  #
+  # @param [String] prefs_section The prefs section the pref belongs to
+  # @param [String] pref          The preference to set
+  # @param [String] value         The value to set the preference to
+  def set_preference(prefs_section, pref, value)
+    @driver.setPref(prefs_section, pref, value.to_s)
+  end
+      
+  # Get value of preference pref in prefs section prefs_section.
+  #
+  # TODO: This needs to be moved to a separate preference section.
+  #
+  # @param [String] prefs_section The prefs section the pref belongs to
+  # @param [String] pref          The preference to get
+  #
+  # @return [String] The value of the preference
+  def get_preference(prefs_section, pref)
+    @driver.getPref(prefs_section, pref)
+  end
+    
+  # Get default value of preference pref in prefs section
+  # prefs_section.
+  #
+  # TODO: This needs to be moved to a separate preference section.
+  #
+  # @param [String] prefs_section The prefs section the pref belongs to
+  # @param [String] pref          The preference to get
+  #
+  # @return [String] The value of the preference
+  def get_default_preference(prefs_section, pref)
+    @driver.getDefaultPref(prefs_section, pref)
+  end
+
   # Get the version number of the driver.  This _is not_ the same as
   # the version number for OperaWatir, which can be retrieved using
   # +OperaWatir.version+ instead.
@@ -114,38 +156,7 @@ class OperaWatir::Browser
   # @return [Boolean] true if browser attached is of type desktop,
   #   false otherwise
   def desktop?
-    false
-  end
-
-  # Send key events to the browser instance.  I.e. “Down” (arrow
-  # down), “Space” (space key), “Home”, &c.
-  #
-  # @param [String] key to be pressed once
-  def key(key)
-    @driver.key(key)
-  end
-
-  # Enables you to hold down a key, i.e. “Ctrl”, “Alt”, “Shift”, &c.
-  # Remember to release the keys afterwards with the key_up method.
-  #
-  # @param [String] key to be pressed down
-  def key_down(key)
-    @driver.keyDown(key)
-  end
-
-  # Releases a held down key.
-  #
-  # @param [String] key to be lifted
-  def key_up(key)
-    @driver.keyUp(key)
-  end
-
-  # Types given text directly in to the browser.  The text will be
-  # inputted to the page depending on where the focus is.
-  #
-  # @param [String] text to be typed
-  def type(text)
-    @driver.type(text)
+    false  # FIXME
   end
 
   # Sends an Opera action to the browser.
@@ -174,7 +185,7 @@ private
       s.setRunOperaLauncherFromOperaDriver true
       s.setOperaLauncherBinary self.settings[:launcher]
       s.setOperaBinaryLocation self.settings[:path]
-      s.setOperaBinaryArguments self.settings[:args] + (Config::CONFIG['host_os'] =~ /mswin|mingw|bccwin|wince|emc/ ? '' : ' -nosession') + ' opera:debug'
+      s.setOperaBinaryArguments self.settings[:args] + ' -watirtest'
     }
   end
 

data/lib/operawatir/compat/collection.rb

@@ -96,4 +96,10 @@ class OperaWatir::Collection
     end.join("\n")
   end
 
+private
+
+  def map_or_return(&blk)
+    blk.call(raw_elements.first)
+  end
+
 end

data/lib/operawatir/compat/element.rb

@@ -89,7 +89,7 @@ class OperaWatir::Element
   # Clears a text input or textarea of any text.
   def clear
     assert_enabled!
-    node.clear
+    uncheck!
   end
 
   # If passed a value it will type text into the element, otherwise it
@@ -100,7 +100,8 @@ class OperaWatir::Element
     if value
       self.text = value
     else
-      check!
+      assert_enabled
+      click!
     end
   end
 
@@ -137,6 +138,8 @@ class OperaWatir::Element
     end
   end
 
+  alias_method :set?, :checked?
+
   # For `<select>` elements returns either 'select-one' for
   # `<select>`s where only a single `<option>` can be selected, or
   # 'select-multiple' otherwise.  For non-`<select>` elements returns

data/lib/operawatir/compat/element_finders.rb

@@ -37,6 +37,8 @@ module OperaWatir::Compat::ElementFinders
   def_element :checkbox, :checkboxes, :how => :name do |selector|
     selector.tag(:input).attribute :type => 'checkbox'
   end
+  # Override checkbox method to allow (:name, <name>, <value>) selectors
+  # see line 113
 
   def_element :dd, :dds
 
@@ -105,6 +107,23 @@ module OperaWatir::Compat::ElementFinders
     selector.tag(:input).attribute :type => 'radio'
   end
 
+  # Override checbox and radio methods to allow (:name, <name>, <value>)
+  # selectors
+  [:checkbox, :radio].each do |tag|
+    define_method tag do |*args|
+      c = OperaWatir::Collection.new(self)
+      c.selector.tag(:input).attribute(:type => tag.to_s)
+
+      if args.length == 3 and args[0] == :name
+        c.selector.attribute(:name => args[1]).attribute(:value => args[2])
+      else
+        c.add_selector_from_arguments args, :name
+      end
+
+      return c
+    end
+  end
+
   def_element :select_list, :select_lists do |selector|
     selector.tag :select
   end

data/lib/operawatir/desktop-waiter.rb

@@ -0,0 +1,144 @@
+# -*- coding: utf-8 -*-
+
+require 'rspec'
+require 'rbconfig'
+require 'ostruct'
+
+class Object
+  def truthy?
+
+    # FIXME: Should we not check for truthfulness instead, and presume
+    # that anything else passed to be false?  Below we are doing the
+    # opposite.
+    #self && !['false', 'no', 'n', '0', 0].include?(self)
+
+    self && [true, 'true', 'yes', 'y', '1', 1].include?(self)
+  end
+end
+
+
+module OperaWatir::Waiter
+  extend self
+
+  def self.default_attr_accessor(attr, default)
+    define_method attr.to_sym do
+      default || instance_variable_get("@#{attr}") || ENV["OPERA_#{attr.to_s.upcase}"]
+    end
+    attr_writer attr.to_sym
+  end
+
+  def defaults
+    configure do |c|
+      c.path          = nil
+      c.args          = ''
+      c.files         = "file://localhost/#{File.expand_path('interactive', File.dirname(RSpec.configuration.files_to_run[0]))}"
+      c.inspectr      = false
+      c.terminal_size = [80,24]
+    end
+  end
+
+  def configure(*args, &block)
+    HelperConfig.block_to_hash(block).each do |setting, value|
+      default_attr_accessor setting, value
+    end
+  end
+
+  class HelperConfig < OpenStruct
+    def self.block_to_hash(block=nil)
+      config = self.new
+      if block
+        block.call(config)
+        config.to_hash
+      else
+        {}
+      end
+    end
+    
+    def to_hash
+      @table
+    end
+  end
+
+  defaults
+
+  def browser
+    @browser ||= OperaWatir::DesktopBrowser.new(path, *args.split(' ').to_java(:string))
+  end
+  
+  def helper_file
+    File.expand_path(File.join(Dir.pwd, 'helper.rb'))
+  end
+
+  def configure_rspec
+    RSpec.configure do |config|
+      config.include SpecHelpers
+
+      config.after(:suite) do
+        # Only exit if the envrionment variable is set
+        if ENV["OPERA_PATH"].to_s.length > 0
+          OperaWatir::Waiter.browser.quit
+        else
+          # Just shutsdown the driver
+          OperaWatir::Waiter.browser.quit_driver
+        end
+      end
+      config.before(:all) do
+        #set_prefs
+      end
+      config.after(:all) do
+        #delete_prefs
+      end
+    end
+  end
+  
+  def inspectr_path
+    File.join File.expand_path('../../../utils', __FILE__),
+              (Config::CONFIG['host_os'] =~ /mswin|msys|mingw32/ ? 'inspectr.exe' : 'inspectr')
+  end
+  
+  def spawn_inspectr
+    abort 'operawatir: inspectr is not supported on your operating system' unless Config::CONFIG['host_os'] =~ /linux/
+    abort 'operawatir: Unable to locate inspectr executable' unless File.exist?(inspectr_path)
+    
+    Thread.new do
+      puts "Attaching inspectr to PID ##{browser.pid}"
+      exec inspectr_path, browser.pid.to_s
+    end
+  end
+  
+  def run!
+    require helper_file if File.exist?(helper_file)
+    spawn_inspectr if inspectr.truthy?
+    configure_rspec
+    RSpec::Core::Runner.autorun
+  end
+
+  
+  # Helpers included for each Spec
+  
+  module SpecHelpers
+    def browser
+      OperaWatir::Waiter.browser
+    end
+
+    # TODO Not sure of this
+    def files(new_path=nil)
+      if new_path
+        OperaWatir::Waiter.files = new_path
+      else
+        OperaWatir::Waiter.files
+      end
+    end
+    alias_method :files=, :files
+  end
+end
+
+# Overriding trapping in RSpec.
+module RSpec
+  module Core
+    class Runner
+      def self.trap_interrupt; end
+    end
+  end
+end
+