safariwatir 0.2.6 → 0.2.8

data/safariwatir.rb

@@ -13,12 +13,35 @@ module Watir
     def text
       @scripter.document_text
     end
+
+    def title
+      @scripter.document_title
+    end
   end
 
   module Container
     attr_reader :scripter
     private :scripter
 
+    DEFAULT_TYPING_LAG = 0.08
+
+    def set_fast_speed
+      @scripter.typing_lag = 0
+    end
+    
+    def set_slow_speed
+      @scripter.typing_lag = DEFAULT_TYPING_LAG
+    end
+    
+    def speed=(how_fast)
+      case how_fast
+      when :fast : set_fast_speed
+      when :slow : set_slow_speed
+      else
+        raise ArgumentError, "Invalid speed: #{how_fast}"
+      end
+    end
+
     module Clickable
       def click
         @scripter.highlight(self) do
@@ -71,30 +94,23 @@ module Watir
       end
 
       def operate(&block)
-        send("operate_by_" + how.to_s, &block)
+        scripter_suffix = OPERATIONS[how]
+        if scripter_suffix.nil?
+          raise "SafariWatir does not currently support finding by #{how}"
+        end
+        @scripter.send("operate_by_#{scripter_suffix}", self, &block)        
       end
 
-      protected
-      
-      def operate_by_id(&block)
-        @scripter.operate_by_id(self, &block)        
-      end
-      def operate_by_index(&block)
-        @scripter.operate_by_index(self, &block)        
-      end
-      def operate_by_name(&block)
-        @scripter.operate_by_name(self, &block)        
-      end
-      def operate_by_text(&block)
-        @scripter.operate_on_link(self, &block)        
-      end
-      def operate_by_url(&block)
-        @scripter.operate_on_link(self, &block)        
-      end
-      def operate_by_value(&block)
-        @scripter.operate_by_input_value(self, &block)
-      end
-      alias_method :operate_by_caption, :operate_by_value
+      OPERATIONS = {
+        :id => "id",
+        :index => "index",
+        :class => "class",
+        :name => "name",
+        :text => "on_link",
+        :url => "on_link",
+        :value => "input_value",
+        :caption => "input_value"
+      }
     end
 
     class Form < HtmlElement
@@ -124,6 +140,10 @@ module Watir
       include Clickable
       include Container
 
+      def html
+        @scripter.get_html_for(self)
+      end
+
       def text
         @scripter.get_text_for(self)
       end
@@ -205,6 +225,22 @@ module Watir
         Option.new(@scripter, self, how, what)
       end
       
+      def selected_values
+        values = []
+        index = 1
+        loop do
+          option = option(:index, index)
+          break unless option.exists?
+          values << option if option.selected?
+          index += 1
+        end
+        values.map {|o| o.text } #TODO?
+      end
+
+      def selected_value
+        selected_values.first
+      end
+      
       def speak
         @scripter.speak_options_for(self)
       end
@@ -230,6 +266,14 @@ module Watir
       end
       alias :exist? :exists?
       
+      def selected?
+        @scripter.option_selected?(self)
+      end
+      
+      def text
+        @scripter.get_text_for(self)
+      end
+
       def tag; "OPTION"; end
     end
 
@@ -288,6 +332,8 @@ module Watir
     class TableCell < ContentElement
       def initialize(scripter, how, what, row = nil)
         @scripter = scripter.for_table(self)
+        set_slow_speed # TODO: Need to inherit this somehow
+
         @how = how
         @what = what
         @row = row
@@ -416,8 +462,6 @@ module Watir
     include Container
     include PageContainer
 
-    DEFAULT_TYPING_LAG = 0.08
-
     def self.start(url = nil)
       safari = new
       safari.goto(url) if url
@@ -429,23 +473,6 @@ module Watir
       @scripter.ensure_window_ready
       set_slow_speed
     end
-
-    def set_fast_speed
-      @scripter.typing_lag = 0
-    end
-    
-    def set_slow_speed
-      @scripter.typing_lag = DEFAULT_TYPING_LAG
-    end
-    
-    def speed=(how_fast)
-      case how_fast
-      when :fast : set_fast_speed
-      when :slow : set_slow_speed
-      else
-        raise ArgumentError, "Invalid speed: #{how_fast}"
-      end
-    end    
     
     def close
       scripter.close

data/safariwatir/scripter.rb

@@ -120,6 +120,10 @@ if (element) {
       execute(element.operate { %|return element.innerText| }, element)
     end
 
+    def get_html_for(element = @element)
+      execute(element.operate { %|return element.innerHTML| }, element)
+    end
+
     def operate_by_table_cell(element = @element)      
 %|var element = document;
 if (element == undefined) {
@@ -137,7 +141,11 @@ if (element == undefined) {
     end
 
     def document_html
-      execute(%|return document.getElementsByTagName('BODY').item(0).outerHTML;|)
+      execute(%|return document.all[0].outerHTML;|)
+    end
+
+    def document_title
+      execute(%|return document.title;|)
     end
   
     def focus(element)
@@ -196,11 +204,10 @@ if (selected == -1) {
       element_exists?(element) { handle_option(element) }
     end
     
-    def handle_option(select_list, selection = nil)
+    def handle_option(select_list)
 %|var option_found = false;
 for (var i = 0; i < element.options.length; i++) {
   if (element.options[i].#{select_list.how} == '#{select_list.what}') {
-    #{selection}
     option_found = true;
   }
 }
@@ -209,6 +216,21 @@ if (!option_found) {
 }|      
     end
     private :handle_option
+
+    def option_selected?(element = @element)
+      element_exists?(element) { handle_selected(element) == "true" }
+    end
+
+    def handle_selected(select_list)
+%|var selected = false;
+for (var i = 0; i < element.options.length; i++) {
+  if (element.options[i].#{select_list.how} == '#{select_list.what}' && element.options[i].selected) {
+    selected = true;
+  }
+}
+return selected;|      
+    end
+    private :handle_option
     
     def clear_text_input(element = @element)
       execute(element.operate { %|element.value = '';| }, element)
@@ -342,6 +364,12 @@ for (var i = 0; i < elements.length; i++) {
   }
 }|, yield)
     end
+
+    def operate_by_class(element)
+      js.operate(%|
+var elements = document.getElementsByClassName('#{element.what}');
+var element = elements[0];|, yield)
+    end
     
     # Checkboxes/Radios have the same name, different values    
     def handle_form_element_name_match(element)

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: safariwatir
 version: !ruby/object:Gem::Version 
-  version: 0.2.6
+  version: 0.2.8
 platform: ruby
 authors: 
 - Dave Hoover
-autorequire: safariwatir
+autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2008-01-11 00:00:00 -06:00
+date: 2008-08-17 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -35,7 +35,7 @@ files:
 - safariwatir/core_ext.rb
 - safariwatir/scripter.rb
 - watir/exceptions.rb
-has_rdoc: false
+has_rdoc: true
 homepage: http://safariwatir.rubyforge.org/
 post_install_message: 
 rdoc_options: []
@@ -58,7 +58,7 @@ requirements:
 - Mac OS X running Safari
 - Some features require you to turn on "Enable access for assistive devices" in System Preferences > Universal Access
 rubyforge_project: safariwatir
-rubygems_version: 1.0.0
+rubygems_version: 1.1.1
 signing_key: 
 specification_version: 2
 summary: Automated testing tool for web applications.