locatine 0.02058 → 0.02539

data/lib/locatine/large_scripts/page.js

@@ -0,0 +1,60 @@
+
+function walk(elm) {
+    let node;
+
+    const tagName = elm.tagName.toLowerCase();
+    const array = Array.prototype.slice.call( document.getElementsByTagName(tagName) );
+    const index = array.indexOf(elm);
+    const relative = elm.getBoundingClientRect();
+
+    // init item
+    const item = {tag: tagName,
+                  index: index,
+                  style: getComputedStyle(elm).cssText,
+                  text: "",
+                  attrs: {},
+                  coordinates: {top:0, bottom:0, left:0, right:0},
+                  children: []};
+
+    // text for item
+    if (elm.childNodes) {
+      for (let z = 0; z < elm.childNodes.length; ++z){
+        if (elm.childNodes[z].nodeType === 3){
+          item.text += elm.childNodes[z].textContent;
+        }
+      }
+    } else {
+      item.text = elm.textContent
+    }
+
+    // attributes for item
+    atts = elm.attributes;
+    if (atts) {
+      for (var att, k = 0, n = atts.length; k < n; k++){
+        att = atts[k];
+        item.attrs[att.nodeName] = att.nodeValue;
+      }
+    }
+
+    item.coordinates.top = relative["top"] + window.scrollY;
+    item.coordinates.bottom = relative["bottom"] + window.scrollY;
+    item.coordinates.left = relative["left"] + window.scrollX;
+    item.coordinates.right = relative["right"] + window.scrollX;
+
+    // Handle child elements (not magic ones)
+    for (node = elm.firstChild; node; node = node.nextSibling) {
+        if (node.nodeType === 1) { // 1 == Element
+          if (node.attributes['id']) {
+            if (node.attributes['id'].value !== 'locatine_magic_div') {
+              item.children.push(walk(node))
+            }
+          } else {
+            item.children.push(walk(node))
+          }
+        }
+    }
+
+    return item;
+}
+let result = walk(document.body);
+return [result];

data/lib/locatine/scope.rb

@@ -80,6 +80,7 @@ module Locatine
       item = @search.send(:ask, @scope, '', nil, vars)
       return find_all(vars) if item[:element].nil?
 
+      @search.send(:set_env_for_search, nil, nil, nil, nil, nil, nil)
       @search.send(:store, item[:attributes], @scope, item[:name])
       new_define(vars)
     end

data/lib/locatine/search.rb

@@ -1,19 +1,20 @@
 require 'watir'
 require 'json'
 require 'fileutils'
-require 'chromedriver-helper'
+require 'webdrivers'
 
 # Internal requires
 require 'locatine/for_search/merge'
 require 'locatine/for_search/public'
 require 'locatine/for_search/saying'
 require 'locatine/for_search/helpers'
+require 'locatine/for_search/defaults'
 require 'locatine/for_search/file_work'
+require 'locatine/for_search/page_work'
 require 'locatine/for_search/listening'
 require 'locatine/for_search/highlight'
 require 'locatine/for_search/data_logic'
 require 'locatine/for_search/find_logic'
-require 'locatine/for_search/find_by_css'
 require 'locatine/for_search/name_helper'
 require 'locatine/for_search/dialog_logic'
 require 'locatine/for_search/find_by_magic'
@@ -21,6 +22,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
   ##
@@ -32,12 +34,13 @@ module Locatine
     include Locatine::ForSearch::Public
     include Locatine::ForSearch::Saying
     include Locatine::ForSearch::Helpers
+    include Locatine::ForSearch::Defaults
     include Locatine::ForSearch::FileWork
+    include Locatine::ForSearch::PageWork
     include Locatine::ForSearch::DataLogic
     include Locatine::ForSearch::Listening
     include Locatine::ForSearch::FindLogic
     include Locatine::ForSearch::Highlight
-    include Locatine::ForSearch::FindByCss
     include Locatine::ForSearch::NameHelper
     include Locatine::ForSearch::FindByMagic
     include Locatine::ForSearch::DialogLogic
@@ -45,6 +48,7 @@ module Locatine
     include Locatine::ForSearch::DataGenerate
     include Locatine::ForSearch::FindByLocator
     include Locatine::ForSearch::XpathGenerator
+    include Locatine::ForSearch::ElementSelection
 
     attr_accessor :data,
                   :depth,
@@ -53,7 +57,10 @@ module Locatine
                   :scope,
                   :tolerance,
                   :visual_search,
-                  :no_fail
+                  :no_fail,
+                  :trusted,
+                  :untrusted,
+                  :autolearn
     attr_reader   :json,
                   :browser
   end

data/lib/locatine/version.rb

@@ -1,6 +1,6 @@
 module Locatine
   # constants here...
-  VERSION = '0.02058'.freeze
+  VERSION = '0.02539'.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.02539'
 platform: ruby
 authors:
 - Sergei Seleznev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-04-23 00:00:00.000000000 Z
+date: 2019-09-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -81,40 +81,48 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '6.16'
 - !ruby/object:Gem::Dependency
-  name: json
+  name: webdrivers
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '4.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 4.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '4.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 4.0.1
 - !ruby/object:Gem::Dependency
-  name: chromedriver-helper
+  name: sinatra
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: 2.0.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: 2.0.5
 description: The main goal to write locators never
 email: s_seleznev_qa@hotmail.com
-executables: []
+executables:
+- locatine-daemon.rb
 extensions: []
 extra_rdoc_files: []
 files:
 - README.md
+- bin/locatine-daemon.rb
 - lib/locatine.rb
 - lib/locatine/app/background.js
 - lib/locatine/app/content.css
@@ -125,12 +133,15 @@ files:
 - lib/locatine/app/popup.css
 - lib/locatine/app/popup.html
 - lib/locatine/app/popup.js
+- lib/locatine/daemon.rb
+- lib/locatine/daemon_helpers.rb
 - lib/locatine/for_search.rb
 - lib/locatine/for_search/data_generate.rb
 - lib/locatine/for_search/data_logic.rb
+- lib/locatine/for_search/defaults.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
 - lib/locatine/for_search/find_by_locator.rb
 - lib/locatine/for_search/find_by_magic.rb
@@ -140,11 +151,14 @@ files:
 - lib/locatine/for_search/listening.rb
 - lib/locatine/for_search/merge.rb
 - lib/locatine/for_search/name_helper.rb
+- lib/locatine/for_search/page_work.rb
 - lib/locatine/for_search/public.rb
 - lib/locatine/for_search/saying.rb
 - lib/locatine/for_search/xpath_generator.rb
 - lib/locatine/large_scripts/css.js
 - lib/locatine/large_scripts/dimensions.js
+- lib/locatine/large_scripts/element.js
+- lib/locatine/large_scripts/page.js
 - lib/locatine/scope.rb
 - lib/locatine/search.rb
 - lib/locatine/version.rb

data/lib/locatine/for_search/find_by_css.rb

@@ -1,47 +0,0 @@
-module Locatine
-  module ForSearch
-    ##
-    # 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
-end