locatine 0.02651 → 0.02653

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 346a046dc0581334a4266d04cd1e67aa901173fee6b1d283ee9a5f2f6b65c847
-  data.tar.gz: 4844bdbc771b339065af81425be655928d9212c55d15aab78639d777c7a17c53
+  metadata.gz: d99cd5d5712f3b8c2e5ee842d747cabe50389989ae74ee3cfa2e7c7c053459bb
+  data.tar.gz: 5887791f4997688df39acfab6d5bb9e15827e77b970643a9e6fd63afa9947e57
 SHA512:
-  metadata.gz: 29615368e78617aace0075da63b77f4870ecd10e377ad561b0211d5907d37a4954c2f7fd8e625e1a7f98c9ecb1733ef36605a5d8ad75a5e284f53b2e22039cd6
-  data.tar.gz: 6091dda3b44a530b3d5ddc5bca2c2cd871dab961a6e2768253d214292c9d196d5feae0e3a76b03aa6c45e3cfbba0c5e2159d338ec6bbe69ff422565e1e96202a
+  metadata.gz: fbd537352c05d38f9b4a2f8ebaee26c1e83d787071593caaa1a72bce8be60c41b36c2d869923d633bfb3851e26497b63f453c15e69fac4725986d8207cea03a7
+  data.tar.gz: 11f6d7403fb9eed905255a1c4d1eee477a2ea220d867d0a4d7ce09a9a0b50b081daf59f21cb92dbffcbe4dd4e31ca76ef01e3234e66353ee203a1007b8cc4685

data/README.md

@@ -14,7 +14,7 @@ That's it.
 
 ## Stage of development:
 
-Version of Locatine is **0.02651**. This is the 1st version since redesign. Next 5-15 versions will be about bug fixing and minor tweaks.
+Version of Locatine is **0.02653**. This is the 1st version since redesign. Next 5-15 versions will be about bug fixing and minor tweaks.
 
 ## Attention
 
@@ -80,7 +80,7 @@ driver = Selenium::WebDriver.
 
 This way is recommended because of the simplicity.
 
-Another way is to set options after the session was created by making [POST request to '/locatine/session/%session_id%'](https://github.com/sseleznevqa/locatine#post-to-wd-hub-session_id)
+Another way is to set options after the session was created by making [POST request to '/locatine/session/%session_id%'](https://github.com/sseleznevqa/locatine#post-to-wdhubsession)
 
 ## Settings to pass
 
@@ -329,7 +329,7 @@ For more information about locators read about [locator strategies](https://www.
 
 Locatine also provides its own locator strategy == 'locatine'. In order to use it you need to inject it to the code of selenium-webdriver implementation.
 
-See it's done for ruby [here](https://github.com/sseleznevqa/locatine/tree/master/spec/e2e_spec.rb#L6-L25)
+See it's done for ruby [here](https://github.com/sseleznevqa/locatine/tree/master/spec/e2e_spec.rb#L5-L11)
 
 When it's done you can use:
 

data/lib/locatine/daemon.rb

@@ -2,8 +2,6 @@
 
 require 'sinatra/base'
 require 'json'
-require 'locatine/session'
-require 'locatine/daemon_helpers/methods'
 
 module Locatine
   #

data/lib/locatine/logger.rb

@@ -0,0 +1,62 @@
+# frozen_string_literal: true
+
+require 'colorize'
+
+module Locatine
+  #
+  # Methods for sending lines to STDOUT
+  module Logger
+    def warn(text)
+      puts "WARNING: #{Time.now}: ".yellow + text
+    end
+
+    def log(text)
+      puts "MESSAGE: #{Time.now}: ".magenta + text
+    end
+
+    def locatine_error(text)
+      puts "ERROR: #{Time.now}: ".red + text.red
+    end
+
+    def warn_locator
+      warn("Locator is broken. For #{name} by"\
+           " #{@locator['using']}>>>'#{locator['value']}'")
+    end
+
+    def warn_guess
+      warn("Locatine is trying to guess what is #{@name}")
+    end
+
+    def log_start
+      log "#{Time.now}: Locatine is working on #{@name}"
+    end
+
+    def warn_magic
+      warn "Locatine cannot find element #{@name} by usual methods and "\
+           'starting to look for some element that is similar. Retrived '\
+           'element may be not the one that is desired from this point'
+    end
+
+    def warn_lost
+      warn "Locatine found nothing for #{@name}"
+    end
+
+    def warn_unstable_page
+      warn 'Locatine detected stale element error. It means some elements'\
+           ' found by locatine are not attached to DOM anymore.'\
+           ' Page is unstable. Starting searching process again'
+    end
+
+    def log_found
+      log "Locatine found something as #{@name}"
+      log "XPATH == #{generate_xpath(raw_info)}"
+    end
+
+    def raise_script_error(script, args, answer)
+      locatine_error 'Locatine faced an error while trying to perform '\
+        "js script.\n ---Script was: #{script}\n\n ---Arguments was: #{args}"\
+        "\n\n ---Answer was: #{answer}"
+      raise answer['error']
+    end
+  end
+end

data/lib/locatine/results.rb

@@ -1,12 +1,5 @@
 # frozen_string_literal: true
 
-require 'locatine/results_helpers/info_generator'
-require 'locatine/results_helpers/xpath_generator'
-require 'locatine/results_helpers/find_by_magic'
-require 'locatine/results_helpers/common'
-require 'locatine/results_helpers/logger'
-require 'locatine/results_helpers/guess'
-
 module Locatine
   #
   # Locatine results container
@@ -15,7 +8,7 @@ module Locatine
     include Locatine::ResultsHelpers::XpathGenerator
     include Locatine::ResultsHelpers::FindByMagic
     include Locatine::ResultsHelpers::Common
-    include Locatine::ResultsHelpers::Logger
+    include Locatine::Logger
     include Locatine::ResultsHelpers::Guess
 
     attr_accessor :name, :config, :locator

data/lib/locatine/results_helpers/guess.rb

@@ -40,6 +40,32 @@ module Locatine
         end
         answer
       end
+
+      def count_similarity
+        all = 0
+        same = 0
+        # Next is necessary for unknown reason (smthing thread related)
+        raw = raw_info['0']
+        get_trusted(known['0']).each do |hash|
+          caught = (raw.select { |item| info_hash_eq(item, hash) }).first
+          all += 1
+          same += 1 if caught
+        end
+        similar_enough(same, all)
+      end
+
+      def similar?
+        return false if empty?
+
+        return true if tolerance == 100
+
+        count_similarity
+      end
+
+      def similar_enough(same, all)
+        sameness = (same * 100) / all
+        sameness >= 100 - tolerance
+      end
     end
   end
 end

data/lib/locatine/session.rb

@@ -1,14 +1,10 @@
 # frozen_string_literal: true
 
-require 'locatine/results'
-require 'locatine/element'
-require 'locatine/results_helpers/logger'
-
 module Locatine
   #
   # Locatine session operator finds and returns
   class Session
-    include Locatine::ResultsHelpers::Logger
+    include Locatine::Logger
     attr_accessor :json, :depth, :trusted, :untrusted, :tolerance, :stability,
                   :elements, :timeout
 

data/lib/locatine/version.rb

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

data/lib/locatine.rb

@@ -1,5 +1,15 @@
 # frozen_string_literal: true
 
+require 'locatine/daemon_helpers/methods'
+require 'locatine/results_helpers/common'
+require 'locatine/results_helpers/find_by_magic'
+require 'locatine/results_helpers/guess'
+require 'locatine/results_helpers/info_generator'
+require 'locatine/results_helpers/xpath_generator'
+
+require 'locatine/logger'
 require 'locatine/version'
 require 'locatine/daemon'
 require 'locatine/session'
+require 'locatine/element'
+require 'locatine/results'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: locatine
 version: !ruby/object:Gem::Version
-  version: '0.02651'
+  version: '0.02653'
 platform: ruby
 authors:
 - Sergei Seleznev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-03-01 00:00:00.000000000 Z
+date: 2020-03-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -141,12 +141,12 @@ files:
 - lib/locatine/daemon.rb
 - lib/locatine/daemon_helpers/methods.rb
 - lib/locatine/element.rb
+- lib/locatine/logger.rb
 - lib/locatine/results.rb
 - lib/locatine/results_helpers/common.rb
 - lib/locatine/results_helpers/find_by_magic.rb
 - lib/locatine/results_helpers/guess.rb
 - lib/locatine/results_helpers/info_generator.rb
-- lib/locatine/results_helpers/logger.rb
 - lib/locatine/results_helpers/xpath_generator.rb
 - lib/locatine/scripts/element.js
 - lib/locatine/scripts/page.js

data/lib/locatine/results_helpers/logger.rb

@@ -1,64 +0,0 @@
-# frozen_string_literal: true
-
-require 'colorize'
-
-module Locatine
-  module ResultsHelpers
-    #
-    # Methods for sending lines to STDOUT
-    module Logger
-      def warn(text)
-        puts "WARNING: #{Time.now}: ".yellow + text
-      end
-
-      def log(text)
-        puts "MESSAGE: #{Time.now}: ".magenta + text
-      end
-
-      def locatine_error(text)
-        puts "ERROR: #{Time.now}: ".red + text.red
-      end
-
-      def warn_locator
-        warn("Locator is broken. For #{name} by"\
-             " #{@locator['using']}>>>'#{locator['value']}'")
-      end
-
-      def warn_guess
-        warn("Locatine is trying to guess what is #{@name}")
-      end
-
-      def log_start
-        log "#{Time.now}: Locatine is working on #{@name}"
-      end
-
-      def warn_magic
-        warn "Locatine cannot find element #{@name} by usual methods and "\
-             'starting to look for some element that is similar. Retrived '\
-             'element may be not the one that is desired from this point'
-      end
-
-      def warn_lost
-        warn "Locatine found nothing for #{@name}"
-      end
-
-      def warn_unstable_page
-        warn 'Locatine detected stale element error. It means some elements'\
-             ' found by locatine are not attached to DOM anymore.'\
-             ' Page is unstable. Starting searching process again'
-      end
-
-      def log_found
-        log "Locatine found something as #{@name}"
-        log "XPATH == #{generate_xpath(raw_info)}"
-      end
-
-      def raise_script_error(script, args, answer)
-        locatine_error 'Locatine faced an error while trying to perform '\
-          "js script.\n ---Script was: #{script}\n\n ---Arguments was: #{args}"\
-          "\n\n ---Answer was: #{answer}"
-        raise answer['error']
-      end
-    end
-  end
-end