marta 0.28017 → 0.28675

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 89341581be4f3b0b1ebf57de01d8e583748ac7c5
-  data.tar.gz: ff147c84a554e8ec66b3f94f0a1016bfb364cc7c
+  metadata.gz: e2794c78d3cf457b70f2c182df894b205e006ce0
+  data.tar.gz: 79ba7ed2850da9a2fe982d0d9a29efdb24b4d2e9
 SHA512:
-  metadata.gz: 6abbbd0b0b39235df76bd6fa6abaaea92227fb4ede3a51f9ba65c6e0f6d86488dcc7430e9b52a3070099a90118acbda9fd00272e3c91c3af66920b116cc26d04
-  data.tar.gz: 4cd9c90457d6ef3dd77b924048b6b9fa6c5f125f2753c71b72502e566ce2c9b9762d4b8ad03e54dbcbd5952dee26d5093e870ac021e1252b6a46be7fca1d918b
+  metadata.gz: 06d88ae0acaa491e65d737bee32ac5313b25972378168cc1e603f61f1b367b0dc514cf820d9d875f74f3d4335fb4bcc46781cb27bead760c675f1d14731072cb
+  data.tar.gz: a1a85fdd3f13c95c437893bc103d764a52235ed0b10867d697cde2ac6b72c4e6b6d89e9e830aa15fc291f610c6c541d1cf61a5b0c5de010d4ba5f5c6cd86f613

data/README.md

@@ -95,6 +95,19 @@ dance_with learn: true or false
 your_page.method_edit('newelementname')
 ```
 
+**Q: And what if I want to create page and define element without learn mode? For example in the middle of a debug session.**
+
+*A Code in learn mode =*
+```ruby
+test_page = TestPage.new # Will show page creation dialog
+test_page.magic_button # Will show magic_button locating dialog
+```
+*is totally identical to code without learn mode =*
+```ruby
+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?**
 
 *A: You can set tolerancy parameter. Larger = longer*
@@ -193,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.28017 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.28675 only. And I am not a professional developer. But I am training her on new tricks.*
 
 ## Internal Design
 

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

@@ -2,6 +2,8 @@
 
   <div id=marta_s_text martaclass=marta_smthing>
     <h2 id=marta_main_title martaclass=marta_smthing></h2>
+    <p martaclass=marta_smthing>If you cannot see all the elements try to move menu down using a button below</p>
+    <input type=button martaclass=marta_smthing id=marta_down onclick=marta_down(); value=DOWN />
     <p martaclass=marta_smthing>You are about to write your own xpath.</p>
     <p martaclass=marta_smthing>Use it when element is: invisible, not present, should be found by exact xpath, marta fails to find it.</p>
     <p martaclass=marta_smthing>Marta will highlight the elements targeted by your xpath. Sometimes it will even show hidden elements.</p>

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

@@ -49,3 +49,8 @@ function marta_try_again(){
     marta_confirm_mark = true;
     marta_result = "2";
 };
+
+function marta_down() {
+  var toDown = document.querySelector("[martaclass=marta_div]");
+  toDown.setAttribute("martastyle", "down");
+}

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

@@ -1,6 +1,8 @@
 <div id=marta_s_everything martaclass=marta_smthing>
   <div id=marta_s_text martaclass=marta_smthing>
     <h2 id=marta_main_title martaclass=marta_smthing></h2>
+    <p martaclass=marta_smthing>If you cannot see all the elements try to move menu down using a button below</p>
+    <input type=button martaclass=marta_smthing id=marta_down onclick=marta_down(); value=DOWN />
     <p martaclass=marta_smthing>You are about to confirm element selection</p>
     <p martaclass=marta_smthing>Marta highlights elements right now</p>
     <p martaclass=marta_smthing>If something wrong was found - maybe it is time to talk to the developer?</p>

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

@@ -5,7 +5,7 @@ function marta_confirm(){
     var toClear = document.querySelector("[martaclass=marta_smthing]");
     toClear.parentNode.removeChild(toClear);
     marta_confirm_mark = true;
-    marta_result = "1";
+    marta_result = "4";
 };
 
 function marta_click_work(e){};
@@ -28,3 +28,8 @@ function marta_add_data() {
     marta_confirm_mark = false;
     document.getElementById("marta_main_title").innerHTML = old_marta_Data + " elements found for " + marta_what;
 };
+
+function marta_down() {
+  var toDown = document.querySelector("[martaclass=marta_div]");
+  toDown.setAttribute("martastyle", "down");
+}

data/lib/marta/data/element.html

@@ -1,6 +1,8 @@
 <div id=marta_s_everything martaclass=marta_smthing>
   <div id=marta_s_text martaclass=marta_smthing>
     <h2 id=marta_main_title martaclass=marta_smthing></h2>
+    <p martaclass=marta_smthing>If you cannot see all the elements try to move menu down using a button below</p>
+    <input type=button martaclass=marta_smthing id=marta_down onclick=marta_down(); value=DOWN />
     <p martaclass=marta_smthing>You are about to define some element</p>
     <p martaclass=marta_smthing>CLICK to select element. Do not worry nothing will work</p>
     <p martaclass=marta_smthing>After the click select the attributes of an element and parents</p>

data/lib/marta/data/element.js

@@ -199,3 +199,8 @@ function marta_end_loop(){
       marta_result = "1";
     }
 };
+
+function marta_down() {
+  var toDown = document.querySelector("[martaclass=marta_div]");
+  toDown.setAttribute("martastyle", "down");
+}

data/lib/marta/data/page.html

@@ -1,7 +1,8 @@
 <div id=marta_s_everything martaclass=marta_smthing>
-
   <div id=marta_s_text>
     <h2 id=marta_main_title></h2>
+    <p>If you cannot see all the elements try to move menu down using a button below</p>
+    <input type=button martaclass=marta_smthing id=marta_down onclick=marta_down(); value=DOWN />
     <p>You are about to add some vars to the page_object</p>
     <p>Please use only valid names for ruby vars (no <b>CROCO</b>, <b>special symbols</b>, just <b>some_var</b> or <b>anotherVar</b>)</p>
     <p>You can use variable in the other one adding: <b>#{@your_var}</b> just like in ruby</p>
@@ -13,7 +14,6 @@
 <div id=marta_s_content>
     <input type=button martaclass=marta_smthing id=marta_more_fields onclick=marta_add_field(); value=Add More />
     <input type=button martaclass=marta_smthing id=marta_confirm onclick=marta_confirm(); value=Confirm />
-
 <div id=vars_fileds>
     <div class=label>Custom vars:</div>
     <div class=content>

data/lib/marta/data/page.js

@@ -36,3 +36,8 @@ function marta_delete_line(line) {
     title.parentNode.removeChild(title);
     staff.parentNode.removeChild(staff);
     };
+
+function marta_down() {
+  var toDown = document.querySelector("[martaclass=marta_div]");
+  toDown.setAttribute("martastyle", "down");
+}

data/lib/marta/data/style.css

@@ -156,11 +156,10 @@ div#marta_s_everything *, div#marta_s_everything {
 div#marta_s_everything h2 {
   text-align: center;
   font-size: 20px;}
-div#marta_s_everything {
+div[martaclass=marta_div] {
   position : relative;
   z-index : 150000;
   padding: 0;
-  margin: 0;
   margin: 0px 0px 0px 0px;
   border: 4px solid rgb(115,115,100);
   font-size: 14px;
@@ -168,6 +167,10 @@ div#marta_s_everything {
   background-color: rgb(230,230,200);
   color: black;
 }
+
+div[martastyle=down] {
+  margin: 100% 0px 0px 0px;
+}
 div#marta_s_everything p {text-align: left;
   margin-left: 20px;}
 div#marta_s_everything p b {color: red;}

data/lib/marta/dialogs.rb

@@ -56,12 +56,13 @@ module Marta
             mass_highlight_turn @mass
           end
           @result = ask_for_elements
+          mass_highlight_turn(@mass, false)
           if @result.class == Hash
             @attrs = @result
+          elsif @result != '1'
+            xpath_way
           end
-          mass_highlight_turn(@mass, false)
         end
-
         if @result == '1'
           standart_meth_merge
         else
@@ -85,7 +86,7 @@ module Marta
       # Creating data to save when user suggests a custom xpath
       def xpath_meth_merge
         temp = temp_hash
-        temp['meths'][@method_name]['options'] = @result
+        temp['meths'][@method_name]['options'] = @attrs['options']
         @data['meths'].merge!(temp['meths'])
         @data
       end
@@ -118,10 +119,8 @@ module Marta
       # JS returning '1' when it's done. That is not good
       # and should be rewrited as soon as possible
       def finished?
-        if @result == '1'
+        if @result == '1' or @result == '4'
           true
-        elsif @result == '3'
-          xpath_way
         else
           false
         end
@@ -130,15 +129,13 @@ module Marta
       # When user selects xpath way. Marta is doing some work before finish
       def xpath_way
         @result = ask_xpath
-        if @result == '2'
-          false
-        else
+        if @result != '2'
+          @attrs = Hash.new
           @attrs['options'] = @result
           @mass = get_elements_by_attrs
           mass_highlight_turn @mass
           @result = ask_confirmation
           mass_highlight_turn(@mass, false)
-          finished?
         end
       end
 

data/lib/marta/json_2_class.rb

@@ -36,24 +36,15 @@ module Marta
       include OptionsAndPaths, ReadWrite
 
       #
-      # Main class creation method. SmartPage method is only working with
-      # a proper initialization.
+      # Main class creation method.
       #
-      # By default SmartPage has no initialization which is making it almost
-      # useles while not constructed like that. It will be fixed.
+      # SmartPage can be initialized with user data as well
       def self.create(class_name, data, edit)
         c = Class.new(SmartPage) do
+          alias_method :old_init, :initialize
           define_method :initialize do |my_data=data, my_class_name=class_name,
                                         will_edit=edit|
-            @data = my_data
-            @class_name = class_name
-            @edit_mark = will_edit
-            build_content my_data
-            if will_edit
-              page_edit my_class_name, my_data
-            end
-            # We need optimization here very much!
-            build_content my_data
+            old_init(class_name, my_data, will_edit)
           end
         end
         # We are vanishing previous version of class
@@ -122,7 +113,7 @@ module Marta
     end
 
     def build_var(name, content)
-      if !self.methods.include?(name.to_sym) and (@data['meths'][name] == nil)
+      if !self.methods.include?(name.to_sym) and (@data['meths'][name].nil?)
         self.singleton_class.send(:attr_accessor, name.to_sym)
         instance_variable_set("@#{name}", process_string(content))
       else

data/lib/marta/options_and_paths.rb

@@ -107,9 +107,9 @@ module Marta
 
     # Defining the place for files to inject to browser
     def gem_libdir
-      t = ["#{File.dirname(File.expand_path($0))}/../lib/#{Marta::NAME}",
+      t = ["#{Dir.pwd}/lib/#{Marta::NAME}",
            "#{Gem.dir}/gems/#{Marta::NAME}-#{Marta::VERSION}/lib/#{Marta::NAME}"]
-      t.each {|i| return i if File.readable?(i) }
+      File.readable?(t[0])? t[0] : t[1]
     end
 
     # Marta knows does she learn or not.

data/lib/marta/public_methods.rb

@@ -6,6 +6,37 @@ module Marta
 
     include OptionsAndPaths
 
+
+    #
+    # User can create pageobject class using SmartPage.new
+    #
+    # SmartPage can be created withoud 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
+    # "MyClass". All data provided will be stored in MyClass.json
+    # Once 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 =
+    # {"vars"=>{},"meths"=>{}}. You can take an existing json as well.
+    # Notice that rocket like syntax is a must here. It will be changed later
+    #
+    # Third parameter is about to show or not default page creation dialog.
+    # So it can be true or false
+    def initialize(my_class_name, my_data = ({"vars" => {},"meths" => {}}),
+                   will_edit = true)
+      @data ||= my_data
+      @class_name ||= my_class_name
+      @edit_mark ||= will_edit
+      build_content my_data
+      if will_edit
+        page_edit my_class_name, my_data
+      end
+      # We need optimization here very much!
+      build_content my_data
+    end
+
     # User can define a method for example in a middle of a debug session
     def method_edit(name)
       method_name = correct_name(name)

data/lib/marta/version.rb

@@ -1,4 +1,4 @@
 module Marta
-  VERSION = "0.28017"
+  VERSION = "0.28675"
   NAME = "marta"
 end

data/marta.gemspec

@@ -10,7 +10,7 @@ Gem::Specification.new do |spec|
   spec.email         = ["s_seleznev_qa@hotmail.com"]
 
   spec.summary       = "That will be an another one watir-webdriver wrap"
-  spec.description   = "Element location tool for your watir autotests"
+  spec.description   = "Element location tool for your watir autotests."
   spec.homepage      = "https://github.com/sseleznevqa/marta"
   spec.license       = "MIT"
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: marta
 version: !ruby/object:Gem::Version
-  version: '0.28017'
+  version: '0.28675'
 platform: ruby
 authors:
 - Sergei Seleznev
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-07-02 00:00:00.000000000 Z
+date: 2017-07-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -94,7 +94,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: Element location tool for your watir autotests
+description: Element location tool for your watir autotests.
 email:
 - s_seleznev_qa@hotmail.com
 executables: []