Clean up module syntax

Fix #134

Author: bootstraponline

lib/appium_lib.rb

@@ -21,17 +21,5 @@ def self.method_missing method, *args, &block
   end
 end
 
-module Appium
-  # @private
-  def self.add_to_path file, path=false
-    path = path ? "../#{path}/" : '..'
-    path = File.expand_path path, file
-
-    $:.unshift path unless $:.include? path
-  end
-
-  add_to_path __FILE__
-
-  require_relative 'appium_lib/logger'
-  require_relative 'appium_lib/driver'
-end
+require_relative 'appium_lib/logger'
+require_relative 'appium_lib/driver'

lib/appium_lib/android/dynamic.rb

@@ -1,45 +1,44 @@
 # encoding: utf-8
-
 module Appium
   class Driver
     @@map = {
-        1 => [ 'text(String text)', 'SELECTOR_TEXT', 1],
-        2 => [ 'textStartsWith(String text)', 'SELECTOR_START_TEXT', 2],
-        3 => [ 'textContains(String text)', 'SELECTOR_CONTAINS_TEXT', 3],
-        4 => [ 'className(String className)', 'SELECTOR_CLASS', 4],
-        5 => [ 'description(String desc)', 'SELECTOR_DESCRIPTION',  5],
-        6 => [ 'descriptionStartsWith(String desc)', 'SELECTOR_START_DESCRIPTION', 6],
-        7 => [ 'descriptionContains(String desc)', 'SELECTOR_CONTAINS_DESCRIPTION', 7],
-        8 => [ 'index(final int index)', 'SELECTOR_INDEX', 8],
-        9 => [ 'instance(final int instance)', 'SELECTOR_INSTANCE', 9],
-        10 => [ 'enabled(boolean val)', 'SELECTOR_ENABLED', 10],
-        11 => [ 'focused(boolean val)', 'SELECTOR_FOCUSED', 11],
-        12 => [ 'focusable(boolean val)', 'SELECTOR_FOCUSABLE', 12],
-        13 => [ 'scrollable(boolean val)', 'SELECTOR_SCROLLABLE', 13],
-        14 => [ 'clickable(boolean val)', 'SELECTOR_CLICKABLE', 14],
-        15 => [ 'checked(boolean val)', 'SELECTOR_CHECKED', 15],
-        16 => [ 'selected(boolean val)', 'SELECTOR_SELECTED',  16],
+        1   => ['text(String text)', 'SELECTOR_TEXT', 1],
+        2   => ['textStartsWith(String text)', 'SELECTOR_START_TEXT', 2],
+        3   => ['textContains(String text)', 'SELECTOR_CONTAINS_TEXT', 3],
+        4   => ['className(String className)', 'SELECTOR_CLASS', 4],
+        5   => ['description(String desc)', 'SELECTOR_DESCRIPTION', 5],
+        6   => ['descriptionStartsWith(String desc)', 'SELECTOR_START_DESCRIPTION', 6],
+        7   => ['descriptionContains(String desc)', 'SELECTOR_CONTAINS_DESCRIPTION', 7],
+        8   => ['index(final int index)', 'SELECTOR_INDEX', 8],
+        9   => ['instance(final int instance)', 'SELECTOR_INSTANCE', 9],
+        10  => ['enabled(boolean val)', 'SELECTOR_ENABLED', 10],
+        11  => ['focused(boolean val)', 'SELECTOR_FOCUSED', 11],
+        12  => ['focusable(boolean val)', 'SELECTOR_FOCUSABLE', 12],
+        13  => ['scrollable(boolean val)', 'SELECTOR_SCROLLABLE', 13],
+        14  => ['clickable(boolean val)', 'SELECTOR_CLICKABLE', 14],
+        15  => ['checked(boolean val)', 'SELECTOR_CHECKED', 15],
+        16  => ['selected(boolean val)', 'SELECTOR_SELECTED', 16],
         # // SELECTOR_ID = 17; // nothing.
-        18 => [ 'packageName(String name)', 'SELECTOR_PACKAGE_NAME', 18],
+        18  => ['packageName(String name)', 'SELECTOR_PACKAGE_NAME', 18],
         # // SELECTOR_CHILD              = 19; // childSelector(UiSelector selector)
         # // SELECTOR_CONTAINER          = 20; // containerSelector(UiSelector selector)
         # // SELECTOR_PATTERN            = 21; // ! private ! patternSelector(UiSelector selector)
         # // SELECTOR_PARENT             = 22; // fromParent(UiSelector selector)
         # // SELECTOR_COUNT              = 23; // nothing.
-        24 => [ 'longClickable(boolean val)', 'SELECTOR_LONG_CLICKABLE', 24],
-        25 => [ 'textMatches(String regex)', 'SELECTOR_TEXT_REGEX', 25],
-        26 => [ 'classNameMatches(String regex)', 'SELECTOR_CLASS_REGEX', 26],
-        27 => [ 'descriptionMatches(String regex)', 'SELECTOR_DESCRIPTION_REGEX', 27],
-        28 => [ 'packageNameMatches(String regex)', 'SELECTOR_PACKAGE_NAME_REGEX', 28],
+        24  => ['longClickable(boolean val)', 'SELECTOR_LONG_CLICKABLE', 24],
+        25  => ['textMatches(String regex)', 'SELECTOR_TEXT_REGEX', 25],
+        26  => ['classNameMatches(String regex)', 'SELECTOR_CLASS_REGEX', 26],
+        27  => ['descriptionMatches(String regex)', 'SELECTOR_DESCRIPTION_REGEX', 27],
+        28  => ['packageNameMatches(String regex)', 'SELECTOR_PACKAGE_NAME_REGEX', 28],
         # // start internal methods at 100
-        100 => [ 'getStringAttribute("name")', 'GET_NAME', 100]
-      }
+        100 => ['getStringAttribute("name")', 'GET_NAME', 100]
+    }
 
-      # @private
-      def dynamic_code_to_string code, value=false
-        result = @@map[code].first
-        return result unless value
-        result.split('(').first + "( \"#{value}\" )"
-      end
+    # @private
+    def dynamic_code_to_string code, value=false
+      result = @@map[code].first
+      return result unless value
+      result.split('(').first + "( \"#{value}\" )"
+    end
   end # class Driver
 end # module Appium

lib/appium_lib/android/element/alert.rb

@@ -1,37 +1,39 @@
 # encoding: utf-8
-module Appium::Android
-  # Tap the alert button identified by value.
-  # @param value [Integer, String] either an integer index of the button or the button's name
-  # @return [void]
-  def alert_click value
-    button(value).click
-  end
+module Appium
+  module Android
+    # Tap the alert button identified by value.
+    # @param value [Integer, String] either an integer index of the button or the button's name
+    # @return [void]
+    def alert_click value
+      button(value).click
+    end
 
-  # Accept the alert.
-  # The last button is considered "accept."
-  # @return [void]
-  def alert_accept
-    last_button.click
-  end
+    # Accept the alert.
+    # The last button is considered "accept."
+    # @return [void]
+    def alert_accept
+      last_button.click
+    end
 
-  # Get the text of the alert's accept button.
-  # The last button is considered "accept."
-  # @return [String]
-  def alert_accept_text
-    last_button.text
-  end
+    # Get the text of the alert's accept button.
+    # The last button is considered "accept."
+    # @return [String]
+    def alert_accept_text
+      last_button.text
+    end
 
-  # Dismiss the alert.
-  # The first button is considered "dismiss."
-  # @return [void]
-  def alert_dismiss
-    first_button.click
-  end
+    # Dismiss the alert.
+    # The first button is considered "dismiss."
+    # @return [void]
+    def alert_dismiss
+      first_button.click
+    end
 
-  # Get the text of the alert's dismiss button.
-  # The first button is considered "dismiss."
-  # @return [String]
-  def alert_dismiss_text
-    first_button.text
+    # Get the text of the alert's dismiss button.
+    # The first button is considered "dismiss."
+    # @return [String]
+    def alert_dismiss_text
+      first_button.text
+    end
   end
-end # module Appium::Android
+end