locatine 0.01100 → 0.01135

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8ca422d8fbe87acacb5b19639d98c509fbdb04a2
-  data.tar.gz: b81058cdc3aa26f76a5521312de44f11f5b299bd
+  metadata.gz: f3cb2cbc141c7d5c0961539de0d404445f6b5f61
+  data.tar.gz: 7597435001651d14154b8e0ccfc584491e26aafa
 SHA512:
-  metadata.gz: f3435a0ae9f55f95e2419d47f37e066c9af65c4cc630b222229a5057aec35060a4a3d24504a5bb1eed21bee6c2c59611b692eb14dec12a945648da1f75bb8fd0
-  data.tar.gz: 96236870dffc079e8fa474b8fab27d5276c57ddbb1655ff0b8edf598a7eea1e45476e8cfb41b27e6feb16fc992c0f66bca6f80a84afdfe45df623ae75f9b9cc2
+  metadata.gz: 58f225f496d12d9e9e7a517c96ea72365fe86cd699b969ad5a8d21c9d2578e9cfb11e992676b72f6309679c39dca22a76ced8a2f6b3b46881258419b4f593a17
+  data.tar.gz: e0715af3063fd55346c94649feb8d3a02b26382c9c02b6797fe070ab91cb3b04afde97f23f81abadc60758e45fd481c38755e35b3c79afbf540f1743a4e3f909

data/lib/locatine/app/manifest.json

@@ -1,6 +1,6 @@
 {
   "name": "Locatine app",
-  "version": "0.01100",
+  "version": "0.01135",
   "description": "Messaging from browser to main app",
   "devtools_page": "devtools.html",
   "permissions": ["activeTab", "storage", "contextMenus", "tabs"],

data/lib/locatine/find_by_locator.rb

@@ -63,7 +63,7 @@ module Locatine
     ##
     # Getting elements by tag
     def find_by_tag(hash, vars, depth = 0)
-      correction = '/*' * depth.to_i
+      correction = '//*' if depth.to_i > 0
       xpath = "//*[self::#{process_string(hash['value'], vars)}]"
       find_by_locator(xpath: "#{xpath}#{correction}#{not_magic_div}")
     end
@@ -71,7 +71,7 @@ module Locatine
     ##
     # Getting elements by text
     def find_by_text(hash, vars, depth = 0)
-      correction = '/*' * depth.to_i
+      correction = '//*' if depth.to_i > 0
       xpath = "//*[contains(text(), '#{process_string(hash['value'], vars)}')]"
       find_by_locator(xpath: "#{xpath}#{correction}#{not_magic_div}")
     end
@@ -79,7 +79,7 @@ module Locatine
     ##
     # Getting elements by attribute
     def find_by_attribute(hash, vars, depth = 0)
-      correction = '/*' * depth.to_i
+      correction = '//*' if depth.to_i > 0
       full_part = '//*[@*'
       hash['name'].split('_').each do |part|
         full_part += "[contains(name(), '#{part}')]"

data/lib/locatine/find_by_magic.rb

@@ -13,9 +13,21 @@ module Locatine
       @cold_time = nil
       raise "Unable to find element #{name} in #{scope}" if all.empty?
 
+      suggest_by_all(all, data, vars, name, scope)
+    end
+
+    def similar_enough(data, attributes)
+      (same_entries(data['0'], attributes, '0').length * 100 /
+      data['0'].length) > @tolerance
+    end
+
+    def suggest_by_all(all, data, vars, name, scope)
       max = all.count(all.max_by { |i| all.count(i) })
       suggestion = (all.select { |i| all.count(i) == max }).uniq
       attributes = generate_data(suggestion, vars)
+      ok = similar_enough(data, attributes)
+      raise "Unable to find element similar to #{name} in #{scope}" unless ok
+
       return suggestion, attributes
     end
 

data/lib/locatine/find_logic.rb

@@ -11,24 +11,34 @@ module Locatine
       name
     end
 
-    def core_search(result, name, scope, vars, exact)
+    def stable?(attributes)
+      s = []
+      attributes.each_pair do |_depth, array|
+        s.push array.max_by { |item| item['stability'].to_i }['stability'].to_i
+      end
+      s.max > 1
+    end
+
+    def data_search(name, scope, vars, exact)
+      result = find_by_data(@data[scope][name], vars)
+      attributes = generate_data(result, vars) if result
+      if !result && (!exact || !stable?(@data[scope][name]))
+        result, attributes = find_by_magic(name, scope,
+                                           @data[scope][name], vars)
+      end
+      return result, attributes
+    end
+
+    def core_search(name, scope, vars, exact)
       if @data[scope][name].to_h != {}
-        result = find_by_data(@data[scope][name], vars)
-        attributes = generate_data(result, vars) if result
-        if !result && !exact
-          result, attributes = find_by_magic(name, scope,
-                                             @data[scope][name], vars)
-        end
+        result, attributes = data_search(name, scope, vars, exact)
       end
       return result, attributes
     end
 
     def full_search(name, scope, vars, locator, exact)
       result, attributes = locator_search(locator, vars)
-      unless result
-        result, attributes = core_search(result, name, scope,
-                                         vars, exact)
-      end
+      result, attributes = core_search(name, scope, vars, exact) unless result
       result, attributes = ask(scope, name, result, vars) if @learn
       raise "Nothing was found for #{scope} #{name}" if !result && !exact
 

data/lib/locatine/public.rb

@@ -26,7 +26,8 @@ module Locatine
                    browser: nil,
                    learn: ENV['LEARN'].nil? ? false : true,
                    stability_limit: 10,
-                   scope: 'Default')
+                   scope: 'Default',
+                   tolerance: 15)
       browser ||= right_browser
       @browser = browser
       @json = json
@@ -37,6 +38,7 @@ module Locatine
       @learn = learn
       @stability_limit = stability_limit
       @scope = scope
+      @tolerance = tolerance
     end
 
     ##
@@ -77,10 +79,12 @@ module Locatine
              look_in: nil,
              iframe: nil,
              return_locator: false,
-             collection: false)
+             collection: false,
+             tolerance: nil)
       name = set_name(simple_name, name)
       @type = look_in
       @iframe = iframe
+      @tolerance ||= tolerance
       scope ||= @scope.nil? ? 'Default' : @scope
       result, attributes = full_search(name, scope, vars, locator, exact)
       return { xpath: generate_xpath(attributes, vars) } if result &&

data/lib/locatine/search.rb

@@ -4,19 +4,19 @@ require 'fileutils'
 require 'chromedriver-helper'
 
 # Internal requires
+require 'locatine/merge'
 require 'locatine/public'
-require 'locatine/find_logic'
-require 'locatine/file_work'
 require 'locatine/helpers'
-require 'locatine/xpath_generator'
-require 'locatine/find_by_locator'
-require 'locatine/find_by_magic'
+require 'locatine/file_work'
+require 'locatine/highlight'
+require 'locatine/find_logic'
 require 'locatine/dialog_logic'
+require 'locatine/find_by_magic'
 require 'locatine/find_by_guess'
-require 'locatine/highlight'
 require 'locatine/data_generate'
-require 'locatine/merge'
 require 'locatine/dialog_actions'
+require 'locatine/xpath_generator'
+require 'locatine/find_by_locator'
 
 module Locatine
   ##
@@ -44,6 +44,7 @@ module Locatine
                   :learn,
                   :json,
                   :stability_limit,
-                  :scope
+                  :scope,
+                  :tolerance
   end
 end

data/lib/locatine/version.rb

@@ -1,6 +1,6 @@
 module Locatine
   # constants here...
-  VERSION = '0.01100'.freeze
+  VERSION = '0.01135'.freeze
   NAME = 'locatine'.freeze
   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.01100'
+  version: '0.01135'
 platform: ruby
 authors:
 - Sergei Seleznev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-03-08 00:00:00.000000000 Z
+date: 2019-03-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler