locatine 0.01300 → 0.01309

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dcac98a7110904e47f05c216b6b78032013f626f
-  data.tar.gz: d2560254389abffb699a635a40dd211bebcb0abc
+  metadata.gz: 36abed5fc9bb50605d737f8f56be664970461ec9
+  data.tar.gz: 3c5b291cf577d416c2396643425d1129c9957b50
 SHA512:
-  metadata.gz: 58a755f90fa8442934185daf90f33d0655e215c7487d21fb44dbd760ad3004bc222bca599ca77c221342a86dde2e665a0f9fdefc365456f06c5389cb60612a54
-  data.tar.gz: 8f0cf282edc1cc4652c8badf6d266814bdd22ab47efb88e708ac381eb75100d895e9e1ccc5306628fb1282eaf3927d8273a03006a96bfd66af638700558ee18c
+  metadata.gz: a8e84bd41e4c91bc7ad2dfcffd9c1ca92791aa48a3f658b4a21ad73d61215d6b3afd7b7baeeed69b9d45ee1dd0cafca876f9abecc4540b8ffd9ad30d2d448299
+  data.tar.gz: 8415caf49216b65470b0668c9f98c470c5140982a3328750a8f68bc9d348b496c4b667058efe852ba18f78b65d7c02934716ba4ea9c262d4b88c3994657fa78d

data/lib/locatine/app/content.js

@@ -56,15 +56,17 @@ async function refreshData(){
 };
 
 async function getSelected(value){
-  const magic_div = document.getElementById("locatine_magic_div");
-  const tagName = value.tagName;
-  const array = Array.prototype.slice.call( document.getElementsByTagName(tagName) );
-  const index = array.indexOf(value);
-  if (document.locatine_selected !=  value) {
-    document.locatine_selected = value;
-    await set_value("locatine_confirm", "selected");
-    magic_div.setAttribute("tag", tagName);
-    magic_div.setAttribute("index", index);
+  if (value) {
+    const magic_div = document.getElementById("locatine_magic_div");
+    const tagName = value.tagName;
+    const array = Array.prototype.slice.call( document.getElementsByTagName(tagName) );
+    const index = array.indexOf(value);
+    if (document.locatine_selected !=  value) {
+      document.locatine_selected = value;
+      await set_value("locatine_confirm", "selected");
+      magic_div.setAttribute("tag", tagName);
+      magic_div.setAttribute("index", index);
+    }
   }
 };
 

data/lib/locatine/app/manifest.json

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

data/lib/locatine/data_generate.rb

@@ -40,10 +40,36 @@ module Locatine
 
     ##
     # Generating array of hashes representing data of the element
-    def get_element_info(element, vars)
+    def get_element_info(element, vars, depth)
       attrs = get_dynamic_attributes(element, vars)
       attrs.push get_dynamic_tag(element, vars)
       attrs += get_dynamic_text(element, vars)
+      attrs += get_dynamic_css(element, vars) if depth.to_i.zero?
+      attrs
+    end
+
+    def hash_by_style(style, value, vars)
+      value.gsub!(vars[style.to_sym], "\#{#{style}}") if vars[style.to_sym]
+      { 'name' => style, 'value' => value, 'type' => 'css' }
+    end
+
+    def get_raw_css(element)
+      test_script = 'return typeof(arguments[0])'
+      ok = engine.execute_script(test_script, element) == 'object'
+      script = 'return getComputedStyle(arguments[0]).cssText'
+      return engine.execute_script(script, element) if ok
+    end
+
+    def get_dynamic_css(element, vars)
+      attrs = []
+      raw = get_raw_css(element)
+      if raw
+        styles = css_text_to_hash(get_raw_css(element))
+        (styles.to_a - @default_styles).to_h.each_pair do |style, value|
+          hash = hash_by_style(style, value, vars)
+          attrs.push(hash) if hash
+        end
+      end
       attrs
     end
 
@@ -60,14 +86,13 @@ module Locatine
     ##
     # Getting element\\parents information
     def get_family_info(element, vars)
-      current_depth = 0
+      i = 0
       attributes = {}
-      while current_depth != @depth
-        attributes[current_depth.to_s] = get_element_info(element, vars)
-        current_depth += 1
+      while i != @depth
+        attributes[i.to_s] = get_element_info(element, vars, i)
+        i += 1
         element = element.parent
-        # Sometimes watir is not returning a valid parent that's why:
-        current_depth = @depth unless element.parent.exists?
+        i = @depth unless element.exists?
       end
       attributes
     end

data/lib/locatine/find_by_css.rb

@@ -0,0 +1,45 @@
+module Locatine
+  ##
+  # Looking for elements by css values
+  module FindByCss
+    private
+
+    def css_array_by_data(data, vars)
+      q_css = []
+      get_trusted(data['0']).each do |hash|
+        if hash['type'] == 'css'
+          value = process_string(hash['value'], vars) if vars[hash['name']]
+          q_css.push("#{hash['name']}: #{value || hash['value']}")
+        end
+      end
+      q_css
+    end
+
+    def return_caught_elements(caught)
+      all = []
+      caught.each do |i|
+        @help_hash[i[0]] ||= engine.elements(tag_name: i[0].downcase).to_a
+        elm = @help_hash[i[0]][i[1].to_i]
+        all.push(elm) if elm
+      end
+      all
+    end
+
+    def select_elements_from_raws_by_css(q_css, raws)
+      all = []
+      @help_hash = {}
+      q_css.each do |item|
+        caught = (raws.select { |i| i[2].include?(item) })
+        all += return_caught_elements(caught)
+      end
+      all
+    end
+
+    def full_find_by_css(data, vars)
+      q_css = css_array_by_data(data, vars)
+      script = File.read("#{HOME}/large_scripts/css.js")
+      raws = engine.execute_script(script)
+      select_elements_from_raws_by_css(q_css, raws)
+    end
+  end
+end

data/lib/locatine/find_by_magic.rb

@@ -35,20 +35,21 @@ module Locatine
       all = []
       data.each_pair do |depth, array|
         get_trusted(array).each do |hash|
-          all += one_option_array(hash, vars, depth)
+          all += one_option_array(hash, vars, depth).to_a
         end
       end
+      all += full_find_by_css(data, vars)
       all
     end
 
     def one_option_array(hash, vars, depth)
       case hash['type']
       when 'tag'
-        find_by_tag(hash, vars, depth).to_a
+        find_by_tag(hash, vars, depth)
       when 'text'
-        find_by_text(hash, vars, depth).to_a
+        find_by_text(hash, vars, depth)
       when 'attribute'
-        find_by_attribute(hash, vars, depth).to_a
+        find_by_attribute(hash, vars, depth)
       end
     end
   end

data/lib/locatine/helpers.rb

@@ -27,6 +27,32 @@ module Locatine
       Watir::Browser.new(:chrome, switches: ["--load-extension=#{HOME}/app"])
     end
 
+    def import_browser(browser)
+      s_class = browser.class.superclass
+      b = right_browser unless browser
+      b = browser if browser.class == Watir::Browser
+      b = Watir::Browser.new(browser) if s_class == Selenium::WebDriver::Driver
+      @browser = b
+      @default_styles = default_styles.to_a
+    end
+
+    def css_text_to_hash(text)
+      almost_hash = []
+      array = text[0..-2].split('; ')
+      array.each do |item|
+        almost_hash.push item.split(': ')
+      end
+      almost_hash.to_h
+    end
+
+    def default_styles
+      css =
+        engine.execute_script("const dummy = document.createElement('dummy');
+                               document.body.appendChild(dummy);
+                               return getComputedStyle(dummy).cssText;")
+      css_text_to_hash(css)
+    end
+
     def process_string(str, vars)
       str = str.to_s
       thevar = str.match(/\#{([^\#{]*)}/)[1] unless str.match(/\#{(.*)}/).nil?

data/lib/locatine/large_scripts/css.js

@@ -0,0 +1,21 @@
+function walk(elm, result) {
+    let node;
+
+    const tagName = elm.tagName;
+    const array = Array.prototype.slice.call( document.getElementsByTagName(tagName) );
+    const index = array.indexOf(elm);
+
+    const item = [tagName, index, getComputedStyle(elm).cssText]
+    result.push(item)
+
+    // Handle child elements
+    for (node = elm.firstChild; node; node = node.nextSibling) {
+        if (node.nodeType === 1) { // 1 == Element
+            result = walk(node, result);
+        }
+    }
+    return result
+}
+let array = walk(document.body,[]);
+array.shift();
+return array;

data/lib/locatine/public.rb

@@ -21,15 +21,19 @@ module Locatine
     # consider it trusted.
     #
     # +scope+ will be used in search (if not provided) defaulkt is "Default"
+    #
+    # +tolerance+ Shows how similar must be an element found as alternative
+    # to the lost one. Default is 33 which means that if less than 33% of
+    # metrics of alternative elements are the same as of the lost element
+    # will not be returned
     def initialize(json: './Locatine_files/default.json',
                    depth: 3,
                    browser: nil,
                    learn: ENV['LEARN'].nil? ? false : true,
                    stability_limit: 10,
                    scope: 'Default',
-                   tolerance: 15)
-      browser ||= right_browser
-      @browser = browser
+                   tolerance: 33)
+      import_browser browser
       import_file(json)
       @depth = depth
       @learn = learn
@@ -104,5 +108,9 @@ module Locatine
     def json=(value)
       import_file(value)
     end
+
+    def browser=(value)
+      import_browser(value)
+    end
   end
 end

data/lib/locatine/search.rb

@@ -10,6 +10,7 @@ require 'locatine/helpers'
 require 'locatine/file_work'
 require 'locatine/highlight'
 require 'locatine/find_logic'
+require 'locatine/find_by_css'
 require 'locatine/dialog_logic'
 require 'locatine/find_by_magic'
 require 'locatine/find_by_guess'
@@ -30,6 +31,7 @@ module Locatine
     include Locatine::FileWork
     include Locatine::FindLogic
     include Locatine::Highlight
+    include Locatine::FindByCss
     include Locatine::FindByMagic
     include Locatine::DialogLogic
     include Locatine::FindByGuess
@@ -40,11 +42,11 @@ module Locatine
 
     attr_accessor :data,
                   :depth,
-                  :browser,
                   :learn,
                   :stability_limit,
                   :scope,
                   :tolerance
-    attr_reader   :json
+    attr_reader   :json,
+                  :browser
   end
 end

data/lib/locatine/version.rb

@@ -1,6 +1,6 @@
 module Locatine
   # constants here...
-  VERSION = '0.01300'.freeze
+  VERSION = '0.01309'.freeze
   NAME = 'locatine'.freeze
   HOME = if File.readable?("#{Dir.pwd}/lib/#{Locatine::NAME}")
            "#{Dir.pwd}/lib/#{Locatine::NAME}"

data/lib/locatine/xpath_generator.rb

@@ -17,7 +17,7 @@ module Locatine
       xpath = "[not(@id = 'locatine_magic_div')]"
       data.each_pair do |_depth, array|
         get_trusted(array).each do |hash|
-          xpath = generate_xpath_part(hash, vars) + xpath
+          xpath = generate_xpath_part(hash, vars).to_s + xpath
         end
         xpath = '/*' + xpath
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: locatine
 version: !ruby/object:Gem::Version
-  version: '0.01300'
+  version: '0.01309'
 platform: ruby
 authors:
 - Sergei Seleznev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-03-13 00:00:00.000000000 Z
+date: 2019-03-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -128,12 +128,14 @@ files:
 - lib/locatine/dialog_actions.rb
 - lib/locatine/dialog_logic.rb
 - lib/locatine/file_work.rb
+- lib/locatine/find_by_css.rb
 - lib/locatine/find_by_guess.rb
 - lib/locatine/find_by_locator.rb
 - lib/locatine/find_by_magic.rb
 - lib/locatine/find_logic.rb
 - lib/locatine/helpers.rb
 - lib/locatine/highlight.rb
+- lib/locatine/large_scripts/css.js
 - lib/locatine/merge.rb
 - lib/locatine/public.rb
 - lib/locatine/search.rb