marta 0.31813 → 0.31831

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1b4fe8f6b3ddacabb9ee5feba5d3c203f08a26cb
-  data.tar.gz: 57cbf028c9088b41a80e8281aa943a084fbe66d6
+  metadata.gz: 5194e2abdec5dea63de3729eded639658cd5e4c4
+  data.tar.gz: 3c246346272294bb585cad04e824ad3f0c271887
 SHA512:
-  metadata.gz: e2b37b9b074afe23940c0949028c1a65eee3931fbaed832c4fca5c8de9e42da36dcf3f5516673a8908d5eb21ad15bc374de969c040f13e1e7483bb7a118d7b75
-  data.tar.gz: e003e723ea5d48d563b05b0e2d88d2fade5d2ccdd7de78caf2fe974f7622e91c088a4885e10239f69107108b1e618c4f1d8420a5831f7451acfc1b936fdeb942
+  metadata.gz: 5afbf7645596d47577731e8e3898e6c2e8a96e575900d0832798cdd0a9ced60430fc70b3afa2e284b1999d721ab150fe7f2e7ac75f4d14c51ec0b57e46b38ca3
+  data.tar.gz: 860e8de97e4f32469897609fedad639d26864b6503706532f88d2057f122a40bf8d6506f1077adb77ec1f81db00753dde0001fff444a3fab14b1c51379c4f172

data/README.md

@@ -139,7 +139,7 @@ test_page = SmartPage.new("TestPage")
 test_page.method_edit("magic_button")
 ```
 
-**Q: Sometimes Marta is looking for lost element for too long. What can I do about it?**
+**Q: Sometimes Marta is looking for the lost element for too long. What can I do about it?**
 
 *A: You can set tolerancy parameter. Larger = longer*
 ```ruby
@@ -147,6 +147,13 @@ dance_with tolerancy: 1024# is the default value
 ```
 *That logic will be changed to more understandable soon. I hope.*
 
+**Q: Marta is trying to find the lost element after pretty long time. Why?**
+
+*A: Marta is not starting active search for the element immediately because she hopes that the element will appear (created by js). By default marta is waiting for the element for 10 seconds. But if you are sure that it is too long (or maybe too short) you can change that waiting time like:*
+```ruby
+dance_with cold_timeout: 5
+```
+
 **Q: How can I get Watir browser instance if I want for example execute_script or find element without Marta?**
 
 *A: Like that*
@@ -240,7 +247,7 @@ g_page.search "I am in love with selenium."
 
 **Q: What else?**
 
-*A: Nothing. Marta is under development. Her version is 0.31813 only. And I am not a professional developer. But I am training her on new tricks.*
+*A: Nothing. Marta is under development. Her version is 0.31831 only. And I am not a professional developer. But I am training her on new tricks.*
 
 ## Internal Design
 

data/lib/marta/black_magic.rb

@@ -1,5 +1,6 @@
 require 'marta/x_path'
 require 'marta/simple_element_finder'
+require 'marta/options_and_paths'
 
 module Marta
 
@@ -15,7 +16,7 @@ module Marta
   # becoming larger than tolerancy value
   module BlackMagic
 
-    include XPath, SimpleElementFinder
+    include XPath, SimpleElementFinder, OptionsAndPaths
 
     private
 
@@ -25,6 +26,8 @@ module Marta
     # @note It is believed that no user will use it
     class MagicFinder < BasicFinder
 
+      include OptionsAndPaths
+
       def initialize(meth, tolerancy, requestor)
         @tolerancy = tolerancy
         @engine = requestor.engine
@@ -34,7 +37,7 @@ module Marta
       # We can prefind an element and wait for it.
       def prefind_with_waiting
         begin
-          prefind.wait_until_present(timeout: 10)
+          prefind.wait_until_present(timeout: SettingMaster.cold_timeout)
         rescue
           # found nothing
           prefind

data/lib/marta/data/custom-xpath.html

@@ -3,7 +3,7 @@
     <div martaclass=marta_smthing martastyle=header>
       <h2 id=marta_main_title martaclass=marta_smthing></h2>
       <div martastyle=icons_holder martaclass=marta_smthing>
-        <input type=button martaclass=marta_smthing martastyle=icon_button id=marta_hide onclick=marta_hide(); value=&#x21E8; />
+        <input type=button martaclass=marta_smthing martastyle=icon_button id=marta_hide value=&#x21E8; />
       </div>
     </div>
     <div martaclass=marta_smthing martastyle=hint>
@@ -21,14 +21,14 @@
       </label>
     </div>
     <div martastyle=buttons_holder martaclass=marta_smthing>
-      <input type=button martaclass=marta_smthing id=marta_try_again martastyle=action_button onclick=marta_try_again(); value="Try again" />
-      <input type=button martaclass=marta_smthing id=marta_confirm martastyle=confirm_button onclick=marta_confirm(); value=Confirm />
+      <input type=button martaclass=marta_smthing id=marta_try_again martastyle=action_button value="Try again" />
+      <input type=button martaclass=marta_smthing id=marta_confirm martastyle=confirm_button value=Confirm />
     </div>
   </div>
   <div id=xpath_field martaclass=marta_smthing>
     <div martaclass=marta_smthing class=label id=marta_xpath_label>Set XPATH here and hit Enter.</div>
     <span martaclass=marta_smthing>XPATH:
-      <input onchange=marta_look(); type=text id=marta_user_xpath martaclass=marta_smthing value=//>
+      <input type=text id=marta_user_xpath martaclass=marta_smthing value=//>
     </span>
   </div>
 </hr>

data/lib/marta/data/custom-xpath.js

@@ -1,21 +1,26 @@
-var marta_result = {};
-var marta_confirm_mark = false;
-var marta_temp_els =[];
+document.marta_result = {};
+document.marta_confirm_mark = false;
+document.marta_temp_els =[];
 
-function marta_add_data() {
-    marta_confirm_mark = false;
-    document.getElementById("marta_main_title").innerHTML = "XPATH for " + marta_what + " = ?";
+document.getElementById("marta_try_again").onclick = function() {document.marta_try_again()};
+document.getElementById("marta_confirm").onclick = function() {document.marta_confirm()};
+document.getElementById("marta_user_xpath").onchange = function() {document.marta_look()};
+document.getElementById("marta_hide").onclick = function() {document.marta_hide()};
+
+document.marta_add_data = function() {
+    document.marta_confirm_mark = false;
+    document.getElementById("marta_main_title").innerHTML = "XPATH for " + document.marta_what + " = ?";
 };
 
-function marta_look() {
+document.marta_look = function() {
   try {
-    for (var i=0; i<marta_temp_els.snapshotLength; i++) {
-      marta_temp_els.snapshotItem(i).removeAttribute("martaclass");
+    for (var i=0; i<document.marta_temp_els.snapshotLength; i++) {
+      document.marta_temp_els.snapshotItem(i).removeAttribute("martaclass");
     };
     var t=0;
     var value = document.getElementById("marta_user_xpath").value;
     var result = document.evaluate(value, document.body, null, XPathResult.ORDERED_NODE_SNAPSHOT_TYPE, null);
-    marta_temp_els = result;
+    document.marta_temp_els = result;
     for (var i=0; i<result.snapshotLength; i++) {
       var marta_smthing = ((result.snapshotItem(i).getAttribute("martaclass")=="marta_smthing")||(result.snapshotItem(i).getAttribute("martaclass")=="marta_div"));
       if(!marta_smthing) {
@@ -29,28 +34,28 @@ function marta_look() {
   };
 };
 
-function marta_confirm(){
-    for (var i=0; i<marta_temp_els.snapshotLength; i++) {
-      marta_temp_els.snapshotItem(i).removeAttribute("martaclass");
+document.marta_confirm = function(){
+    for (var i=0; i<document.marta_temp_els.snapshotLength; i++) {
+      document.marta_temp_els.snapshotItem(i).removeAttribute("martaclass");
     };
-    marta_result["collection"] = document.getElementById("marta_array").checked;
-    marta_result["xpath"] = document.getElementById("marta_user_xpath").value;
+    document.marta_result["collection"] = document.getElementById("marta_array").checked;
+    document.marta_result["xpath"] = document.getElementById("marta_user_xpath").value;
     var toClear = document.querySelector("[martaclass=marta_smthing]");
     toClear.parentNode.removeChild(toClear);
-    marta_confirm_mark = true;
+    document.marta_confirm_mark = true;
 };
 
-function marta_try_again(){
-    for (var i=0; i<marta_temp_els.snapshotLength; i++) {
-      marta_temp_els.snapshotItem(i).removeAttribute("martaclass");
+document.marta_try_again = function(){
+    for (var i=0; i<document.marta_temp_els.snapshotLength; i++) {
+      document.marta_temp_els.snapshotItem(i).removeAttribute("martaclass");
     };
     var toClear = document.querySelector("[martaclass=marta_div]");
     toClear.parentNode.removeChild(toClear);
-    marta_confirm_mark = true;
-    marta_result = "2";
+    document.marta_confirm_mark = true;
+    document.marta_result = "2";
 };
 
-function marta_hide() {
+document.marta_hide = function() {
   var toHide = document.querySelector("[martaclass=marta_div]");
   if (toHide.getAttribute("martastyle")=="hidden"){
     toHide.setAttribute("martastyle", "none");

data/lib/marta/data/element-confirm.html

@@ -3,7 +3,7 @@
     <div martaclass=marta_smthing martastyle=header>
       <h2 id=marta_main_title martaclass=marta_smthing></h2>
       <div martastyle=icons_holder martaclass=marta_smthing>
-        <input type=button martaclass=marta_smthing martastyle=icon_button id=marta_hide onclick=marta_hide(); value=&#x21E8; />
+        <input type=button martaclass=marta_smthing martastyle=icon_button id=marta_hide value=&#x21E8; />
       </div>
     </div>
     <div martaclass=marta_smthing martastyle=hint>
@@ -16,9 +16,9 @@
   </div>
   <div id=marta_s_content martaclass=marta_smthing>
     <div martastyle=buttons_holder martaclass=marta_smthing>
-      <input type=button martaclass=marta_smthing martastyle=confirm_button id=marta_confirm onclick=marta_confirm(); value=Confirm />
-      <input type=button martaclass=marta_smthing martastyle=cancel_button id=marta_try_again onclick=marta_try_again(); value="Try again" />
-      <input type=button martaclass=marta_smthing martastyle=action_button id=marta_set_by_hand onclick=marta_set_by_hand(); value="Set by hand" />
+      <input type=button martaclass=marta_smthing martastyle=confirm_button id=marta_confirm value=Confirm />
+      <input type=button martaclass=marta_smthing martastyle=cancel_button id=marta_try_again value="Try again" />
+      <input type=button martaclass=marta_smthing martastyle=action_button id=marta_set_by_hand value="Set by hand" />
     </div>
   </div>
   <div id=attr_fields martaclass=marta_smthing>

data/lib/marta/data/element-confirm.js

@@ -1,35 +1,40 @@
-var marta_result = {};
-var marta_confirm_mark = false;
+document.marta_result = {};
+document.marta_confirm_mark = false;
 
-function marta_confirm(){
+document.getElementById("marta_try_again").onclick = function() {document.marta_try_again()};
+document.getElementById("marta_confirm").onclick = function() {document.marta_confirm()};
+document.getElementById("marta_set_by_hand").onclick = function() {document.marta_set_by_hand()};
+document.getElementById("marta_hide").onclick = function() {document.marta_hide()};
+
+document.marta_confirm = function(){
     var toClear = document.querySelector("[martaclass=marta_smthing]");
     toClear.parentNode.removeChild(toClear);
-    marta_confirm_mark = true;
-    marta_result = "4";
+    document.marta_confirm_mark = true;
+    document.marta_result = "4";
 };
 
-function marta_click_work(e){};
+document.marta_click_work = function(e){};
 
-function marta_try_again(){
+document.marta_try_again = function(){
     var toClear = document.querySelector("[martaclass=marta_div]");
     toClear.parentNode.removeChild(toClear);
-    marta_confirm_mark = true;
-    marta_result = "2";
+    document.marta_confirm_mark = true;
+    document.marta_result = "2";
 };
 
-function marta_set_by_hand(){
+document.marta_set_by_hand = function(){
     var toClear = document.querySelector("[martaclass=marta_div]");
     toClear.parentNode.removeChild(toClear);
-    marta_confirm_mark = true;
-    marta_result = "3";
+    document.marta_confirm_mark = true;
+    document.marta_result = "3";
 };
 
-function marta_add_data() {
-    marta_confirm_mark = false;
-    document.getElementById("marta_main_title").innerHTML = old_marta_Data + " elements found for " + marta_what;
+document.marta_add_data = function() {
+    document.marta_confirm_mark = false;
+    document.getElementById("marta_main_title").innerHTML = document.old_marta_Data + " elements found for " + document.marta_what;
 };
 
-function marta_hide() {
+document.marta_hide = function() {
   var toHide = document.querySelector("[martaclass=marta_div]");
   if (toHide.getAttribute("martastyle")=="hidden"){
     toHide.setAttribute("martastyle", "none");

data/lib/marta/data/element.html

@@ -3,7 +3,7 @@
     <div martaclass=marta_smthing martastyle=header>
       <h2 id=marta_main_title martaclass=marta_smthing></h2>
       <div martastyle=icons_holder martaclass=marta_smthing>
-        <input type=button martaclass=marta_smthing martastyle=icon_button id=marta_hide onclick=marta_hide(); value=&#x21E8; />
+        <input type=button martaclass=marta_smthing martastyle=icon_button id=marta_hide value=&#x21E8; />
       </div>
     </div>
     <div martaclass=marta_smthing martastyle=hint>
@@ -19,9 +19,9 @@
   </div>
   <div id=marta_s_content martaclass=marta_smthing martastyle=main_content>
     <div martastyle=buttons_holder martaclass=marta_smthing>
-      <input type=button martaclass=marta_smthing id=marta_confirm martastyle=confirm_button onclick=marta_end_loop(); value=Confirm />
-      <input type=button martaclass=marta_smthing id=marta_set_by_hand martastyle=action_button onclick=marta_set_by_hand(); value="Set by hand" />
-      <input type=button martaclass=marta_smthing id=marta_show_html martastyle=action_button onclick=marta_show_html(); value="Find in html" />
+      <input type=button martaclass=marta_smthing id=marta_confirm martastyle=confirm_button value=Confirm />
+      <input type=button martaclass=marta_smthing id=marta_set_by_hand martastyle=action_button value="Set by hand" />
+      <input type=button martaclass=marta_smthing id=marta_show_html martastyle=action_button value="Find in html" />
     </div>
   </div>
   <div id=marta_s_element_type martaclass=marta_smthing martastyle=options_holder>

data/lib/marta/data/element.js

@@ -1,113 +1,133 @@
-var marta_room = 0;
-var marta_result = {};
-var marta_confirm_mark = false;
-var marta_waits_iframe = "IFRAME";
+document.marta_room = 0;
+document.marta_result = {};
+document.marta_confirm_mark = false;
+document.marta_test_xx = 0;
+document.marta_test_yy = 0;
 
-function sleep(ms) {
-  ms += new Date().getTime();
-  while (new Date() < ms){};
+document.getElementById("marta_confirm").onclick = function() {document.marta_end_loop()};
+document.getElementById("marta_set_by_hand").onclick = function() {document.marta_set_by_hand()};
+document.getElementById("marta_show_html").onclick = function() {document.marta_show_html()};
+document.getElementById("marta_hide").onclick = function() {document.marta_hide()};
+
+document.marta_magic_click = function(e) {
+  if (document.marta_test_xx == 0) {var xx = e.clientX} else {var xx = document.marta_test_xx};
+  if (document.marta_test_yy == 0) {var yy = e.clientY} else {var yy = document.marta_test_yy};
+  document.getElementById("marta_magic_div").setAttribute("martastyle", "off");
+  document.marta_click_work(document.elementFromPoint(xx, yy));
+  document.getElementById("marta_magic_div").setAttribute("martastyle", "at_large");
 };
 
-var marta_monitor = setInterval(function(){
-    var elem = document.activeElement;
-    if(elem && elem.tagName == marta_waits_iframe){
-        marta_waits_iframe = "Nope, she is not";
-        marta_click_work(elem, true);
-    } else {
-        marta_waits_iframe = "IFRAME";
-    };
-}, 100);
+document.marta_create_element = function(dom, tag, attrs, inner) {
+  var element = document.createElement(tag);
+  dom.appendChild(element);
+  for (var key in attrs) {
+    element.setAttribute(key, attrs[key])
+  };
+  element.innerHTML = inner;
+  return element;
+};
+
+if (!document.getElementById("marta_magic_div")){
+  document.marta_create_element(document.body, "div", {"martaclass": "marta_smthing","id":"marta_magic_div", "martastyle": "at_large"}, "");
+} else {
+  document.getElementById("marta_magic_div").setAttribute("martastyle", "at_large");
+};
+document.getElementById('marta_magic_div').onclick = function(e) {document.marta_magic_click(e)};
 
-function marta_add_field(title, what, key, marker) {
-    marta_room++;
+document.marta_add_field = function(title, what, key, marker) {
+    document.marta_room++;
     var objTo = document.getElementById("attr_fields");
     var divtest = document.createElement("div");
-    var att = document.createAttribute("martaclass");
-    att.value = "marta_smthing";
-    divtest.setAttributeNode(att);
-    divtest.innerHTML = "<div martaclass=marta_smthing class=label id=marta_title"+marta_room+">ATTR</div><div martaclass=marta_smthing martastyle=field_line class=content id=marta_staff"+marta_room+"><input martastyle=name_field martaclass=marta_smthing class=marta_s_name_field type=text disabled=disabled; id=marta_name"+marta_room+" value=><input onchange=marta_change_field(this); martastyle=value_field martaclass=marta_smthing type=text id=marta_default_value"+marta_room+" value=><input martastyle=cancel_button martaclass=marta_smthing type=button onclick=marta_delete_line("+marta_room+") value=Delete id=delete_marta_value"+marta_room+"</div>";
     objTo.appendChild(divtest);
-    document.getElementById("marta_title"+marta_room ).innerHTML = title;
-    document.getElementById("marta_name"+marta_room ).value = what;
-    var field = document.getElementById("marta_default_value"+marta_room);
+    divtest.setAttribute("martaclass", "marta_smthing");
+    var headerDiv = document.marta_create_element(divtest, "div", {"martaclass": "marta_smthing", "class": "label", "id": "marta_title"+document.marta_room}, "ATTR");
+    var contentDiv = document.marta_create_element(divtest, "div", {"martaclass": "marta_smthing", "martastyle": "field_line", "class": "content", "id": "marta_staff"+document.marta_room}, "");
+    var nameField = document.marta_create_element(contentDiv, "input", {"martaclass": "marta_smthing", "martastyle": "name_field", "class": "marta_s_name_field", "type": "text", "disabled": "disabled;", "id": "marta_name"+document.marta_room, "value": ""}, "");
+    var valueField = document.marta_create_element(contentDiv, "input", {"martaclass": "marta_smthing", "martastyle": "value_field", "type": "text", "id": "marta_default_value"+document.marta_room, "value": ""}, "");
+    var cancelButton = document.marta_create_element(contentDiv, "input", {"martaclass": "marta_smthing", "martaroom": document.marta_room, "martastyle": "cancel_button", "type": "button", "id": "delete_marta_value"+document.marta_room, "value": "Delete"}, "");
+    document.getElementById("marta_title"+document.marta_room ).innerHTML = title;
+    document.getElementById("marta_name"+document.marta_room ).value = what;
+    var field = document.getElementById("marta_default_value"+document.marta_room);
     field.value = key;
     var att = document.createAttribute("marta_object_map");
     att.value = title+";;"+what+";;"+marker;
     field.setAttributeNode(att);
+    document.getElementById("delete_marta_value"+document.marta_room).onclick = function(e) {document.marta_delete_line(e)};
+    document.getElementById("marta_default_value"+document.marta_room).onchange = function(e) {document.marta_change_field(e)};
 };
 
-function marta_change_field(field){
+document.marta_change_field = function(field){
   var data = field.getAttribute("marta_object_map").split(";;");
   if (data[2] == "-1"){
     if (field.value == ""){
-      delete marta_result[data[0]][data[1]];
+      delete document.marta_result[data[0]][data[1]];
     } else {
-      marta_result[data[0]][data[1]]=field.value;
+      document.marta_result[data[0]][data[1]]=field.value;
     };
   }else if (data[2] == "taggy"){
     if (field.value == ""){
-      marta_result["options"][data[1]] = "*";
+      document.marta_result["options"][data[1]] = "*";
     } else {
-      marta_result["options"][data[1]]=field.value;
+      document.marta_result["options"][data[1]]=field.value;
     };
   }else {
     if (field.value == ""){
-      delete marta_result[data[0]][data[1]][parseInt(data[2])];
+      delete document.marta_result[data[0]][data[1]][parseInt(data[2])];
     } else {
-      marta_result[data[0]][data[1]][parseInt(data[2])]=field.value;
+      document.marta_result[data[0]][data[1]][parseInt(data[2])]=field.value;
     };
   };
-  marta_confirm();
+  document.marta_confirm();
 };
 
-function marta_clean_up(){
+document.marta_clean_up = function(){
   var toClear = document.body.querySelectorAll("[martaclass=marta_div],[martaclass=marta_script],[martaclass=marta_style]");
   for (var i = 0; i < toClear.length; i++) {
     toClear[i].parentNode.removeChild(toClear[i]);
   };
-  marta_room = 0;
+  document.marta_room = 0;
 };
 
-function marta_confirm(){
-  if (marta_room != 0){
-    marta_result["options"]["collection"] = document.getElementById("marta_array").checked;
-    marta_clean_up();
-    for (var what in marta_result){
-      for (var key in marta_result[what]){
-        if (marta_result[what][key] instanceof Array){
-          for (var i = 0; i < marta_result[what][key].length; i++) {
-            if (marta_result[what][key][i] == undefined) {
-              marta_result[what][key].splice(i, 1);
+document.marta_confirm = function(){
+  if (document.marta_room != 0){
+    document.marta_result["options"]["collection"] = document.getElementById("marta_array").checked;
+    document.marta_clean_up();
+    for (var what in document.marta_result){
+      for (var key in document.marta_result[what]){
+        if (document.marta_result[what][key] instanceof Array){
+          for (var i = 0; i < document.marta_result[what][key].length; i++) {
+            if (document.marta_result[what][key][i] == undefined) {
+              document.marta_result[what][key].splice(i, 1);
             i--;
             };
           };
         };
       };
     };
-    marta_confirm_mark = true;
-    return marta_result;
+    document.marta_confirm_mark = true;
+    return document.marta_result;
   };
 };
 
-function marta_add_data() {
-  marta_result = old_marta_Data;
-    marta_confirm_mark = false;
-    document.getElementById("marta_main_title").innerHTML = marta_what;
-    if (old_marta_Data != {}){
+document.marta_add_data = function() {
+  document.marta_result = document.old_marta_Data;
+    document.marta_confirm_mark = false;
+    document.getElementById("marta_main_title").innerHTML = document.marta_what;
+    if (document.old_marta_Data != {}){
       try {
-        document.getElementById("marta_array").checked = old_marta_Data["options"]["collection"];}
+        document.getElementById("marta_array").checked = document.old_marta_Data["options"]["collection"];}
       catch(e){};
-      for (var what in old_marta_Data){
+      for (var what in document.old_marta_Data){
         if (what != "options"){
-          marta_add_field("TAG", what, old_marta_Data["options"][what], "taggy");
-          for (var key in old_marta_Data[what]){
+          document.marta_add_field("TAG", what, document.old_marta_Data["options"][what], "taggy");
+          for (var key in document.old_marta_Data[what]){
               if (/class/.test(key) == true){
-                for (var k = 0, length = old_marta_Data[what][key].length; k < length; k++){
-                  marta_add_field(what, key, old_marta_Data[what][key][k], k);
+                for (var k = 0, length = document.old_marta_Data[what][key].length; k < length; k++){
+                  document.marta_add_field(what, key, document.old_marta_Data[what][key][k], k);
                 };
               }else
               {
-                marta_add_field(what, key, old_marta_Data[what][key], "-1");
+                document.marta_add_field(what, key, document.old_marta_Data[what][key], "-1");
               };
             };
         };
@@ -115,28 +135,28 @@ function marta_add_data() {
     };
 };
 
-function marta_show_html() {
+document.marta_show_html = function() {
   var area = document.getElementById("marta_s_html_holder");
-  area.innerHTML = spaninize(document.documentElement.innerHTML);
+  area.innerHTML = document.spaninize(document.documentElement.innerHTML);
 };
 
-function marta_touch(element) {
+document.marta_touch = function(element) {
   var control = element.textContent.replace(/</g,"&lt;").replace(/>/g,"&gt;");
   var everything = document.getElementsByTagName("*");
   for (var i=0, max=everything.length; i < max; i++) {
     var check = everything[i].outerHTML.replace(/</g,"&lt;").replace(/>/g,"&gt;");
     if (check == control) {
-      everything[i].click();
+      document.marta_click_work(everything[i]);
     };
   };
 };
 
-function wrap(el, wrapper) {
+document.wrap = function(el, wrapper) {
   wrapper.appendChild(el.cloneNode(true));
   el.parentNode.replaceChild(wrapper, el);
 };
 
-function spaninize(string) {
+document.spaninize = function(string) {
   var dummy = document.createElement( "marta_span" );
   dummy.innerHTML = string;
   ignore = dummy.querySelectorAll("[martaclass=marta_div],[martaclass=marta_script],[martaclass=marta_style]");
@@ -154,104 +174,101 @@ function spaninize(string) {
     };
     var wrapper = document.createElement( "marta_span" );
     wrapper.setAttribute("martaclass","marta_smthing");
-    wrapper.setAttribute("onclick","marta_touch(this);");
-    wrap(everything[i], wrapper);
+    document.wrap(everything[i], wrapper);
   };
+  var theParent = document.getElementById("marta_s_html_holder");
+  theParent.onclick = function(e) {document.pretouch(e)};
   return dummy.innerHTML.replace(/<(?!.?marta_span)([^>]*)>/g,"&lt;$1&gt;").replace(/marta_span/g,"span");
 };
 
-function marta_click_work(e, iframe=false) {
-  if (iframe == false){
-    e = e || window.event;
-    var target = e.target || e.srcElement;
-  } else {
-    target = e;
-  };
+document.pretouch = function(e) {
+    if (e.target !== e.currentTarget) {
+        var clickedItem = e.target;
+        document.marta_touch(clickedItem);
+    };
+};
+
+document.marta_click_work = function(target) {
     var marta_smthing = target.getAttribute("martaclass")=="marta_smthing";
     if(!marta_smthing){
         document.getElementById("attr_fields").innerHTML="";
-        marta_room = 0;
-        marta_result = {};
-        marta_result["options"] = {};
-        marta_after_click(target,"self");
+        document.marta_room = 0;
+        document.marta_result = {};
+        document.marta_result["options"] = {};
+        document.marta_after_click(target,"self");
         if (!!target.parentElement){
-          marta_after_click(target.parentElement,"pappy");
+          document.marta_after_click(target.parentElement,"pappy");
         };
         if (!!target.parentElement.parentElement){
-          marta_after_click(target.parentElement.parentElement,"granny");
-        };
-        if(!marta_confirm_mark){
-          e.stopPropagation();
-          e.preventDefault();
+          document.marta_after_click(target.parentElement.parentElement,"granny");
         };
-        marta_confirm();
+        document.marta_confirm();
     };
 };
 
-document.onclick = function(e) {marta_click_work(e)};
-
-function marta_after_click(el, what) {
-    marta_result[what] = {};
-    marta_result["options"][what] = el.tagName;
-    marta_add_field("TAG", what, marta_result["options"][what], "taggy");
+document.marta_after_click = function(el, what) {
+    document.marta_result[what] = {};
+    document.marta_result["options"][what] = el.tagName;
+    document.marta_add_field("TAG", what, document.marta_result["options"][what], "taggy");
     for (var att, i = 0, atts = el.attributes, n = atts.length; i < n; i++){
       att = atts[i];
       if(/^[a-zA-Z0-9- _!@#$%^*();:,.?/]*$/.test(att.nodeValue) == true && att.nodeName != "martaclass"){
         if (/class/.test(att.nodeName) == true){
           var values=att.nodeValue.split(" ");
-          marta_result[what][att.nodeName]=[];
+          document.marta_result[what][att.nodeName]=[];
           for (var val, j = 0, vals = values, l = vals.length; j < l; j++){
             val = vals[j];
-            marta_result[what][att.nodeName][j]=val;
+            document.marta_result[what][att.nodeName][j]=val;
           };
         } else {
-          marta_result[what][att.nodeName]=att.nodeValue;
+          document.marta_result[what][att.nodeName]=att.nodeValue;
         };
       };
     };
     if (what == "self"){
       try{
-        marta_result[what]["retrieved_by_marta_text"]=el.firstChild.nodeValue;
+        document.marta_result[what]["retrieved_by_marta_text"]=el.firstChild.nodeValue;
       }catch(e){};
     };
-    for (var key in marta_result[what]){
+    for (var key in document.marta_result[what]){
       if (/class/.test(key) == true){
-        for (var k = 0, length = marta_result[what][key].length; k < length; k++){
-          marta_add_field(what, key, marta_result[what][key][k], k);
+        for (var k = 0, length = document.marta_result[what][key].length; k < length; k++){
+          document.marta_add_field(what, key, document.marta_result[what][key][k], k);
         };
       }else
       {
-        marta_add_field(what, key, marta_result[what][key], "-1");
+        document.marta_add_field(what, key, document.marta_result[what][key], "-1");
       };
     };
 };
 
-function marta_delete_line(line) {
+document.marta_delete_line = function(theEvent) {
+    var line = theEvent.target.getAttribute("martaroom");
     var title = document.getElementById("marta_title"+line);
     var staff = document.getElementById("marta_staff"+line);
     var field = document.getElementById("marta_default_value"+line);
     field.value = "";
-    marta_change_field(field);
+    document.marta_change_field(field);
     staff.parentNode.removeChild(staff);
     title.parentNode.removeChild(title);
 };
 
-function marta_set_by_hand(){
+document.marta_set_by_hand = function(){
     var toClear = document.querySelector("[martaclass=marta_div]");
     toClear.parentNode.removeChild(toClear);
-    marta_confirm_mark = true;
-    marta_result = "3";
+    document.marta_confirm_mark = true;
+    document.marta_result = "3";
 };
 
-function marta_end_loop(){
-    if (marta_room != 0){
-      marta_clean_up();
-      marta_confirm_mark = true;
-      marta_result = "1";
+document.marta_end_loop = function(){
+    if (document.marta_room != 0){
+      document.marta_clean_up();
+      document.marta_confirm_mark = true;
+      document.marta_result = "1";
     }
 };
 
-function marta_hide() {
+document.marta_hide = function() {
   var toHide = document.querySelector("[martaclass=marta_div]");
   if (toHide.getAttribute("martastyle")=="hidden"){
     toHide.setAttribute("martastyle", "none");

data/lib/marta/data/for_test.js

@@ -1,8 +1,8 @@
-function marta_add_data(){
-  document.getElementById("title").innerHTML = marta_what;
-  document.getElementById(old_marta_Data).innerHTML = old_marta_Data;
+document.marta_add_data = function(){
+  document.getElementById("title").innerHTML = document.marta_what;
+  document.getElementById(document.old_marta_Data).innerHTML = document.old_marta_Data;
 };
-var marta_result = "";
-var marta_confirm_mark = false;
-setTimeout(function() { marta_result = "Done" }, 1000);
-setTimeout(function() { marta_confirm_mark = true }, 2000);
+document.marta_result = "";
+document.marta_confirm_mark = false;
+setTimeout(function() { document.marta_result = "Done" }, 1000);
+setTimeout(function() { document.marta_confirm_mark = true }, 2000);

data/lib/marta/data/page.html

@@ -3,7 +3,7 @@
     <div martaclass=marta_smthing martastyle=header>
       <h2 martaclass=marta_smthing id=marta_main_title></h2>
       <div martaclass=marta_smthing martastyle=icons_holder>
-        <input type=button martaclass=marta_smthing martastyle=icon_button id=marta_hide onclick=marta_hide(); value=&#x21E8; />
+        <input type=button martaclass=marta_smthing martastyle=icon_button id=marta_hide value=&#x21E8; />
       </div>
     </div>
     <div martaclass=marta_smthing martastyle=hint>

data/lib/marta/data/page.js

@@ -1,41 +1,61 @@
-var marta_room = 0;
-var marta_result = {};
-var marta_confirm_mark = false;
+document.marta_room = 0;
+document.marta_result = {};
+document.marta_confirm_mark = false;
 
-function marta_add_field() {
-    marta_room++;
+document.getElementById("marta_confirm").onclick = function() {document.marta_confirm()};
+document.getElementById("marta_more_fields").onclick = function() {document.marta_add_field()};
+document.getElementById("marta_hide").onclick = function() {document.marta_hide()};
+
+document.marta_create_element = function(dom, tag, attrs, inner) {
+  var element = document.createElement(tag);
+  dom.appendChild(element);
+  for (var key in attrs) {
+    element.setAttribute(key, attrs[key])
+  };
+  element.innerHTML = inner;
+  return element;
+};
+
+document.marta_add_field = function() {
+    document.marta_room++;
     var objTo = document.getElementById("vars_fileds");
     var divtest = document.createElement("div");
-    divtest.innerHTML = "<div martastyle=field_line id=marta_staff"+marta_room+"><input type=text martaclass=marta_smthing martastyle=name_field id=marta_name"+marta_room+" value=><input martaclass=marta_smthing martastyle=value_field type=text id=marta_default_value"+marta_room+" value=><input martaclass=marta_smthing martastyle=cancel_button type=button onclick=marta_delete_line("+marta_room+") value=Delete id=delete_marta_value"+marta_room+"</div>";
     objTo.appendChild(divtest);
+    var contentDiv = document.marta_create_element(divtest, "div", {"martaclass": "marta_smthing", "martastyle": "field_line", "class": "content", "id": "marta_staff"+document.marta_room}, "");
+    var nameField = document.marta_create_element(contentDiv, "input", {"martaclass": "marta_smthing", "martastyle": "name_field", "class": "marta_s_name_field", "type": "text", "id": "marta_name"+document.marta_room, "value": ""}, "");
+    var valueField = document.marta_create_element(contentDiv, "input", {"martaclass": "marta_smthing", "martastyle": "value_field", "type": "text", "id": "marta_default_value"+document.marta_room, "value": ""}, "");
+    var cancelButton = document.marta_create_element(contentDiv, "input", {"martaclass": "marta_smthing", "martaroom": document.marta_room, "martastyle": "cancel_button", "type": "button", "id": "delete_marta_value"+document.marta_room, "value": "Delete"}, "");
+    document.getElementById("delete_marta_value"+document.marta_room).onclick = function(e) {document.marta_delete_line(e)};
 };
-function marta_confirm(){
-        for(i=1; i<=marta_room; i++){
+
+document.marta_confirm = function(){
+        for(i=1; i<=document.marta_room; i++){
             if (!!document.getElementById("marta_name"+i) && (document.getElementById("marta_name"+i).value != "")) {
-              marta_result[document.getElementById("marta_name"+i).value] = document.getElementById("marta_default_value"+i).value;
+              document.marta_result[document.getElementById("marta_name"+i).value] = document.getElementById("marta_default_value"+i).value;
             };
         };
         var toClear = document.querySelector("[martaclass=marta_div]");
         toClear.parentNode.removeChild(toClear);
-        marta_confirm_mark = true;
-        return marta_result;};
+        document.marta_confirm_mark = true;
+        return document.marta_result;};
 
-function marta_add_data() {
-    document.getElementById("marta_main_title").innerHTML = "You are defining " + marta_what;
-    for (var key in old_marta_Data){
-        marta_add_field();
-        document.getElementById("marta_name"+marta_room ).value = key;
-        document.getElementById("marta_default_value"+marta_room ).value = old_marta_Data[key];
+document.marta_add_data = function() {
+    document.getElementById("marta_main_title").innerHTML = "You are defining " + document.marta_what;
+    for (var key in document.old_marta_Data){
+        document.marta_add_field();
+        document.getElementById("marta_name"+document.marta_room ).value = key;
+        document.getElementById("marta_default_value"+document.marta_room ).value = document.old_marta_Data[key];
     };
 };
 
-function marta_delete_line(line) {
+document.marta_delete_line = function(theEvent) {
+    var line = theEvent.target.getAttribute("martaroom");
     var staff = document.getElementById("marta_staff"+line);
     title.parentNode.removeChild(title);
     staff.parentNode.removeChild(staff);
 };
 
-function marta_hide() {
+document.marta_hide = function() {
   var toHide = document.querySelector("[martaclass=marta_div]");
   if (toHide.getAttribute("martastyle")=="hidden"){
     toHide.setAttribute("martastyle", "none");

data/lib/marta/data/style.css

@@ -111,7 +111,7 @@ div[martaclass=marta_div] * {
   outline-color : invert;
   outline-style : none;
   outline-width : medium;
-  overflow : visible;
+  overflow : auto;
   overflow-x : visible;
   overflow-y : visible;
   padding : 0;
@@ -127,7 +127,7 @@ div[martaclass=marta_div] * {
   right : auto;
   tab-size : 8;
   table-layout : auto;
-  text-align : inherit;
+  text-align : auto;
   text-align-last : auto;
   text-decoration : none;
   text-decoration-color : inherit;
@@ -213,6 +213,26 @@ div[martastyle=hint] {
     margin: 0 auto;
 }
 
+div[martastyle=at_large] {
+  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: 149000;
+}
+
+div[martastyle=off] {
+  height: 0%;
+  width: 0%;
+}
+
 div[martastyle=html_content]{
   text-align: center;
 }

data/lib/marta/injector.rb

@@ -28,7 +28,7 @@ module Marta
         @custom_scripts = custom_scripts
         @default_vars = [{"marta_what": "\"#{@title}\""},
           {"old_marta_Data": @data.to_s.gsub('=>',':').gsub('nil','null')}]
-        @default_scripts = ["marta_add_data();"]
+        @default_scripts = ["document.marta_add_data();"]
       end
 
       # "first" or "last".
@@ -39,12 +39,16 @@ module Marta
       # Inserting to the page
       def insert_to_page(tag, inner, first = true)
         where = get_where(first)
-        script = <<-JS
-        var newMartaObject = document.createElement('#{tag}');
-        newMartaObject.setAttribute('martaclass','marta_#{tag}');
-        newMartaObject.innerHTML   = '#{inner}';
-        document.body.insertBefore(newMartaObject,document.body.#{where}Child);
-        JS
+        if tag != "script"
+          script = <<-JS
+          var newMartaObject = document.createElement('#{tag}');
+          newMartaObject.setAttribute('martaclass','marta_#{tag}');
+          newMartaObject.innerHTML   = '#{inner}';
+          document.body.insertBefore(newMartaObject,document.body.#{where}Child);
+          JS
+        else
+          script = inner
+        end
         @engine.execute_script script.gsub("\n",'')
       end
 
@@ -72,7 +76,7 @@ module Marta
 
       # Syringe sets javascript variables
       def set_var(var, value)
-        insert_to_page('script', "var #{var} = #{value};", false)
+        insert_to_page('script', "document.#{var} = #{value};", false)
       end
 
       # Syringe runs scripts
@@ -111,13 +115,10 @@ module Marta
         result = false
         while result != true
           # When Marta can't get a result she is reinjecting her stuff
-          begin
-            result = @engine.execute_script("return marta_confirm_mark")
-          rescue
-            actual_injection
-          end
+          result = @engine.execute_script("return document.marta_confirm_mark")
+          actual_injection if result.nil?
         end
-        @engine.execute_script("return marta_result")
+        @engine.execute_script("return document.marta_result")
       end
     end
 

data/lib/marta/options_and_paths.rb

@@ -18,6 +18,7 @@ module Marta
       @@learn = Hash.new
       @@engine = Hash.new
       @@base_url = Hash.new
+      @@cold_timeout = Hash.new
 
       # Getting uniq id for process thread
       def self.thread_id
@@ -58,6 +59,11 @@ module Marta
         @@base_url[thread_id]
       end
 
+      # Time setting for Marta. She will wait that time before active search
+      def self.cold_timeout
+        @@cold_timeout[thread_id]
+      end
+
       # Marta is changing parameters by the same scheme.
       def self.parameter_set(what, value, default)
         what[thread_id] = !value.nil? ? value : what[thread_id]
@@ -85,6 +91,9 @@ module Marta
 
       # Marta is setting engine by pretty comlex rules
       def self.set_engine(value)
+        if (engine.class == Watir::Browser) and (value.class == Watir::Browser)
+          engine.close
+        end
         iframe_locate
         @@engine = parameter_set(@@engine, value, nil)
         iframe_switch_to
@@ -108,15 +117,24 @@ module Marta
         @@tolerancy = parameter_set(@@tolerancy, value, 1024)
       end
 
-      # Marta uses a simple ruke to set the basic url.
-      def self.set_base_url(value)
-        if (value.nil?) or (value.class == String)
-          @@base_url = parameter_set(@@base_url, value, "")
+      def self.parameter_check_and_set(where, value, default, expected_class)
+        if (value.nil?) or (value.class == expected_class)
+          where = parameter_set(where, value, default)
         else
-          raise ArgumentError, "Basic url at least should be a string. Not"\
-          " a #{value}:#{value.class}"
+          raise ArgumentError, "The value should be a #{expected_class}."\
+                               " Not a #{value}:#{value.class}"
         end
       end
+
+      # Marta uses a simple rule to set the basic url.
+      def self.set_base_url(value)
+        parameter_check_and_set(@@base_url, value, "", String)
+      end
+
+      # Marta uses simple rule to set the cold timeout
+      def self.set_cold_timeout(value)
+        parameter_check_and_set(@@cold_timeout, value, 10, Fixnum)
+      end
     end
 
     private
@@ -147,5 +165,9 @@ module Marta
     def base_url
       SettingMaster.base_url
     end
+
+    def cold_timeout
+      SettingMaster.cold_timeout
+    end
   end
 end

data/lib/marta/version.rb

@@ -1,4 +1,4 @@
 module Marta
-  VERSION = "0.31813"
+  VERSION = "0.31831"
   NAME = "marta"
 end

data/lib/marta.rb

@@ -61,13 +61,14 @@ module Marta
   # Settings can be changed at any time by calling dance with.
   # Read more in the README
   def dance_with(browser: nil, folder: nil, learn: nil, tolerancy: nil,
-                 base_url: nil)
+                 base_url: nil, cold_timeout: nil)
     SettingMaster.set_engine browser
     SettingMaster.set_folder folder
     SettingMaster.set_base_url base_url
     SettingMaster.set_learn learn
     read_folder
     SettingMaster.set_tolerancy tolerancy
+    SettingMaster.set_cold_timeout cold_timeout
     engine
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: marta
 version: !ruby/object:Gem::Version
-  version: '0.31813'
+  version: '0.31831'
 platform: ruby
 authors:
 - Sergei Seleznev
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-09-01 00:00:00.000000000 Z
+date: 2017-09-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler