locatine 0.0092 → 0.00463

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 44a26e49cfff1bf0841fd588c9556fa0fbb1b394
-  data.tar.gz: 8f5b147ce47421e947be9ccdc2191da0fa746621
+  metadata.gz: 3f5d7a3f44e75991451c83cc507561dc4a1c7f06
+  data.tar.gz: 88aaf2612d0f3d4b0a56b2fa1ef6cb830eddd790
 SHA512:
-  metadata.gz: 3d151d506c89a6990640d34515519121a1b5b0da0c5d4797d3751b2b486ce7cb094ec90a7adab71c5580a2f2dbcd88c8f169c0c078f75c0c35bcc05589db9fbc
-  data.tar.gz: 3f6251ba3eed8756ca023d47a43b57953210463670430320cf46d06e762113796b2bc8f12d51f58d89f5d2c873e7de602787f5cfb4913d6d39f74d422755eea4
+  metadata.gz: 967f585713d8557bf164013ba74fb804d55b1628d5f2057b450873b3107027cd36f9ef7db48e0f0e1741a92296518a879748adf0c0c075f02d3df87c4a474414
+  data.tar.gz: 387240a6229f98260bb3ce3f64a6bcfc8f0e6eae856c8bb579a870d92be2193ae5acab128dd194d86545e7342ef88dbb2abca2b6a295a4719c3d25ab22252d3d

data/lib/locatine/search.rb

@@ -2,31 +2,27 @@ require "watir"
 require "json"
 require "fileutils"
 require "chromedriver-helper"
+require "pry"
 
 module Locatine
 
   ##
   # Search is the main class of the Locatine
   #
-  # Locatine can search.
+  # Locatine can dance.
   class Search
 
     attr_accessor :data, :depth, :browser, :learn, :json, :stability_limit, :scope
 
     ##
-    # Creates a new instance of Search
+    # Creates a new instance of Dance
     #
     # Params:
     # +json+ is the name of file to store//read data. Default => "./Locatine_files/default.json"
-    #
     # +depth+ is the value that shows how many data will be stored for element.
-    #
     # +browser+ is the instance of Watir::Browser. Unless provided it gonna be created with locatine-app onboard.
-    #
     # +learn+ shows will locatine ask for assistance from user or will fail on error. learn is true when LEARN parameter is set in environment.
-    #
     # +stability_limit+ shows max times attribute should be present to consider it trusted.
-    #
     # +scope+ will be used in search (if not provided) defaulkt is "Default"
     def initialize(json: "./Locatine_files/default.json",
                    depth: 3,
@@ -53,30 +49,14 @@ module Locatine
     # Looking for the element
     #
     # Params:
-    #
     # +scope+ is a parameter that is used to get information about the element from @data. Default is "Default"
-    #
     # +name+ is a parameter that is used to get information about the element from @data. Must not be nil.
-    #
     # +exact+ if true locatine will be forced to use only basic search. Default is false
-    #
     # +locator+ if not empty it is used for the first attempt to find the element. Default is {}
-    #
     # +vars+ hash of variables that will be used for dynamic attributes. See readme for example
-    #
     # +look_in+ only elements of that kind will be used. Use Watir::Browser methods returning collections (:text_fields, :links, :divs, etc.)
-    #
     # +iframe+ if provided locatine will look for elements inside of it
-    def find(simple_name = nil,
-             name: nil,
-             scope: nil,
-             exact: false,
-             locator: {},
-             vars: {},
-             look_in: nil,
-             iframe: nil,
-             return_locator: false,
-             collection: false)
+    def find(simple_name = nil, name: nil, scope: nil, exact: false, locator: {}, vars: {}, look_in: nil, iframe: nil, return_locator: false)
       name ||= simple_name
       raise ArgumentError, ":name should be provided" if !name
       @type = look_in
@@ -94,18 +74,15 @@ module Locatine
         end
       end
       result, attributes = ask(scope, name, result, vars) if @learn
-      raise RuntimeError, "Nothing was found for #{scope} #{name}" if !result && !exact
-      if result
-        attributes = generate_data(result, vars) if !attributes
-        store(attributes, scope, name)
-        return return_locator ? {xpath: generate_xpath(attributes, vars)} : to_subtype(result, collection)
-      else
-        return nil
-      end
+      raise RuntimeError, "Nothing was found for #{scope} #{name}" if !result
+      attributes = generate_data(result, vars) if !attributes
+      @type = nil
+      store(attributes, scope, name)
+      return return_locator ? {xpath: generate_xpath(attributes, vars)} : to_subtype(result)
     end
 
     ##
-    # Find alias with return_locator option enforced
+    # Find alias with return_locator enforced
     def lctr(*args)
       if args.last.class == Hash
         args.last[:return_locator] = true
@@ -115,12 +92,6 @@ module Locatine
       find(args)
     end
 
-    ##
-    # Find alias with collection option enforced
-    def collect(*args)
-      enforce(:collection, true, *args)
-    end
-
     private
 
     ##
@@ -142,18 +113,6 @@ module Locatine
       end
     end
 
-    def enforce(what, value, *args)
-      if args.last.class == Hash
-        args.last[what] = value
-        find(*args)
-      else
-        temp = Hash.new
-        temp[what] = value
-        args.push(temp)
-        find(*args)
-      end
-    end
-
     def engine
       return (@iframe || @browser)
     end
@@ -201,12 +160,7 @@ module Locatine
     end
 
     def get_trusted(array)
-      if array.length > 0
-        max_stability = (array.max_by {|i| i["stability"].to_i})["stability"].to_i
-        return (array.select {|i| i["stability"].to_i == max_stability}).uniq
-      else
-        return []
-      end
+      return (array.select {|i| i["stability"].to_i == (array.max_by {|i| i["stability"].to_i})["stability"].to_i}).uniq
     end
 
     def generate_xpath(data, vars)
@@ -262,8 +216,7 @@ module Locatine
       @cold_time = timeout
       raise RuntimeError, "Locatine is unable to find element #{name} in #{scope}" if all.length == 0
       # Something esoteric here :)
-      max = all.count(all.max_by {|i| all.count(i)})
-      suggestion = (all.select {|i| all.count(i) == max}).uniq
+      suggestion = (all.select {|i| all.count(i) == all.count(all.max_by {|i| all.count(i)})}).uniq
       attributes = generate_data(suggestion, vars)
       return suggestion, attributes
     end
@@ -319,15 +272,12 @@ module Locatine
       end
     end
 
-    def set_title(text)
-      puts text
-      send_to_app("locatinetitle", text)
-    end
-
     ##
     # Sending request to locatine app
     def start_listening(scope, name)
       send_to_app("locatinestyle", "blocked", @browser) if @iframe
+      puts "You are defining #{name} in #{scope}" # TODO send to app
+      send_to_app("locatinetitle", "You are defining #{name} in #{scope}.")
       send_to_app("locatinehint", "Toggle single//collection mode button if you need. If you want to do some actions on the page toggle Locatine waiting button. You also can select element on devtools -> Elements. Do not forget to confirm your selection.")
       send_to_app("locatinestyle", "set_true")
       sleep 0.5
@@ -343,17 +293,15 @@ module Locatine
         all = all + find_by_locator({xpath: "//*[@*[contains(., '#{part}')]]"}).to_a
       end
       if all.length>0
-        max = all.count(all.max_by {|i| all.count(i)})
-        guess = (all.select {|i| all.count(i) == max}).uniq
+        guess = (all.select {|i| all.count(i) == all.count(all.max_by {|i| all.count(i)})}).uniq
         guess_data = generate_data(guess, vars)
-        by_data = find_by_data(guess_data, vars)
-        if by_data.nil? || (engine.elements.length/find_by_data(guess_data, vars).length <=4)
-          set_title "Locatine has no good guess for #{name} in #{scope}. Try to change the name. Or just define it."
+        if (engine.elements.length/find_by_data(guess_data, vars).length <=4)
+          puts "Locatine has no good guess for #{name} in #{scope}. Try to change the name. Or just define it."
           guess = nil
           guess_data = {}
         end
       else
-        set_title "Locatine has no guess for #{name} in #{scope}. Try to change the name. Or just define it."
+        puts "Locatine has no guess for #{name} in #{scope}. Try to change the name. Or just define it."
       end
       @cold_time = timeout
       return guess, guess_data.to_h
@@ -367,8 +315,7 @@ module Locatine
       if !element.nil?
         attributes = generate_data(element, vars)
       else
-        set_title("Locatine is trying to guess what is #{name} in #{scope}.")
-        element, attributes = find_by_guess(scope, name, vars) if name.length >= 5
+        element, attributes = find_by_guess(scope, name, vars)
       end
       while !finished do
         sleep 0.1
@@ -388,17 +335,13 @@ module Locatine
         if old_element != element
           mass_highlight_turn(old_element, false) if old_element
           mass_highlight_turn(element) if element
-          if element.nil?
-            set_title "Nothing is selected as #{name} in #{scope}"
-          else
-            set_title "#{element.length} elements were selected as #{name} in #{scope}. If it is correct - confirm the selection."
-          end
+          puts "#{element.length} elemens were selected as #{name} in #{scope}"
         end
         old_element, old_tag, old_index = element, tag, index
         case get_from_app("locatineconfirmed")
         when "true"
           send_to_app("locatineconfirmed", "ok")
-          send_to_app("locatinetitle", "Right now you are defining nothing. So no button will work")
+          send_to_app("locatinetitle", "You are defining nothing. So no button will work")
           send_to_app("locatinehint", "Place for a smart hint here")
           finished = true
         when "declined"
@@ -586,14 +529,11 @@ module Locatine
     #
     # Params:
     # +result+ must be Watir::HTMLElementCollection or Array
-    #
-    # +collection+ nil, true or false
-    def to_subtype(result, collection)
-      case collection
-      when true
+    def to_subtype(result)
+      if result.size == 1
+        return result[0].to_subtype
+      else
         return result
-      when false
-        return result.first.to_subtype
       end
     end
   end

data/lib/locatine/version.rb

@@ -1,6 +1,12 @@
 module Locatine
   # constants here...
-  VERSION = "0.0092"
+  generator = Random.new 42
+  versions = []
+  1000.times do
+    versions.push generator.rand.round(5)
+  end
+  ITERATION = 0
+  VERSION = versions.sort[ITERATION].to_s
   NAME = "locatine"
   HOME = File.readable?("#{Dir.pwd}/lib/#{Locatine::NAME}")? "#{Dir.pwd}/lib/#{Locatine::NAME}" : "#{Gem.dir}/gems/#{Locatine::NAME}-#{Locatine::VERSION}/lib/#{Locatine::NAME}"
 end

data/lib/locatine.rb

@@ -1,2 +1 @@
-require "locatine/search"
-require "locatine/version"
+Dir.glob("./lib/locatine/*.rb").each {|it| require it}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: locatine
 version: !ruby/object:Gem::Version
-  version: '0.0092'
+  version: '0.00463'
 platform: ruby
 authors:
 - Sergei Seleznev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-03-05 00:00:00.000000000 Z
+date: 2019-03-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -115,15 +115,6 @@ extensions: []
 extra_rdoc_files: []
 files:
 - lib/locatine.rb
-- lib/locatine/app/background.js
-- lib/locatine/app/content.css
-- lib/locatine/app/content.js
-- lib/locatine/app/devtools.html
-- lib/locatine/app/devtools.js
-- lib/locatine/app/manifest.json
-- lib/locatine/app/popup.css
-- lib/locatine/app/popup.html
-- lib/locatine/app/popup.js
 - lib/locatine/search.rb
 - lib/locatine/version.rb
 homepage: https://github.com/sseleznevqa/locatine

data/lib/locatine/app/background.js

@@ -1,9 +0,0 @@
-chrome.browserAction.onClicked.addListener(
-  function(tab) {
-    console.log("WAS here");
-    chrome.windows.create( {'url': 'popup.html',
-                            'type': 'popup',
-                            'width': 800,
-                            'height': 600});
-
-  });

data/lib/locatine/app/content.css

@@ -1,40 +0,0 @@
-@keyframes locatine_found {
-  0%   {border: 4px dashed #6495ED;}
-  20%  {border: 4px dashed #FF7F50;}
-  40%  {border: 4px dashed #8FBC8F;}
-  60% {border: 4px dashed #FFA500;}
-  80% {border: 4px dashed #DDA0DD;}
-  100% {border: 4px dashed #6495ED;}
-}
-
-div[locatinestyle=true] {
-  position:fixed;
-  padding:0;
-  margin:0;
-  top:0;
-  left:0;
-  opacity: 0;
-  background: black;
-  height: 100%;
-  width: 100%;
-  pointer-events: visible;
-  display: block;
-  z-index: 2147483646;
-}
-
-div[locatinestyle=false] {
-  height: 0%;
-  width: 0%;
-}
-
-div[locatinestyle=blocked] {
-  height: 0%;
-  width: 0%;
-}
-
-[locatineclass=foundbylocatine]
-  {animation: locatine_found 6s infinite;
-   -webkit-appearance: none;
-   -moz-appearance: none;
-   appearance: none;
-}

data/lib/locatine/app/content.js

@@ -1,94 +0,0 @@
-async function set_value(name, value){
-  let temp = {};
-  temp[name] = value;
-  await chrome.storage.sync.set(temp, function() {});
-};
-
-async function get_value(name) {
-  let x = await new Promise((resolve, reject) => chrome.storage.sync.get([name], resolve));
-  return x[name];
-};
-
-document.addEventListener("locatine_send", async function(e) {
-  await set_value(e.detail.varname, e.detail.varvalue);
-});
-
-async function refreshData(){
-  if (!document.getElementById("locatine_magic_div")){
-    const options = {
-      "locatineclass": "locatine_smthing",
-      "id":"locatine_magic_div",
-      "locatinestyle": await get_value('magic_div') || "false",
-      "locatinetitle": "ok",
-      "locatinehint": "ok"
-    };
-    locatine_create_element(document.body, "div", options, "");
-  } else {
-    const magicDiv = document.getElementById("locatine_magic_div");
-    if (magicDiv.getAttribute("locatinestyle") === "set_true") {
-      await set_value('magic_div', true);
-      magicDiv.setAttribute("locatinestyle", "true");
-    };
-    if (magicDiv.getAttribute("locatinetitle") != "ok") {
-      await set_value('locatine_title', magicDiv.getAttribute("locatinetitle"));
-      await set_value('locatine_hint', magicDiv.getAttribute("locatinehint"));
-      magicDiv.setAttribute("locatinetitle", "ok");
-    }
-    let status = await get_value('magic_div');
-    if (magicDiv.getAttribute("locatinestyle") != "set_true"){
-      magicDiv.setAttribute("locatinestyle", status);
-    }
-    magicDiv.setAttribute("locatinecollection", await get_value("locatine_collection"))
-    if (magicDiv.getAttribute("locatineconfirmed") === "ok") {
-      magicDiv.removeAttribute("tag");
-      magicDiv.removeAttribute("index");
-      await set_value("locatine_confirm", false);
-      await set_value('magic_div', false);
-    }
-    const confirmed = await get_value('locatine_confirm');
-    magicDiv.setAttribute("locatineconfirmed", confirmed);
-  };
-  const magic_cover = document.getElementById('locatine_magic_div');
-  magic_cover.onclick = function(e) {locatine_magic_click(e)};
-};
-
-function getSelected(value){
-  const tagName = value.tagName;
-  const array = Array.prototype.slice.call( document.getElementsByTagName(tagName) );
-  const index = array.indexOf(value);
-  document.getElementById("locatine_magic_div").setAttribute("tag", tagName);
-  document.getElementById("locatine_magic_div").setAttribute("index", index);
-};
-
-function locatine_magic_click(e) {
-  document.getElementById("locatine_magic_div").setAttribute("locatinestyle", "blocked");
-  const value = document.elementFromPoint(e.clientX, e.clientY);
-  document.getElementById("locatine_magic_div").setAttribute("locatinestyle", "true");
-  const tagName = value.tagName;
-  const array = Array.prototype.slice.call( document.getElementsByTagName(tagName) );
-  const index = array.indexOf(value);
-  document.getElementById("locatine_magic_div").setAttribute("TAG", tagName);
-  document.getElementById("locatine_magic_div").setAttribute("INDEX", index);
-};
-
-function locatine_create_element(dom, tag, attrs, inner) {
-  const element = document.createElement(tag);
-  dom.appendChild(element);
-  for (var key in attrs) {
-    element.setAttribute(key, attrs[key])
-  };
-  element.innerHTML = inner;
-  return element;
-};
-
-//set_value('magic_div','off');
-
-setInterval(async function(){
-  if (document.getElementById("locatine_magic_div")) {
-    if (document.getElementById("locatine_magic_div").getAttribute("locatinestyle") != "blocked") {
-      await refreshData()
-    }
-  } else {
-    await refreshData()
-  }
-}, 100);

data/lib/locatine/app/devtools.html

@@ -1 +0,0 @@
-<script src="devtools.js"></script>

data/lib/locatine/app/devtools.js

@@ -1,3 +0,0 @@
-setInterval(function(){
-  chrome.devtools.inspectedWindow.eval("getSelected($0)", { useContentScriptContext: true });
-}, 100);

data/lib/locatine/app/manifest.json

@@ -1,20 +0,0 @@
-{
-  "name": "Locatine app",
-  "version": "0.0092",
-  "description": "Messaging from browser to main app",
-  "devtools_page": "devtools.html",
-  "permissions": ["activeTab", "storage", "contextMenus", "tabs"],
-  "background": {
-    "scripts": ["background.js"],
-    "persistent": true
-  },
-  "content_scripts": [{
-       "matches": ["<all_urls>"],
-       "all_frames": true,
-       "js":      ["content.js"],
-       "css":     ["content.css"]
-   }],
-   "browser_action": {
-      "default_title": "Locatine"},
-  "manifest_version": 2
-}

data/lib/locatine/app/popup.css

@@ -1,41 +0,0 @@
-.button {
-  border: none;
-  height: 30px;
-  width: 100%;
-  color: white;
-  padding: 5px 32px;
-  text-align: center;
-  text-decoration: none;
-  display: inline-block;
-  font-size: 16px;
-}
-
-.green {
-  background-color: #4CAF50
-}
-
-.red {
-  background-color: #AF4C50
-}
-
-.blue {
-  background-color: #4C50AF
-}
-
-.header {
-  padding: 10px 5px 10px 5px;
-  text-align: center;
-  color: black;
-  font-size: 25px;
-}
-
-.hint {
-  padding: 10px 5px 10px 5px;
-  text-align: center;
-  background-color: #EFFA93;
-  box-shadow: 5px 5px 5px;
-}
-
-.block {
-  padding: 30px 5px 30px 5px;
-}

data/lib/locatine/app/popup.html

@@ -1,17 +0,0 @@
-
-<html>
-  <head>
-    <link rel="stylesheet" href="popup.css">
-  </head>
-  <body>
-    <h2 class="header" id="mainTitle">Right now you are defining nothing. So no button will work</h2>
-    <h3 class="hint" id="hint">But you can click it anyway :)</h3>
-    <div class="block">
-      <input class="blue button" id="watchSwitch" type="button" value="Do not watch"/>
-      <input class="blue button" id="mode" type="button" value="Adding mode is enabled"/>
-      <input class="red button" id="clearMark" type="button" value="Clear selection"/>
-      <input class="green button" id="confirm" type="button" value="Confirm selection"/>
-    </div>
-    <script src="popup.js"></script>
-  </body>
-</html>

data/lib/locatine/app/popup.js

@@ -1,50 +0,0 @@
-async function get_value(name) {
-  let x = await new Promise((resolve, reject) => chrome.storage.sync.get([name], resolve));
-  return x[name];
-};
-
-async function set_value(name, value){
-  let temp = {};
-  temp[name] = value;
-  await chrome.storage.sync.set(temp, function() {});
-};
-
-async function correct_buttons() {
-  if (await get_value("magic_div") === true) {
-    document.getElementById("watchSwitch").setAttribute("value", "Locatine is waiting for click");
-  } else {
-    document.getElementById("watchSwitch").setAttribute("value", "Locatine is not waiting now");
-  };
-  if (await get_value("locatine_collection") === true) {
-    document.getElementById("mode").setAttribute("value", "You are in collection mode")
-  } else {
-    document.getElementById("mode").setAttribute("value", "You are in single selection mode")
-  };
-  document.getElementById("mainTitle").innerText = await get_value("locatine_title");
-  document.getElementById("hint").innerText = await get_value("locatine_hint");
-}
-
-async function watch() {
-  await set_value("magic_div", !(await get_value("magic_div")));
-}
-
-function clear() {
-  set_value("locatine_confirm", "declined");
-}
-
-function confirm() {
-  set_value("locatine_confirm", true);
-}
-
-async function mode() {
-  await set_value("locatine_collection", !(await get_value("locatine_collection")));
-}
-
-document.getElementById("watchSwitch").onclick = function() {watch()};
-document.getElementById("clearMark").onclick = function() {clear()};
-document.getElementById("confirm").onclick = function() {confirm()};
-document.getElementById("mode").onclick = function() {mode()};
-
-setInterval(function(){
-  correct_buttons();
-}, 100);