Check method exists before calling

Author: bootstraponline

lib/appium_lib.rb

@@ -8,21 +8,23 @@ def self.method_missing method, *args, &block
   raise "driver is nil. called #{method}" if $driver == nil
 
   if $driver.respond_to?(method)
-      # puts "[method_missing] Calling driver.send for #{method}"
-      $driver.send( method, *args, &block )
+    # puts "[method_missing] Calling driver.send for #{method}"
+    $driver.send(method, *args, &block)
+  elsif self.respond_to?(method)
+    # puts "[method_missing] Calling super for #{method}"
+    super(*args, &block)
   else
-      # puts "[method_missing] Calling super for #{method}"
-      super(*args, &block )
-    end
+    super
+  end
 end
 
 module Appium
   # @private
   def self.add_to_path file, path=false
-   path = path ? "../#{path}/" : '..'
-   path = File.expand_path path, file
+    path = path ? "../#{path}/" : '..'
+    path = File.expand_path path, file
 
-   $:.unshift path unless $:.include? path
+    $:.unshift path unless $:.include? path
   end
 
   add_to_path __FILE__

lib/appium_lib/driver.rb

@@ -191,15 +191,14 @@ def initialize opts={}
         $driver.public_methods(false).each do | m |
           Object.class_eval do
             define_method m do | *args, &block |
-              begin
-                # puts "[Object.class_eval] Calling super for #{m}"
-                # prefer existing method.
-                # super will invoke method missing on driver
-                super(*args, &block)
-              rescue NoMethodError
-                # puts '[Object.class_eval] NoMethodError'
-                $driver.send m, *args, &block
-              end
+                if defined?(super) # check if method is defined on super
+                  # puts "[Object.class_eval] Calling super for #{m}"
+                  # prefer existing method.
+                  super(*args, &block)
+                else
+                  # puts '[Object.class_eval] not on super, calling driver.'
+                  $driver.send m, *args, &block
+                end
             end
           end
         end