refactor: separate core android ios more (#670)

* update base directory

Author: KazuCocoa

lib/appium_lib/core/common/base.rb

@@ -1,3 +1,4 @@
+# The following files have selenium-webdriver related stuff.
 require_relative 'base/base'
 require_relative 'base/bridge'
 require_relative 'base/capabilities'

lib/appium_lib/core/common/base/base.rb

@@ -1,4 +1,4 @@
-require_relative '../rch_context'
+require_relative 'search_context'
 
 module Appium
   module Core

lib/appium_lib/core/common/base/command.rb

@@ -0,0 +1,10 @@
+module Appium
+  module Core
+    class Base
+      module Commands
+        OSS = ::Selenium::WebDriver::Remote::OSS::Bridge::COMMANDS.freeze
+        W3C = ::Selenium::WebDriver::Remote::W3C::Bridge::COMMANDS.freeze
+      end # module Commands
+    end # module Base
+  end # module Core
+end # module Appium

lib/appium_lib/core/common/base/http_default.rb

@@ -1,6 +1,6 @@
 module Appium
   module Core
-    module Base
+    class Base
       module Http
         class Default < Selenium::WebDriver::Remote::Http::Default
           # TODO: when divide the core to the other gem, then update here. appium/ruby_lib_core/#{version}

lib/appium_lib/core/common/base/search_context.rb

@@ -1,87 +1,89 @@
 module Appium
   module Core
-    module SearchContext
-      # referenced: ::Selenium::WebDriver::SearchContext
+    class Base
+      module SearchContext
+        # referenced: ::Selenium::WebDriver::SearchContext
 
-      FINDERS = ::Selenium::WebDriver::SearchContext::FINDERS.merge(accessibility_id: 'accessibility id')
+        FINDERS = ::Selenium::WebDriver::SearchContext::FINDERS.merge(accessibility_id: 'accessibility id')
 
-      def self.add_finders(finders)
-        FINDERS.merge!(finders)
-      end
+        def self.add_finders(finders)
+          FINDERS.merge!(finders)
+        end
 
-      #
-      # Find the first element matching the given arguments
-      #
-      # @overload find_element(how, what)
-      #   @param [Symbol, String] how The method to find the element by
-      #   @param [String] what The locator to use
-      # @overload find_element(opts)
-      #   @param [Hash] opts Find options
-      #   @option opts [Symbol] :how Key named after the method to find the element by, containing the locator
-      # @return [Element]
-      #
-      # @raise [Error::NoSuchElementError] if the element doesn't exist
-      #
-      # @example Find element with accessibility id
-      #    find_elements :accessibility_id, 'Animation'
-      #    find_elements :accessibility_id, 'Animation'
-      #
-      def find_element(*args)
-        how, what = extract_args(args)
-        by = _set_by_from_finders(how)
-        begin
-          bridge.find_element_by by, what.to_s, ref
-        rescue Selenium::WebDriver::Error::TimeOutError
-          raise Selenium::WebDriver::Error::NoSuchElementError
+        #
+        # Find the first element matching the given arguments
+        #
+        # @overload find_element(how, what)
+        #   @param [Symbol, String] how The method to find the element by
+        #   @param [String] what The locator to use
+        # @overload find_element(opts)
+        #   @param [Hash] opts Find options
+        #   @option opts [Symbol] :how Key named after the method to find the element by, containing the locator
+        # @return [Element]
+        #
+        # @raise [Error::NoSuchElementError] if the element doesn't exist
+        #
+        # @example Find element with accessibility id
+        #    find_elements :accessibility_id, 'Animation'
+        #    find_elements :accessibility_id, 'Animation'
+        #
+        def find_element(*args)
+          how, what = extract_args(args)
+          by = _set_by_from_finders(how)
+          begin
+            bridge.find_element_by by, what.to_s, ref
+          rescue Selenium::WebDriver::Error::TimeOutError
+            raise Selenium::WebDriver::Error::NoSuchElementError
+          end
         end
-      end
 
-      #
-      # Find all elements matching the given arguments
-      #
-      # @see SearchContext#find_element
-      #
-      def find_elements(*args)
-        how, what = extract_args(args)
-        by = _set_by_from_finders(how)
-        begin
-          bridge.find_elements_by by, what.to_s, ref
-        rescue Selenium::WebDriver::Error::TimeOutError
-          raise Selenium::WebDriver::Error::NoSuchElementError
+        #
+        # Find all elements matching the given arguments
+        #
+        # @see SearchContext#find_element
+        #
+        def find_elements(*args)
+          how, what = extract_args(args)
+          by = _set_by_from_finders(how)
+          begin
+            bridge.find_elements_by by, what.to_s, ref
+          rescue Selenium::WebDriver::Error::TimeOutError
+            raise Selenium::WebDriver::Error::NoSuchElementError
+          end
         end
-      end
 
-      private
+        private
 
-      def _set_by_from_finders(how)
-        finders = FINDERS
-        by = finders[how.to_sym]
-        raise ArgumentError, "cannot find element by #{how.inspect}" unless by
-        by
-      end
+        def _set_by_from_finders(how)
+          finders = FINDERS
+          by = finders[how.to_sym]
+          raise ArgumentError, "cannot find element by #{how.inspect}" unless by
+          by
+        end
 
-      def extract_args(args)
-        case args.size
-        when 2
-          args
-        when 1
-          arg = args.first
+        def extract_args(args)
+          case args.size
+          when 2
+            args
+          when 1
+            arg = args.first
 
-          unless arg.respond_to?(:shift)
-            raise ArgumentError, "expected #{arg.inspect}:#{arg.class} to respond to #shift"
-          end
+            unless arg.respond_to?(:shift)
+              raise ArgumentError, "expected #{arg.inspect}:#{arg.class} to respond to #shift"
+            end
 
-          # this will be a single-entry hash, so use #shift over #first or #[]
-          arr = arg.dup.shift
-          unless arr.size == 2
-            raise ArgumentError, "expected #{arr.inspect} to have 2 elements"
-          end
+            # this will be a single-entry hash, so use #shift over #first or #[]
+            arr = arg.dup.shift
+            unless arr.size == 2
+              raise ArgumentError, "expected #{arr.inspect} to have 2 elements"
+            end
 
-          arr
-        else
-          raise ArgumentError, "wrong number of arguments (#{args.size} for 2)"
+            arr
+          else
+            raise ArgumentError, "wrong number of arguments (#{args.size} for 2)"
+          end
         end
-      end
-    end
-  end
-end
+      end # module SearchContext
+    end # class Base
+  end # module Core
+end # module Appium

lib/appium_lib/core/common/base/wait.rb

@@ -1,6 +1,6 @@
 module Appium
   module Core
-    module Base
+    class Base
       class Wait < ::Selenium::WebDriver::Wait
         require 'timeout' # for wait
 

lib/appium_lib/core/common/command.rb

@@ -1,3 +1,5 @@
+require_relative 'base/command'
+
 module Appium
   module Core
     # ref: https://github.com/appium/appium-base-driver/blob/master/lib/mjsonwp/routes.js