marta 0.35324 → 0.36651

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 61bcb2398f0d8990eae955226b5b40f1eb9e41d9
-  data.tar.gz: ee3b776091c0e869eb46a1df7b4d4031c5006674
+  metadata.gz: 3fff8db3d7bb63b3a765a6245f661c3af8feceb1
+  data.tar.gz: 60b85051a58507f6346f1a2d27aa562552093219
 SHA512:
-  metadata.gz: 7b97670a0d556afe54da7c2b4ce0510ab405ba555e9e91200edc6f28de0e32249c2a0dea3bbca80ce29e1a40d9d504ddfc8a5fd677ac84fa2796f2a2cad720cd
-  data.tar.gz: 40bb826d1758ec5ccdea71c801fe68e798a61c46e60fd538dcd87ba4b27f8f687c8015ebb26afad395e68f35e79568e3d0d527163ac20e5919a2e8f62c89fd98
+  metadata.gz: 768f7c86b374d6aab228142d2048f05f55caad520c8c2940cd29f50eeff968d1d16f11759283c3cebf6b1afaca17f165916ba71077ec66a6925d8fef4f5f485a
+  data.tar.gz: e3f9941f06ab4846963376462cca33ac56a0a57a4ca5c251666b2c506691849fb027ef27e0ed2ec582b2ee0382301f3e793781fdca2875e1b51db2409d1f4faf

data/README.md

@@ -184,7 +184,7 @@ engine.element(id: 'will_be_located_without_Marta')
 
 **Q: How can I find a collection of elements?**
 
-*A: When defining an element you can set a collection checkbox at the top of the dialog. In that case Marta will return Watir::ElementCollection.*
+*A: When defining an element you can set a collection checkbox at the top of the dialog. In that case Marta will return Watir::ElementCollection. When collection mark is enabled Marta will try to find all the elements of the kind. Click the first and the second element of a kind and Marta will try to find all elements of that kind. If Marta will add to many elements to the collection press shift and click the element that should be excluded. Try it. This is fun.*
 
 **Q: How can I find an invisible element? Or hardly clickable element with 1px size?**
 
@@ -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.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.*
+*A: Nothing. Marta is under development. Her version is 0.36651. 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/black_magic.rb

@@ -92,10 +92,10 @@ module Marta
         array_of_elements, array_of_els_xpaths = Array.new, Array.new
         something = nil
         array_of_xpaths.each do |xpath|
-          something = @engine.element(xpath: xpath)
-          if something.exists?
-            array_of_elements.push something
-            array_of_els_xpaths.push xpath
+          something = @engine.elements(xpath: xpath)
+          if something.to_a.length > 0
+            array_of_elements += something.to_a
+            something.to_a.length.times {array_of_els_xpaths.push xpath}
           end
         end
         return array_of_elements, array_of_els_xpaths
@@ -105,17 +105,36 @@ module Marta
       def get_search_result(result, array_of_elements, array_of_els_xpaths)
         something = result
         if array_of_elements.size > 0
-          result = array_of_elements.group_by(&:itself).
-                   values.max_by(&:size).first
+          inputs = get_result_inputs(array_of_elements)
+          most_uniq_xpath_by_inputs(array_of_els_xpaths, inputs)
+          array_of_elements[array_of_els_xpaths.index(@xpath)]
         else
-          result = nil
+          something
         end
-        if result != nil
-          @xpath = array_of_els_xpaths[array_of_elements.index(result)]
-        else
-          result = something
+      end
+
+      # Getting indexes of the most common element in the array of suggested
+      # elements
+      def get_result_inputs(array_of_elements)
+        result = array_of_elements.group_by(&:itself).
+                 values.max_by(&:size).first
+        array_of_elements.each_index.
+                                select{|i| array_of_elements[i] == result}
+      end
+
+      # Getting the most specific xpath for the most common element in order
+      # to locate it only
+      def most_uniq_xpath_by_inputs(array_of_els_xpaths, inputs)
+        xpaths = Array.new
+        array_of_els_xpaths.
+               each_with_index{|e, i| xpaths.push e if inputs.include?(i)}
+        @xpath = xpaths[0]
+        xpaths.each do |x|
+          current_count = array_of_els_xpaths.count(x)
+          proposed_count = array_of_els_xpaths.count(@xpath)
+          @xpath = x if current_count < proposed_count
         end
-        return result
+        @xpath
       end
 
       # The core of Black Magic Algorithm

data/lib/marta/data/page.js

@@ -46,6 +46,12 @@ document.marta_add_data = function() {
         document.getElementById("marta_name"+document.marta_room ).value = key;
         document.getElementById("marta_default_value"+document.marta_room ).value = document.old_marta_Data[key];
     };
+    if (document.marta_room == 0) {
+      document.marta_add_field();
+      document.getElementById("marta_name"+document.marta_room ).value = "url";
+      document.marta_add_field();
+      document.getElementById("marta_name"+document.marta_room ).value = "path";
+    };
 };
 
 document.marta_delete_line = function(theEvent) {

data/lib/marta/version.rb

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

data/lib/marta/x_path.rb

@@ -89,15 +89,27 @@ module Marta
       def generate_xpaths(depth)
         result_array = Array.new
         form_variants(depth).each do |variant|
-          xpath = String.new
+          xpaths = [""]
           variant.each do |part|
-            xpath = xpath + part[:full]
+            xpaths = tree_push(xpaths, part[:full])
           end
-          result_array.push process_string(xpath, @requestor)
+          result_array += xpaths
         end
         result_array
       end
 
+      # Sometimes we need to double number of variants since there
+      # are more than one option to try
+      def tree_push(main, what)
+        result = Array.new
+        what.each do |part|
+          main.each do |host_item|
+            result.push(process_string(host_item + part, @requestor))
+          end
+        end
+        result
+      end
+
       # Special method to get the single xpath only. Without unknowns
       def generate_xpath
         generate_xpaths(0).join
@@ -158,9 +170,10 @@ module Marta
       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}]", "")
+          make_hash("[#{not_start}contains(text(),'#{value}')#{not_end}]", [""])
         else
-          make_hash("[#{not_start}@#{attribute}='#{value}'#{not_end}]", "")
+          make_hash("[#{not_start}@#{attribute}='#{value}'#{not_end}]", ["",
+                     "[#{not_start}@*='#{value}'#{not_end}]"])
         end
       end
 
@@ -174,8 +187,11 @@ module Marta
         not_start, not_end = get_nots_frames(negative)
         value.each do |value_part|
           if value_part.gsub(' ','') != ''
-            result_array.push make_hash("[#{not_start}contains(@#{attribute},"\
-                                        "'#{value_part}')#{not_end}]", "")
+            result_array.
+              push make_hash("[#{not_start}contains(@#{attribute},"\
+                             "'#{value_part}')#{not_end}]", ["",
+                             "[#{not_start}@*[contains"\
+                             "(.,'#{value_part}')]#{not_end}]"])
           end
         end
         result_array
@@ -183,7 +199,13 @@ module Marta
 
       # Creating the smallest possible part of array hash
       def make_hash(full, empty)
-        {full: "#{full}", empty: "#{empty}"}
+        if empty.class != Array
+          empty = [empty]
+        end
+        if full.class != Array
+          full = [full]
+        end
+        {full: full, empty: empty}
       end
     end
   end

metadata

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