watir-webdriver 0.2.1 → 0.2.2

data/lib/watir-webdriver/attribute_helper.rb

@@ -52,6 +52,8 @@ module Watir
         define_boolean_attribute(method_name, attribute_name)
       when :int
         define_int_attribute(method_name, attribute_name)
+      when :float
+        define_float_attribute(method_name, attribute_name)
       else
         # $stderr.puts "treating #{type.inspect} as string for now"
       end
@@ -79,6 +81,14 @@ module Watir
       end
     end
 
+    def define_float_attribute(mname, aname)
+      define_method mname do
+        assert_exists
+        value = @element.attribute(aname)
+        value && Float(value)
+      end
+    end
+
     def add_attributes(attributes)
       attributes.each do |type, attr_list|
         typed_attributes[type] += attr_list

data/lib/watir-webdriver/elements/element.rb

@@ -101,7 +101,7 @@ module Watir
       assert_exists
 
       begin
-        @element.value || ''
+        @element.attribute('value') || ''
       rescue WebDriver::Error::InvalidElementStateError
         ""
       end

data/lib/watir-webdriver/elements/file_field.rb

@@ -24,23 +24,6 @@ module Watir
       path = path.gsub(File::SEPARATOR, File::ALT_SEPARATOR) if File::ALT_SEPARATOR
       @element.send_keys path
     end
-
-    #
-    # Return the value of this field
-    #
-    # In IE, the path returned depends on the "Include local directory path
-    # when uploading files to a server" security setting:
-    #
-    # @see http://msdn.microsoft.com/en-us/library/ms535128(VS.85).aspx
-    #
-    # @return [String]
-    #
-
-    def value
-      # since 'value' is an attribute on input fields, we override this here
-      assert_exists
-      @element.value
-    end
   end
 
   module Container

data/lib/watir-webdriver/elements/image.rb

@@ -28,17 +28,17 @@ module Watir
 
     def file_created_date
       assert_exists
-      raise NotImplementedError
+      raise NotImplementedError, "not currently supported by WebDriver"
     end
 
     def file_size
       assert_exists
-      raise NotImplementedError
+      raise NotImplementedError, "not currently supported by WebDriver"
     end
 
     def save(path)
       assert_exists
-      raise NotImplementedError
+      raise NotImplementedError, "not currently supported by WebDriver"
     end
 
   end # Image

data/lib/watir-webdriver/elements/text_field.rb

@@ -38,16 +38,6 @@ module Watir
       @element.clear
     end
 
-    #
-    # Returns the text in the text field.
-    #
-
-    def value
-      # since 'value' is an attribute on input fields, we override this here
-      assert_exists
-      @element.value
-    end
-
     private
 
     def locate

data/lib/watir-webdriver/version.rb

@@ -1,3 +1,3 @@
 module Watir
-  VERSION = "0.2.1"
+  VERSION = "0.2.2"
 end

data/lib/watir-webdriver/window_switching.rb

@@ -7,7 +7,7 @@ module Watir
       if args.empty?
         all
       else
-        filter_windows(args, all, :select)
+        filter_windows extract_selector(args), all
       end
     end
 
@@ -21,15 +21,13 @@ module Watir
 
     private
 
-    def filter_windows(args, all, method)
-      sel = extract_selector(args)
-
-      unless sel.keys.all? { |k| [:title, :url].include? k }
-        raise ArgumentError, "invalid window selector: #{sel.inspect}"
+    def filter_windows(selector, windows)
+      unless selector.keys.all? { |k| [:title, :url].include? k }
+        raise ArgumentError, "invalid window selector: #{selector.inspect}"
       end
 
-      all.send(method) do |win|
-        sel.all? { |key, value| value === win.send(key) }
+      windows.select do |win|
+        selector.all? { |key, value| value === win.send(key) }
       end
     end
   end # WindowSwitching
@@ -46,7 +44,7 @@ module Watir
       elsif selector.has_key? :handle
         @handle = selector.delete :handle
       else
-        unless selector.keys.all? { |k| [:title, :url].include? k }
+        unless selector.keys.all? { |k| [:title, :url, :index].include? k }
           raise ArgumentError, "invalid window selector: #{selector.inspect}"
         end
       end
@@ -115,9 +113,11 @@ module Watir
     end
 
     def locate
-      handle = @driver.window_handles.find { |handle|
-        matches?(handle)
-      }
+      handle = if @selector.has_key?(:index)
+                  @driver.window_handles[Integer(@selector[:index])]
+                else
+                  @driver.window_handles.find { |handle| matches?(handle) }
+                end
 
       handle or raise Exception::NoMatchingWindowFoundException, @selector.inspect
     end

metadata

@@ -2,7 +2,7 @@
 name: watir-webdriver
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors: 
 - Jari Bakken
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-21 00:00:00 +01:00
+date: 2011-04-04 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency