watigiri 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1467249eba7486417d9378223903444241c26d04
-  data.tar.gz: d28c6579fc4fd346b952a5283042d57fe6a0d1c2
+  metadata.gz: acd708121fc8cb20c263c683acf3b021c396fc16
+  data.tar.gz: ed2524285816a2add8b394598141115556ed7dc8
 SHA512:
-  metadata.gz: b3f2adcbaf7d8206c12af6608fbbf0192729c5427cc26ce896e3466cb5c939c5be5760eab3a92b24c2bdace7b651577a53f73542ed0a763259751fd165c739f3
-  data.tar.gz: d7e2ba7e4c3207359c6f15dd58ad96cdb16d9c000d6ac00e038fd13d8011c39ae56004640d0b1db88caed41ec4c9e8b56c8ddbe606aa22e18147ba6107891056
+  metadata.gz: 42ca74e87402d2a77a9777795814f0e95cb731f8ee1bbad710b8d35703e590d9f2dee3b1e9c04b1ad06234821a0882cc96c699dde6587cb3bc383093e4847419
+  data.tar.gz: 5a01f63348806558b179d4f2285ba2eddc3ed9298f3063d1b8790c9156bda4f9d5a427038488bbb1d2635a236f6da89492ca367aafaf2302c494462cbe111616

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

@@ -6,6 +6,10 @@ module Watigiri
       @element = element
       @selector = selector
     end
+
+    def tag_name
+      element.name
+    end
   end
 
   module Locators
@@ -23,19 +27,8 @@ module Watigiri
         @nokogiri ? element.element : nokogiri_to_selenium(element)
       end
 
-      def locate_all
-        @nokogiri = @selector.delete(:nokogiri)
-        @regex = regex?
-
-        return super unless @nokogiri || @regex
-        @query_scope.doc ||= Nokogiri::HTML(@query_scope.html).tap { |d| d.css('script').remove }
-
-        elements = using_watir(:all)
-        @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)
+      def locate_element(how, what, _driver_scope = @query_scope.wd)
         return super unless @nokogiri
 
         el = @query_scope.doc.send("at_#{how}", what)
@@ -51,40 +44,10 @@ module Watigiri
         end
       end
 
-      def filter_elements_by_locator noko_elements, visible = nil, visible_text = nil, idx = nil, tag_name: nil, filter: :first
-        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
-        filter == :first ? noko_elements[idx || 0] : noko_elements
-      end
-
-      def filter_elements_by_regex(noko_elements, rx_selector, filter)
-        return if noko_elements.empty?
-        return super if noko_elements.first.is_a?(Selenium::WebDriver::Element)
-        method = filter == :first ? :find : :select
-
-        if @nokogiri || !@regex
-          return noko_elements.__send__(method) { |el| matches_selector?(el.element, rx_selector) }
-        end
-
-        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
-
       def fetch_value(element, how)
         return super unless @nokogiri || @regex
         return super if element.is_a?(Selenium::WebDriver::Element)
+        element = element.element if element.is_a?(Watigiri::Element)
         case how
         when :text
           element.inner_text
@@ -97,30 +60,13 @@ module Watigiri
         end
       end
 
-      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
-
       def nokogiri_to_selenium(element)
         return element if element.is_a?(Selenium::WebDriver::Element)
-        tag = element.name
-        index = @query_scope.doc.xpath("//#{tag}").find_index { |el| el == element }
+        tag = element.tag_name
+        index = @query_scope.doc.xpath("//#{tag}").find_index { |el| el == element.element }
         Watir::Element.new(@query_scope, index: index, tag_name: tag).wd
       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
-
       def regex?
         @selector.values.any? { |v| v.is_a?(Regexp) }
       end

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.3.1"
+  spec.version       = "0.3.2"
   spec.authors       = ["Titus Fortner"]
   spec.email         = ["titusfortner@gmail.com"]
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: watigiri
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - Titus Fortner
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-01-20 00:00:00.000000000 Z
+date: 2018-05-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler