locatine 0.02539 → 0.02542

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 63c1d452b58e6881483141749a4cd5fc572a1a34
-  data.tar.gz: 5436ddbbd222888ab16ef121750e871be2d0b330
+  metadata.gz: df3f8d995c895faf833681632462dcd884e73bce
+  data.tar.gz: 8885ecd8b1513df7cac86761a22e02acdb692f03
 SHA512:
-  metadata.gz: 875b40b1ebc3294dc60868c4f029a3eb2c37b984509002c30fadecad20d7e26f0df207eab8ed3466cc7021777d9a89baa6a0a6c4ba7dc655bea1109b573031cb
-  data.tar.gz: 9c36756f4c0388acf60d1009ed79ebed732b2401daa387930a3f61c8c97b745f2c1bc0bdeeced30e300543d88b09459c7bdf0f7320ef4630dbd47e83c9b58550
+  metadata.gz: 0234243bf852972ac60752c0be0232a2c427ce0f40f21fefaaa2cf8e7a32403e2c33f8761fcaa28712ffd8bd0960b1d2c46f5f3846e45c56e51edf5b5dc2831e
+  data.tar.gz: ec7071e6b671a03d6cf2fe034b510f914af84e403248ddcd6a3d230a9c8cf9ba4f2c291ffe9722a5a58436d3208754b5898d1a9dc94d00f9016772fcf2a6b117

data/README.md

@@ -16,7 +16,7 @@ That's it.
 
 ## Stage of development:
 
-Version of Locatine is **0.02539** 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.02542** only. It means so far this is an alfa. You can use it in a real project if you are a risky person.
 
 ## Installation
 

data/lib/locatine/app/background.js

@@ -1,6 +1,5 @@
 chrome.browserAction.onClicked.addListener(
   function(tab) {
-    console.log("WAS here");
     chrome.windows.create( {'url': 'popup.html',
                             'type': 'popup',
                             'width': 640,

data/lib/locatine/app/content.js

@@ -20,6 +20,7 @@ async function creatingDiv(){
   locatine_create_element(document.body, "div", options, "");
   const magic_cover = document.getElementById('locatine_magic_div');
   magic_cover.onclick = function(e) {locatine_magic_click(e)};
+  await set_value('locatine_confirm', 'new')
   document.body.onkeypress = async function(e) {
     if (e.which == 13) {
       await set_value('locatine_confirm', true)

data/lib/locatine/app/manifest.json

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

data/lib/locatine/app/popup.js

@@ -20,8 +20,10 @@ async function correct_buttons() {
   } else {
     document.getElementById("mode").setAttribute("value", "You are in single selection mode")
   };
-  document.getElementById("mainTitle").innerText = await get_value("locatine_title");
-  document.getElementById("hint").innerText = await get_value("locatine_hint");
+  if (await get_value("locatine_title")) {
+    document.getElementById("mainTitle").innerText = await get_value("locatine_title");
+    document.getElementById("hint").innerText = await get_value("locatine_hint");
+  }
   if ((document.getElementById("nameHandler").value != await get_value("locatineName")) && (!document.hasFocus())){
     document.getElementById("nameHandler").value = (await get_value("locatineName") || "");
   }

data/lib/locatine/for_search/dialog_logic.rb

@@ -53,18 +53,40 @@ module Locatine
         return els, attrs
       end
 
+      # get_from_app('locatineconfirmed') 'selected' or 'declined' or 'true'
+      # or 'abort' or 'new' or anything else (ok or false)
       def listening(els, attrs, vars, name, scope)
-        until %w[true abort].include?(get_from_app('locatineconfirmed'))
-          sleep(0.1)
-          els, attrs = user_selection(els, attrs, vars, name, scope)
+        sleep(0.1)
+        result = hearing
+        els, attrs = understanding(els, attrs, vars, name, scope, result)
+        if (!result[:done] || !els) && !result[:abort]
+          return listening(els, attrs, vars, name, scope)
         end
-        result = get_from_app('locatineconfirmed')
-        return els, attrs if els && result != 'abort'
 
-        els, attrs = decline(els, name, scope)
-        return els, attrs if result == 'abort'
+        return els, attrs
+      end
+
+      def understanding(els, attrs, vars, name, scope, result)
+        if result[:selected]
+          els, attrs = user_selection(els, attrs, vars, name, scope)
+        else
+          start_listening(scope, name) if result[:new]
+          els, attrs = decline(els, name, scope) if result[:declined]
+        end
+        return els, attrs
+      end
 
-        listening(els, attrs, vars, name, scope)
+      def hearing
+        answer = {}
+        result = get_from_app('locatineconfirmed')
+        answer[:selected] = ((result == 'selected') || (result == 'true'))
+        answer[:new] = result == 'new'
+        answer[:done] = result == 'true'
+        answer[:abort] = result == 'abort'
+        answer[:declined] = ((result == 'new') ||
+                             (result == 'declined') ||
+                             (result == 'abort'))
+        answer
       end
 
       ##

data/lib/locatine/for_search/find_by_guess.rb

@@ -25,7 +25,6 @@ module Locatine
         suggested = most_common_of(all).map do |element|
           engine.elements(tag_name: element['tag'])[element['index'].to_i]
         end
-        send_no_guess(name, scope) if suggested.length > 1
         suggested
       end
 

data/lib/locatine/for_search/helpers.rb

@@ -18,13 +18,12 @@ module Locatine
 
       def take_html
         engine.locate
-        engine.html
+        engine.html.gsub(/<div.*id="locatine_magic_div".*>/, '')
       end
 
       def time
         t = Time.now
-        "#{t.year}.#{t.month}.#{t.day}  #{t.hour.to_s.rjust(2, '0')}:"\
-        "#{t.min.to_s.rjust(2, '0')}:#{t.sec.to_s.rjust(2, '0')}"
+        t.strftime('%F %T')
       end
 
       def fix_iframe

data/lib/locatine/for_search/listening.rb

@@ -23,6 +23,7 @@ module Locatine
       def start_listening(scope, name)
         send_to_app('locatinestyle', 'blocked', @browser) if @iframe
         send_to_app('locatinestyle', 'set_true')
+        send_to_app('locatineconfirmed', 'ok')
         send_selecting(name, scope)
         sleep 0.5
       end

data/lib/locatine/large_scripts/element.js

@@ -1,6 +1,5 @@
 
 function one_element(target){
-  console.log("TARGET ==", target);
 
   let element = {};
   let attribute = {};

data/lib/locatine/version.rb

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