locatine 0.02542 → 0.02637

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: df3f8d995c895faf833681632462dcd884e73bce
-  data.tar.gz: 8885ecd8b1513df7cac86761a22e02acdb692f03
+  metadata.gz: 8d969a9d3fc96c105d69b1d41f7ff8df92198d6d
+  data.tar.gz: 93ec07af0558fd08a13224686c9844775f3b36c9
 SHA512:
-  metadata.gz: 0234243bf852972ac60752c0be0232a2c427ce0f40f21fefaaa2cf8e7a32403e2c33f8761fcaa28712ffd8bd0960b1d2c46f5f3846e45c56e51edf5b5dc2831e
-  data.tar.gz: ec7071e6b671a03d6cf2fe034b510f914af84e403248ddcd6a3d230a9c8cf9ba4f2c291ffe9722a5a58436d3208754b5898d1a9dc94d00f9016772fcf2a6b117
+  metadata.gz: 6f7d7af25a50b8aeb293f3795574999e87debe5adfd3149bb3e9855257a5cf4f47c2f980c57a8582b7b65890abafc665c3d96ab39604eb4ae615bdc636489d11
+  data.tar.gz: 3883f1e882b88f038dcacd6520d408126e9c82b9178a5cfb2d5069d4b14a7327e25651d08a45ab447f8b4a0366341482aefc7414668d06e08aeebaa13ef2ffd0

data/README.md

@@ -16,7 +16,11 @@ That's it.
 
 ## Stage of development:
 
-Version of Locatine is **0.02542** 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.02637** only. It means so far this is an alfa. You can use it in a real project if you are a risky person.
+
+## Attention
+
+Beginning with the next version locatine (especially locatine-daemon) will be refactored dramatically. It is highly possible that the next version will be not completable with that one.
 
 ## Installation
 

data/lib/locatine/app/content.css

@@ -20,7 +20,7 @@ div[locatinestyle=true] {
   display: block;
   z-index: 2147483646;
   color: #FF99AA;
-  font-size: 45px;
+  font-size: 4vw;
   text-align: center;
   cursor: default;
 }
@@ -30,11 +30,6 @@ div[locatinestyle=false] {
   width: 0%;
 }
 
-div[locatinestyle=blocked] {
-  height: 0%;
-  width: 0%;
-}
-
 [locatineclass=foundbylocatine]
   {animation: locatine_found 6s infinite;
    -webkit-appearance: none;

data/lib/locatine/app/content.js

@@ -46,21 +46,24 @@ async function setTitleHint(magicDiv){
     await set_value('locatine_title', magicDiv.getAttribute("locatinetitle"));
     await set_value('locatine_hint', magicDiv.getAttribute("locatinehint"));
     magicDiv.setAttribute("locatinetitle", "ok");
-    let op = 1;
-    magicDiv.innerHTML = await get_value("locatine_title");
-    let timer = setInterval(function () {
-      if ((magicDiv.style.opacity == 1) && (op < 0.97)) {
-        clearInterval(timer);// If other process changed opacity.
-      };
-      if (op <= 0.2) {
-        clearInterval(timer);
-        magicDiv.style.opacity = 0;
-        magicDiv.innerHTML = "";
-      }
-      magicDiv.style.opacity = op;
-      magicDiv.style.filter = 'alpha(opacity=' + op * 100 + ")";
-      op -= op * 0.03;
-    }, 50);
+    let status = await get_value('magic_div');
+    if (status) {
+      let op = 1;
+      magicDiv.innerHTML = await get_value("locatine_title");
+      let timer = setInterval(function () {
+        if ((magicDiv.style.opacity == 1) && (op < 0.97)) {
+          clearInterval(timer);// If other process changed opacity.
+        };
+        if (op <= 0.2) {
+          clearInterval(timer);
+          magicDiv.style.opacity = 0;
+          magicDiv.innerHTML = "";
+        }
+        magicDiv.style.opacity = op;
+        magicDiv.style.filter = 'alpha(opacity=' + op * 100 + ")";
+        op -= op * 0.03;
+      }, 50);
+    }
   }
 }
 
@@ -117,7 +120,7 @@ async function getSelected(value){
 };
 
 async function locatine_magic_click(e) {
-  document.getElementById("locatine_magic_div").setAttribute("locatinestyle", "blocked");
+  document.getElementById("locatine_magic_div").setAttribute("locatinestyle", "false");
   const value = document.elementFromPoint(e.clientX, e.clientY);
   document.getElementById("locatine_magic_div").setAttribute("locatinestyle", "true");
   const tagName = value.tagName;
@@ -140,7 +143,7 @@ function locatine_create_element(dom, tag, attrs, inner) {
 
 setInterval(async function(){
   if (document.getElementById("locatine_magic_div")) {
-    if (document.getElementById("locatine_magic_div").getAttribute("locatinestyle") != "blocked") {
+    if (document.getElementById("locatine_magic_div").getAttribute("locatinestyle") != "false") {
       await refreshData()
     }
   } else {

data/lib/locatine/app/manifest.json

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

data/lib/locatine/for_search/find_by_magic.rb

@@ -28,7 +28,7 @@ module Locatine
       # We are taking every element that look at least a bit similar to one we
       # are looking for
       def magic_elements(name, scope, data, vars, page)
-        warn_element_lost(name, scope)
+        warn_element_lost(name, scope, data, vars)
         all = select_from_page(page, data, vars)
         raise_not_found(name, scope) if all.empty? && !@current_no_f
         suggested = most_common_of(all).map do |element|
@@ -54,7 +54,7 @@ module Locatine
         ok = similar_enough(data, attributes) unless suggest.empty?
         raise_not_similar(name, scope) if !ok && !@current_no_f
         if ok
-          warn_lost_found(name, scope)
+          warn_lost_found(name, scope, attributes, vars)
           return suggest, attributes
         end
         warn_not_found(name, scope)

data/lib/locatine/for_search/listening.rb

@@ -21,7 +21,7 @@ module Locatine
       ##
       # Sending request to locatine app
       def start_listening(scope, name)
-        send_to_app('locatinestyle', 'blocked', @browser) if @iframe
+        send_to_app('locatinestyle', 'set_false', @browser) if @iframe
         send_to_app('locatinestyle', 'set_true')
         send_to_app('locatineconfirmed', 'ok')
         send_selecting(name, scope)

data/lib/locatine/for_search/saying.rb

@@ -128,9 +128,10 @@ module Locatine
          ' :links, etc.)'
       end
 
-      def warn_element_lost(name, scope)
-        send_warn "#{name} in #{scope} is//are lost. Locatine is trying "\
-                  'to find it anyway.'
+      def warn_element_lost(name, scope, data, vars)
+        xpath = generate_xpath(data, vars)
+        send_warn "#{name} in #{scope} by xpath: ```#{xpath}``` is//are lost."\
+                  ' Locatine is trying to find it anyway.'
       end
 
       def warn_cannot_highlight(data)
@@ -154,8 +155,10 @@ module Locatine
         send_warn "Only the first 50 elements of #{size} were highlighted."
       end
 
-      def warn_lost_found(name, scope)
-        send_warn "Something was found as #{name} in #{scope}."
+      def warn_lost_found(name, scope, data, vars)
+        xpath = generate_xpath(data, vars)
+        send_warn "Something was found as #{name} in #{scope} by xpath:"\
+                  "```#{xpath}```"
       end
 
       def warn_not_found(name, scope)

data/lib/locatine/for_search/xpath_generator.rb

@@ -34,7 +34,15 @@ module Locatine
       end
 
       def generate_xpath_part(hash, vars)
-        value = process_string(hash['value'], vars)
+        result = ''
+        values = process_string(hash['value'], vars).split(/[,.-_ ;'\\"]/)
+        values.each do |value|
+          result += generate_real_xpath_part(hash, value) if !value.empty?
+        end
+        result
+      end
+
+      def generate_real_xpath_part(hash, value)
         case hash['type']
         when 'tag'
           "[self::#{value}]"

data/lib/locatine/version.rb

@@ -1,6 +1,6 @@
 module Locatine
   # constants here...
-  VERSION = '0.02542'.freeze
+  VERSION = '0.02637'.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.02542'
+  version: '0.02637'
 platform: ruby
 authors:
 - Sergei Seleznev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-10-08 00:00:00.000000000 Z
+date: 2019-11-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler