appium_lib_core 1.7.2 → 1.8.0

data/lib/appium_lib_core/driver.rb

@@ -163,15 +163,9 @@ module Appium
                        http_client_ops: { http_client: nil, open_timeout: 999_999, read_timeout: 999_999 })
         server_url ||= "http://127.0.0.1:#{@port}/wd/hub"
 
-        # open_timeout and read_timeout are explicit wait.
-        open_timeout = http_client_ops.delete(:open_timeout)
-        read_timeout = http_client_ops.delete(:read_timeout)
-
-        http_client = http_client_ops.delete(:http_client)
-        @http_client ||= http_client ? http_client : Appium::Core::Base::Http::Default.new
-
-        @http_client.open_timeout = open_timeout if open_timeout
-        @http_client.read_timeout = read_timeout if read_timeout
+        create_http_client http_client: http_client_ops.delete(:http_client),
+                           open_timeout: http_client_ops.delete(:open_timeout),
+                           read_timeout: http_client_ops.delete(:read_timeout)
 
         begin
           # included https://github.com/SeleniumHQ/selenium/blob/43f8b3f66e7e01124eff6a5805269ee441f65707/rb/lib/selenium/webdriver/remote/driver.rb#L29
@@ -197,6 +191,14 @@ module Appium
 
       private
 
+      def create_http_client(http_client: nil, open_timeout: nil, read_timeout: nil)
+        @http_client ||= http_client ? http_client : Appium::Core::Base::Http::Default.new
+
+        # open_timeout and read_timeout are explicit wait.
+        @http_client.open_timeout = open_timeout if open_timeout
+        @http_client.read_timeout = read_timeout if read_timeout
+      end
+
       # Ignore setting default wait if the target driver has no implementation
       def set_implicit_wait_by_default(wait)
         @driver.manage.timeouts.implicit_wait = wait
@@ -317,6 +319,9 @@ module Appium
         when :windows
           # no windows specific extentions
           Appium::Logger.debug('windows')
+        when :tizen
+          # no tizen specific extentions
+          Appium::Logger.debug('tizen')
         else
           Appium::Logger.warn('no device matched')
         end

data/lib/appium_lib_core/element/image.rb

@@ -16,7 +16,7 @@ module Appium
       #
       attr_reader :visual
 
-      def initialize(bridge, x, y, width, height, visual = nil) # rubocop:disable Metrics/ParameterLists
+      def initialize(bridge, x, y, width, height, visual = nil)
         @bridge = bridge
         @visual = visual
 

data/lib/appium_lib_core/ios/device/clipboard.rb

@@ -8,8 +8,8 @@ module Appium
           def self.add_methods
             ::Appium::Core::Device.add_endpoint_method(:get_clipboard) do
               def get_clipboard(content_type: :plaintext)
-                unless ::Appium::Core::Device::Clipboard::CONTENT_TYPE.member?(content_type)
-                  raise "content_type should be #{::Appium::Core::Device::Clipboard::CONTENT_TYPE}"
+                unless ::Appium::Core::Base::Device::Clipboard::CONTENT_TYPE.member?(content_type)
+                  raise "content_type should be #{::Appium::Core::Base::Device::Clipboard::CONTENT_TYPE}"
                 end
 
                 params = { contentType: content_type }
@@ -21,8 +21,8 @@ module Appium
 
             ::Appium::Core::Device.add_endpoint_method(:set_clipboard) do
               def set_clipboard(content:, content_type: :plaintext)
-                unless ::Appium::Core::Device::Clipboard::CONTENT_TYPE.member?(content_type)
-                  raise "content_type should be #{::Appium::Core::Device::Clipboard::CONTENT_TYPE}"
+                unless ::Appium::Core::Base::Device::Clipboard::CONTENT_TYPE.member?(content_type)
+                  raise "content_type should be #{::Appium::Core::Base::Device::Clipboard::CONTENT_TYPE}"
                 end
 
                 params = {

data/lib/appium_lib_core/ios/xcuitest/device/battery.rb

@@ -11,10 +11,10 @@ module Appium
 
                   state = case response['state']
                           when 1, 2, 3
-                            ::Appium::Core::Device::BatteryStatus::IOS[response['state']]
+                            ::Appium::Core::Base::Device::BatteryStatus::IOS[response['state']]
                           else
                             ::Appium::Logger.warn("The state is unknown or undefined: #{response['state']}")
-                            ::Appium::Core::Device::BatteryStatus::IOS[0] # :unknown
+                            ::Appium::Core::Base::Device::BatteryStatus::IOS[0] # :unknown
                           end
                   { state: state, level: response['level'] }
                 end

data/lib/appium_lib_core/ios/xcuitest/device/performance.rb

@@ -17,10 +17,9 @@ module Appium
               end
 
               ::Appium::Core::Device.add_endpoint_method(:get_performance_record) do
-                # rubocop:disable Metrics/ParameterLists
                 def get_performance_record(save_file_path: './performance', profile_name: 'Activity Monitor',
                                            remote_path: nil, user: nil, pass: nil, method: 'PUT')
-                  option = ::Appium::Core::Device::ScreenRecord.new(
+                  option = ::Appium::Core::Base::Device::ScreenRecord.new(
                     remote_path: remote_path, user: user, pass: pass, method: method
                   ).upload_option
 
@@ -29,7 +28,6 @@ module Appium
 
                   File.open("#{save_file_path}.zip", 'wb') { |f| f << result.unpack('m')[0] }
                 end
-                # rubocop:enable Metrics/ParameterLists
               end
             end
           end # module Performance

data/lib/appium_lib_core/ios/xcuitest/device/screen.rb

@@ -9,7 +9,7 @@ module Appium
                 # rubocop:disable Metrics/ParameterLists
                 def start_recording_screen(remote_path: nil, user: nil, pass: nil, method: nil, force_restart: nil,
                                            video_type: 'mp4', time_limit: '180', video_quality: 'medium')
-                  option = ::Appium::Core::Device::ScreenRecord.new(
+                  option = ::Appium::Core::Base::Device::ScreenRecord.new(
                     remote_path: remote_path, user: user, pass: pass, method: method, force_restart: force_restart
                   ).upload_option
 

data/lib/appium_lib_core/ios_xcuitest.rb

@@ -5,5 +5,3 @@ require_relative 'ios/device'
 require_relative 'ios/xcuitest/search_context'
 require_relative 'ios/xcuitest/device'
 require_relative 'ios/xcuitest/bridge'
-
-require_relative 'device/battery_status'

data/lib/appium_lib_core/version.rb

@@ -1,6 +1,6 @@
 module Appium
   module Core
-    VERSION = '1.7.2'.freeze unless defined? ::Appium::Core::VERSION
-    DATE    = '2018-06-23'.freeze unless defined? ::Appium::Core::DATE
+    VERSION = '1.8.0'.freeze unless defined? ::Appium::Core::VERSION
+    DATE    = '2018-07-07'.freeze unless defined? ::Appium::Core::DATE
   end
 end

data/release_notes.md

@@ -1,3 +1,13 @@
+#### v1.8.0 2018-07-07
+
+- [77350e6](https://github.com/appium/ruby_lib_core/commit/77350e6a23b91c84f446e1637a748ff6feb01ded) Release 1.8.0
+- [2162056](https://github.com/appium/ruby_lib_core/commit/21620568f14ed4537b43c29e2b28026795e30617) Remove dynamic method definitions (#103)
+- [a2e89bf](https://github.com/appium/ruby_lib_core/commit/a2e89bfb9d596e96bd27501a290ad0a2ff3528d4) extract create http client
+- [fb9d5e5](https://github.com/appium/ruby_lib_core/commit/fb9d5e5728745bc6a13434d9a7cedb88d08a7b8e) Add tizen (#100)
+- [0ecc90b](https://github.com/appium/ruby_lib_core/commit/0ecc90b449a3d841402fe731add8cbe2e530d325) add changelog about find_element/s_by_image
+- [a08c7c7](https://github.com/appium/ruby_lib_core/commit/a08c7c769d12316f3a410b28f93799682a111ed8) update docstring for find_elements_by_image
+
+
 #### v1.7.2 2018-06-23
 
 - [72bbc01](https://github.com/appium/ruby_lib_core/commit/72bbc01dc69579c5b7dea43b6ec01fee37299ebe) Release 1.7.2

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: appium_lib_core
 version: !ruby/object:Gem::Version
-  version: 1.7.2
+  version: 1.8.0
 platform: ruby
 authors:
 - Kazuaki MATSUO
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-06-23 00:00:00.000000000 Z
+date: 2018-07-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: selenium-webdriver
@@ -251,6 +251,22 @@ files:
 - lib/appium_lib_core/common/command/common.rb
 - lib/appium_lib_core/common/command/mjsonwp.rb
 - lib/appium_lib_core/common/command/w3c.rb
+- lib/appium_lib_core/common/device/app_management.rb
+- lib/appium_lib_core/common/device/app_state.rb
+- lib/appium_lib_core/common/device/battery_status.rb
+- lib/appium_lib_core/common/device/clipboard_content_type.rb
+- lib/appium_lib_core/common/device/context.rb
+- lib/appium_lib_core/common/device/device.rb
+- lib/appium_lib_core/common/device/device_lock.rb
+- lib/appium_lib_core/common/device/file_management.rb
+- lib/appium_lib_core/common/device/image_comparison.rb
+- lib/appium_lib_core/common/device/ime_actions.rb
+- lib/appium_lib_core/common/device/keyboard.rb
+- lib/appium_lib_core/common/device/keyevent.rb
+- lib/appium_lib_core/common/device/screen_record.rb
+- lib/appium_lib_core/common/device/setting.rb
+- lib/appium_lib_core/common/device/touch_actions.rb
+- lib/appium_lib_core/common/device/value.rb
 - lib/appium_lib_core/common/error.rb
 - lib/appium_lib_core/common/log.rb
 - lib/appium_lib_core/common/logger.rb
@@ -260,21 +276,6 @@ files:
 - lib/appium_lib_core/common/wait/timer.rb
 - lib/appium_lib_core/common/ws/websocket.rb
 - lib/appium_lib_core/device.rb
-- lib/appium_lib_core/device/app_management.rb
-- lib/appium_lib_core/device/app_state.rb
-- lib/appium_lib_core/device/battery_status.rb
-- lib/appium_lib_core/device/clipboard_content_type.rb
-- lib/appium_lib_core/device/context.rb
-- lib/appium_lib_core/device/device_lock.rb
-- lib/appium_lib_core/device/file_management.rb
-- lib/appium_lib_core/device/image_comparison.rb
-- lib/appium_lib_core/device/ime_actions.rb
-- lib/appium_lib_core/device/keyboard.rb
-- lib/appium_lib_core/device/keyevent.rb
-- lib/appium_lib_core/device/screen_record.rb
-- lib/appium_lib_core/device/setting.rb
-- lib/appium_lib_core/device/touch_actions.rb
-- lib/appium_lib_core/device/value.rb
 - lib/appium_lib_core/driver.rb
 - lib/appium_lib_core/element/image.rb
 - lib/appium_lib_core/ios.rb

data/lib/appium_lib_core/device/app_management.rb

@@ -1,113 +0,0 @@
-module Appium
-  module Core
-    module Device
-      module AppManagement
-        def self.add_methods # rubocop:disable Metrics/CyclomaticComplexity,Metrics/PerceivedComplexity
-          ::Appium::Core::Device.add_endpoint_method(:launch_app) do
-            def launch_app
-              execute :launch_app
-            end
-          end
-
-          ::Appium::Core::Device.add_endpoint_method(:close_app) do
-            def close_app
-              execute :close_app
-            end
-          end
-
-          ::Appium::Core::Device.add_endpoint_method(:close_app) do
-            def close_app
-              execute :close_app
-            end
-          end
-
-          ::Appium::Core::Device.add_endpoint_method(:reset) do
-            def reset
-              execute :reset
-            end
-          end
-
-          ::Appium::Core::Device.add_endpoint_method(:app_strings) do
-            def app_strings(language = nil)
-              opts = language ? { language: language } : {}
-              execute :app_strings, {}, opts
-            end
-          end
-
-          ::Appium::Core::Device.add_endpoint_method(:background_app) do
-            def background_app(duration = 0)
-              execute :background_app, {}, seconds: duration
-            end
-          end
-
-          ::Appium::Core::Device.add_endpoint_method(:install_app) do
-            def install_app(path, # rubocop:disable Metrics/ParameterLists
-                            replace: nil,
-                            timeout: nil,
-                            allow_test_packages: nil,
-                            use_sdcard: nil,
-                            grant_permissions: nil)
-              args = { appPath: path }
-
-              args[:options] = {} unless options?(replace, timeout, allow_test_packages, use_sdcard, grant_permissions)
-
-              args[:options][:replace] = replace unless replace.nil?
-              args[:options][:timeout] = timeout unless timeout.nil?
-              args[:options][:allowTestPackages] = allow_test_packages unless allow_test_packages.nil?
-              args[:options][:useSdcard] = use_sdcard unless use_sdcard.nil?
-              args[:options][:grantPermissions] = grant_permissions unless grant_permissions.nil?
-
-              execute :install_app, {}, args
-            end
-
-            private
-
-            def options?(replace, timeout, allow_test_packages, use_sdcard, grant_permissions)
-              replace.nil? || timeout.nil? || allow_test_packages.nil? || use_sdcard.nil? || grant_permissions.nil?
-            end
-          end
-
-          ::Appium::Core::Device.add_endpoint_method(:remove_app) do
-            def remove_app(id, keep_data: nil, timeout: nil)
-              # required: [['appId'], ['bundleId']]
-              args = { appId: id }
-
-              args[:options] = {} unless keep_data.nil? || timeout.nil?
-              args[:options][:keepData] = keep_data unless keep_data.nil?
-              args[:options][:timeout] = timeout unless timeout.nil?
-
-              execute :remove_app, {}, args
-            end
-          end
-
-          ::Appium::Core::Device.add_endpoint_method(:app_installed?) do
-            def app_installed?(app_id)
-              # required: [['appId'], ['bundleId']]
-              execute :app_installed?, {}, bundleId: app_id
-            end
-          end
-
-          ::Appium::Core::Device.add_endpoint_method(:activate_app) do
-            def activate_app(app_id)
-              # required: [['appId'], ['bundleId']]
-              execute :activate_app, {}, bundleId: app_id
-            end
-          end
-
-          ::Appium::Core::Device.add_endpoint_method(:terminate_app) do
-            def terminate_app(app_id, timeout: nil)
-              # required: [['appId'], ['bundleId']]
-              #
-              args = { appId: app_id }
-
-              args[:options] = {} unless timeout.nil?
-              args[:options][:timeout] = timeout unless timeout.nil?
-
-              execute :terminate_app, {}, args
-            end
-          end
-        end
-      end # module AppManagement
-    end # module Device
-  end # module Core
-end # module Appium

data/lib/appium_lib_core/device/app_state.rb

@@ -1,32 +0,0 @@
-module Appium
-  module Core
-    module Device
-      module AppState
-        STATUS = [
-          :not_installed,                   # 0
-          :not_running,                     # 1
-          :running_in_background_suspended, # 2
-          :running_in_background,           # 3
-          :running_in_foreground            # 4
-        ].freeze
-
-        def self.add_methods
-          ::Appium::Core::Device.add_endpoint_method(:app_state) do
-            def app_state(app_id)
-              # required: [['appId'], ['bundleId']]
-              response = execute :app_state, {}, appId: app_id
-
-              case response
-              when 0, 1, 2, 3, 4
-                ::Appium::Core::Device::AppState::STATUS[response]
-              else
-                ::Appium::Logger.debug("Unexpected status in app_state: #{response}")
-                response
-              end
-            end
-          end
-        end
-      end
-    end
-  end
-end

data/lib/appium_lib_core/device/battery_status.rb

@@ -1,23 +0,0 @@
-module Appium
-  module Core
-    module Device
-      module BatteryStatus
-        ANDROID = [
-          :undefined,    # 0, dummy
-          :unknown,      # 1
-          :charging,     # 2
-          :discharging,  # 3
-          :not_charging, # 4
-          :full          # 5
-        ].freeze
-
-        IOS = [
-          :unknown,      # 0
-          :unplugged,    # 1
-          :charging,     # 2
-          :full          # 3
-        ].freeze
-      end
-    end
-  end
-end

data/lib/appium_lib_core/device/clipboard_content_type.rb

@@ -1,9 +0,0 @@
-module Appium
-  module Core
-    module Device
-      module Clipboard
-        CONTENT_TYPE = [:plaintext, :image, :url].freeze
-      end
-    end
-  end
-end

data/lib/appium_lib_core/device/context.rb

@@ -1,48 +0,0 @@
-module Appium
-  module Core
-    module Device
-      module Context
-        def self.add_methods
-          ::Appium::Core::Device.add_endpoint_method(:within_context) do
-            def within_context(context)
-              existing_context = current_context
-              set_context context
-              if block_given?
-                result = yield
-                set_context existing_context
-                result
-              else
-                set_context existing_context
-              end
-            end
-          end
-
-          ::Appium::Core::Device.add_endpoint_method(:switch_to_default_context) do
-            def switch_to_default_context
-              set_context nil
-            end
-          end
-
-          ::Appium::Core::Device.add_endpoint_method(:current_context) do
-            def current_context
-              execute :current_context
-            end
-          end
-
-          ::Appium::Core::Device.add_endpoint_method(:available_contexts) do
-            def available_contexts
-              # return empty array instead of nil on failure
-              execute(:available_contexts, {}) || []
-            end
-          end
-
-          ::Appium::Core::Device.add_endpoint_method(:set_context) do
-            def set_context(context = null)
-              execute :set_context, {}, name: context
-            end
-          end
-        end
-      end # module ImeActions
-    end # module Device
-  end # module Core
-end # module Appium