locatine 0.01309 → 0.01439

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 36abed5fc9bb50605d737f8f56be664970461ec9
-  data.tar.gz: 3c5b291cf577d416c2396643425d1129c9957b50
+  metadata.gz: 77f63cceefd7594a340e9295b71d7ef491e60ebe
+  data.tar.gz: 61cdf5270323f799eec652caa3f528b4491c53f0
 SHA512:
-  metadata.gz: a8e84bd41e4c91bc7ad2dfcffd9c1ca92791aa48a3f658b4a21ad73d61215d6b3afd7b7baeeed69b9d45ee1dd0cafca876f9abecc4540b8ffd9ad30d2d448299
-  data.tar.gz: 8415caf49216b65470b0668c9f98c470c5140982a3328750a8f68bc9d348b496c4b667058efe852ba18f78b65d7c02934716ba4ea9c262d4b88c3994657fa78d
+  metadata.gz: 2d7c8bc6e6d829f11be85a9c9e783f521c1cbe18febcee3d073417d7bdc729dc8e840849c88c70610049d9998c52f43e2d949f2b83b5187b9fb59bdf6420810d
+  data.tar.gz: 42bd7eec1492d5495ff35e661513fbd2e1add8dd3d6f084e334ffc9119ea646c1f8d2f7f96b817c013fde0b87fec0b62cd787a063b1b8e97b79ddf4aee16f42a

data/lib/locatine/app/content.js

@@ -61,7 +61,7 @@ async function getSelected(value){
     const tagName = value.tagName;
     const array = Array.prototype.slice.call( document.getElementsByTagName(tagName) );
     const index = array.indexOf(value);
-    if (document.locatine_selected !=  value) {
+    if ((document.locatine_selected !=  value) && (String(tagName) != "")) {
       document.locatine_selected = value;
       await set_value("locatine_confirm", "selected");
       magic_div.setAttribute("tag", tagName);

data/lib/locatine/app/manifest.json

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

data/lib/locatine/data_generate.rb

@@ -1,56 +1,62 @@
 module Locatine
   ##
-  # Generating locatine json info from element itself
+  # Collecting data of element and making it dynamic
   module DataGenerate
     private
 
-    def get_dynamic_attributes(element, vars)
-      attrs = []
-      get_attributes(element).each do |hash|
-        if vars[hash['name'].to_sym]
-          hash['value'].gsub!(vars[hash['name'].to_sym], "\#{#{hash['name']}}")
-        end
-        attrs.push hash
-      end
-      attrs
+    def real_text_of(element)
+      element.text == element.inner_html ? element.text : ''
+    end
+
+    def mesure(element)
+      xy = element.location
+      wh = element.size
+      return xy.x, xy.y, wh.width, wh.height
     end
 
     def get_dynamic_tag(element, vars)
       tag = element.tag_name
       tag = "\#{tag}" if vars[:tag] == tag
-      { 'name' => 'tag', 'value' => tag, 'type' => 'tag' }
-    end
-
-    def real_text_of(element)
-      element.text == element.inner_html ? element.text : ''
+      push_hash('tag', tag, 'tag')
     end
 
     def get_dynamic_text(element, vars)
       attrs = []
-      real_text_of(element).split(' ').each do |word|
-        final_word = if !vars[:text].to_s.strip.empty?
-                       word.gsub(vars[:text].to_s, "\#{text}")
-                     else
-                       word
-                     end
-        attrs.push('name' => 'text', 'value' => final_word, 'type' => 'text')
+      real_text_of(element).split(/['" ]/).each do |word|
+        final = if !vars[:text].to_s.strip.empty?
+                  word.gsub(vars[:text].to_s, "\#{text}")
+                else
+                  word
+                end
+        attrs.push push_hash('text', final, 'text') unless final.empty?
       end
       attrs
     end
 
-    ##
-    # Generating array of hashes representing data of the element
-    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
+    def process_dimension(name, value, vars)
+      s_name = name.to_s
+      value = value.to_s.gsub(vars[name], "\#{#{s_name}}") if vars[name]
+      value
+    end
+
+    def processed_dimensions(element, vars)
+      x, y, width, height = mesure(element)
+      x = process_dimension(:x, x, vars)
+      y = process_dimension(:y, y, vars)
+      width = process_dimension(:width, width, vars)
+      height = process_dimension(:height, height, vars)
+      return x, y, width, height
+    end
+
+    def get_dimensions(element, vars)
+      resolution = window_size
+      x, y, w, h = processed_dimensions(element, vars)
+      push_hash(resolution, "#{x}*#{y}*#{w}*#{h}", 'dimensions')
     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' }
+      push_hash(style, value, 'css')
     end
 
     def get_raw_css(element)
@@ -73,30 +79,6 @@ module Locatine
       attrs
     end
 
-    ##
-    # Generating data for group of elements
-    def generate_data(result, vars)
-      family = {}
-      result.each do |item|
-        family = get_commons(get_family_info(item, vars), family)
-      end
-      family
-    end
-
-    ##
-    # Getting element\\parents information
-    def get_family_info(element, vars)
-      i = 0
-      attributes = {}
-      while i != @depth
-        attributes[i.to_s] = get_element_info(element, vars, i)
-        i += 1
-        element = element.parent
-        i = @depth unless element.exists?
-      end
-      attributes
-    end
-
     ##
     # Collecting attributes of the element
     def get_attributes(element)
@@ -105,9 +87,9 @@ module Locatine
       attributes.each_pair do |name, value|
         next if name.to_s == 'locatineclass'
 
-        value.split(' ').uniq.each do |part|
+        value.split(/['" ]/).uniq.each do |part|
           array.push('name' => name.to_s, 'type' => 'attribute',
-                     'value' => part)
+                     'value' => part) unless part.empty?
         end
       end
       array

data/lib/locatine/data_logic.rb

@@ -0,0 +1,53 @@
+module Locatine
+  ##
+  # Logic of collecting data of the element
+  module DataLogic
+    private
+
+    def get_dynamic_attributes(element, vars)
+      attrs = []
+      get_attributes(element).each do |hash|
+        if vars[hash['name'].to_sym]
+          hash['value'].gsub!(vars[hash['name'].to_sym], "\#{#{hash['name']}}")
+        end
+        attrs.push hash
+      end
+      attrs
+    end
+
+    ##
+    # Generating array of hashes representing data of the element
+    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? && visual?
+      attrs.push get_dimensions(element, vars) if depth.to_i.zero? && visual?
+      attrs
+    end
+
+    ##
+    # Generating data for group of elements
+    def generate_data(result, vars)
+      family = {}
+      result.each do |item|
+        family = get_commons(get_family_info(item, vars), family)
+      end
+      family
+    end
+
+    ##
+    # Getting element\\parents information
+    def get_family_info(element, vars)
+      i = 0
+      attributes = {}
+      while i != @depth
+        attributes[i.to_s] = get_element_info(element, vars, i)
+        i += 1
+        element = element.parent
+        i = @depth unless element.exists?
+      end
+      attributes
+    end
+  end
+end

data/lib/locatine/find_by_magic.rb

@@ -18,7 +18,7 @@ module Locatine
 
     def similar_enough(data, attributes)
       (same_entries(data['0'], attributes, '0').length * 100 /
-      data['0'].length) > @tolerance
+      data['0'].length) >= @tolerance
     end
 
     def suggest_by_all(all, data, vars, name, scope)
@@ -38,10 +38,58 @@ module Locatine
           all += one_option_array(hash, vars, depth).to_a
         end
       end
-      all += full_find_by_css(data, vars)
+      all += full_find_by_css(data, vars) if visual?
+      all += find_by_dimensions(data, vars) if visual?
       all
     end
 
+    def min_max_by_size(middle, size)
+      min = middle - (size.to_i * (100 + @tolerance)) / 200
+      max = middle + (size.to_i * (100 + @tolerance)) / 200
+      return min, max
+    end
+
+    def middle(sizes)
+      x = sizes[0].to_i + (sizes[2].to_i / 2)
+      y = sizes[1].to_i + (sizes[3].to_i / 2)
+      return x, y
+    end
+
+    def dimension_search_field(sizes)
+      x, y = middle(sizes)
+      x_min, x_max = min_max_by_size(x, sizes[2])
+      y_min, y_max = min_max_by_size(y, sizes[3])
+      return x_min, x_max, y_min, y_max
+    end
+
+    def retrieve_mesures(data)
+      size = window_size
+      dimensions = data['0'].map do |i|
+        i if (i['type'] == 'dimensions') && (i['name'] == size)
+      end
+      dimensions.compact
+    end
+
+    def sizez_from_dimensions(dimensions, vars)
+      result = []
+      dimensions.first['value'].split('*').each do |value|
+        result.push(process_string(value, vars))
+      end
+      result
+    end
+
+    def find_by_dimensions(data, vars)
+      dimensions = retrieve_mesures(data)
+      if !dimensions.empty?
+        sizes = sizez_from_dimensions(dimensions, vars)
+        xmi, xma, ymi, yma = dimension_search_field(sizes)
+        script = File.read("#{HOME}/large_scripts/dimensions.js")
+        engine.execute_script(script, xmi, xma, ymi, yma).compact
+      else
+        []
+      end
+    end
+
     def one_option_array(hash, vars, depth)
       case hash['type']
       when 'tag'

data/lib/locatine/helpers.rb

@@ -23,6 +23,22 @@ module Locatine
       "[not(@id = 'locatine_magic_div')]"
     end
 
+    def push_hash(name, value, type)
+      { 'name' => name,
+        'value' => value,
+        'type' => type }
+    end
+
+    def window_size
+      b_w = engine.execute_script('return window.innerWidth')
+      b_h = engine.execute_script('return window.innerHeight')
+      "#{b_w}x#{b_h}"
+    end
+
+    def visual?
+      @visual_search
+    end
+
     def right_browser
       Watir::Browser.new(:chrome, switches: ["--load-extension=#{HOME}/app"])
     end

data/lib/locatine/large_scripts/dimensions.js

@@ -0,0 +1,17 @@
+function walk(xmi, xma, ymi, yma){
+  let x;
+  let y;
+  let array =[];
+  let one;
+  for (x = xmi; x <= xma; x++) {
+    for (y = ymi; y <= yma; y++) {
+      one = document.elementFromPoint(x, y);
+      if ((one != document.documentElement) && (one != document.body)){
+        array.push(document.elementFromPoint(x, y));
+      }
+    }
+  }
+  return [...new Set(array)];
+}
+
+return walk(parseInt(arguments[0]), parseInt(arguments[1]), parseInt(arguments[2]), parseInt(arguments[3]))

data/lib/locatine/public.rb

@@ -32,7 +32,8 @@ module Locatine
                    learn: ENV['LEARN'].nil? ? false : true,
                    stability_limit: 10,
                    scope: 'Default',
-                   tolerance: 33)
+                   tolerance: 33,
+                   visual_search: false)
       import_browser browser
       import_file(json)
       @depth = depth
@@ -40,6 +41,7 @@ module Locatine
       @stability_limit = stability_limit
       @scope = scope
       @tolerance = tolerance
+      @visual_search = visual_search
     end
 
     ##

data/lib/locatine/search.rb

@@ -9,6 +9,7 @@ require 'locatine/public'
 require 'locatine/helpers'
 require 'locatine/file_work'
 require 'locatine/highlight'
+require 'locatine/data_logic'
 require 'locatine/find_logic'
 require 'locatine/find_by_css'
 require 'locatine/dialog_logic'
@@ -29,6 +30,7 @@ module Locatine
     include Locatine::Public
     include Locatine::Helpers
     include Locatine::FileWork
+    include Locatine::DataLogic
     include Locatine::FindLogic
     include Locatine::Highlight
     include Locatine::FindByCss
@@ -45,7 +47,8 @@ module Locatine
                   :learn,
                   :stability_limit,
                   :scope,
-                  :tolerance
+                  :tolerance,
+                  :visual_search
     attr_reader   :json,
                   :browser
   end

data/lib/locatine/version.rb

@@ -1,6 +1,6 @@
 module Locatine
   # constants here...
-  VERSION = '0.01309'.freeze
+  VERSION = '0.01439'.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.01309'
+  version: '0.01439'
 platform: ruby
 authors:
 - Sergei Seleznev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-03-18 00:00:00.000000000 Z
+date: 2019-03-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -125,6 +125,7 @@ files:
 - lib/locatine/app/popup.html
 - lib/locatine/app/popup.js
 - lib/locatine/data_generate.rb
+- lib/locatine/data_logic.rb
 - lib/locatine/dialog_actions.rb
 - lib/locatine/dialog_logic.rb
 - lib/locatine/file_work.rb
@@ -136,6 +137,7 @@ files:
 - lib/locatine/helpers.rb
 - lib/locatine/highlight.rb
 - lib/locatine/large_scripts/css.js
+- lib/locatine/large_scripts/dimensions.js
 - lib/locatine/merge.rb
 - lib/locatine/public.rb
 - lib/locatine/search.rb