locatine 0.01215 → 0.01300

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 654fcf96ac8cb5d60890e8f763c11f48d7a8a44b
-  data.tar.gz: 4124878952ca9a27a869a347d2d56959e72e470b
+  metadata.gz: dcac98a7110904e47f05c216b6b78032013f626f
+  data.tar.gz: d2560254389abffb699a635a40dd211bebcb0abc
 SHA512:
-  metadata.gz: e009b71ac4bf3c74912a0c7f03b7faf5de050dbbc996fd1cf95a8435dea7bb6a6708949f39c9ca42fae5769ebc40af7e79513d64b6e5424e8e359eafce865f79
-  data.tar.gz: 6eb4a9ca18de051c96e915b0b6d7130d7ec0c2529577443b17b59bcf675dcbf4b082b7c38ea41426f600b78f092d85352e614c52d46aea34e64cdfd0bace1b1f
+  metadata.gz: 58a755f90fa8442934185daf90f33d0655e215c7487d21fb44dbd760ad3004bc222bca599ca77c221342a86dde2e665a0f9fdefc365456f06c5389cb60612a54
+  data.tar.gz: 8f0cf282edc1cc4652c8badf6d266814bdd22ab47efb88e708ac381eb75100d895e9e1ccc5306628fb1282eaf3927d8273a03006a96bfd66af638700558ee18c

data/lib/locatine/app/manifest.json

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

data/lib/locatine/dialog_actions.rb

@@ -30,7 +30,7 @@ module Locatine
     end
 
     def fix_iframe
-      @iframe = @browser.iframe(@iframe.selector) if @iframe
+      @iframe = @browser.iframe(@iframe.selector) if @iframe && @iframe.stale?
     end
 
     def push_title(text)
@@ -40,7 +40,8 @@ module Locatine
 
     ##
     # Sending request to locatine app
-    def start_listening(_scope, _name)
+    def start_listening(scope, name)
+      push_title "You are selecting #{name} in #{scope}"
       send_to_app('locatinestyle', 'blocked', @browser) if @iframe
       send_to_app('locatinehint', 'Toggle single//collection mode button if '\
         'you need. If you want to do some actions on the page toggle Locatine'\
@@ -59,13 +60,12 @@ module Locatine
 
     def response_action(element)
       send_to_app('locatineconfirmed', 'ok')
-      send_to_app('locatinetitle', 'Right now you are defining nothing. '\
-                                   'So no button will work')
+      push_title 'Right now you are defining nothing. So no button will work'
       send_to_app('locatinehint', 'Place for a smart hint here')
       mass_highlight_turn(element, false)
       send_to_app('locatinestyle', 'set_false')
       send_to_app('locatinestyle', 'ok', @browser) if @iframe
-      sleep 0.5
+      sleep 1
     end
   end
 end

data/lib/locatine/dialog_logic.rb

@@ -43,19 +43,35 @@ module Locatine
 
       warn "Maybe #{tag} can't be found as a #{@type}?" if @type && !element
 
-      return find_by_data(attributes, vars).to_a, attributes.to_h unless element
+      return_selected(element, attributes, new_attributes, vars)
+    end
+
+    def return_old_selection(attrs, vars)
+      return find_by_data(attrs, vars).to_a, attrss.to_h if attrs.to_h != {}
+
+      return nil, {}
+    end
+
+    def return_selected(element, attributes, new_attributes, vars)
+      if !element && new_attributes.to_h != {}
+        push_title 'Selected element was lost before locatine locate it. '\
+                 'Consider choosing it from devtools or write your own locator'
+        return return_old_selection(attributes, vars)
 
+      end
       return element, new_attributes
     end
 
     def what_was_selected(element, attributes, vars, name, scope)
-      send_to_app('locatineconfirmed', 'ok')
       tag, index = tag_index
+      send_to_app('locatineconfirmed', 'ok')
       mass_highlight_turn(element, false) if element
       element, attributes = working_on_selected(tag, index, vars, attributes)
-      mass_highlight_turn(element) if element
-      push_title "#{element.length} elements were selected as #{name} in "\
+      if element
+        mass_highlight_turn(element)
+        push_title "#{element.length} elements were selected as #{name} in "\
                   "#{scope}. If it is correct - confirm the selection."
+      end
       return element, attributes
     end
 

data/lib/locatine/file_work.rb

@@ -15,7 +15,7 @@ module Locatine
       hash.merge(JSON.parse(File.read(@json))['data'])
     end
 
-    def set_file(json)
+    def import_file(json)
       @json = json
       @folder = File.dirname(@json)
       @name = File.basename(@json)

data/lib/locatine/public.rb

@@ -30,7 +30,7 @@ module Locatine
                    tolerance: 15)
       browser ||= right_browser
       @browser = browser
-      set_file(json)
+      import_file(json)
       @depth = depth
       @learn = learn
       @stability_limit = stability_limit
@@ -102,7 +102,7 @@ module Locatine
     end
 
     def json=(value)
-      set_file(value)
+      import_file(value)
     end
   end
 end

data/lib/locatine/version.rb

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