locatine 0.02653 → 0.02710

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d99cd5d5712f3b8c2e5ee842d747cabe50389989ae74ee3cfa2e7c7c053459bb
-  data.tar.gz: 5887791f4997688df39acfab6d5bb9e15827e77b970643a9e6fd63afa9947e57
+  metadata.gz: 56487180200c449f68c037e000f60aa54165623f2fa8ccfab887d8756c7e848c
+  data.tar.gz: 8cc1c4a8edffdc0bab1dc2ca4f32038f106412a3bc4864d11547bc27ddcf091e
 SHA512:
-  metadata.gz: fbd537352c05d38f9b4a2f8ebaee26c1e83d787071593caaa1a72bce8be60c41b36c2d869923d633bfb3851e26497b63f453c15e69fac4725986d8207cea03a7
-  data.tar.gz: 11f6d7403fb9eed905255a1c4d1eee477a2ea220d867d0a4d7ce09a9a0b50b081daf59f21cb92dbffcbe4dd4e31ca76ef01e3234e66353ee203a1007b8cc4685
+  metadata.gz: edb0be42a2a0b1d624a53975cf0ace45688df57b20b8e75bfaf6eca1c1adf992a64848b94ef984517ca8de8f14856c6795738b0ef14c4b5928727b11b91da595
+  data.tar.gz: e20848ead9b6346734b19062568d70025d579f314773fed3ee66c2104732c83c30dce86f1b0e0101df51b5831ffbae4fa79b5b048ee9688f17416bc8a84486e8

data/README.md

@@ -14,7 +14,7 @@ That's it.
 
 ## Stage of development:
 
-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.
+Version of Locatine is **0.02710**. The 3rd version since rewriting. 10-15 next versions is dedicated to bug fixing, tweaking.
 
 ## Attention
 

data/lib/locatine/element.rb

@@ -7,6 +7,10 @@ module Locatine
     attr_accessor :answer
 
     def initialize(session, element_code)
+      unless element_code
+        raise ArgumentError, 'Cannot init element with no element data'
+      end
+
       @session = session
       @answer = element_code
     end

data/lib/locatine/results_helpers/find_by_magic.rb

@@ -28,12 +28,17 @@ module Locatine
         classic = classic_thread
         magic = magic_thread
         sleep 0.1 while timer && !similar?
-        classic.kill
-        magic.kill
+        kill_join(classic)
+        kill_join(magic)
         normalize_indexes(magic['out']) if empty? && (magic['out'].to_h != {})
         self
       end
 
+      def kill_join(thread)
+        thread.kill
+        thread.join
+      end
+
       def magic_routine(data)
         Thread.current['out'] = {}
         page = @session.page
@@ -54,14 +59,21 @@ module Locatine
       end
 
       def magic_find(data = known)
+        @everything = all_elements
         magic_routine(data)
         normalize_indexes
       end
 
-      def normalize_indexes(indexes = Thread.current['out'])
+      def all_elements
         all = { 'using' => 'tag name', 'value' => '*' }
         list = @session.api_request('/elements', 'Post', all.to_json).body
-        list = JSON.parse(list)['value']
+        JSON.parse(list)['value']
+      end
+
+      def normalize_indexes(indexes = Thread.current['out'])
+        list = all_elements
+        return warn_unstable_page if list != @everything
+
         answers = max_indexes(indexes).map { |index| list[index.to_i] }
         answers.each do |item|
           push Locatine::Element.new(@session, item)

data/lib/locatine/results_helpers/guess.rb

@@ -60,6 +60,11 @@ module Locatine
         return true if tolerance == 100
 
         count_similarity
+      rescue RuntimeError => e
+        raise e.message unless e.message == 'stale element reference'
+
+        warn_unstable_page
+        false
       end
 
       def similar_enough(same, all)

data/lib/locatine/session.rb

@@ -64,9 +64,9 @@ module Locatine
 
     def execute_script(script, *args)
       args.map! { |item| item.class == Locatine::Element ? item.answer : item }
-      value = JSON.parse(api_request('/execute/sync', 'Post',
-                                     { script: script, args: args }
-                                             .to_json).body)['value']
+      response = api_request('/execute/sync', 'Post',
+                             { script: script, args: args }.to_json).body
+      value = JSON.parse(response, max_nesting: false)['value']
       error_present = (value.class == Hash) && value['error']
       raise_script_error(script, args, value) if error_present
 

data/lib/locatine/version.rb

@@ -2,7 +2,7 @@
 
 module Locatine
   # constants here...
-  VERSION = '0.02653'
+  VERSION = '0.02710'
   NAME = 'locatine'
   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.02653'
+  version: '0.02710'
 platform: ruby
 authors:
 - Sergei Seleznev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-03-02 00:00:00.000000000 Z
+date: 2020-03-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler