watigiri 0.5.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9ab5b03da6791a3ea140287be1c54da77467dc2a
-  data.tar.gz: 3a97f2c0b646ceec77ee95a228b9e5211906fe77
+  metadata.gz: 6b72b888e42e3c48e712af1d1b52d8d33abd9f78
+  data.tar.gz: 392b4c4e20b03cf400b2df0eeec7d1600f6766a3
 SHA512:
-  metadata.gz: fd78179291c518fe0f759d1df7d350cccdce98ce3e7e480e31c4c5cbebb961ec8901a4a9126438568d900aa1876e7b04eb0c44e3af497840f9305066dbc4cd0f
-  data.tar.gz: d9b0c1f1ff1d3edef4fd625c073648c7d8fe1612355d7d50299c4f0d0d43a9802f70ece28c6ae585f202a15215789bbe4bbb9146eb0831d76cc777b47c1840c1
+  metadata.gz: 853cca62feb297f9ccef578e63dfba6ce0dcd1a088b462ca1335889a5914388d8af490326d7e452ba194fd50a43df8dbe656ab5a0d2dcd3c0b9574b46c58c3c5
+  data.tar.gz: 8be0f3f162b0845ac0e7c8f652f8a100aa43f48e8d365a2dcaa8245dede92507d6a1fdcc450b1107d8e9a750dba9fce9f48e061e5171cdd05c757234d249a5af

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

@@ -18,17 +18,23 @@ module Watigiri
         @nokogiri = @selector.delete(:nokogiri)
         return super unless @nokogiri || regex?
 
-        # :inner_html should be using `#fragment`, but can't because of
-        # https://github.com/sparklemotion/nokogiri/issues/572
-        method = @query_scope.is_a?(Watir::Browser) ? :html : :inner_html
-
-        @query_scope.doc ||= Nokogiri::HTML(@query_scope.send(method)).tap { |d| d.css('script').remove }
+        set_nokogiri
 
         element = using_watir(:first)
         return if element.nil?
         @nokogiri ? element.element : nokogiri_to_selenium(element)
       end
 
+      def locate_all
+        @nokogiri = @selector.delete(:nokogiri)
+        return super unless @nokogiri || regex?
+
+        set_nokogiri
+
+        elements = using_watir(:all)
+        @nokogiri ? elements.map(&:element) : elements.map { |el| nokogiri_to_selenium(el) }
+      end
+
       # Is only used when there is no regex, index or visibility locators
       def locate_element(how, what, _driver_scope = @query_scope.wd)
         return super unless @nokogiri
@@ -47,18 +53,16 @@ module Watigiri
       end
 
       def fetch_value(element, how)
-        element = update_element(element)
-        return if element.nil?
+        noko_element = noko_element(element)
+        return super if noko_element.nil?
 
         case how
         when :text
-          element.inner_text
+          noko_element.inner_text
         when :tag_name
-          element.name.to_s.downcase
-        when :href
-          element.attribute('href')&.to_s
+          noko_element.name.downcase
         else
-          element.attribute(how.to_s.tr('_', '-')).to_s
+          noko_element.attribute(how.to_s.tr('_', '-')).to_s.strip
         end
       end
 
@@ -71,11 +75,12 @@ module Watigiri
 
       def regex?
         return @regex unless @regex.nil?
-        return false unless (@selector.keys & %i[adjacent visible label text visible_text]).empty?
+
+        return false unless (@selector.keys & %i[adjacent visible label text visible_text visible_label]).empty?
         @regex = @selector.values.any? { |v| v.is_a?(Regexp) }
       end
 
-      def update_element(element)
+      def noko_element(element)
         if !(@nokogiri || regex?) || element.is_a?(Selenium::WebDriver::Element)
           nil
         elsif element.is_a?(Watigiri::Element)
@@ -84,6 +89,24 @@ module Watigiri
           element
         end
       end
+
+      def set_nokogiri
+        return if @query_scope.doc
+
+        # should be using `#fragment` instead of `#inner_html`, but can't because of
+        # https://github.com/sparklemotion/nokogiri/issues/572
+        doc = if @query_scope.is_a?(Watir::Browser)
+                Nokogiri::HTML(@query_scope.html)
+              else
+                Nokogiri::HTML(@query_scope.inner_html)
+              end
+
+        @query_scope.doc = doc.tap { |d| d.css('script').remove }
+      end
+
+      def text_regexp_deprecation(*)
+        # Nokogiri can not determine visible text so no need to check
+      end
     end
 
     class Element
@@ -125,8 +148,10 @@ module Watigiri
         include LocatorHelpers
 
         def regex?
-          return false unless (@selector.keys & %i[adjacent visible label text visible_text]).empty?
-          @selector.any? { |k, v| v.is_a?(Regexp) && k != :value }
+          return @regex unless @regex.nil?
+
+          return false unless (@selector.keys & %i[adjacent visible label text visible_text visible_label]).empty?
+          @regex = @selector.any? { |k, v| v.is_a?(Regexp) && k != :value }
         end
       end
     end
@@ -154,8 +179,10 @@ module Watigiri
         end
 
         def regex?
-          return false unless (@selector.keys & %i[adjacent visible label text visible_text]).empty?
-          @selector.any? { |k, v| v.is_a?(Regexp) && k != :value }
+          return @regex unless @regex.nil?
+
+          return false unless (@selector.keys & %i[adjacent visible label text visible_text visible_label]).empty?
+          @regex = @selector.any? { |k, v| v.is_a?(Regexp) && k != :value }
         end
       end
     end

data/watigiri.gemspec

@@ -3,7 +3,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = 'watigiri'
-  spec.version       = '0.5.0'
+  spec.version       = '0.6.0'
   spec.authors       = ['Titus Fortner']
   spec.email         = ['titusfortner@gmail.com']
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: watigiri
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Titus Fortner