locatine 0.01454 → 0.01546

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5f4b5920958d23beb5f982dbf21031b415be3ee2
-  data.tar.gz: 6845db3f39092cdfb16e041dcbf30137cb061cff
+  metadata.gz: 8a4b678e1915017d1898771afe9cd2b737051b62
+  data.tar.gz: 8adbe3846eecb369e49483a1aa2e08b291dddf6c
 SHA512:
-  metadata.gz: 66bdbebd614dd0e0bc629437b8373ac030b428153c4c76bf85b05f31c213e9a25d184fb9df8bf6925da5b87e34ff776e5efa518f600fed468f53ae6deed26745
-  data.tar.gz: 8102bbf0e52b8dac143953a548dc36e9cf8b500baf31f818e2b2959f210ba6d8d3b0e062d6646fb1e8632cb815a465e386ffb9e96979ccf99f430634babc290c
+  metadata.gz: f79005a1036bbe968439219a2b3c90ec183b95d4ae7990cebdee2aa9065186a93dcb96c592dd5dd894a1b1f633eb20d9e5ee604206c8c6ef88296eb2a936a531
+  data.tar.gz: 53b87536a961b56ec9b82a2762812dfd151b7454b716eb108137f97fa8d71e751fca8c564c6da414c0f8d68c5784a69d0c2d4853e9a477d2b248a7b9f5497560

data/lib/locatine/app/manifest.json

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

data/lib/locatine/data_generate.rb

@@ -87,9 +87,9 @@ module Locatine
       attributes.each_pair do |name, value|
         next if name.to_s == 'locatineclass'
 
-        value.split(/['" ]/).uniq.each do |part|
+        value.split(/['" ]/).reject(&:empty?).uniq.each do |part|
           array.push('name' => name.to_s, 'type' => 'attribute',
-                     'value' => part) unless part.empty?
+                     'value' => part)
         end
       end
       array

data/lib/locatine/find_by_locator.rb

@@ -22,7 +22,7 @@ module Locatine
       results = engine.send(method, locator)
       return correct_method_detected(results) if collection?(results.class)
 
-      return acceptable_method_detected(results, method, locator)
+      acceptable_method_detected(results, method, locator)
     end
 
     def correct_method_detected(results)

data/lib/locatine/find_by_magic.rb

@@ -6,29 +6,39 @@ module Locatine
 
     ##
     # Getting all the elements via black magic
-    def find_by_magic(name, scope, data, vars)
+    def find_by_magic(name, scope, data, vars, exact)
       warn "#{name} in #{scope} is lost. Looking for it."
       @cold_time = 0
       all = all_options(data, vars)
       @cold_time = nil
-      raise "Unable to find element #{name} in #{scope}" if all.empty?
+      raise "Unable to find element #{name} in #{scope}" if all.empty? && !exact
 
-      suggest_by_all(all, data, vars, name, scope)
+      suggest_by_all(all, data, vars, name, scope, exact)
     end
 
     def similar_enough(data, attributes)
-      (same_entries(data['0'], attributes, '0').length * 100 /
-      data['0'].length) >= @tolerance
+      same = same_entries(data['0'], attributes, '0').length
+      all = data['0'].length
+      sameness = (same * 100) / all
+      sameness >= 100 - @current_t
     end
 
-    def suggest_by_all(all, data, vars, name, scope)
+    def best_of_all(all, vars)
       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
+      suggest = (all.select { |i| all.count(i) == max }).uniq unless max.zero?
+      attributes = generate_data(suggest, vars) unless suggest.nil?
+      return suggest, attributes
+    end
+
+    def suggest_by_all(all, data, vars, name, scope, exact)
+      suggest, attributes = best_of_all(all, vars)
+      ok = similar_enough(data, attributes) unless suggest.nil?
+      spawn = !ok && !exact
+      raise "Unable to find element similar to #{name} in #{scope}" if spawn
+
+      return suggest, attributes if ok
 
-      return suggestion, attributes
+      return nil, nil
     end
 
     def all_options(data, vars)
@@ -44,8 +54,8 @@ module Locatine
     end
 
     def min_max_by_size(middle, size)
-      min = middle - (size.to_i * (100 + @tolerance)) / 200
-      max = middle + (size.to_i * (100 + @tolerance)) / 200
+      min = middle - (size.to_i * (200 - @current_t)) / 200
+      max = middle + (size.to_i * (200 - @current_t)) / 200
       return min, max
     end
 

data/lib/locatine/find_logic.rb

@@ -16,7 +16,7 @@ module Locatine
       attributes.each_pair do |_depth, array|
         s.push array.max_by { |item| item['stability'].to_i }['stability'].to_i
       end
-      s.max > 1
+      s.max >= @stability_limit
     end
 
     def data_search(name, scope, vars, exact)
@@ -24,7 +24,7 @@ module Locatine
       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)
+                                           @data[scope][name], vars, exact)
       end
       return result, attributes
     end
@@ -37,15 +37,21 @@ module Locatine
     end
 
     def full_search(name, scope, vars, locator, exact)
-      result, attributes = locator_search(locator, vars)
-      result, attributes = core_search(name, scope, vars, exact) unless result
-      result, attributes = ask(scope, name, result, vars) if @learn
+      result, attributes = search_steps(name, scope, vars, locator, exact)
       raise "Nothing was found for #{scope} #{name}" if !result && !exact
 
       store(attributes, scope, name) if result
       return result, attributes
     end
 
+    def search_steps(name, scope, vars, locator, exact)
+      result, attributes = locator_search(locator, vars)
+      ok = result || ((locator != {}) && exact)
+      result, attributes = core_search(name, scope, vars, exact) unless ok
+      result, attributes = ask(scope, name, result, vars) if @learn
+      return result, attributes
+    end
+
     def locator_search(locator, vars)
       result = find_by_locator(locator) if locator != {}
       attributes = generate_data(result, vars) if result

data/lib/locatine/helpers.rb

@@ -19,6 +19,12 @@ module Locatine
       (@iframe || @browser)
     end
 
+    def set_env_for_search(look_in, iframe, tolerance)
+      @type = look_in
+      @iframe = iframe
+      @current_t = tolerance || @tolerance
+    end
+
     def not_magic_div
       "[not(@id = 'locatine_magic_div')]"
     end

data/lib/locatine/public.rb

@@ -30,9 +30,9 @@ module Locatine
                    depth: 3,
                    browser: nil,
                    learn: ENV['LEARN'].nil? ? false : true,
-                   stability_limit: 10,
+                   stability_limit: 1000,
                    scope: 'Default',
-                   tolerance: 33,
+                   tolerance: 67,
                    visual_search: false)
       import_browser browser
       import_file(json)
@@ -85,9 +85,7 @@ module Locatine
              collection: false,
              tolerance: nil)
       name = set_name(simple_name, name)
-      @type = look_in
-      @iframe = iframe
-      @tolerance ||= tolerance
+      set_env_for_search(look_in, iframe, 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/version.rb

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