page-object 1.1.1 → 1.2.0

data/lib/page-object/elements/table_row.rb

@@ -30,19 +30,6 @@ module PageObject
         ::PageObject::Elements::TableCell.new(row_element, platform)
       end
 
-
-      def include_platform_for platform
-        super
-        if platform[:platform] == :watir_webdriver
-          require 'page-object/platforms/watir_webdriver/table_row'
-          self.class.send :include, PageObject::Platforms::WatirWebDriver::TableRow
-        elsif platform[:platform] == :selenium_webdriver
-          require 'page-object/platforms/selenium_webdriver/table_row'
-          self.class.send :include, PageObject::Platforms::SeleniumWebDriver::TableRow
-        else
-          raise ArgumentError, "expect platform to be :watir_webdriver or :selenium_webdriver"
-        end
-      end
     end
 
     ::PageObject::Elements.tag_to_class[:tr] = ::PageObject::Elements::TableRow

data/lib/page-object/elements/text_area.rb

@@ -16,20 +16,6 @@ module PageObject
         super + [:label]
       end
 
-      protected
-
-      def include_platform_for platform
-        super
-        if platform[:platform] == :watir_webdriver
-          require 'page-object/platforms/watir_webdriver/text_area'
-          self.class.send :include, PageObject::Platforms::WatirWebDriver::TextArea
-        elsif platform[:platform] == :selenium_webdriver
-          require 'page-object/platforms/selenium_webdriver/text_area'
-          self.class.send :include, PageObject::Platforms::SeleniumWebDriver::TextArea
-        else
-          raise ArgumentError, "expect platform to be :watir_webdriver or :selenium_webdriver"
-        end
-      end
     end
 
     ::PageObject::Elements.tag_to_class[:textarea] = ::PageObject::Elements::TextArea

data/lib/page-object/elements/text_field.rb

@@ -22,18 +22,6 @@ module PageObject
         super + [:title, :value, :text, :label]
       end
 
-      def include_platform_for platform
-        super
-        if platform[:platform] == :watir_webdriver
-          require 'page-object/platforms/watir_webdriver/text_field'
-          self.class.send :include, PageObject::Platforms::WatirWebDriver::TextField
-        elsif platform[:platform] == :selenium_webdriver
-          require 'page-object/platforms/selenium_webdriver/text_field'
-          self.class.send :include, PageObject::Platforms::SeleniumWebDriver::TextField
-        else
-          raise ArgumentError, "expect platform to be :watir_webdriver or :selenium_webdriver"
-        end
-      end
     end
 
     ::PageObject::Elements.type_to_class[:text] = ::PageObject::Elements::TextField

data/lib/page-object/elements/unordered_list.rb

@@ -31,18 +31,6 @@ module PageObject
         [:class, :id, :index, :xpath]
       end
 
-      def include_platform_for platform
-        super
-        if platform[:platform] == :watir_webdriver
-          require 'page-object/platforms/watir_webdriver/unordered_list'
-          self.class.send :include, PageObject::Platforms::WatirWebDriver::UnorderedList
-        elsif platform[:platform] == :selenium_webdriver
-          require 'page-object/platforms/selenium_webdriver/unordered_list'
-          self.class.send :include, PageObject::Platforms::SeleniumWebDriver::UnorderedList
-        else
-          raise ArgumentError, "expect platform to be :watir_webdriver or :selenium_webdriver"
-        end
-      end
     end
 
     ::PageObject::Elements.tag_to_class[:ul] = ::PageObject::Elements::UnorderedList

data/lib/page-object/elements/video.rb

@@ -2,16 +2,6 @@ module PageObject
   module Elements
     class Video < Media
 
-      def height
-        height = attribute(:height)
-        return height.to_i if height
-      end
-
-      def width
-        width = attribute(:width)
-        return width.to_i if width
-      end
-      
     end
     ::PageObject::Elements.type_to_class[:video] = ::PageObject::Elements::Video
   end

data/lib/page-object/platforms/selenium_webdriver/element.rb

@@ -146,7 +146,7 @@ module PageObject
           parent = bridge.executeScript(script, element)
           type = element.attribute(:type).to_s.downcase if parent.tag_name.to_sym == :input
           cls = ::PageObject::Elements.element_class_for(parent.tag_name, type)
-          cls.new(parent, :platform => :selenium_webdriver)
+          cls.new(parent, :platform => @platform.class::PLATFORM_NAME)
         end
 
         #

data/lib/page-object/platforms/selenium_webdriver/page_object.rb

@@ -12,6 +12,14 @@ module PageObject
       # and use the methods dynamically added from the PageObject::Accessors module.
       #
       class PageObject
+
+        PLATFORM_NAME = :selenium_webdriver
+
+        def self.define_widget_accessors(widget_tag, widget_class, base_element_tag)
+          define_widget_singular_accessor(base_element_tag, widget_class, widget_tag)
+          define_widget_multiple_accessor(base_element_tag, widget_class, widget_tag)
+        end
+
         def initialize(browser)
           @browser = browser
         end
@@ -139,7 +147,7 @@ module PageObject
           element = @browser.execute_script("return document.activeElement")
           type = element.attribute(:type).to_s.downcase if element.tag_name.to_sym == :input
           cls = ::PageObject::Elements.element_class_for(element.tag_name, type)
-          cls.new(element, :platform => :selenium_webdriver)
+          cls.new(element, :platform => self.class::PLATFORM_NAME)
         end
 
         #
@@ -1026,7 +1034,7 @@ module PageObject
         # See PageObject::Accessors#page_sections
         #
         def pages_for(identifier, page_class)
-          SectionCollection.new(find_selenium_pages(identifier, page_class))
+          SectionCollection[*find_selenium_pages(identifier, page_class)]
         end
 
        #
@@ -1120,7 +1128,7 @@ module PageObject
             return build_null_object(identifier, type, tag, other)
           end
           @browser.switch_to.default_content unless frame_identifiers.nil?
-          type.new(element, :platform => :selenium_webdriver)
+          type.new(element, :platform => self.class::PLATFORM_NAME)
         end
 
         def find_selenium_elements(identifier, type, tag, other=nil)
@@ -1134,7 +1142,7 @@ module PageObject
             elements = eles.find_all {|ele| matches_selector?(ele, regexp[0], regexp[1])}
           end
           @browser.switch_to.default_content unless frame_identifiers.nil?
-          elements.map { |element| type.new(element, :platform => :selenium_webdriver) }
+          elements.map { |element| type.new(element, :platform => self.class::PLATFORM_NAME) }
         end
 
         def find_selenium_pages(identifier, page_class)
@@ -1178,7 +1186,7 @@ module PageObject
           null_element.tag = tag
           null_element.other = other
           null_element.platform = self
-          Elements::Element.new(null_element, :platform => :selenium_webdriver)
+          Elements::Element.new(null_element, :platform => self.class::PLATFORM_NAME)
         end
 
         def delete_regexp(identifier)
@@ -1256,6 +1264,19 @@ module PageObject
             end
           end
         end
+
+        def self.define_widget_multiple_accessor(base_element_tag, widget_class, widget_tag)
+          send(:define_method, "#{widget_tag}s_for") do |identifier|
+            find_selenium_elements(identifier, widget_class, base_element_tag)
+          end
+        end
+
+        def self.define_widget_singular_accessor(base_element_tag, widget_class, widget_tag)
+          send(:define_method, "#{widget_tag}_for") do |identifier|
+            find_selenium_element(identifier, widget_class, base_element_tag)
+          end
+        end
+
       end
     end
   end

data/lib/page-object/platforms/selenium_webdriver/select_list.rb

@@ -38,7 +38,7 @@ module PageObject
         #
         # @return [array of PageObject::Elements::Option]
         def options
-          find_options.map { |e| ::PageObject::Elements::Option.new(e, :platform => :selenium_webdriver) }
+          find_options.map { |e| ::PageObject::Elements::Option.new(e, :platform => @platform.class::PLATFORM_NAME) }
         end
 
         #

data/lib/page-object/platforms/selenium_webdriver/table.rb

@@ -14,7 +14,7 @@ module PageObject
           eles = table_rows
           idx = find_index_by_title(idx, eles) if idx.kind_of?(String)
           return nil unless idx
-          initialize_row(eles[idx], :platform => :selenium_webdriver)
+          initialize_row(eles[idx], :platform => @platform.class::PLATFORM_NAME)
         end
 
         #

data/lib/page-object/platforms/selenium_webdriver/table_row.rb

@@ -14,7 +14,7 @@ module PageObject
           els = table_cells
           idx = find_index_by_title(idx) if idx.kind_of?(String)
           return nil unless idx  && columns >= idx + 1
-          initialize_cell(els[idx], :platform => :selenium_webdriver)
+          initialize_cell(els[idx], :platform => @platform.class::PLATFORM_NAME)
         end
 
         #

data/lib/page-object/platforms/watir_webdriver/element.rb

@@ -28,7 +28,14 @@ module PageObject
         def flash
           element.flash
         end
-        
+
+        #
+        # Click this element
+        #
+        def right_click
+          element.right_click
+        end
+
         #
         # Get the text for the element
         #
@@ -134,7 +141,7 @@ module PageObject
           parent = element.parent
           type = element.type if parent.tag_name.to_sym == :input
           cls = ::PageObject::Elements.element_class_for(parent.tag_name, type)
-          cls.new(parent, :platform => :watir_webdriver)
+          cls.new(parent, :platform => @platform.class::PLATFORM_NAME)
         end
 
         #

data/lib/page-object/platforms/watir_webdriver/ordered_list.rb

@@ -10,7 +10,7 @@ module PageObject
         # @return [PageObject::Elements::ListItem]
         #
         def [](idx)
-          Object::PageObject::Elements::ListItem.new(children[idx], :platform => :watir_webdriver)
+          Object::PageObject::Elements::ListItem.new(children[idx], :platform => @platform.class::PLATFORM_NAME)
         end
 
         #

data/lib/page-object/platforms/watir_webdriver/page_object.rb

@@ -6,6 +6,7 @@ require 'page-object/core_ext/string'
 module PageObject
   module Platforms
     module WatirWebDriver
+
       #
       # Watir implementation of the page object platform driver.  You should not use the
       # class directly.  Instead you should include the PageObject module in your page object
@@ -14,6 +15,13 @@ module PageObject
       class PageObject
         attr_reader :browser
 
+        PLATFORM_NAME = :watir_webdriver
+
+        def self.define_widget_accessors(widget_tag, widget_class, base_element_tag)
+        define_widget_singular_accessor(base_element_tag, widget_class, widget_tag)
+        define_widget_multiple_accessor(base_element_tag, widget_class, widget_tag)
+        end
+
         def initialize(browser)
           @browser = browser
         end
@@ -132,7 +140,8 @@ module PageObject
           element = browser.execute_script("return document.activeElement")
           type = element.type.to_sym if element.tag_name.to_sym == :input
           cls = ::PageObject::Elements.element_class_for(element.tag_name, type)
-          cls.new(element, :platform => :watir_webdriver)
+          # cls.new(element, :platform => :watir_webdriver)
+          cls.new(element, :platform => self.class::PLATFORM_NAME)
         end
 
         #
@@ -954,7 +963,7 @@ module PageObject
         # See PageObject::Accessors#page_sections
         #
         def pages_for(identifier, page_class)
-          SectionCollection.new(find_watir_pages(identifier, page_class))
+          SectionCollection[*find_watir_pages(identifier, page_class)]
         end
 
         #
@@ -1023,14 +1032,14 @@ module PageObject
           identifier, frame_identifiers = parse_identifiers(identifier, type, tag_name)
           elements = @browser.instance_eval "#{nested_frames(frame_identifiers)}#{the_call}"
           switch_to_default_content(frame_identifiers)
-          elements.map { |element| type.new(element, :platform => :watir_webdriver) }
+          elements.map { |element| type.new(element, :platform => self.class::PLATFORM_NAME) }
         end
 
         def find_watir_element(the_call, type, identifier, tag_name=nil)
           identifier, frame_identifiers = parse_identifiers(identifier, type, tag_name)
           element = @browser.instance_eval "#{nested_frames(frame_identifiers)}#{the_call}"
           switch_to_default_content(frame_identifiers)
-          type.new(element, :platform => :watir_webdriver)
+          type.new(element, :platform => self.class::PLATFORM_NAME)
         end
 
         def find_watir_pages(identifier, page_class)
@@ -1099,6 +1108,18 @@ module PageObject
             end
           end
         end
+
+        def self.define_widget_multiple_accessor(base_element_tag, widget_class, widget_tag)
+          send(:define_method, "#{widget_tag}s_for") do |identifier|
+            find_watir_elements("#{base_element_tag}s(identifier)", widget_class, identifier, base_element_tag)
+          end
+        end
+
+        def self.define_widget_singular_accessor(base_element_tag, widget_class, widget_tag)
+          send(:define_method, "#{widget_tag}_for") do |identifier|
+            find_watir_element("#{base_element_tag}(identifier)", widget_class, identifier, base_element_tag)
+          end
+        end
       end
     end
   end

data/lib/page-object/platforms/watir_webdriver/select_list.rb

@@ -34,7 +34,7 @@ module PageObject
         # @return [array of PageObject::Elements::Option]
         #
         def options
-          element.options.map { |e| ::PageObject::Elements::Option.new(e, :platform => :watir_webdriver) }
+          element.options.map { |e| ::PageObject::Elements::Option.new(e, :platform => @platform.class::PLATFORM_NAME) }
         end
 
         #

data/lib/page-object/platforms/watir_webdriver/table.rb

@@ -14,7 +14,7 @@ module PageObject
         def [](idx)
           idx = find_index_by_title(idx) if idx.kind_of?(String)
           return nil unless idx
-          initialize_row(element[idx], :platform => :watir_webdriver)
+          initialize_row(element[idx], :platform => @platform.class::PLATFORM_NAME)
         end
 
         #

data/lib/page-object/platforms/watir_webdriver/table_row.rb

@@ -12,7 +12,7 @@ module PageObject
         def [](idx)
           idx = find_index_by_title(idx) if idx.kind_of?(String)
           return nil unless idx && columns >= idx + 1
-          initialize_cell(element[idx], :platform => :watir_webdriver)
+          initialize_cell(element[idx], :platform => @platform.class::PLATFORM_NAME)
         end
 
         #

data/lib/page-object/platforms/watir_webdriver/unordered_list.rb

@@ -10,7 +10,7 @@ module PageObject
         # @return [PageObject::Elements::ListItem]
         #
         def [](idx)
-          Object::PageObject::Elements::ListItem.new(children[idx], :platform => :watir_webdriver)
+          Object::PageObject::Elements::ListItem.new(children[idx], :platform => @platform.class::PLATFORM_NAME)
         end
 
         #

data/lib/page-object/section_collection.rb

@@ -0,0 +1,16 @@
+module PageObject
+  class SectionCollection < Array
+    def find_by(values_hash)
+      find do |section|
+        values_hash.all? { |key, value| value === section.public_send(key) }
+      end
+    end
+
+    def select_by(values_hash)
+      matches = select do |section|
+        values_hash.all? { |key, value| value === section.public_send(key) }
+      end
+      self.class[*matches]
+    end
+  end
+end

data/lib/page-object/version.rb

@@ -1,4 +1,4 @@
 module PageObject
   # @private
-  VERSION = "1.1.1"
+  VERSION = "1.2.0"
 end

data/lib/page-object/widgets.rb

@@ -20,13 +20,25 @@ module PageObject
         define_accessors(Accessors, widget_tag, widget_class)
         define_nested_elements(Elements::Element, widget_tag)
         define_locators(PageObject, widget_tag)
-        define_selenium_accessors(Platforms::SeleniumWebDriver::PageObject, widget_tag, widget_class, base_element_tag)
-        define_watir_accessors(Platforms::WatirWebDriver::PageObject, widget_tag, widget_class, base_element_tag)
+
+        PageObject::Platforms.constants.each { |platform|
+          platform_class = constantize_classname("PageObject::Platforms::#{platform}::PageObject")
+          if platform_class.respond_to?(:define_widget_accessors)
+            platform_class.send(:define_widget_accessors,widget_tag, widget_class, base_element_tag)
+          else
+            $stderr.puts "*** WARNING"
+            $stderr.puts "*** Platform PageObject::Platforms::#{platform} does not support widgets! Please add the 'define_widget_accessors' method in PageObject::Platforms::#{platform}::PageObject to support widgets."
+          end
+        }
       end
     end
 
     private
 
+    def self.constantize_classname name
+      name.split("::").inject(Object) { |k,n| k.const_get(n) }
+    end
+
     def self.define_accessors(base, widget_tag, widget_class)
       accessors_module = Module.new do
         define_method widget_tag do |name, *identifier_args, &block|
@@ -58,40 +70,6 @@ module PageObject
       base.send(:include, accessors_module)
     end
 
-    def self.define_watir_accessors(base, widget_tag, widget_class, base_element_tag)
-      define_singular_watir_accessor(base, base_element_tag, widget_class, widget_tag)
-      define_multiple_watir_accessor(base, base_element_tag, widget_class, widget_tag)
-    end
-
-    def self.define_multiple_watir_accessor(base, base_element_tag, widget_class, widget_tag)
-      base.send(:define_method, "#{widget_tag}s_for") do |identifier|
-        find_watir_elements("#{base_element_tag}s(identifier)", widget_class, identifier, base_element_tag)
-      end
-    end
-
-    def self.define_singular_watir_accessor(base, base_element_tag, widget_class, widget_tag)
-      base.send(:define_method, "#{widget_tag}_for") do |identifier|
-        find_watir_element("#{base_element_tag}(identifier)", widget_class, identifier, base_element_tag)
-      end
-    end
-
-    def self.define_selenium_accessors(base, widget_tag, widget_class, base_element_tag)
-      define_singular_selenium_accessor(base, base_element_tag, widget_class, widget_tag)
-      define_multiple_selenium_accessor(base, base_element_tag, widget_class, widget_tag)
-    end
-
-    def self.define_multiple_selenium_accessor(base, base_element_tag, widget_class, widget_tag)
-      base.send(:define_method, "#{widget_tag}s_for") do |identifier|
-        find_selenium_elements(identifier, widget_class, base_element_tag)
-      end
-    end
-
-    def self.define_singular_selenium_accessor(base, base_element_tag, widget_class, widget_tag)
-      base.send(:define_method, "#{widget_tag}_for") do |identifier|
-        find_selenium_element(identifier, widget_class, base_element_tag)
-      end
-    end
-
     def self.define_nested_elements(base, widget_tag)
       define_singular_nested_accessor(base, widget_tag)
       define_multiple_nested_accessor(base, widget_tag)