apparition 0.1.0 → 0.2.0

data/lib/capybara/apparition/node/drag.rb

@@ -39,6 +39,71 @@ module Capybara::Apparition
       @page.mouse.up
     end
 
+    def drop(*args)
+      if args[0].is_a? String
+        input = evaluate_on ATTACH_FILE
+        input = Capybara::Apparition::Node.new(driver, @page, input['objectId'])
+        input.set(args)
+        evaluate_on DROP_FILE, { objectId: input.id }
+      else
+        items = args.each_with_object([]) do |arg, arr|
+          arg.each_with_object(arr) do |(type, data), arr_|
+            arr_ << { type: type, data: data }
+          end
+        end
+        evaluate_on DROP_STRING, { value: items }
+      end
+    end
+
+    DROP_STRING = <<~JS
+      function(strings){
+        var dt = new DataTransfer(),
+            opts = { cancelable: true, bubbles: true, dataTransfer: dt };
+        for (var i=0; i < strings.length; i++){
+          if (dt.items) {
+            dt.items.add(strings[i]['data'], strings[i]['type']);
+          } else {
+            dt.setData(strings[i]['type'], strings[i]['data']);
+          }
+        }
+        var dropEvent = new DragEvent('drop', opts);
+        this.dispatchEvent(dropEvent);
+      }
+    JS
+
+    DROP_FILE = <<~JS
+      function(input){
+        var files = input.files,
+            dt = new DataTransfer(),
+            opts = { cancelable: true, bubbles: true, dataTransfer: dt };
+        input.parentElement.removeChild(input);
+        if (dt.items){
+          for (var i=0; i<files.length; i++){
+            dt.items.add(files[i]);
+          }
+        } else {
+          Object.defineProperty(dt, "files", {
+            value: files,
+            writable: false
+          });
+        }
+        var dropEvent = new DragEvent('drop', opts);
+        this.dispatchEvent(dropEvent);
+      }
+    JS
+
+    ATTACH_FILE = <<~JS
+      function(){
+        var input = document.createElement('INPUT');
+        input.type = "file";
+        input.id = "_capybara_drop_file";
+        input.multiple = true;
+        document.body.appendChild(input);
+        return input;
+      }
+    JS
+
+
   private
 
     def html5_drag_to(element)

data/lib/capybara/apparition/page.rb

@@ -10,44 +10,43 @@ module Capybara::Apparition
     attr_reader :modal_messages
     attr_reader :mouse, :keyboard
     attr_reader :viewport_size
+    attr_reader :browser_context_id
     attr_accessor :perm_headers, :temp_headers, :temp_no_redirect_headers
     attr_reader :network_traffic
+    attr_reader :target_id
 
-    def self.create(browser, session, id, ignore_https_errors: false, screenshot_task_queue: nil, js_errors: false)
-      session.command 'Page.enable'
+    def self.create(browser, session, id, browser_context_id,
+                    ignore_https_errors: false, **options)
+      session.async_command 'Page.enable'
 
       # Provides a lot of info - but huge overhead
       # session.command 'Page.setLifecycleEventsEnabled', enabled: true
 
-      page = Page.new(browser, session, id, ignore_https_errors, screenshot_task_queue, js_errors)
+      page = Page.new(browser, session, id, browser_context_id, options)
 
       session.async_commands 'Network.enable', 'Runtime.enable', 'Security.enable', 'DOM.enable'
-      # session.command 'Network.enable'
-      # session.command 'Runtime.enable'
-      # session.command 'Security.enable'
-      # session.command 'Security.setOverrideCertificateErrors', override: true if ignore_https_errors
-      session.command 'Security.setIgnoreCertificateErrors', ignore: !!ignore_https_errors
-      # session.command 'DOM.enable'
-      # session.command 'Log.enable'
+      session.async_command 'Security.setIgnoreCertificateErrors', ignore: !!ignore_https_errors
       if Capybara.save_path
-        session.command 'Page.setDownloadBehavior', behavior: 'allow', downloadPath: Capybara.save_path
+        session.async_command 'Page.setDownloadBehavior', behavior: 'allow', downloadPath: Capybara.save_path
       end
       page
     end
 
-    def initialize(browser, session, id, _ignore_https_errors, _screenshot_task_queue, js_errors)
-      @target_id = id
+    def initialize(browser, session, target_id, browser_context_id,
+                   js_errors: false, url_blacklist: [], url_whitelist: [], extensions: [])
+      @target_id = target_id
+      @browser_context_id = browser_context_id
       @browser = browser
       @session = session
       @keyboard = Keyboard.new(self)
       @mouse = Mouse.new(self, @keyboard)
       @modals = []
       @modal_messages = []
-      @frames = Capybara::Apparition::FrameManager.new(id)
+      @frames = Capybara::Apparition::FrameManager.new(@target_id)
       @response_headers = {}
       @status_code = 0
-      @url_blacklist = []
-      @url_whitelist = []
+      @url_blacklist = url_blacklist || []
+      @url_whitelist = url_whitelist || []
       @credentials = nil
       @auth_attempts = []
       @proxy_credentials = nil
@@ -67,6 +66,10 @@ module Capybara::Apparition
 
       register_js_error_handler # if js_errors
 
+      extensions.each do |name|
+        add_extension(name)
+      end
+
       setup_network_interception if browser.proxy_auth
     end
 
@@ -84,6 +87,12 @@ module Capybara::Apparition
       @perm_headers = {}
     end
 
+    def add_extension(filename)
+      command('Page.addScriptToEvaluateOnNewDocument', source: File.read(filename))
+    rescue Errno::ENOENT
+      raise ::Capybara::Apparition::BrowserError.new('name' => "Unable to load extension: #{filename}", 'args' => nil)
+    end
+
     def add_modal(modal_response)
       @last_modal_message = nil
       @modals.push(modal_response)
@@ -190,9 +199,9 @@ module Capybara::Apparition
       result = _raw_evaluate(query % js_escaped_selector)
       (result || []).map { |r_o| [self, r_o['objectId']] }
     rescue ::Capybara::Apparition::BrowserError => e
-      raise unless e.name =~ /is not a valid (XPath expression|selector)/
+      raise unless /is not a valid (XPath expression|selector)/.match? e.name
 
-      raise Capybara::Apparition::InvalidSelector, [method, selector]
+      raise Capybara::Apparition::InvalidSelector, 'args' => [method, selector]
     end
 
     def execute(script, *args)
@@ -225,12 +234,14 @@ module Capybara::Apparition
       go_history(+1)
     end
 
-    attr_reader :response_headers
+    def response_headers
+      @response_headers[current_frame.id] || {}
+    end
 
     attr_reader :status_code
 
     def wait_for_loaded(allow_obsolete: false)
-      timer = Capybara::Helpers.timer(expire_in: 10)
+      timer = Capybara::Helpers.timer(expire_in: 30)
       cf = current_frame
       until cf.usable? || (allow_obsolete && cf.obsolete?) || @js_error
         if timer.expired?
@@ -276,7 +287,7 @@ module Capybara::Apparition
 
     def element_from_point(x:, y:)
       r_o = _raw_evaluate("document.elementFromPoint(#{x}, #{y})", context_id: main_frame.context_id)
-      while r_o && (r_o['description'] =~ /^iframe/)
+      while r_o && (/^iframe/.match? r_o['description'])
         frame_node = command('DOM.describeNode', objectId: r_o['objectId'])
         frame = @frames.get(frame_node.dig('node', 'frameId'))
         fo = frame_offset(frame)
@@ -291,7 +302,7 @@ module Capybara::Apparition
     end
 
     def set_viewport(width:, height:, screen: nil)
-      wait_for_loaded
+      # wait_for_loaded
       @viewport_size = { width: width, height: height }
       result = @browser.command('Browser.getWindowForTarget', targetId: @target_id)
       begin
@@ -351,7 +362,7 @@ module Capybara::Apparition
 
     def update_headers(async: false)
       method = async ? :async_command : :command
-      if (ua = extra_headers.find { |k, _v| k =~ /^User-Agent$/i })
+      if (ua = extra_headers.find { |k, _v| /^User-Agent$/i.match? k })
         send(method, 'Network.setUserAgentOverride', userAgent: ua[1])
       end
       send(method, 'Network.setExtraHTTPHeaders', headers: extra_headers)
@@ -377,6 +388,14 @@ module Capybara::Apparition
 
     attr_reader :url_blacklist, :url_whitelist
 
+    def current_frame
+      @frames.current
+    end
+
+    def main_frame
+      @frames.main
+    end
+
   private
 
     def eval_wrapped_script(wrapper, script, args)
@@ -420,8 +439,7 @@ module Capybara::Apparition
 
       @session.on 'Page.windowOpen' do |params|
         puts "**** windowOpen was called with: #{params}" if ENV['DEBUG']
-        # TODO: find a better way to handle this
-        sleep 0.4 # wait a bit so the window has time to start loading
+        @browser.refresh_pages(opener: self)
       end
 
       @session.on 'Page.frameAttached' do |params|
@@ -441,13 +459,16 @@ module Capybara::Apparition
           puts "**** creating frome for #{frame_params['id']}" if ENV['DEBUG']
           @frames.add(frame_params['id'], frame_params)
         end
+        @frames.get(frame_params['id'])&.loading(frame_params['loaderId'] || -1)
       end
 
       @session.on 'Page.frameStartedLoading' do |params|
+        puts "Setting loading for #{params['frameId']}" if ENV['DEBUG']
         @frames.get(params['frameId'])&.loading(-1)
       end
 
       @session.on 'Page.frameStoppedLoading' do |params|
+        puts "Setting loaded for #{params['frameId']}" if ENV['DEBUG']
         @frames.get(params['frameId'])&.loaded!
       end
 
@@ -516,7 +537,7 @@ module Capybara::Apparition
 
       @session.on 'Network.responseReceived' do |params|
         if params['type'] == 'Document'
-          @response_headers = params['response']['headers']
+          @response_headers[params['frameId']] = params['response']['headers']
           @status_code = params['response']['status']
         end
       end
@@ -596,7 +617,7 @@ module Capybara::Apparition
       unless @temp_no_redirect_headers.empty? || !navigation
         headers.delete_if { |name, value| @temp_no_redirect_headers[name] == value }
       end
-      if (accept = perm_headers.keys.find { |k| k =~ /accept/i })
+      if (accept = perm_headers.keys.find { |k| /accept/i.match? k })
         headers[accept] = perm_headers[accept]
       end
 
@@ -621,14 +642,6 @@ module Capybara::Apparition
       async_command 'Network.continueInterceptedRequest', errorReason: reason, interceptionId: id
     end
 
-    def current_frame
-      @frames.current
-    end
-
-    def main_frame
-      @frames.main
-    end
-
     def go_history(delta)
       history = command('Page.getNavigationHistory')
       entry = history['entries'][history['currentIndex'] + delta]
@@ -667,7 +680,8 @@ module Capybara::Apparition
                          executionContextId: context_id,
                          arguments: args,
                          returnByValue: false,
-                         awaitPromise: true)
+                         awaitPromise: true,
+                         userGesture: true)
       process_response(response)
     end
 
@@ -754,7 +768,11 @@ module Capybara::Apparition
       function(){
         let apparitionId=0;
         return (function ider(obj){
-          if (obj && (typeof obj == 'object') && !(obj instanceof HTMLElement) && !obj.apparitionId){
+          if (obj &&
+              (typeof obj == 'object') &&
+              !(obj instanceof HTMLElement) &&
+              !(obj instanceof CSSStyleDeclaration) &&
+              !obj.apparitionId){
             obj.apparitionId = ++apparitionId;
             Reflect.ownKeys(obj).forEach(key => ider(obj[key]))
           }

data/lib/capybara/apparition/page/frame.rb

@@ -47,10 +47,12 @@ module Capybara::Apparition
     end
 
     def loading(id)
+      puts "Setting loading to #{id}" if ENV['DEBUG']
       self.loader_id = id
     end
 
     def reloading!
+      puts 'Reloading' if ENV['DEBUG']
       self.loader_id = @prev_loader_id
     end
 
@@ -64,6 +66,7 @@ module Capybara::Apparition
 
     def loaded!
       @prev_loader_id = loader_id
+      puts "Setting loaded - was #{loader_id}" if ENV['DEBUG']
       self.loader_id = nil
     end
 

data/lib/capybara/apparition/page/frame_manager.rb

@@ -7,7 +7,7 @@ module Capybara::Apparition
     def initialize(id)
       @frames = {}
       @frames_mutex = Mutex.new
-      add(id)
+      add(id).loading(-1)
       @main_id = @current_id = id
     end
 

data/lib/capybara/apparition/page/keyboard.rb

@@ -102,8 +102,15 @@ module Capybara::Apparition
         location: 0
       )
 
+      if key.to_sym == :return
+        warn '[DEPRECATION]: Key symbol :return is deprecated in favor of :enter'
+        key = :enter
+      end
+
       definition = KEY_DEFINITIONS[key.to_sym]
-      raise KeyError, "Unknown key: #{key}" if definition.nil?
+      raise KeyError, "Unknown key: #{key}" if definition.nil? && !key.is_a?(String)
+
+      definition ||= { text: key }
 
       definition = OpenStruct.new definition
 

data/lib/capybara/apparition/utility.rb

@@ -4,7 +4,7 @@ module Capybara
   module Apparition
     class << self
       def windows?
-        RbConfig::CONFIG['host_os'] =~ /mingw|mswin|cygwin/
+        RbConfig::CONFIG['host_os'].match?(/mingw|mswin|cygwin/)
       end
 
       def mri?

data/lib/capybara/apparition/version.rb

@@ -2,6 +2,6 @@
 
 module Capybara
   module Apparition
-    VERSION = '0.1.0'
+    VERSION = '0.2.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: apparition
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Thomas Walpole
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-02-05 00:00:00.000000000 Z
+date: 2019-05-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: backports
@@ -231,13 +231,12 @@ files:
 - lib/capybara/apparition/browser/modal.rb
 - lib/capybara/apparition/browser/render.rb
 - lib/capybara/apparition/browser/window.rb
+- lib/capybara/apparition/configuration.rb
 - lib/capybara/apparition/console.rb
 - lib/capybara/apparition/cookie.rb
 - lib/capybara/apparition/cookie_jar.rb
 - lib/capybara/apparition/dev_tools_protocol/remote_object.rb
 - lib/capybara/apparition/dev_tools_protocol/session.rb
-- lib/capybara/apparition/dev_tools_protocol/target.rb
-- lib/capybara/apparition/dev_tools_protocol/target_manager.rb
 - lib/capybara/apparition/driver.rb
 - lib/capybara/apparition/driver/chrome_client.rb
 - lib/capybara/apparition/driver/launcher.rb
@@ -270,14 +269,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.3.0
+      version: 2.4.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.1
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Chrome driver using CDP for Capybara

data/lib/capybara/apparition/dev_tools_protocol/target.rb

@@ -1,64 +0,0 @@
-# frozen_string_literal: true
-
-require 'capybara/apparition/dev_tools_protocol/session'
-
-module Capybara::Apparition
-  module DevToolsProtocol
-    class Target
-      def initialize(browser, info)
-        @browser = browser
-        @info = info.dup
-        @page = nil
-      end
-
-      def info
-        @info.dup.freeze
-      end
-
-      def update(new_info)
-        @info ||= {}
-        @info.merge!(new_info)
-        info
-      end
-
-      def id
-        @info['targetId']
-      end
-
-      def context_id
-        @info['browserContextId']
-      end
-
-      def title
-        @info['title']
-      end
-
-      def url
-        @info['url']
-      end
-
-      def page
-        @page ||= begin
-          if info['type'] == 'page'
-            Page.create(@browser, create_session, id,
-                        ignore_https_errors: @browser.ignore_https_errors,
-                        js_errors: @browser.js_errors).inherit(@info.delete('inherit'))
-          else
-            nil
-          end
-        end
-      end
-
-      def close
-        @browser.command('Target.closeTarget', targetId: id)
-      end
-
-    private
-
-      def create_session
-        session_id = @browser.command('Target.attachToTarget', targetId: id)['sessionId']
-        Session.new(@browser, @browser.client, id, session_id)
-      end
-    end
-  end
-end