locatine 0.02710 → 0.02878

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 56487180200c449f68c037e000f60aa54165623f2fa8ccfab887d8756c7e848c
-  data.tar.gz: 8cc1c4a8edffdc0bab1dc2ca4f32038f106412a3bc4864d11547bc27ddcf091e
+  metadata.gz: 457cb5d21eae999673da17f8c5c200181755f846946e81c81d9a23bbafa85528
+  data.tar.gz: f3ae98ffc268889f4781126b71106ffc99c29c73f9cd4e8321743388fb56bf70
 SHA512:
-  metadata.gz: edb0be42a2a0b1d624a53975cf0ace45688df57b20b8e75bfaf6eca1c1adf992a64848b94ef984517ca8de8f14856c6795738b0ef14c4b5928727b11b91da595
-  data.tar.gz: e20848ead9b6346734b19062568d70025d579f314773fed3ee66c2104732c83c30dce86f1b0e0101df51b5831ffbae4fa79b5b048ee9688f17416bc8a84486e8
+  metadata.gz: ed6f3ad8a5e29ea3b3e672b5a5cbd006571fa9536821dbc0b1467b005cf0998efc19425ba17f166a608cf84b5a884908c1d718275dbbebd0a56372a85f10d988
+  data.tar.gz: a7e5b86fe05b8710fd5bbd675733937dab017f8c27d8e27e4dbd5865da9313211775877c931a56c36414e0f1a3d94d3c66365a511f543daad4022fb00be91b14

data/README.md

@@ -14,7 +14,7 @@ That's it.
 
 ## Stage of development:
 
-Version of Locatine is **0.02710**. The 3rd version since rewriting. 10-15 next versions is dedicated to bug fixing, tweaking.
+Version of Locatine is **0.02878**. The 4th version since rewriting. 5-15 next versions is dedicated to bug fixing, tweaking.
 
 ## Attention
 
@@ -367,9 +367,7 @@ element = driver.find_element(css: "/*important input*/")
 
 Locatine will try to find it by those two words. If the id is really uniq it will return the desired element.
 
-Right now there is a Locatine Naming App that is in pending review status in the Chrome extension shop. This app is for creating good locatine locators.
-
-If you wanna try it before it is published - code is in the app folder of this repository.
+There is a [Locatine Name Helper chrome extension](https://chrome.google.com/webstore/detail/locatine-locator-helper/heeoaalghiamfjphdlieoblmodpcficg). This app is for creating good locatine locators (it is creating a pair - most uniq attribute value + tag for selected element, elements). Note that the app is an early draft. It's gonne be better with time.
 
 **NOTE! Locatine locators case insensitive.**
 

data/lib/locatine.rb

@@ -13,3 +13,4 @@ require 'locatine/daemon'
 require 'locatine/session'
 require 'locatine/element'
 require 'locatine/results'
+require 'locatine/error'

data/lib/locatine/daemon.rb

@@ -34,10 +34,18 @@ module Locatine
       { result: result }.to_json
     end
 
+    def send_error(error)
+      status error.status
+
+      error.answer
+    end
+
     # selenium calls
     post '/wd/hub/session/*/element' do
       content_type settings.headers['Content-Type']
       results = settings.sessions[session_id].find(params, element_id)
+      return send_error(results.first) if results.first.class == Locatine::Error
+
       status 200
       results.empty? ? raise_not_found : { value: results.first.answer }.to_json
     end
@@ -45,6 +53,8 @@ module Locatine
     post '/wd/hub/session/*/elements' do
       content_type settings.headers['Content-Type']
       results = settings.sessions[session_id].find(params, element_id)
+      return send_error(results.first) if results.first.class == Locatine::Error
+
       status 200
       answer = results.empty? ? [] : results.map(&:answer)
       { value: answer }.to_json

data/lib/locatine/error.rb

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+module Locatine
+  #
+  # Simple error
+  class Error
+    attr_accessor :answer, :status
+
+    def initialize(response)
+      @answer = response.body
+      @status = response.code
+    end
+  end
+end

data/lib/locatine/logger.rb

@@ -58,5 +58,12 @@ module Locatine
         "\n\n ---Answer was: #{answer}"
       raise answer['error']
     end
+
+    def warn_error_detected(answer)
+      warn "selenium is returning an error with code #{answer.code} "\
+           'It will be returned to your code. It can be locatine internal '\
+           'bug, selenium problem (dead browser for example) or something '\
+           'in your code (invalid locator for example)'
+    end
   end
 end

data/lib/locatine/results.rb

@@ -22,8 +22,12 @@ module Locatine
 
     def simple_find
       path = @parent ? "/element/#{@parent}/elements" : '/elements'
-      selenium_found = @session.api_request(path, 'Post', @locator.to_json).body
-      JSON.parse(selenium_found)['value'].each do |item|
+      response = @session.api_request(path, 'Post', @locator.to_json)
+      found = JSON.parse(response.body)
+      error_present = (found['value'].class == Hash) && found['value']['error']
+      return error_routine(response) if error_present
+
+      found['value'].each do |item|
         push Locatine::Element.new(@session, item)
       end
       self
@@ -33,9 +37,15 @@ module Locatine
       #  {"element-6066-11e4
     end
 
+    def error_routine(answer)
+      @error = Locatine::Error.new(answer)
+      warn_error_detected(answer)
+      push @error
+    end
+
     def classic_find
       first_attempt
-      locating = @locator['value'].empty? || tolerance.positive?
+      locating = (@locator['value'].empty? || tolerance.positive?) && !@error
       return unless locating
 
       second_attempt

data/lib/locatine/results_helpers/find_by_magic.rb

@@ -72,9 +72,12 @@ module Locatine
 
       def normalize_indexes(indexes = Thread.current['out'])
         list = all_elements
-        return warn_unstable_page if list != @everything
+        warn_unstable_page if list != @everything
+        max_list = max_indexes(indexes)
+        old_answers = max_list.map { |index| @everything[index.to_i] }
+        answers = max_list.map { |index| list[index.to_i] }
+        return if old_answers != answers
 
-        answers = max_indexes(indexes).map { |index| list[index.to_i] }
         answers.each do |item|
           push Locatine::Element.new(@session, item)
         end

data/lib/locatine/scripts/page.js

@@ -50,4 +50,5 @@ function walk(target) {
 }
 const everything = Array.prototype.slice.call( document.getElementsByTagName("*") );
 let result = walk(document.body);
-return [result];
+// We need to incapsulate since chromedriver cannot return a giant object
+return JSON.stringify({"result": [result]});

data/lib/locatine/session.rb

@@ -49,12 +49,7 @@ module Locatine
     end
 
     def find(params, parent = nil)
-      results = Results.new
-      results.configure(self, params, parent)
-      answer = results.find
-      @elements[results.name] = results.info unless answer.empty?
-      write unless answer.empty?
-      answer
+      find_routine(params, parent)
     rescue RuntimeError => e
       raise e.message unless e.message == 'stale element reference'
 
@@ -62,6 +57,17 @@ module Locatine
       find(params, parent)
     end
 
+    def find_routine(params, parent)
+      results = Results.new
+      results.configure(self, params, parent)
+      answer = results.find
+      if !answer.empty? && answer.first.class != Locatine::Error
+        @elements[results.name] = results.info
+        write
+      end
+      answer
+    end
+
     def execute_script(script, *args)
       args.map! { |item| item.class == Locatine::Element ? item.answer : item }
       response = api_request('/execute/sync', 'Post',
@@ -74,7 +80,10 @@ module Locatine
     end
 
     def page
-      execute_script(File.read("#{HOME}/scripts/page.js"))
+      # We need duplicated JSON parse since standart
+      # chromedriver giving an error here if the page is too large
+      page = execute_script(File.read("#{HOME}/scripts/page.js"))
+      JSON.parse(page, max_nesting: false)['result']
     end
 
     def call_uri(path)

data/lib/locatine/version.rb

@@ -2,7 +2,7 @@
 
 module Locatine
   # constants here...
-  VERSION = '0.02710'
+  VERSION = '0.02878'
   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.02710'
+  version: '0.02878'
 platform: ruby
 authors:
 - Sergei Seleznev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-03-05 00:00:00.000000000 Z
+date: 2020-03-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -141,6 +141,7 @@ files:
 - lib/locatine/daemon.rb
 - lib/locatine/daemon_helpers/methods.rb
 - lib/locatine/element.rb
+- lib/locatine/error.rb
 - lib/locatine/logger.rb
 - lib/locatine/results.rb
 - lib/locatine/results_helpers/common.rb