locatine 0.02058 → 0.02247

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 839233263a07aac6fda720392d0dbd920a5a9660
-  data.tar.gz: b60a4fdc5d93b96abb65b49c128302eb73d5a9b6
+  metadata.gz: 023773fde5af096ee6f8b04948dbeadcee35f3d2
+  data.tar.gz: 2071bcae7bf758afc1196a82f04f74690931f9c0
 SHA512:
-  metadata.gz: f6279a2237def4ac7799e8a1ed6f3d293251d92ad7e2a62e13fd98ac22b05c2d4bccaabd4be19cf9de97f27a28a98916d784236af6240109ccb61323481dd7be
-  data.tar.gz: f1f87a3f394b2091d0391e53e3844067e6c929d51dfc68e2d526a0dd44dd588ce293752044e9c27602997f3d9b2d43c27e1fb657683387761079fae9b81d5f65
+  metadata.gz: c3c8e5959c2fd4b850608ee0d998357c32ce9af253e6726c3077f6eafeeef4625a85fa0e5c70f10564d14c1d46756efe61a9823f4e68f2ac37dd5000d008d1bb
+  data.tar.gz: 99f44eb1de8f7158f8b108edc971c2682322fc2fb60db7e2729da318a73729e21f1dece359616bdfd14e9703a8277b6372c968cac73725fd82e930a85d61fa80

data/README.md

@@ -16,7 +16,7 @@ That's it.
 
 ## Stage of development:
 
-Version of Locatine is **0.02058** 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.02247** 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/manifest.json

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

data/lib/locatine/for_search/dialog_logic.rb

@@ -18,50 +18,6 @@ module Locatine
         return element, attributes
       end
 
-      def add_selected_attributes(new_attributes, attributes)
-        if get_from_app('locatinecollection') == 'true'
-          get_commons(new_attributes, attributes.to_h)
-        else
-          new_attributes
-        end
-      end
-
-      def selected_element_attributes(tag, index, vars)
-        generate_data([engine.elements(tag_name: tag)[index]], vars).to_h
-      end
-
-      def selected_element(tag, index, vars, attributes)
-        new_attributes = selected_element_attributes(tag, index, vars)
-        new_attributes = add_selected_attributes(new_attributes, attributes)
-        element = find_by_data(new_attributes, vars)
-        return element, new_attributes
-      end
-
-      def working_on_selected(tag, index, vars, attributes)
-        send_working(tag, index)
-        element, new_attributes = selected_element(tag, index, vars, attributes)
-        warn_dropping(tag, index) unless element
-
-        warn_type(tag) if @type && !element
-
-        return_selected(element, attributes, new_attributes, vars)
-      end
-
-      def return_old_selection(attrs, vars)
-        return find_by_data(attrs, vars).to_a, attrs.to_h if attrs.to_h != {}
-
-        return nil, {}
-      end
-
-      def return_selected(element, attributes, new_attributes, vars)
-        if !element && new_attributes.to_h != {}
-          send_lost
-          return return_old_selection(attributes, vars)
-
-        end
-        return element, new_attributes
-      end
-
       def what_was_selected(element, attributes, vars)
         tag, index = tag_index
         send_to_app('locatineconfirmed', 'ok')

data/lib/locatine/for_search/element_selection.rb

@@ -0,0 +1,80 @@
+module Locatine
+  module ForSearch
+    ##
+    # Cooking element data for dialog
+    module ElementSelection
+      private
+
+      def add_selected_attributes(new_attributes, attributes)
+        if get_from_app('locatinecollection') == 'true'
+          get_commons(new_attributes, attributes.to_h)
+        else
+          new_attributes
+        end
+      end
+
+      def simple_attrs(tag, index, vars)
+        element = engine.elements(tag_name: tag)[index]
+        attrs = generate_data([element], vars).to_h
+        return element, attrs
+      end
+
+      def negative_needed(element, vars, old_depth)
+        @depth = old_depth
+        warn_no_negatives
+        generate_data([element], vars).to_h
+      end
+
+      def complex_attrs(element, vars, old_depth = @depth)
+        attrs = get_family_info(element, vars).to_h
+        return negative_needed(element, vars, old_depth) if attrs.length < @depth
+
+        if find_by_data(attrs, vars).length > 1
+          @depth +=1
+          return complex_attrs(element, vars, old_depth)
+        end
+        @depth = old_depth
+        attrs
+      end
+
+      def selected_element_attributes(tag, index, vars)
+        element, attrs = simple_attrs(tag, index, vars)
+        length = find_by_data(attrs, vars).to_a.length
+        attrs = complex_attrs(element, vars) if length > 1
+        attrs
+      end
+
+      def selected_element(tag, index, vars, attributes)
+        new_attributes = selected_element_attributes(tag, index, vars)
+        new_attributes = add_selected_attributes(new_attributes, attributes)
+        element = find_by_data(new_attributes, vars)
+        return element, new_attributes
+      end
+
+      def working_on_selected(tag, index, vars, attributes)
+        send_working(tag, index)
+        element, new_attributes = selected_element(tag, index, vars, attributes)
+        warn_dropping(tag, index) unless element
+
+        warn_type(tag) if @type && !element
+
+        return_selected(element, attributes, new_attributes, vars)
+      end
+
+      def return_old_selection(attrs, vars)
+        return find_by_data(attrs, vars).to_a, attrs.to_h if attrs.to_h != {}
+
+        return nil, {}
+      end
+
+      def return_selected(element, attributes, new_attributes, vars)
+        if !element && new_attributes.to_h != {}
+          send_lost
+          return return_old_selection(attributes, vars)
+
+        end
+        return element, new_attributes
+      end
+    end
+  end
+end

data/lib/locatine/for_search/file_work.rb

@@ -35,6 +35,7 @@ module Locatine
       # Setting stability
       def set_stability(first, second)
         second = first if second.to_h == {}
+        first = second.merge first
         final = Hash.new { |hash, key| hash[key] = [] }
         first.each_pair do |depth, array|
           final[depth] = same_entries(array, second, depth, true).uniq

data/lib/locatine/for_search/highlight.rb

@@ -27,7 +27,7 @@ module Locatine
       ##
       # We can highlight\unhighlight tons of elements at once
       def mass_highlight_turn(mass, turn_on = true)
-        warn_much_highlight if turn_on && mass.length > 50
+        warn_much_highlight(mass.length) if turn_on && mass.length > 50
         mass[0..49].each do |element|
           if turn_on
             highlight element

data/lib/locatine/for_search/merge.rb

@@ -16,7 +16,8 @@ module Locatine
       def same_entries(array, second, depth, stability_up = false)
         result = []
         array.each do |hash|
-          to_add = select_same(second[depth], hash)
+          item = second[depth]
+          to_add = item.nil? ? [] : select_same(second[depth], hash)
           to_add = stability_bump(to_add, hash) if stability_up
           result += to_add
         end

data/lib/locatine/for_search/saying.rb

@@ -146,7 +146,19 @@ module Locatine
       end
 
       def warn_not_found(name, scope)
-        "Locatine cannot find element #{name} in #{scope}"
+        send_warn "Locatine cannot find element #{name} in #{scope}"
+      end
+
+      def warn_totally_same(how_deep)
+        send_warn('There are more than one elements with totally similar'\
+          " attributes. Custom depth for element is set to #{how_deep}.")
+      end
+
+      def warn_no_negatives
+        send_warn 'The only way to find the selected element is to use'\
+        " negative expression like //*[not(@id='something')]. Locatine does"\
+        ' not support it. So you must to provide for element a custom locator.'\
+        ' Or find it as a part of collection and than return it by index'
       end
 
       def raise_not_found(name, scope)

data/lib/locatine/search.rb

@@ -1,7 +1,7 @@
 require 'watir'
 require 'json'
 require 'fileutils'
-require 'chromedriver-helper'
+require 'webdrivers'
 
 # Internal requires
 require 'locatine/for_search/merge'
@@ -21,6 +21,7 @@ require 'locatine/for_search/find_by_guess'
 require 'locatine/for_search/data_generate'
 require 'locatine/for_search/xpath_generator'
 require 'locatine/for_search/find_by_locator'
+require 'locatine/for_search/element_selection'
 
 module Locatine
   ##
@@ -45,6 +46,7 @@ module Locatine
     include Locatine::ForSearch::DataGenerate
     include Locatine::ForSearch::FindByLocator
     include Locatine::ForSearch::XpathGenerator
+    include Locatine::ForSearch::ElementSelection
 
     attr_accessor :data,
                   :depth,

data/lib/locatine/version.rb

@@ -1,6 +1,6 @@
 module Locatine
   # constants here...
-  VERSION = '0.02058'.freeze
+  VERSION = '0.02247'.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.02058'
+  version: '0.02247'
 platform: ruby
 authors:
 - Sergei Seleznev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-04-23 00:00:00.000000000 Z
+date: 2019-05-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -95,19 +95,25 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '2.0'
 - !ruby/object:Gem::Dependency
-  name: chromedriver-helper
+  name: webdrivers
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '3.8'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.8.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '3.8'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.8.0
 description: The main goal to write locators never
 email: s_seleznev_qa@hotmail.com
 executables: []
@@ -129,6 +135,7 @@ files:
 - lib/locatine/for_search/data_generate.rb
 - lib/locatine/for_search/data_logic.rb
 - lib/locatine/for_search/dialog_logic.rb
+- lib/locatine/for_search/element_selection.rb
 - lib/locatine/for_search/file_work.rb
 - lib/locatine/for_search/find_by_css.rb
 - lib/locatine/for_search/find_by_guess.rb