meglish 1.0.0 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a33e98ec5019f3c7430792697ceda3afd26cbdc1
-  data.tar.gz: edf7559f926cc0e479ca8625fbd209b3cafdd4f5
+  metadata.gz: b3e4962ed4645bc91877f34b17287d739c6c755b
+  data.tar.gz: 1046efe069e8127e5a4021146008d6af94df1681
 SHA512:
-  metadata.gz: 6cd92291f4f0d8e84f5a04b9d43b5aff3ebba53edc57bd20a3c8d7dd4c4b08a6251e6a3e3a847711d71beff8698919210eb1261d10d211f33838f65abc5cbf09
-  data.tar.gz: 76f718217235fa55086c95773dd39244f80c3cd380e6f2d3442c09694987cd820fdc463b28a80ae1ef7de7ac8dd52755d525a2ca37b5c57ceca055074598bcf8
+  metadata.gz: 2cb4bd87803ec8bdc4b91e2929ce2ed49153919e91fbb330e2ea6653e2270cebd1d22c86e1585768a7b92fdcf6fe3e85ed55ddcc3aaa54505525fd492d3fab77
+  data.tar.gz: bad064fb7ba732d7fc78ec942dcc0d3f1a72de9591a3f23dc1d5141dbb240a8eb9af8de3e016e96b6eba22d8c81098b4e1d3df5fbfc7739ad8c240962b9e190b

data/lib/{meglish.rb → meglish_core.rb}

@@ -1,21 +1,23 @@
-module MeglishCommands
+module Meglish
+    MELGISH_CONDITIONS = {
+        clear_text: true,
+        scroll_to_element: true,
+        include_all: true,
+        timeout: 30,
+        confirm_alert: true
+    }
 
     def clear_text_element(_query, _options = {})
-        find_element_on_screen(_query, _options)
-        touch(_query.strip)
+        touch_element(_query.strip, _options)
         clear_text
     end
 
     def element_enabled?(_query, _options = {})
-        element = find_elements(_query, _options)
-        find_element_on_screen(_query, _options)
-        find_elements(_query, _options).first['enabled'] unless element.nil?
+        get_element['enabled']
     end
 
     def element_visible?(_query, _options = {})
-        element = find_elements(_query, _options)
-        find_element_on_screen(_query, _options) unless element.nil?
-        find_elements(_query, _options).first['visible'] unless element.nil?
+        get_element['visible']
     end
 
     def find_coordinate_element(_query, _options = {})
@@ -25,11 +27,10 @@ module MeglishCommands
 
     def find_element_on_screen(_query, _options = {})
         _query = include_all(_query, _options)
-        logging(_query, 'NORMAL')
-        timeout = _options[:timeout].nil? ? 20 : _options[:timeout].to_i
-        wait_for_element_exists(_query, timeout: timeout)
+        MeglishLog.new.log(_query)
+        wait_for_element_exists(_query, get_option(:timeout, _options))
         sleep 0.5
-        scroll_to_element(_query, _options) if _options[:scroll_to_element].nil? || _options[:scroll_to_element]
+        scroll_to_element(_query, _options)
     end
 
     def find_elements(_query, _options = {})
@@ -62,9 +63,9 @@ module MeglishCommands
         return []
     end
 
-    def keyboard_enter_text_element(text, _options = {})
+    def keyboard_enter_text_element(_text, _options = {})
         wait_for_keyboard
-        keyboard_enter_text text
+        keyboard_enter_text _text
         hide_soft_keyboard
     end
 
@@ -89,7 +90,19 @@ module MeglishCommands
         touch_element(_touch_element_query, _options)
     end
 
+    def set_date_element(_query_input, _date, _options = {})
+        new_date = _date.match(/(^[\d]{4})\/([\d]{1,2})\/([\d]{1,2})/)
+        year = new_date[1].to_i
+        month = (new_date[2].to_i) - 1
+        day = new_date[3].to_i
+
+        touch_element(_query_input, _options)
+        query("DatePicker" ,{method_name: :updateDate, arguments: [year, month, day]})
+        touch("MDButton id:'md_buttonDefaultPositive'") unless get_option(:confirm_alert, _options)
+    end
+
     def scroll_to_element(_query, _to_top_first = false, _options = {})
+        return unless get_option(:scroll_to_element, _options)
         hide_soft_keyboard
         unless (query(_query).first['rect']['height']).zero? && (query(_query).first['rect']['width']).zero?
             w, h = get_device_size
@@ -99,7 +112,7 @@ module MeglishCommands
             swipe_until_find_element(_query, w, x, h, y)
         end
     rescue
-        logging('Scroll to element was ignored')
+        MeglishLog.new.log('Scroll to element was ignored')
         query(_query)
     end
 
@@ -134,8 +147,7 @@ module MeglishCommands
     end
 
     def touch_element(_query, _options = {})
-        find_element_on_screen(_query, _options)
-        touch(_query.strip)
+        touch_element(_query.strip, _options)
     end
 
     def touch_element_by_text_position(_query, _text, _options = {})
@@ -148,11 +160,9 @@ module MeglishCommands
     end
 
     def touch_and_keyboard_text_element(_query, _text, _options = {})
-        find_element_on_screen(_query, _options)
-        touch(_query.strip)
-        clear_text if _options[:clear_text].nil? || _options[:clear_text] == true
-        keyboard_enter_text(_text)
-        hide_soft_keyboard
+        touch_element(_query.strip, _options)
+        clear_text if get_element(:clear_text, _options)
+        keyboard_enter_text_element(_text, _options)
     end
 
     def wait_for_or_ignore(_query, _timeout = 3, _options = {})
@@ -169,12 +179,12 @@ module MeglishCommands
         found
     end
 
-    def wait_for_text_element(_query, _timeout = 10, options = {})
+    def wait_for_text_element(_query, _timeout = 10, _options = {})
         count = 0
         filled = ''
         while (filled.nil? || filled.empty?)
             return if count >= _timeout
-            filled = text_element(_query, options)
+            filled = text_element(_query, _options)
             sleep 1
             count += 1
         end
@@ -196,11 +206,7 @@ module MeglishCommands
     private
 
     def include_all(_query, _options = {})
-        include_all = true
-        unless _options.empty?
-            include_all = _options[:include_all].nil? ? true : _options[:include_all]
-        end
-        _query = 'all ' + _query if _query.include?('all ') == false && include_all == true
+        _query = 'all ' + _query if _query.include?('all ') == false && get_option(:include_all, _options)
         _query
     end
 
@@ -227,4 +233,16 @@ module MeglishCommands
             swipe_left(_query) until query(_query).first['visible'] || (count_times += 1) >= 5
         end
     end
+
+    def get_option(_option, _options)
+        default_value = ENV[_option]
+        default_value = MELGISH_CONDITIONS[_option] if default_value.nil? || default_value.empty?
+        return default_value unless has_option?(_option, _options)
+        _options[option]
+    end
+
+    def has_option?(_option, _options)
+        return (_options[_option].nil? ? false : true) unless _options.nil? || _options.empty?
+        return false
+    end
 end

data/lib/meglish_helper.rb

@@ -0,0 +1,5 @@
+class MeglishHelper
+    def build_index(_index)
+        _index.to_s.empty? ? '' : " index:#{_index} "
+    end
+end

data/lib/meglish_log.rb

@@ -0,0 +1,9 @@
+class MeglishLog
+    def log(_text)
+        default_value = ENV[:meglish_log]
+        default_value = default_value.nil? ? true : false
+        if default_value
+            puts "  >> " + _text
+        end
+    end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: meglish
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.2
 platform: ruby
 authors:
 - Eduardo Gomes Heinen
@@ -9,17 +9,39 @@ autorequire:
 bindir: bin
 cert_chain: []
 date: 2016-11-12 00:00:00.000000000 Z
-dependencies: []
-description: ''
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: calabash-android
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.8.2
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.8.2
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.8.2
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.8.2
+description: Meglish find automatically your elements inside your Android Apps
 email: eduardogheinen@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- lib/meglish.rb
+- lib/meglish_core.rb
+- lib/meglish_helper.rb
+- lib/meglish_log.rb
 homepage: http://rubygems.org/gems/meglish
 licenses:
-- MIT
+- AGPL-3.0
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -40,5 +62,5 @@ rubyforge_project:
 rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
-summary: Meglish a super framework to Calabash Android
+summary: Meglish is a super framework to Calabash-Android
 test_files: []