watigiri 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 88ad103bcf8deb0b774e803ba687e340e8ee5373
-  data.tar.gz: 3b29a90e092b817df788048b3f03a5acb2542848
+  metadata.gz: c30b44d2a541b53088b5a62f077bef279297c1bc
+  data.tar.gz: 9efb3cae6a9fc60c035ebedb6dd1c16cd58c24ac
 SHA512:
-  metadata.gz: 621425770d2df585d453c8aaa1874d81c21e003ed580ab9861118cc48f04a7e66c6ef4474a070cdb1af9753468d6e0772990e067fac3b7d6b03ba8037339b0db
-  data.tar.gz: 507d3b8fd60b950ee55a635e8adc7f2a3fd709bd94c6539ba0287c3677a187578115786104dfadee604f2ef0e963dc0380f499d64cbdda43a6a5e2fcdccc3fe6
+  metadata.gz: 84e1abf4aafa91e653fd3644997df5e43be6c3c245baf6be68b6ec723b0fb63955b2fd5a2e295b636c82862c54337d562ae41efd9d8914fcd1580b8d7cf3afe4
+  data.tar.gz: d418e2daaf3c1a64e1d82d8d434a77edde1b99c254b4b1081819616f3e87011fa0dba8ce8a71417287b86c63dd4b12e62bb62697fd72a00c7b553911cdb65009

data/.travis.yml

@@ -2,4 +2,7 @@ sudo: false
 language: ruby
 rvm:
   - 2.4.1
-before_install: gem install bundler -v 1.15.3
+before_install:
+  - export DISPLAY=:99
+  - sh -e /etc/init.d/xvfb start
+  - export PATH=~/.webdrivers:$PATH

data/Rakefile

@@ -3,4 +3,7 @@ require "rspec/core/rake_task"
 
 RSpec::Core::RakeTask.new(:spec)
 
-task :default => :spec
+require 'watirspec/rake_tasks'
+WatirSpec::RakeTasks.new
+
+task default: %i[spec watirspec:run]

data/lib/extensions/watir/browser.rb

@@ -9,8 +9,8 @@ module Watir
 
     def doc=(html)
       @doc = html
+      return if html.nil?
 
-      return if @doc.nil?
       reset_doc = ->(browser) { browser.doc = nil }
       after_hooks.add(reset_doc)
     end

data/lib/extensions/watir/iframe.rb

@@ -15,9 +15,10 @@ module Watir
 
     private
 
+    alias_method :watir_switch!, :switch!
     def switch!
       @browser.doc = nil
-      super
+      watir_switch!
     end
 
   end # FramedDriver

data/lib/watigiri.rb

@@ -7,6 +7,11 @@ require 'extensions/watir/iframe'
 
 require 'watigiri/locators/element/locator'
 require 'watigiri/locators/element/selector_builder'
-require 'watigiri/locators/element/validator'
 
 Watir.locator_namespace = Watigiri::Locators
+
+# Use Watir Validator behaviors for all Elements
+Watigiri::Locators::Element::Validator = Watir::Locators::Element::Validator
+Watigiri::Locators::Button::Validator = Watir::Locators::Button::Validator
+Watigiri::Locators::TextField::Validator = Watir::Locators::TextField::Validator
+

data/lib/watigiri/locators/element/locator.rb

@@ -1,128 +1,189 @@
 module Watigiri
+  class Element
+    attr_reader :element, :selector
+
+    def initialize(element:, selector:)
+      @element = element
+      @selector = selector
+    end
+  end
+
   module Locators
-    class Element
-      class Locator < Watir::Locators::Element::Locator
+    module LocatorHelpers
+      def locate
+        @nokogiri = @selector.delete(:nokogiri)
+        @regex = regex?
 
-        def locate
-          @nokogiri = @selector.delete(:nokogiri)
+        return super unless @nokogiri || @regex
+        @query_scope.browser.doc ||= Nokogiri::HTML(@query_scope.html).tap { |d| d.css('script').remove }
+
+        element = find_first_by_multiple
+        return if element.nil?
+        @nokogiri ? element.element : nokogiri_to_selenium(element)
+      end
 
-          return super unless @nokogiri
-          @query_scope.browser.doc ||= Nokogiri::HTML(@query_scope.html).tap {|d| d.css('script').remove }
+      def locate_all
+        @nokogiri = @selector.delete(:nokogiri)
+        @regex = regex?
 
-          reset_doc = ->(browser) { browser.doc = nil }
-          @query_scope.browser.after_hooks.add(reset_doc)
+        return super unless @nokogiri || @regex
+        @query_scope.browser.doc ||= Nokogiri::HTML(@query_scope.html).tap { |d| d.css('script').remove }
 
-          find_first_by_multiple
+        elements = find_all_by_multiple
+        @nokogiri ? elements : elements.map { |element| nokogiri_to_watir element }
+      end
+
+      # Is only used when there is no regex, index or visibility locators
+      def locate_element(how, what)
+        return super unless @nokogiri
+
+        el = @query_scope.browser.doc.send("at_#{how}", what)
+        Watigiri::Element.new element: el, selector: {how => what}
+      end
+
+      # "how" can only be :css or :xpath
+      def locate_elements(how, what, _scope = @query_scope.wd)
+        return super unless (@nokogiri || @regex) && @query_scope.is_a?(Watir::Browser)
+
+        @query_scope.browser.doc.send(how, what).map do |el|
+          Watigiri::Element.new element: el, selector: {how => what}
         end
+      end
 
-        def locate_element(how, what)
-          unless @nokogiri
-            return ensure_scope_context.find_element(how, what)
-          end
-          case how
-          when :css
-            @query_scope.browser.doc.at_css(what)
-          when :xpath
-            @query_scope.browser.doc.at_xpath(what)
-          end
+      def filter_elements noko_elements, visible, idx, number
+        return super unless @nokogiri || @regex
+        return super if noko_elements.first.is_a?(Selenium::WebDriver::Element)
+
+        unless visible.nil?
+          noko_elements.select! { |el| visible == nokogiri_to_watir(el.element).visible? }
         end
+        number == :single ? noko_elements[idx || 0] : noko_elements
+      end
 
-        def locate_elements(how, what, _scope = nil)
-          unless @nokogiri
-            return ensure_scope_context.find_elements(how, what)
-          end
-          case how
-          when :css
-            @query_scope.browser.doc.css(what).to_a
-          when :xpath
-            @query_scope.browser.doc.xpath(what).to_a
-          end
+      def filter_elements_by_regex(noko_elements, rx_selector, method)
+        return if noko_elements.empty?
+        return super if noko_elements.first.is_a?(Selenium::WebDriver::Element)
+
+        if @nokogiri || !@regex
+          return noko_elements.__send__(method) { |el| matches_selector?(el.element, rx_selector) }
         end
 
-        def fetch_value(element, how)
-          return super unless @nokogiri
-          case how
-          when :text
-            element.inner_text
-          when :tag_name
-            element.name.to_s.downcase
-          when :href
-            (href = element.attribute('href')) && href.to_s.strip
-          else
-            element.attribute(how.to_s.tr("_", "-")).to_s
+        selenium_elements = ensure_scope_context.find_elements(noko_elements.first.selector)
+
+        if method == :select
+          selenium_elements.zip(noko_elements).each_with_object([]) do |els, array|
+            array << els.first if matches_selector?(els.last.element, rx_selector)
           end
+        else
+          index = noko_elements.find_index { |el| matches_selector?(el.element, rx_selector) }
+          index.nil? ? nil : selenium_elements[index]
         end
+      end
 
-        # TODO remove after https://github.com/watir/watir/pull/630
-        def find_first_by_multiple
-          selector = selector_builder.normalized_selector
+      def fetch_value(element, how)
+        return super unless @nokogiri || @regex
+        return super if element.is_a?(Selenium::WebDriver::Element)
+        case how
+        when :text
+          element.inner_text
+        when :tag_name
+          element.name.to_s.downcase
+        when :href
+          (href = element.attribute('href')) && href.to_s.strip
+        else
+          element.attribute(how.to_s.tr("_", "-")).to_s
+        end
+      end
 
-          idx = selector.delete(:index) unless selector[:adjacent]
-          visible = selector.delete(:visible)
+      def nokogiri_to_watir(element)
+        return element if element.is_a?(Selenium::WebDriver::Element)
+        se_element = nokogiri_to_selenium(element)
+        tag = element.name
+        Watir.element_class_for(tag).new(@query_scope, element: se_element)
+      end
 
-          how, what = selector_builder.build(selector)
+      def nokogiri_to_selenium(element)
+        return element if element.is_a?(Selenium::WebDriver::Element)
+        tag = element.name
+        index = @query_scope.browser.doc.xpath("//#{tag}").find_index { |el| el == element }
+        Watir::Element.new(@query_scope, index: index, tag_name: tag).wd
+      end
 
-          if how
-            # could build xpath/css for selector
-            if idx || !visible.nil?
-              idx ||= 0
-              elements = locate_elements(how, what)
-              elements = elements.select { |el| visible == el.displayed? } unless visible.nil?
-              elements[idx] unless elements.nil?
-            else
-              locate_element(how, what)
-            end
-          else
-            # can't use xpath, probably a regexp in there
-            if idx || !visible.nil?
-              idx ||= 0
-              elements = wd_find_by_regexp_selector(selector, :select)
-              elements = elements.select { |el| visible == el.displayed? } unless visible.nil?
-              elements[idx] unless elements.nil?
-            else
-              wd_find_by_regexp_selector(selector, :find)
-            end
-          end
+      def label_from_text(label_exp)
+        # TODO: this won't work correctly if @wd is a sub-element
+        elements = locate_elements(:xpath, '//label')
+        return super if elements.any? { |el| el.is_a? Selenium::WebDriver::Element }
+        element = elements.find do |el|
+          matches_selector?(el.element, text: label_exp)
         end
+        element.nil? ? nil : element.element
+      end
 
-        # TODO Remove after https://github.com/watir/watir/pull/630
-        def wd_find_by_regexp_selector(selector, method = :find)
-          query_scope = ensure_scope_context
-          rx_selector = delete_regexps_from(selector)
-
-          if rx_selector.key?(:label) && selector_builder.should_use_label_element?
-            label = label_from_text(rx_selector.delete(:label)) || return
-            if (id = label.attribute(:for))
-              selector[:id] = id
-            else
-              query_scope = label
-            end
-          end
+      def regex?
+        @selector.values.any? { |v| v.is_a?(Regexp) }
+      end
+    end
 
-          how, what = selector_builder.build(selector)
 
-          unless how
-            raise Error, "internal error: unable to build Selenium selector from #{selector.inspect}"
-          end
+    class Element
+      class Locator < Watir::Locators::Element::Locator
+        include LocatorHelpers
+      end
+    end
 
-          if how == :xpath && can_convert_regexp_to_contains?
-            rx_selector.each do |key, value|
-              next if key == :tag_name || key == :text
+    class Button
+      class Locator < Watir::Locators::Button::Locator
+        include LocatorHelpers
+      end
+    end
 
-              predicates = regexp_selector_to_predicates(key, value)
-              what = "(#{what})[#{predicates.join(' and ')}]" unless predicates.empty?
+    class Cell
+      class Locator < Watir::Locators::Cell::Locator
+        include LocatorHelpers
+      end
+    end
+
+    class Row
+      class Locator < Watir::Locators::Row::Locator
+        include LocatorHelpers
+      end
+    end
+
+    class TextArea
+      class Locator < Watir::Locators::TextArea::Locator
+        include LocatorHelpers
+
+        def regex?
+          @selector.any? { |k, v| v.is_a?(Regexp) && k != :value }
+        end
+      end
+    end
+
+    class TextField
+      class Locator < Watir::Locators::TextField::Locator
+        include LocatorHelpers
+
+        def matches_selector?(element, rx_selector)
+          return super if element.is_a? Selenium::WebDriver::Element
+          rx_selector = rx_selector.dup
+
+          tag_name = element.name.downcase
+
+          [:text, :value, :label].each do |key|
+            if rx_selector.key?(key)
+              correct_key = tag_name == 'input' ? :value : :text
+              rx_selector[correct_key] = rx_selector.delete(key)
             end
           end
 
-          elements = locate_elements(how, what, query_scope)
-          elements.__send__(method) { |el| matches_selector?(el, rx_selector) }
+          rx_selector.all? do |how, what|
+            what === fetch_value(element, how)
+          end
         end
 
-        # TODO Remove after https://github.com/watir/watir/pull/630
-        def ensure_scope_context
-          @query_scope.wd
+        def regex?
+          @selector.any? { |k, v| v.is_a?(Regexp) && k != :value }
         end
-
       end
     end
   end

data/lib/watigiri/locators/element/selector_builder.rb

@@ -1,14 +1,45 @@
 module Watigiri
   module Locators
+    module SelectorHelpers
+      def normalized_selector
+        @selector.delete(:nokogiri)
+        super
+      end
+    end
+
     class Element
       class SelectorBuilder < Watir::Locators::Element::SelectorBuilder
+        include SelectorHelpers
+      end
+    end
+
+    class Button
+      class SelectorBuilder < Watir::Locators::Button::SelectorBuilder
+        include SelectorHelpers
+      end
+    end
 
-        def initialize(query_scope, selector, attribute_list)
-          attribute_list << :nokogiri
-          super
-          @selector.delete :nokogiri
-        end
+    class Cell
+      class SelectorBuilder < Watir::Locators::Cell::SelectorBuilder
+        include SelectorHelpers
+      end
+    end
+
+    class Row
+      class SelectorBuilder < Watir::Locators::Row::SelectorBuilder
+        include SelectorHelpers
+      end
+    end
+
+    class TextArea
+      class SelectorBuilder < Watir::Locators::TextArea::SelectorBuilder
+        include SelectorHelpers
+      end
+    end
 
+    class TextField
+      class SelectorBuilder < Watir::Locators::TextField::SelectorBuilder
+        include SelectorHelpers
       end
     end
   end

data/support/travis.sh

@@ -0,0 +1,6 @@
+#!/bin/bash
+
+set -e
+set -x
+
+sh -e /etc/init.d/xvfb start

data/watigiri.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = "watigiri"
-  spec.version       = "0.1.0"
+  spec.version       = "0.2.0"
   spec.authors       = ["Titus Fortner"]
   spec.email         = ["titusfortner@gmail.com"]
 
@@ -26,8 +26,8 @@ with Nokogiri calls where designated.
   spec.add_development_dependency "bundler", "~> 1.15"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec", "~> 3.0"
-  spec.add_development_dependency "webdrivers", "~> 2.0"
+  spec.add_development_dependency "webdrivers", "~> 3.0"
 
-  spec.add_runtime_dependency "watir"
+  spec.add_runtime_dependency "watir", "~> 6.8", ">= 6.8.2"
   spec.add_runtime_dependency "nokogiri"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: watigiri
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Titus Fortner
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-08-21 00:00:00.000000000 Z
+date: 2017-09-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -58,28 +58,34 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: watir
   requirement: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '6.8'
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 6.8.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '6.8'
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 6.8.2
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
@@ -116,7 +122,7 @@ files:
 - lib/watigiri.rb
 - lib/watigiri/locators/element/locator.rb
 - lib/watigiri/locators/element/selector_builder.rb
-- lib/watigiri/locators/element/validator.rb
+- support/travis.sh
 - watigiri.gemspec
 homepage: http://github.com/titusfortner/watigiri
 licenses:

data/lib/watigiri/locators/element/validator.rb

@@ -1,8 +0,0 @@
-module Watigiri
-  module Locators
-    class Element
-      class Validator < Watir::Locators::Element::Validator
-      end
-    end
-  end
-end