marta 0.28879 → 0.29156

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 50b24bc2c301985ae455018ce3c4daf56f39986a
-  data.tar.gz: 97486b64df6b76156979309461bbd3f0cf5aadad
+  metadata.gz: fd0d99204224a1b096fe1d9a103ed94c141f33e6
+  data.tar.gz: 92effa54d30743c5718bbcd2fd047143b970e05f
 SHA512:
-  metadata.gz: be9b83c7c361143334621a076b62251b7da1744dd783cca86bc9f6b4d5b72029318e465c671d01812572fe4c5ae6192447b0acd20ff47694acdaec89ec87d1fb
-  data.tar.gz: 73d0368e435ed0016d0866ec6c564832d954b290c029713417ee9ad9d0c8ac179faa1e32b0920999dbff4e64eca2d35028a93b7107728d832917e2713a87b6d3
+  metadata.gz: 934ff2dcfa6abf910a4f74be6c95826a36cd5c16b1fb06eb35491c8c02a781672b1bf3804099e04d6d8647bc89bf580f7a53b7d60cf9f7c585bbb71f2d3a46dc
+  data.tar.gz: 4debddeef970b3634ccbd73ddcf29ec0e2d1ea2386f4ed19c7d4ef344c862b0c425510c287bba5b746691373eef345b6375c4f9a75a6fbfe0f34f57f8d27b429

data/README.md

@@ -206,7 +206,7 @@ g_page.search "I am in love with selenium."
 
 **Q: What else?**
 
-*A: Nothing. Marta is under development. Her version is 0.28879 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.29156 only. And I am not a professional developer. But I am training her on new tricks.*
 
 ## Internal Design
 

data/lib/marta.rb

@@ -25,6 +25,9 @@ module Marta
   include OptionsAndPaths, ReadWrite, Json2Class
 
   class SmartPage
+
+    attr_accessor :data, :class_name, :edit_mark
+
     include BlackMagic, XPath, SimpleElementFinder, ClassesCreation,
             PublicMethods, Dialogs, Injector, Lightning, OptionsAndPaths,
             Json2Class, ReadWrite, UserValuePrework

data/lib/marta/black_magic.rb

@@ -25,9 +25,10 @@ module Marta
     # @note It is believed that no user will use it
     class MagicFinder < BasicFinder
 
-      def initialize(meth, engine, tolerancy, requestor)
+      def initialize(meth, tolerancy, requestor)
         @tolerancy = tolerancy
-        super(meth, engine, requestor)
+        @engine = requestor.engine
+        super(meth, requestor)
       end
 
       # We can prefind an element and wait for it.
@@ -140,7 +141,7 @@ module Marta
 
     # Marta can find something when data is incorrect (by Black magick)
     def marta_magic_finder(meth)
-      finder = MagicFinder.new(meth, engine, tolerancy_value, self)
+      finder = MagicFinder.new(meth, tolerancy_value, self)
       finder.find
     end
   end

data/lib/marta/data/element.html

@@ -21,12 +21,16 @@
     <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" />
     </div>
   </div>
   <div id=marta_s_element_type martaclass=marta_smthing martastyle=options_holder>
     <div martaclass=marta_smthing class=label id=marta_element_label>What we are looking for (one element or group?)</div>
     <label martaclass=marta_smthing><input type=checkbox id=marta_array martaclass=marta_smthing>Collection</label>
   </div>
+  <div martaclass=marta_smthing martastyle=html_content>
+    <div martaclass=marta_smthing id=marta_s_html_holder readonly=true>Enable HTML selector by Find in html button. NOTE: It is highly experimental.</div>
+  </div>
   <div martastyle=table_headers martaclass=marta_smthing>
     <input type=text martaclass=marta_smthing martastyle=name_field value=attribute_name disabled=disabled;>
     <input martaclass=marta_smthing martastyle=value_field type=text value=default_value disabled=disabled;>

data/lib/marta/data/element.js

@@ -61,11 +61,7 @@ function marta_change_field(field){
 };
 
 function marta_clean_up(){
-  var toClear = document.body.querySelectorAll("[martaclass=marta_div]");
-  for (var i = 0; i < toClear.length; i++) {
-    toClear[i].parentNode.removeChild(toClear[i]);
-  };
-  var toClear = document.body.querySelectorAll("[martaclass=marta_script]");
+  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]);
   };
@@ -119,6 +115,51 @@ function marta_add_data() {
     };
 };
 
+function marta_show_html() {
+  var area = document.getElementById("marta_s_html_holder");
+  area.innerHTML = spaninize(document.documentElement.innerHTML);
+};
+
+function marta_touch(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();
+    };
+  };
+};
+
+function wrap(el, wrapper) {
+  wrapper.appendChild(el.cloneNode(true));
+  el.parentNode.replaceChild(wrapper, el);
+};
+
+function spaninize(string) {
+  var dummy = document.createElement( "marta_span" );
+  dummy.innerHTML = string;
+  ignore = dummy.querySelectorAll("[martaclass=marta_div],[martaclass=marta_script],[martaclass=marta_style]");
+  for (var i = 0; i < ignore.length; i++) {
+    ignore[i].parentNode.removeChild(ignore[i]);
+  };
+  dummy.setAttribute("martaclass", "marta_smthng");
+  var counter = {};
+  var everything = dummy.getElementsByTagName("*");
+  for (var i=0, max=everything.length; i < 2*max; i=i+2) {
+    if (counter[everything[i].tagName] == null) {
+      counter[everything[i].tagName] = 0;
+    } else {
+      counter[everything[i].tagName] = counter[everything[i].tagName] + 1;
+    };
+    var wrapper = document.createElement( "marta_span" );
+    wrapper.setAttribute("martaclass","marta_smthing");
+    wrapper.setAttribute("onclick","marta_touch(this);");
+    wrap(everything[i], wrapper);
+  };
+  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;

data/lib/marta/data/for_test.js

@@ -1,6 +1,6 @@
 function marta_add_data(){
   document.getElementById("title").innerHTML = marta_what;
-  old_marta_Data.innerHTML = old_marta_Data.id
+  document.getElementById(old_marta_Data).innerHTML = old_marta_Data;
 };
 var marta_result = "";
 var marta_confirm_mark = false;

data/lib/marta/data/page.html

@@ -14,6 +14,7 @@
       <p>So if you have defined <b>something</b> and you wanna use the value of it in the other var you should write <b>#{@something}</b></p>
       <p>You should set a var with the <b>url</b> name if you are gonna use <b>your_page.open_page</b> method later</p>
       <p>Your values provided here will be default for your page_object but you can change it like <b>your_page.your_var = newvalue</b></p>
+      <p>NEVER USE AS A VAR NAME:<b>class_name, open_page, data, engine, edit_mark ,method_edit, method_missing</b></p>
     </div>
   </div>
 <div id=marta_s_content martastyle=main_content>

data/lib/marta/data/style.css

@@ -212,6 +212,27 @@ div[martastyle=hint] {
     margin: 0 auto;
 }
 
+div[martastyle=html_content]{
+  text-align: center;
+}
+
+div[martastyle=html_content] div {
+  background-color: #D7F6F5;
+  text-align: center;
+  padding: 5px;
+  border-style: solid;
+  border-width: 1px;
+  width: 90%
+}
+
+div[martastyle=html_content] div span {
+  display: block;
+  position: relative;
+  left: 30px;
+  text-align: left;
+  cursor: pointer;
+}
+
 div[martaclass=marta_div] b {
     color: red;
 }

data/lib/marta/dialogs.rb

@@ -21,13 +21,13 @@ module Marta
     # @note It is believed that no user will use it
     class MethodSpeaker
 
-      include XPath, Lightning, Injector, PublicMethods
+      include XPath, Lightning, Injector, PublicMethods, SimpleElementFinder
 
-      def initialize(class_name, method_name, data, requestor)
-        @class_name = class_name
+      def initialize(method_name, requestor)
+        @class_name = requestor.class_name
         @method_name = method_name
-        @data = data
-        @title = class_name+  '.' + method_name.to_s
+        @data = requestor.data
+        @title = @class_name+  '.' + method_name.to_s
         @requestor = requestor
         @found = 0
         @attrs = @data['meths'][@method_name]
@@ -35,8 +35,8 @@ module Marta
       end
 
       # Standart question
-      def ask(what, title = 'Some title', data = Hash.new)
-        inject(what, title, data)
+      def ask(what, title = 'Some title', data = Hash.new, vars = Array.new)
+        inject(what, title, data, vars)
       end
 
       # Was something stated by user?
@@ -69,7 +69,7 @@ module Marta
           xpath_meth_merge
         end
       end
-
+      
       # Asking: "What are you looking for?"
       def ask_for_elements
         ask 'element', "Found #{@found} elements for #{@title}", @attrs
@@ -149,10 +149,10 @@ module Marta
     end
 
     # Method definition process
-    def user_method_dialogs(my_class_name, method_name, data)
-      dialog_master = MethodSpeaker.new(my_class_name, method_name, data, self)
+    def user_method_dialogs(method_name)
+      dialog_master = MethodSpeaker.new(method_name, self)
       data = dialog_master.dialog
-      file_write(my_class_name.to_s, data)
+      file_write(self.class_name.to_s, data)
       data
     end
   end

data/lib/marta/injector.rb

@@ -16,12 +16,19 @@ module Marta
     class Syringe
 
       def initialize(engine, marta_what, title = 'Something important',
-                     old_data = Hash.new, folder = gem_libdir)
+                     old_data = Hash.new, folder = gem_libdir,
+                     custom_vars = Array.new, custom_scripts = Array.new)
         @what = marta_what
         @title = title
         @data = old_data
+        @data ||= Hash.new
         @engine = engine
         @folder = folder
+        @custom_vars = custom_vars
+        @custom_scripts = custom_scripts
+        @default_vars = [{"marta_what": "\"#{@title}\""},
+          {"old_marta_Data": @data.to_s.gsub('=>',':').gsub('nil','null')}]
+        @default_scripts = ["marta_add_data();"]
       end
 
       # "first" or "last".
@@ -38,22 +45,22 @@ module Marta
         newMartaObject.innerHTML   = '#{inner}';
         document.body.insertBefore(newMartaObject,document.body.#{where}Child);
         JS
-         @engine.execute_script script.gsub("\n",'')
+        @engine.execute_script script.gsub("\n",'')
       end
 
       # Taking a correct js file to inject
       def js
-        File.read(@folder + "/data/#{@what}.js").gsub("\n",'')
+        File.read(@folder + "/data/#{@what}.js")
       end
 
       # Taking a correct html file to inject
       def html
-        File.read(@folder + "/data/#{@what}.html").gsub("\n",'')
+        File.read(@folder + "/data/#{@what}.html")
       end
 
       # Taking a correct css file to inject
       def style
-        File.read(@folder + "/data/style.css").gsub("\n",'')
+        File.read(@folder + "/data/style.css")
       end
 
       # Injecting everything to the page
@@ -63,17 +70,38 @@ module Marta
         insert_to_page('style', style, false)
       end
 
+      # Syringe sets javascript variables
+      def set_var(var, value)
+        insert_to_page('script', "var #{var} = #{value};", false)
+      end
+
+      # Syringe runs scripts
+      def run_script(script)
+        @engine.execute_script(script)
+      end
+
+      # Syringe takes array of hashes to set lots of variables
+      def set_vars(vars_array)
+        vars_array.each do |var_hash|
+          var_hash.each_pair do |var_name, var_value|
+            set_var var_name.to_s, var_value
+          end
+        end
+      end
+
+      # Syringe can run an array of scripts
+      def all_scripts(scripts_array)
+        scripts_array.each do |script|
+          run_script script
+        end
+      end
+
       # It is never used without get_result.
       # But it can be used to show some message for user
       def actual_injection
         files_to_page
-        @data ||= Hash.new
-        insert_to_page('script', "var marta_what = \"#{@title}\"", false)
-        insert_to_page('script',
-                       "var old_marta_Data = #{@data}".gsub('=>',':').
-                                                           gsub('nil','null'),
-                       false)
-        @engine.execute_script("marta_add_data();")
+        set_vars(@default_vars + @custom_vars)
+        all_scripts(@default_scripts + @custom_scripts)
       end
 
       # Retrieving result if js var = marta_confirm_mark is true
@@ -94,8 +122,10 @@ module Marta
     end
 
     # That's how Marta is injecting and retrieving result
-    def inject(what, title = 'Something important', data = Hash.new)
-      syringe = Syringe.new(engine, what, title, data, gem_libdir)
+    def inject(what, title = 'Something important', data = Hash.new,
+                        custom_vars = Array.new, custom_scripts = Array.new)
+      syringe = Syringe.new(engine, what, title, data, gem_libdir,
+                                                 custom_vars, custom_scripts)
       syringe.actual_injection
       syringe.get_result
     end

data/lib/marta/public_methods.rb

@@ -10,12 +10,12 @@ module Marta
     #
     # User can create pageobject class using SmartPage.new
     #
-    # SmartPage can be created withoud all the data. But in that case
+    # SmartPage can be created without all the data. But in that case
     # it will be pretty useless until values are provided
     #
-    # The first argument is a class name. It is a constant like string like
+    # The first argument is a class name. It is a constant-like string like
     # "MyClass". All data provided will be stored in MyClass.json
-    # Once created that way you can call it like MyClass.new.
+    # Once it is created that way you can call it like MyClass.new.
     # That argument is totally necessary one
     #
     # The second argument is a marta's special data hash. By default =
@@ -41,7 +41,7 @@ module Marta
     def method_edit(name)
       method_name = correct_name(name)
       exact_name = method_name.to_s + "_exact"
-      data = user_method_dialogs(@class_name, method_name, @data)
+      data = user_method_dialogs(method_name)
       define_singleton_method method_name.to_sym do |meth_content=@data['meths'][method_name]|
         marta_magic_finder(meth_content)
       end

data/lib/marta/simple_element_finder.rb

@@ -18,11 +18,11 @@ module Marta
 
       include XPath
 
-      def initialize(meth, engine, requestor)
+      def initialize(meth, requestor)
         @requestor = requestor
         @meth = meth
-        @xpath = xpath_by_meth
-        @engine = engine
+        @xpath = xpath_by_meth if !@meth.nil?
+        @engine = requestor.engine
       end
 
       # Maybe our element is defined as a collection?
@@ -73,11 +73,30 @@ module Marta
           subtype_of prefind
         end
       end
+
+      # Sometimes we need to find out what is hidden
+      def find_invisibles
+        result = Array.new
+        all = @engine.elements
+        all.each do |element|
+          if element.exists? and !element.visible?
+            result.push element
+          else
+            x, y = element.wd.location.x + 1, element.wd.location.y + 1
+            element_on_point = @engine.
+                 execute_script "return document.elementFromPoint(#{x}, #{y})"
+            if element_on_point != element
+              result.push element
+            end
+          end
+        end
+        return result
+      end
     end
 
     # We can simply find something
     def marta_simple_finder(meth)
-      finder = BasicFinder.new(meth, engine, self)
+      finder = BasicFinder.new(meth, self)
       finder.find
     end
   end

data/lib/marta/version.rb

@@ -1,4 +1,4 @@
 module Marta
-  VERSION = "0.28879"
+  VERSION = "0.29156"
   NAME = "marta"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: marta
 version: !ruby/object:Gem::Version
-  version: '0.28879'
+  version: '0.29156'
 platform: ruby
 authors:
 - Sergei Seleznev
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-07-13 00:00:00.000000000 Z
+date: 2017-08-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler