locatine 0.03118 → 0.03143

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b992087a77664cfe04949ab6bb1f343edb0c03801bcc118ac21631c4455463f3
-  data.tar.gz: b0d586f4c4de1c38a84eee4d1f9e434a3d8136d4ae25e83367dc573a5ec67c76
+  metadata.gz: 38cf69f2ca475f5755477d3bf3ea25581edf0a4a1a57b6491e70f4b97073541b
+  data.tar.gz: 22eeccf122ed564e802047874710fb85f234d4ba52c03a89b8b3ad8e20d0a2cd
 SHA512:
-  metadata.gz: 59ae3ed8e6aa6ac27be09e3bcaeda8e4ce7968db40e8393efd0fe47aeb25be5770181c718555ed304a1938133e7c198b788e82adbf557acb1e451aa650d90d6e
-  data.tar.gz: b56c011bb15c36a1e42dd342f2cc0f09f21ad65835d3cdf457e20b915b18faaeb381bf3c9328b705e6b4a6ec613ebc17712e0cfead1de2e094905509bb50fbe8
+  metadata.gz: e637591dbc8f53827fd59747dc45675674350f0ed03985b22524b8f9b0b0b705ba60006e5575ee37b2e0c0c51fa8109bf459381fcc11fd96d51120bf2c31da40
+  data.tar.gz: 2b1461b445491aa49a94a725431e2a4cec9d41bbc5d46e6c6570792297f21987e887c930f17285f65e3782bc4fcc4cef9f4490fd6ee62f0e9b6c85f177f82355

data/README.md

@@ -14,7 +14,7 @@ That's it.
 
 ## Stage of development:
 
-Version of Locatine is **0.03118**.
+Version of Locatine is **0.03143**.
 
 ## Installation
 
@@ -48,14 +48,16 @@ driver.quit
 4. Run the locatine daemon
 
 ```
-    $ SELENIUM=http://localhost:4444 locatine-daemon.rb --port=7733
+    $ locatine-daemon.rb --port=7733 --selenium="http://localhost:4444"
 ```
 
-5. SELENIUM - is for url where selenium hub is started, port is the port for your code to connect. 4444 and 7733 are defaults.
+5. *--selenium* - is for url where selenium hub is started, *--port* is the port for your code to connect. 4444 and 7733 are defaults.
 6. Run your code
 7. Data of element will be stored to ./default.json file.
 8. Now if id of your element is changed on the page Locatine will show a warning and gonna try to retrieve it.
-9. See [example](https://github.com/sseleznevqa/locatine/tree/master/examples) to see how it really works.
+9. See [examples](https://github.com/sseleznevqa/locatine/tree/master/examples) to see how it really works.
+
+**NOTE!** All examples in readme are ruby language examples. But any language can be successfully used. You can find Python example using the link above.
 
 ## Session
 

data/lib/locatine/daemon.rb

@@ -13,7 +13,7 @@ module Locatine
 
     configure do
       set :sessions, {}
-      set :selenium, ENV['SELENIUM'] || 'http://localhost:4444'
+      set :selenium, 'http://localhost:4444'
       set :headers, 'Content-Type' => 'application/json'
       set :port, 7733
     end

data/lib/locatine/element.rb

@@ -44,5 +44,16 @@ module Locatine
       @info = @session.execute_script(info, self)
       @info
     end
+
+    ##
+    # Method to get tag of the particular element or return it if it was
+    # gathered before
+    def tag_name
+      return @tag if @tag
+
+      script = 'return arguments[0].tagName'
+      @tag = @session.execute_script(script, self)
+      @tag
+    end
   end
 end

data/lib/locatine/results.rb

@@ -69,7 +69,11 @@ module Locatine
       guess if name_only?
       return if first.class == Locatine::Error || empty?
 
-      log_found if name_only?
+      check_guess if name_only?
+    end
+
+    def check_guess
+      map(&:tag_name).uniq.size == 1 ? log_found : clear
     end
 
     def simple_find

data/lib/locatine/session.rb

@@ -53,12 +53,13 @@ module Locatine
     # @return populated instance of Locatine::Results or an empty array
     #   or Locatine::Error
     def find(params, parent = nil)
+      @start_time = Time.now
       find_routine(params, parent)
     rescue RuntimeError => e
       raise e.message unless e.message == 'stale element reference'
 
       warn_unstable_page
-      find(params, parent)
+      find_routine(params, parent)
     end
 
     ##
@@ -134,8 +135,15 @@ module Locatine
       end
     end
 
+    def define_timeout(params)
+      params['timeout'] = params['timeout']
+                          .to_i - (Time.now - @start_time).round
+      params
+    end
+
     def find_routine(params, parent)
       results = Results.new
+      params = define_timeout(params)
       answer = results.find(self, params, parent)
       if !answer.empty? && answer.first.class != Locatine::Error
         @elements[results.name] = results.info

data/lib/locatine/version.rb

@@ -2,7 +2,7 @@
 
 module Locatine
   # constants here...
-  VERSION = '0.03118'
+  VERSION = '0.03143'
   NAME = 'locatine'
   HOME = if File.readable?("#{Dir.pwd}/lib/#{Locatine::NAME}")
            "#{Dir.pwd}/lib/#{Locatine::NAME}"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: locatine
 version: !ruby/object:Gem::Version
-  version: '0.03118'
+  version: '0.03143'
 platform: ruby
 authors:
 - Sergei Seleznev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-03-12 00:00:00.000000000 Z
+date: 2020-03-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -128,7 +128,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.8'
-description: The main goal to write locators never
+description: The main goal is to write locators (almost) never
 email: s_seleznev_qa@hotmail.com
 executables:
 - locatine-daemon.rb
@@ -178,5 +178,5 @@ requirements: []
 rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
-summary: Element locating tool based on watir
+summary: Element locating proxy for selenium
 test_files: []