locatine 0.02247 → 0.02327

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 023773fde5af096ee6f8b04948dbeadcee35f3d2
-  data.tar.gz: 2071bcae7bf758afc1196a82f04f74690931f9c0
+  metadata.gz: a584853859a41d1442f3037bef100dec0bb1d09e
+  data.tar.gz: 298cabc4969b4e454bb3d6bd9f5f2b5d091ff53c
 SHA512:
-  metadata.gz: c3c8e5959c2fd4b850608ee0d998357c32ce9af253e6726c3077f6eafeeef4625a85fa0e5c70f10564d14c1d46756efe61a9823f4e68f2ac37dd5000d008d1bb
-  data.tar.gz: 99f44eb1de8f7158f8b108edc971c2682322fc2fb60db7e2729da318a73729e21f1dece359616bdfd14e9703a8277b6372c968cac73725fd82e930a85d61fa80
+  metadata.gz: 4a317d9efb1aab542d551d90272ee912edb9b7ee36df13ad74292d1ac377848995d19a786104a5db89480f636bf14d77c3b3f1271d4b408732729d8f0498baa8
+  data.tar.gz: 99dbade69774c044b519d78e5c3ec3b0ba7469eb803e9cff80eee1fa3549bd566460ffaaf2c3c95e7a7817bd83c6dd2254101ef50666a76503a91a19a06b117f

data/README.md

@@ -16,7 +16,7 @@ That's it.
 
 ## Stage of development:
 
-Version of Locatine is **0.02247** only. It means so far this is an alfa. You can use it in a real project if you are a risky person.
+Version of Locatine is **0.02327** only. It means so far this is an alfa. You can use it in a real project if you are a risky person.
 
 ## Installation
 
@@ -96,7 +96,9 @@ Locatine::Search.new(json: "./Locatine_files/default.json",
                      scope: "Default",
                      tolerance: 33,
                      visual_search: false,
-                     no_fail: false)
+                     no_fail: false,
+                     trusted: [],
+                     untrusted: [])
 ```
 
 ### json
@@ -147,6 +149,12 @@ Be careful! Set true only if appearance of your page is pretty stable.
 
 When element is lost and no_fail is true you will get nil for single element and [] for collection. If no_fail is false (which is default) and locatine cannot find something you will face an error.
 
+### trusted/untrusted
+
+If you are sure that some attribute (or something) is not good(generated by random, not uniq, etc.) you can forbid to use it in search. You can write attribute name, "text", "tag", or css attribute name (if you are using visual_search)
+
+On the other hand you can force locatine to always trust something with trusted.
+
 ## Changing options on fly
 
 You can get or set these values on fly. Like:
@@ -170,7 +178,9 @@ s.find(name: "some name",
        return_locator: false,
        collection: false,
        tolerance: nil,
-       no_fail: nil)
+       no_fail: nil,
+       trusted: [],
+       untrusted: [])
 ```
 ### name
 
@@ -257,6 +267,10 @@ It is disabling attempts to find element by advanced algorithms. If locator is p
 
 no_fail option that will work for that search only.
 
+### trusted//untrusted
+
+You can set trusted elements just for search
+
 ## Scope
 
 If you want to define a whole bunch of elements at once you can do:

data/lib/locatine/app/manifest.json

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

data/lib/locatine/for_search/element_selection.rb

@@ -19,7 +19,7 @@ module Locatine
         return element, attrs
       end
 
-      def negative_needed(element, vars, old_depth)
+      def negative_need(element, vars, old_depth)
         @depth = old_depth
         warn_no_negatives
         generate_data([element], vars).to_h
@@ -27,10 +27,10 @@ module Locatine
 
       def complex_attrs(element, vars, old_depth = @depth)
         attrs = get_family_info(element, vars).to_h
-        return negative_needed(element, vars, old_depth) if attrs.length < @depth
+        return negative_need(element, vars, old_depth) if attrs.length < @depth
 
         if find_by_data(attrs, vars).length > 1
-          @depth +=1
+          @depth += 1
           return complex_attrs(element, vars, old_depth)
         end
         @depth = old_depth

data/lib/locatine/for_search/file_work.rb

@@ -43,11 +43,18 @@ module Locatine
         final
       end
 
-      def stability_bump(to_add, hash)
+      def stability_value(name, max, init = 0)
+        result = @trust_now.include?(name) ? max.to_s : (init.to_i + 1).to_s
+        result = '0' if @untrust_now.include?(name)
+        result
+      end
+
+      def stability_bump(to_add, hash, max)
         if to_add.empty? # new ones
-          hash['stability'] = '1'
+          hash['stability'] = stability_value(hash['name'], max)
         elsif to_add[0]['stability'].to_i < @stability_limit # old ones
-          to_add[0]['stability'] = (to_add[0]['stability'].to_i + 1).to_s
+          to_add[0]['stability'] = stability_value(to_add[0]['name'],
+                                                   max, to_add[0]['stability'])
         end
         to_add.empty? ? [hash] : to_add
       end

data/lib/locatine/for_search/helpers.rb

@@ -26,11 +26,18 @@ module Locatine
         @iframe = @browser.iframe(@iframe.selector) if @iframe && @iframe.stale?
       end
 
-      def set_env_for_search(look_in, iframe, tolerance, no_fail)
+      def set_env_for_search(look_in,
+                             iframe,
+                             tolerance,
+                             no_fail,
+                             trusted,
+                             untrusted)
         @type = look_in
         @iframe = iframe
         @current_t = tolerance || @tolerance
         @current_no_f = no_fail || @no_fail
+        @trust_now = trusted || @trusted
+        @untrust_now = untrusted || @untrusted
       end
 
       def not_magic_div

data/lib/locatine/for_search/merge.rb

@@ -18,7 +18,8 @@ module Locatine
         array.each do |hash|
           item = second[depth]
           to_add = item.nil? ? [] : select_same(second[depth], hash)
-          to_add = stability_bump(to_add, hash) if stability_up
+          max = max_stability(second[depth]).to_i + 1
+          to_add = stability_bump(to_add, hash, max) if stability_up
           result += to_add
         end
         result

data/lib/locatine/for_search/public.rb

@@ -36,7 +36,9 @@ module Locatine
                      scope: 'Default',
                      tolerance: 67,
                      visual_search: false,
-                     no_fail: false)
+                     no_fail: false,
+                     trusted: [],
+                     untrusted: [])
         import_browser browser
         import_file(json)
         @depth = depth
@@ -46,6 +48,8 @@ module Locatine
         @tolerance = tolerance
         @visual_search = visual_search
         @no_fail = no_fail
+        @trusted = trusted
+        @untrusted = untrusted
       end
 
       ##
@@ -91,9 +95,12 @@ module Locatine
                return_locator: false,
                collection: false,
                tolerance: nil,
-               no_fail: nil)
+               no_fail: nil,
+               trusted: nil,
+               untrusted: nil)
         name = set_name(simple_name, name)
-        set_env_for_search(look_in, iframe, tolerance, no_fail)
+        set_env_for_search(look_in, iframe, tolerance,
+                           no_fail, trusted, untrusted)
         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/for_search/xpath_generator.rb

@@ -7,14 +7,20 @@ module Locatine
 
       def get_trusted(array)
         if !array.empty?
-          max_stability = (array
-                          .max_by { |i| i['stability'].to_i })['stability']
-          (array.select { |i| i['stability'].to_i == max_stability.to_i }).uniq
+          max = max_stability(array)
+          (array.select { |i| i['stability'].to_i == max.to_i }).uniq
         else
           []
         end
       end
 
+      def max_stability(array)
+        max = (array.max_by { |i| i['stability'].to_i })
+        return max['stability'] if max
+
+        return 0
+      end
+
       def generate_xpath(data, vars)
         xpath = "[not(@id = 'locatine_magic_div')]"
         data.each_pair do |_depth, array|

data/lib/locatine/scope.rb

@@ -80,6 +80,7 @@ module Locatine
       item = @search.send(:ask, @scope, '', nil, vars)
       return find_all(vars) if item[:element].nil?
 
+      @search.send(:set_env_for_search, nil, nil, nil, nil, nil, nil)
       @search.send(:store, item[:attributes], @scope, item[:name])
       new_define(vars)
     end

data/lib/locatine/search.rb

@@ -55,7 +55,9 @@ module Locatine
                   :scope,
                   :tolerance,
                   :visual_search,
-                  :no_fail
+                  :no_fail,
+                  :trusted,
+                  :untrusted
     attr_reader   :json,
                   :browser
   end

data/lib/locatine/version.rb

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