marta 0.34054 → 0.35324

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ebb01908a10c9def323e9ccfb970987b4486be8d
-  data.tar.gz: 5d21e110d4e26c82d70c8bc6196a338dd6ae7350
+  metadata.gz: 61bcb2398f0d8990eae955226b5b40f1eb9e41d9
+  data.tar.gz: ee3b776091c0e869eb46a1df7b4d4031c5006674
 SHA512:
-  metadata.gz: 201a5d76be951f6d680701686a954cb3ee0001ace4cf051acec597ef25ec936e1df143ff9c4ba53d8486a9ef79200f0ccf9ce5af4c91a61def61c991ce2e4c74
-  data.tar.gz: d710edc5c7ac865860ab9e8f4d68ae71c51f39d793ac13401e3257867cbe50312b4684ced457c9fd624b92b5bbe07358c135b07e4366be22b53c43918c5d30c0
+  metadata.gz: 7b97670a0d556afe54da7c2b4ce0510ab405ba555e9e91200edc6f28de0e32249c2a0dea3bbca80ce29e1a40d9d504ddfc8a5fd677ac84fa2796f2a2cad720cd
+  data.tar.gz: 40bb826d1758ec5ccdea71c801fe68e798a61c46e60fd538dcd87ba4b27f8f687c8015ebb26afad395e68f35e79568e3d0d527163ac20e5919a2e8f62c89fd98

data/README.md

@@ -276,7 +276,7 @@ g_page.search "I am in love with selenium."
 
 **Q: What else?**
 
-*A: Nothing. Marta is under development. Her version is 0.34054 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.35324. All the necessary features are working already but there are tons of things that should be done. And I am not a professional developer.*
 
 ## Internal Design
 

data/lib/marta.rb

@@ -11,6 +11,7 @@ require 'marta/json_2_class'
 require 'marta/black_magic'
 require 'marta/simple_element_finder'
 require 'marta/x_path'
+require 'marta/page_arithmetic'
 require "watir"
 require 'fileutils'
 require 'json'
@@ -30,7 +31,7 @@ module Marta
 
     include BlackMagic, XPath, SimpleElementFinder, ClassesCreation,
             PublicMethods, Dialogs, Injector, Lightning, OptionsAndPaths,
-            Json2Class, ReadWrite, UserValuePrework
+            Json2Class, ReadWrite, UserValuePrework, PageArithmetic
 
     # open_page can create new instance
     def self.open_page(*args)

data/lib/marta/data/element.js

@@ -3,12 +3,22 @@ document.marta_result = {};
 document.marta_confirm_mark = false;
 document.marta_test_xx = 0;
 document.marta_test_yy = 0;
+document.marta_shift = false;
 
 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.getElementById("marta_stop").onclick = function() {document.marta_stop()};
+document.getElementById("marta_array").onclick = function() {document.marta_array_switch()};
+
+document.marta_array_switch = function(){
+  if (document.getElementById("marta_array").checked) {
+    document.getElementById("marta_hint").innerHTML = "<p>You are selecting a collection. Select two elements of a kind</p><p>And marta will automatically find all the similar elements</p><p>If Marta found too many elements exclude the wrong element by click on it with Shift</p><p>Note: Marta will return Watir::HTMLElementCollection</p>";
+  } else {
+    document.getElementById("marta_hint").innerHTML = "<p>You are selecting a single element.</p><p>Remember Marta will perform .to_subtype for it automatically</p>";
+  };
+};
 
 document.marta_stop = function() {
   if (document.getElementById("marta_magic_div").getAttribute("martastyle") == "off"){
@@ -26,7 +36,8 @@ 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));
+  var is_shift = e.shiftKey||document.marta_shift;
+  document.marta_click_work(document.elementFromPoint(xx, yy), is_shift);
   document.getElementById("marta_magic_div").setAttribute("martastyle", "at_large");
 };
 
@@ -56,7 +67,12 @@ document.marta_add_field = function(title, what, key, marker) {
     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 valueStyle = "value_field";
+    if (title.indexOf("not_") == 0) {
+      var isNot = document.marta_create_element(contentDiv, "input", {"martaclass": "marta_smthing", "martastyle": "not_field", "class": "marta_s_not_field", "type": "text", "disabled": "disabled;", "value": "  IS NOT  "}, "");
+      valueStyle = "not_value_field";
+    };
+    var valueField = document.marta_create_element(contentDiv, "input", {"martaclass": "marta_smthing", "martastyle": valueStyle, "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;
@@ -136,11 +152,15 @@ document.marta_add_data = function() {
           for (var key in document.old_marta_Data[what]){
               if (/class/.test(key) == true){
                 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);
+                  if ((document.old_marta_Data[what][key][k] != "") && (document.old_marta_Data[what][key][k] != null)){
+                    document.marta_add_field(what, key, document.old_marta_Data[what][key][k], k);
+                  };
                 };
               }else
               {
-                document.marta_add_field(what, key, document.old_marta_Data[what][key], "-1");
+                if ((document.old_marta_Data[what][key] != "") && (document.old_marta_Data[what][key] != null)){
+                  document.marta_add_field(what, key, document.old_marta_Data[what][key], "-1");
+                };
               };
             };
         };
@@ -153,13 +173,13 @@ document.marta_show_html = function() {
   area.innerHTML = document.spaninize(document.documentElement.innerHTML);
 };
 
-document.marta_touch = function(element) {
+document.marta_touch = function(element, shift) {
   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) {
-      document.marta_click_work(everything[i]);
+      document.marta_click_work(everything[i], shift);
     };
   };
 };
@@ -197,23 +217,32 @@ document.spaninize = function(string) {
 document.pretouch = function(e) {
     if (e.target !== e.currentTarget) {
         var clickedItem = e.target;
-        document.marta_touch(clickedItem);
+        document.marta_touch(clickedItem, e.shiftKey);
     };
 };
 
-document.marta_click_work = function(target) {
+document.marta_click_work = function(target, shift) {
     var marta_smthing = target.getAttribute("martaclass")=="marta_smthing";
     if(!marta_smthing){
+        if (shift) {
+          var self = "not_self";
+          var pappy = "not_pappy";
+          var granny = "not_granny";
+        } else {
+          var self = "self";
+          var pappy = "pappy";
+          var granny = "granny";
+        };
         document.getElementById("attr_fields").innerHTML="";
         document.marta_room = 0;
         document.marta_result = {};
         document.marta_result["options"] = {};
-        document.marta_after_click(target,"self");
+        document.marta_after_click(target, self);
         if (!!target.parentElement){
-          document.marta_after_click(target.parentElement,"pappy");
+          document.marta_after_click(target.parentElement, pappy);
         };
         if (!!target.parentElement.parentElement){
-          document.marta_after_click(target.parentElement.parentElement,"granny");
+          document.marta_after_click(target.parentElement.parentElement, granny);
         };
         document.marta_confirm();
     };
@@ -238,7 +267,7 @@ document.marta_after_click = function(el, what) {
         };
       };
     };
-    if (what == "self"){
+    if ((what == "self")||(what == "not_self")){
       try{
         document.marta_result[what]["retrieved_by_marta_text"]=el.firstChild.nodeValue;
       }catch(e){};

data/lib/marta/data/style.css

@@ -330,6 +330,16 @@ input[martastyle=name_field]:disabled, input[martastyle=value_field]:disabled{
     background: linear-gradient(to right, lightgrey , white);
 }
 
+input[type=text][martastyle=not_value_field] {
+  width: 40%;
+}
+
+input[type=text][martastyle=not_field] {
+  width: 10%;
+  color:red;
+  background-color: darkblue;
+}
+
 input[martaclass=marta_smthing][type=checkbox] {
     -webkit-appearance: none;
     background-color: white;

data/lib/marta/dialogs.rb

@@ -3,6 +3,7 @@ require 'marta/x_path'
 require 'marta/lightning'
 require 'marta/injector'
 require 'marta/public_methods'
+require 'marta/page_arithmetic'
 
 module Marta
 
@@ -21,7 +22,8 @@ module Marta
     # @note It is believed that no user will use it
     class MethodSpeaker
 
-      include XPath, Lightning, Injector, PublicMethods, SimpleElementFinder
+      include XPath, Lightning, Injector, PublicMethods, SimpleElementFinder,
+              PageArithmetic
 
       def initialize(method_name, requestor)
         @class_name = requestor.class_name
@@ -58,7 +60,7 @@ module Marta
           @result = ask_for_elements
           mass_highlight_turn(@mass, false)
           if @result.class == Hash
-            @attrs = @result
+            attrs_plus_result
           elsif @result != '1'
             xpath_way
           end
@@ -70,6 +72,25 @@ module Marta
         end
       end
 
+      #
+      # This method is responsible for collection in two clicks feature
+      #
+      # If we have two elements of collection this methods returns hash of
+      # element without diffs (only the same attributes). As well this method
+      # is responsible for adding excluding attributes to collection.
+      # Rare case with single element that not has some attribute is not
+      # implemented so far. All that party is for collections now.
+      def attrs_plus_result
+        if !attrs_exists?
+          @attrs = @result
+        elsif !@attrs['options']['collection'] or
+                                          !@result['options']['collection']
+          @attrs = @result
+        else
+          @attrs = make_collection(@attrs, @result)
+        end
+      end
+
       # Asking: "What are you looking for?"
       def ask_for_elements
         ask 'element', "Found #{@found} elements for #{@title}", @attrs

data/lib/marta/lightning.rb

@@ -7,14 +7,24 @@ module Marta
 
     # We can highlight an element
     def highlight(element)
-      engine.execute_script("arguments[0].setAttribute"\
+      if is_here?(element)
+        engine.execute_script("arguments[0].setAttribute"\
                             "('martaclass','foundbymarta')", element)
+      end
     end
 
     # We can unhighlight an element
     def unhighlight(element)
-      engine.execute_script("arguments[0].removeAttribute('martaclass')",
-                            element)
+      if is_here?(element)
+        engine.execute_script("arguments[0].removeAttribute('martaclass')",
+                              element)
+      end
+    end
+
+    def is_here?(element)
+      element.exists?
+    rescue
+      false
     end
 
     # We can highlight\unhighlight tons of elements at once

data/lib/marta/page_arithmetic.rb

@@ -0,0 +1,147 @@
+module Marta
+
+  #
+  # This is for merging of Smartpages and elements.
+  #
+  # There is a need too form a right collection out of two elements
+  # Page merging will live here as well.
+  module PageArithmetic
+
+    private
+
+    #
+    # This class is used to merge hashes of elements\methods
+    #
+    # @note It is believed that no user will use it
+    # Now it has only one way to merge hashes
+    # This method is getting common only of two methods in order to generate a
+    # correct hash for collection element. Methods of the class are pretty
+    # esoteric. Refactoring is a must here.
+    class MethodMerger
+
+      # Class is taking two hashes. Sometimes order is valuable
+      def initialize(main_hash, second_hash)
+        @main_hash = main_hash
+        @second_hash = second_hash
+      end
+
+      POSITIVE = ['self', 'pappy', 'granny']
+      NEGATIVE = ['not_self', 'not_pappy', 'not_granny']
+
+      # Main method for adding two elements into a large-wide collection
+      def do_collection
+        result = Hash.new
+        result['options'] = options_merge
+        NEGATIVE.each do |key|
+          result[key] = all_of key
+        end
+        POSITIVE.each do |key|
+          result[key], result["not_#{key}"] =
+                      passive_exclude(common_of(key), result["not_#{key}"])
+        end
+        result
+      end
+
+      # The most esoteric part of merging elements into collection
+      # Now we are loosing nots tags if they are not good for us
+      # As well we are loosing positive tags by merging them into alltags
+      # symbol == *. The way out is to use arrays for tags.
+      def options_merge
+        temp = Hash.new
+        temp['collection'] = @main_hash['options']['collection']
+        POSITIVE.each do |key|
+          value = @main_hash['options'][key]
+          main_negative = @main_hash['options']["not_#{key}"]
+          second_negative = @second_hash['options']["not_#{key}"]
+          if (@second_hash['options'][key] == value) or
+             ((@second_hash['options'][key].nil?) and (!value.nil?))
+            temp[key] = value
+          else
+            temp[key] = "*"
+          end
+          if (second_negative != temp[key]) and
+               ((second_negative == main_negative) or
+                 (main_negative.nil?))
+                   temp["not_#{key}"] = second_negative
+          end
+        end
+        temp
+      end
+
+      # This method will leave only common elements of both hashes
+      def common_of(what)
+        temp = Hash.new
+        first, second = @main_hash[what], @second_hash[what]
+        if !first.nil? and !second.nil?
+          first.each_pair do |key, value|
+            if second[key] == value
+              temp[key] = value
+            elsif second[key].class == Array and value.class == Array
+              temp[key] = value & second[key]
+            end
+          end
+        else
+          temp = first
+        end
+        temp
+      end
+
+      # This method will leave all the elements of hashes. But if one attribute
+      # is presented in both. Method will use the one from the main.
+      # When it will be possible to use arrays for tags and attributes this
+      # logic will be changed
+      def all_of(what)
+        temp = Hash.new
+        first, second = @main_hash[what], @second_hash[what]
+        if !first.nil?
+          temp = first
+        end
+        if !second.nil? and !temp.nil?
+          second.each_pair do |key, value|
+            if (temp[key].nil?) or ((temp[key] != value) and
+               (temp[key].class != Array) and (value.class != Array))
+                 temp[key] = value
+            elsif (temp[key].class == Array) and (value.class == Array)
+              temp[key] = (value + temp[key]).uniq
+            end
+          end
+          if !first.nil?
+            first.each_pair do |key, value|
+              if second[key].nil? and !value.nil?
+                temp[key] = nil
+              end
+            end
+          end
+        else
+          temp = second
+        end
+        temp
+      end
+
+      # That is about excluding only attributes that are not presented as
+      # positives.
+      def passive_exclude(main, passive)
+        temp = main
+        not_temp = passive
+        if !passive.nil?
+          passive.each_pair do |key, value|
+            if !main[key].nil?
+              if main[key] == value
+                not_temp[key] = value.class == Array ? []:nil
+              elsif (value.class == Array) and (main[key].class == Array)
+                not_temp[key] = value - main[key]
+              end
+            end
+          end
+        end
+        return temp, not_temp
+      end
+    end
+
+    # Form collection out of two element hashes
+    def make_collection(one, two)
+      merger = MethodMerger.new(one, two)
+      merger.do_collection
+    end
+  end
+end

data/lib/marta/read_write.rb

@@ -16,7 +16,7 @@ module Marta
       def self.file_write(name, data)
         file_name = File.join(SettingMaster.pageobjects_folder, name + '.json')
         File.open(file_name,"w") do |f|
-          f.write(data.to_json)
+          f.write(JSON.pretty_generate(data))
         end
         file_name
       end

data/lib/marta/simple_element_finder.rb

@@ -56,7 +56,11 @@ module Marta
 
       # Transforming an element to a subtype
       def subtype_of(element)
-        @engine.element(xpath: @xpath).to_subtype
+        if @engine.element(xpath: @xpath).exists?
+          @engine.element(xpath: @xpath).to_subtype
+        else
+          @engine.element(xpath: @xpath)
+        end
       end
 
       # Main logic. We are returning a prefinded collection

data/lib/marta/version.rb

@@ -1,4 +1,4 @@
 module Marta
-  VERSION = "0.34054"
+  VERSION = "0.35324"
   NAME = "marta"
 end

data/lib/marta/x_path.rb

@@ -8,7 +8,7 @@ module Marta
     private
 
     #
-    # Here we are crating xpath including arrays of xpaths with one-two-...-x
+    # Here we are creating xpath including arrays of xpaths with one-two-...-x
     # parts that are not known
     #
     # @note It is believed that no user will use it
@@ -34,7 +34,10 @@ module Marta
       # Getting a part (by data or empty=any)
       def get_xpaths(todo, what)
         if todo
-          form_array_hash(@meth['options'][what], @meth[what])
+          result = form_array_hash(@meth['options'][what], @meth[what])
+          result = result + form_array_hash(@meth['options']['not_' + what],
+                                              @meth['not_' + what], true)
+          result
         else
           [make_hash("//", "//"), make_hash("*", "*")]
         end
@@ -118,44 +121,61 @@ module Marta
       end
 
       # Creating a small part of array hash for tag
-      def form_array_hash_for_tag(tag)
+      def form_array_hash_for_tag(tag, negative)
         result_array = Array.new
-        result_array.push make_hash("/", "//")
-        result_array.push make_hash(tag, "*")
+        if negative
+          if !tag.nil? and tag != ""
+            result_array.push make_hash("[not(self::#{tag})]", "")
+          end
+        else
+          result_array.push make_hash("/", "//")
+          result_array.push make_hash(tag, "*")
+        end
         result_array
       end
 
       # Creating an array hash
-      def form_array_hash(tag, attrs)
-        result_array = form_array_hash_for_tag(tag)
-        attrs.each_pair do |attribute, value|
-          if attribute.include?('class')
-            result_array = result_array +
-                                   form_array_hash_for_class(attribute, value)
-          else
-            result_array.push form_hash_for_attribute(attribute, value)
+      def form_array_hash(tag, attrs, negative = false)
+        result_array = form_array_hash_for_tag(tag, negative)
+        if !attrs.nil?
+          attrs.each_pair do |attribute, value|
+            if attribute.include?('class')
+              result_array = result_array +
+                        form_array_hash_for_class(attribute, value, negative)
+            else
+              if !value.nil? and value != ""
+                result_array.push form_hash_for_attribute(attribute,
+                                                          value,
+                                                          negative)
+              end
+            end
           end
         end
         result_array
       end
 
       # Creating a small part of array hash for attribute
-      def form_hash_for_attribute(attribute, value)
-        result_array = Array.new
-        if attribute == 'retrieved_by_marta_text'
-          make_hash("[contains(text(),'#{value}')]", "")
+      def form_hash_for_attribute(attribute, value, negative)
+        not_start, not_end = get_nots_frames(negative)
+        if (attribute == 'retrieved_by_marta_text')
+          make_hash("[#{not_start}contains(text(),'#{value}')#{not_end}]", "")
         else
-          make_hash("[@#{attribute}='#{value}']", "")
+          make_hash("[#{not_start}@#{attribute}='#{value}'#{not_end}]", "")
         end
       end
 
+      def get_nots_frames (negative)
+        return negative ? ["not(", ")"] : ["", ""]
+      end
+
       # Creating a small part of array hash for attribute contains 'class'
-      def form_array_hash_for_class(attribute, value)
+      def form_array_hash_for_class(attribute, value, negative)
         result_array = Array.new
+        not_start, not_end = get_nots_frames(negative)
         value.each do |value_part|
           if value_part.gsub(' ','') != ''
-            result_array.push make_hash("[contains(@#{attribute},"\
-                                        "'#{value_part}')]", "")
+            result_array.push make_hash("[#{not_start}contains(@#{attribute},"\
+                                        "'#{value_part}')#{not_end}]", "")
           end
         end
         result_array

data/marta.gemspec

@@ -14,7 +14,7 @@ Gem::Specification.new do |spec|
   spec.homepage      = "https://github.com/sseleznevqa/marta"
   spec.license       = "MIT"
 
-  spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) } + Dir.glob("lib/marta/data/*")
+  spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features|readme_files)/}) } + Dir.glob("lib/marta/data/*")
   spec.bindir        = "exe"
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: marta
 version: !ruby/object:Gem::Version
-  version: '0.34054'
+  version: '0.35324'
 platform: ruby
 authors:
 - Sergei Seleznev
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-09-12 00:00:00.000000000 Z
+date: 2017-10-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -136,6 +136,7 @@ files:
 - lib/marta/json_2_class.rb
 - lib/marta/lightning.rb
 - lib/marta/options_and_paths.rb
+- lib/marta/page_arithmetic.rb
 - lib/marta/public_methods.rb
 - lib/marta/read_write.rb
 - lib/marta/simple_element_finder.rb
@@ -143,14 +144,6 @@ files:
 - lib/marta/version.rb
 - lib/marta/x_path.rb
 - marta.gemspec
-- readme_files/456steps.png
-- readme_files/8step.png
-- readme_files/hide.png
-- readme_files/html.png
-- readme_files/itemprop.png
-- readme_files/itemprop2.png
-- readme_files/stop.png
-- readme_files/xpath.png
 homepage: https://github.com/sseleznevqa/marta
 licenses:
 - MIT