watigiri 0.2.2 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b54f1a44d2ce370b82465ea35623426beb9cc700
-  data.tar.gz: 16c9d06260d4a01271bc7f789a816e9d20cbdee3
+  metadata.gz: 54015d016184d1f885580b11fefc238c8b033adc
+  data.tar.gz: e8a3da5a13389f1a12d75767619d14a155661bc2
 SHA512:
-  metadata.gz: 68cad5b608ac6b3eebc53f1c36b62371c968db2af9035cfa352a5f96c915a5ca0cb9eb3651f275d3b634fabf44f68fd360905298d7db485a0ce9d9c75ff3a10c
-  data.tar.gz: be6cb2c9ff17d61c292c4b26a86ed4ddc9da9eabc95a8ec777cafa0cecaad50ad8f9bae0143b7b6513a6fcf553f95d0e5c5b06e18124c78151c738d8cbb0032b
+  metadata.gz: 4507c403832e15ef7c955262f199a5a7a28e95fc8f75d4c3273f9a55edba3fbde703a20a41f27e857bf092805b98be894a6a796a813e134b1ccb5d571519e30d
+  data.tar.gz: 8443226c18ace25acb37722d32230945bf2db2c4a77553b5cafb7a0cfd03d872d1853da86899da0d4bafb17067edd91dffd98eecad0f619e1c35267b467b2067

data/lib/extensions/watir/browser.rb

@@ -19,6 +19,7 @@ module Watir
       @doc = nil
       after_hooks.delete(@reset_doc_hook)
     end
+
     #
     # Uses Nokogiri to return the text of page body.
     #

data/lib/extensions/watir/element.rb

@@ -2,8 +2,27 @@ module Watir
 
   class Element
 
-    # TODO - reimplement with Watir Executor when available
+    attr_reader :doc
 
+    #
+    # Store instance of Nokogiri
+    #
+
+    def doc=(html)
+      @doc = html
+      return if html.nil?
+
+      @reset_doc_hook = ->(element) { element.reset_doc }
+      browser.after_hooks.add(@reset_doc_hook)
+    end
+
+    def reset_doc
+      @doc = nil
+      browser.after_hooks.delete(@reset_doc_hook)
+    end
+
+    #
+    # TODO - reimplement with Watir Executor when available
     #
     # Uses Nokogiri to return the text of the element.
     #
@@ -15,5 +34,10 @@ module Watir
       text
     end
 
+    alias_method :el_stale?, :stale?
+    def stale?
+      @doc.nil? && el_stale?
+    end
+
   end # Element
 end # Watir

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

@@ -15,7 +15,8 @@ module Watigiri
         @regex = regex?
 
         return super unless @nokogiri || @regex
-        @query_scope.browser.doc ||= Nokogiri::HTML(@query_scope.html).tap { |d| d.css('script').remove }
+        command = @query_scope.is_a?(Watir::Browser) ? :html : :inner_html
+        @query_scope.doc ||= Nokogiri::HTML(@query_scope.send(command)).tap { |d| d.css('script').remove }
 
         element = using_watir(:first)
         return if element.nil?
@@ -27,7 +28,7 @@ module Watigiri
         @regex = regex?
 
         return super unless @nokogiri || @regex
-        @query_scope.browser.doc ||= Nokogiri::HTML(@query_scope.html).tap { |d| d.css('script').remove }
+        @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 }
@@ -37,15 +38,15 @@ module Watigiri
       def locate_element(how, what)
         return super unless @nokogiri
 
-        el = @query_scope.browser.doc.send("at_#{how}", what)
+        el = @query_scope.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)
+        return super unless @nokogiri || @regex
 
-        @query_scope.browser.doc.send(how, what).map do |el|
+        @query_scope.doc.send(how, what).map do |el|
           Watigiri::Element.new element: el, selector: {how => what}
         end
       end
@@ -106,7 +107,7 @@ module Watigiri
       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 }
+        index = @query_scope.doc.xpath("//#{tag}").find_index { |el| el == element }
         Watir::Element.new(@query_scope, index: index, tag_name: tag).wd
       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.2.2"
+  spec.version       = "0.3.0"
   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.2.2
+  version: 0.3.0
 platform: ruby
 authors:
 - Titus Fortner
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-11-29 00:00:00.000000000 Z
+date: 2018-01-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler