druid-ts 1.1.4 → 1.1.5

data/lib/druid/assist.rb

@@ -402,6 +402,69 @@ module Druid
       find_elements("labels(identifier)", Elements::Label, identifier, 'p')
     end
 
+    #
+    # method to click on an area
+    #
+    def click_area_for(identifier)
+      process_call("area(identifier).click", Elements::Area, identifier, nil, 'area')
+    end
+
+    #
+    # method to retrieve an area element
+    #
+    def area_for(identifier)
+      find_element("area(identifier)", Elements::Area, identifier, 'area')
+    end
+
+    #
+    # method to retrieve an array of area elements
+    #
+    def areas_for(identifier)
+      find_elements("areas(identifier)", Elements::Area, identifier, 'area')
+    end
+
+    #
+    # method to retrieve a canvas element
+    #
+    def canvas_for(identifier)
+      find_element("canvas(identifier)", Elements::Canvas, identifier, 'canvas')
+    end
+
+    #
+    # method to retrieve an array of canvas elements
+    #
+    def canvases_for(identifier)
+      find_elements("canvases(identifier)", Elements::Canvas, identifier, 'canvas')
+    end
+
+    #
+    # method to retrieve an audio element
+    #
+    def audio_for(identifier)
+      find_element("audio(identifier)", Elements::Audio, identifier, 'audio')
+    end
+
+    #
+    # method to retrieve an array of audio elements
+    #
+    def audios_for(identifier)
+      find_elements("audios(identifier)", Elements::Audio, identifier, 'audio')
+    end
+
+    #
+    # method to retrieve an video element
+    #
+    def video_for(identifier)
+      find_element("video(identifier)", Elements::Video, identifier, 'video')
+    end
+
+    #
+    # method to retrieve an array of audio elements
+    #
+    def videos_for(identifier)
+      find_elements("videos(identifier)", Elements::Video, identifier, 'video')
+    end
+
     def element_for(tag, identifier)
       find_element("#{tag.to_s}(identifier)", Elements::Element, identifier, tag.to_s)
     end

data/lib/druid/element_locators.rb

@@ -899,6 +899,132 @@ module Druid
       labels_for identifier.clone
     end
 
+    #
+    # Finds an area
+    #
+    # @param [Hash] identifier how we find an area. You can use a multiple parameters
+    #   by combining of any of the following except xpath.  It defaults to {:index => 0}
+    #   which will return the first file field.  The valid keys are:
+    #   * :class
+    #   * :id
+    #   * :index
+    #   * :name
+    #   * :xpath
+    #
+    def area_element(identifier={:index => 0})
+      area_for(identifier.clone)
+    end
+
+    #
+    # Finds all areas that matches the provided identifier
+    #
+    # @param [Hash] identifier how we find an area. You can use a multiple parameters
+    #   by combining of any of the following except xpath.  It defaults to empty hash
+    #   which will return all file fields.  The valid keys are:
+    #   * :class
+    #   * :id
+    #   * :index
+    #   * :name
+    #   * :xpath
+    #
+    def area_elements(identifier={})
+      areas_for(identifier.clone)
+    end
+
+    #
+    # Finds an canvas
+    #
+    # @param [Hash] identifier how we find an canvas. You can use a multiple parameters
+    #   by combining of any of the following except xpath.  It defaults to {:index => 0}
+    #   which will return the first file field.  The valid keys are:
+    #   * :class
+    #   * :id
+    #   * :index
+    #   * :name
+    #   * :xpath
+    #
+    def canvas_element(identifier={:index => 0})
+      canvas_for(identifier.clone)
+    end
+
+    #
+    # Finds all canvases that matches the provided identifier
+    #
+    # @param [Hash] identifier how we find an canvas. You can use a multiple parameters
+    #   by combining of any of the following except xpath.  It defaults to empty hash
+    #   which will return all file fields.  The valid keys are:
+    #   * :class
+    #   * :id
+    #   * :index
+    #   * :name
+    #   * :xpath
+    #
+    def canvas_elements(identifier={})
+      canvases_for(identifier.clone)
+    end
+
+    #
+    # Finds an audio element
+    #
+    # @param [Hash] identifier how we find an audio. You can use a multiple parameters
+    #   by combining of any of the following except xpath.  It defaults to {:index => 0}
+    #   which will return the first file field.  The valid keys are:
+    #   * :class
+    #   * :id
+    #   * :index
+    #   * :name
+    #   * :xpath
+    #
+    def audio_element(identifier={:index => 0})
+      audio_for(identifier.clone)
+    end
+
+    #
+    # Finds all audios that matches the provided identifier
+    #
+    # @param [Hash] identifier how we find an audio. You can use a multiple parameters
+    #   by combining of any of the following except xpath.  It defaults to empty hash
+    #   which will return all file fields.  The valid keys are:
+    #   * :class
+    #   * :id
+    #   * :index
+    #   * :name
+    #   * :xpath
+    #
+    def audio_elements(identifier={})
+      audios_for(identifier.clone)
+    end
+    #
+    # Finds an video element
+    #
+    # @param [Hash] identifier how we find an video. You can use a multiple parameters
+    #   by combining of any of the following except xpath.  It defaults to {:index => 0}
+    #   which will return the first file field.  The valid keys are:
+    #   * :class
+    #   * :id
+    #   * :index
+    #   * :name
+    #   * :xpath
+    #
+    def video_element(identifier={:index => 0})
+      video_for(identifier.clone)
+    end
+
+    #
+    # Finds all videos that matches the provided identifier
+    #
+    # @param [Hash] identifier how we find an video. You can use a multiple parameters
+    #   by combining of any of the following except xpath.  It defaults to empty hash
+    #   which will return all file fields.  The valid keys are:
+    #   * :class
+    #   * :id
+    #   * :index
+    #   * :name
+    #   * :xpath
+    #
+    def video_elements(identifier={})
+      videos_for(identifier.clone)
+    end
     #
     # Finds an element
     #

data/lib/druid/elements.rb

@@ -22,27 +22,32 @@ module Druid
   end
 end
 
-require 'druid/elements/element.rb'
-require 'druid/elements/ordered_list.rb'
-require 'druid/elements/unordered_list.rb'
-require 'druid/elements/table.rb'
-require 'druid/elements/table_row.rb'
-require 'druid/elements/select_list.rb'
-require 'druid/elements/link.rb'
-require 'druid/elements/button.rb'
-require 'druid/elements/check_box.rb'
-require 'druid/elements/radio_button.rb'
-require 'druid/elements/text_field.rb'
-require 'druid/elements/div.rb'
-require 'druid/elements/table_cell.rb'
-require 'druid/elements/image.rb'
-require 'druid/elements/span.rb'
-require 'druid/elements/hidden_field.rb'
-require 'druid/elements/list_item.rb'
-require 'druid/elements/text_area.rb'
-require 'druid/elements/form.rb'
-require 'druid/elements/option.rb'
-require 'druid/elements/heading.rb'
-require 'druid/elements/paragraph.rb'
-require 'druid/elements/file_field.rb'
-require 'druid/elements/label.rb'
+require 'druid/elements/element'
+require 'druid/elements/ordered_list'
+require 'druid/elements/unordered_list'
+require 'druid/elements/table'
+require 'druid/elements/table_row'
+require 'druid/elements/select_list'
+require 'druid/elements/link'
+require 'druid/elements/button'
+require 'druid/elements/check_box'
+require 'druid/elements/radio_button'
+require 'druid/elements/text_field'
+require 'druid/elements/div'
+require 'druid/elements/table_cell'
+require 'druid/elements/image'
+require 'druid/elements/span'
+require 'druid/elements/hidden_field'
+require 'druid/elements/list_item'
+require 'druid/elements/text_area'
+require 'druid/elements/form'
+require 'druid/elements/option'
+require 'druid/elements/heading'
+require 'druid/elements/paragraph'
+require 'druid/elements/file_field'
+require 'druid/elements/label'
+require 'druid/elements/area'
+require 'druid/elements/canvas'
+require 'druid/elements/media'
+require 'druid/elements/audio'
+require 'druid/elements/video'

data/lib/druid/elements/area.rb

@@ -0,0 +1,29 @@
+module Druid
+  module Elements
+    class Area < Element
+
+      #
+      # Return the coordinates of the area
+      #
+      def coords
+        attribute(:coords)
+      end
+
+      #
+      # Return the shape of the area
+      #
+      def shape
+        attribute(:shape)
+      end
+
+      #
+      # Return the href of the area
+      #
+      def href
+        attribute(:href)
+      end
+    end
+
+    Druid::Elements.type_to_class[:area] = Druid::Elements::Area
+  end
+end

data/lib/druid/elements/audio.rb

@@ -0,0 +1,9 @@
+module Druid
+  module Elements
+    class Audio < Media
+
+    end
+
+    Druid::Elements.type_to_class[:audio] = Druid::Elements::Audio
+  end
+end

data/lib/druid/elements/canvas.rb

@@ -0,0 +1,22 @@
+module Druid
+  module Elements
+    class Canvas < Element
+
+      #
+      # return the width of the canvas
+      #
+      def width
+        attribute(:width).to_i
+      end
+
+      #
+      # return the height of the canvas
+      #
+      def height
+        attribute(:height).to_i
+      end
+    end
+
+    Druid::Elements.type_to_class[:canvas] = Druid::Elements::Canvas
+  end
+end

data/lib/druid/elements/element.rb

@@ -144,6 +144,13 @@ module Druid
         element.focus
       end
 
+      #
+      # get the id of element
+      #
+      def id
+        attribute(:id)
+      end
+
       #
       # Flash the element by temporarily changing the background color
       #
@@ -151,6 +158,13 @@ module Druid
         element.flash
       end
 
+      #
+      # hover over the element
+      #
+      def hover
+        element.hover
+      end
+
       #
       # Returns parent element of current element.
       def parent
@@ -250,7 +264,7 @@ module Druid
       protected
 
       def self.have_to_build_xpath(identifier)
-        ['table', 'span', 'div', 'td', 'li', 'ol', 'ul', 'h1', 'h2', 'h3', 'h4', 'h5', 'h6', 'p', 'label'].include? identifier[:tag_name] and identifier[:name]
+        ['table', 'span', 'div', 'td', 'li', 'ol', 'ul', 'h1', 'h2', 'h3', 'h4', 'h5', 'h6', 'p', 'label', 'area', 'canvas', 'audio', 'video'].include? identifier[:tag_name] and identifier[:name]
       end
 
       def self.build_xpath_for identifier

data/lib/druid/elements/list_item.rb

@@ -2,6 +2,10 @@ module Druid
   module Elements
     class ListItem < Element
 
+      def self.finders
+        super + [:text]
+      end
+
     end
 
     Druid::Elements.tag_to_class[:li] = Druid::Elements::ListItem

data/lib/druid/elements/media.rb

@@ -0,0 +1,45 @@
+module Druid
+  module Elements
+    class Media < Element
+
+      def autoplay?
+        attribute(:autoplay)
+      end
+
+      def has_controls?
+        attribute(:controls)
+      end
+
+      def paused?
+        attribute(:paused)
+      end
+
+      def duration
+        duration = attribute(:duration)
+        return duration.to_f if duration
+      end
+
+      def volume
+        volume = attribute(:volume)
+        return volume.to_i if volume
+      end
+
+      def ended?
+        attribute(:ended)
+      end
+
+      def seeking?
+        attribute(:seeking)
+      end
+
+      def loop?
+        attribute(:loop)
+      end
+
+      def muted?
+        attribute(:muted)
+      end
+
+    end
+  end
+end

data/lib/druid/elements/select_list.rb

@@ -30,12 +30,18 @@ module Druid
       end
 
       #
-      # @return [Array<sTRING>] An array of strings representing the text value of the currently selected options.
+      # @return [Array<String>] An array of strings representing the text of the currently selected options.
       #
       def selected_options
         element.selected_options.map { |e| e.text }.compact
       end
 
+      #
+      # @return [Array<String>] An array of strings representing the value of the currently selected options.
+      def selected_values
+        element.selected_options.map { |e| e.value }.compact
+      end
+
       #
       # Returns true if the select list has one or more options where text or label matches the given value.
       #

data/lib/druid/elements/table_row.rb

@@ -29,6 +29,7 @@ module Druid
 
       def find_index_by_title(title)
         table = element.parent
+        table = table.parent if table.tag_name == 'tbody'
         first_row = table[0]
         first_row.cells.find_index { |column| column.text.include? title}
       end