webkit_remote 0.4.1 → 0.5.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 95ab18456b034195d0905cf56ab3a5d7915ce186
+  data.tar.gz: fc8dad063ba5493c45e6ff9017b9c954d1a09453
+SHA512:
+  metadata.gz: 8170978254202fcfba7393ceeb536292302d1c4710ac6e77d03f271e0faccd0ccc5a9fcdf58549edbe342301a2af241c0eab0822845444dc9f64d09ae9fc35c2
+  data.tar.gz: 90c803cb8956bc3da08a4c474aae08f80632528b4f5f3dbdaff555845150724ad4681530a2acd1a7034687d19770daa332dda2c9563df439ee309f7ba03db6d8

data/.travis.yml

@@ -1,8 +1,10 @@
 language: ruby
 rvm:
   - 1.9.3
+  - 2.0.0
+  - 2.1.0
 before_install:
-  - "sudo sh -c \"echo \\\"deb https://dl.google.com/linux/deb/ stable main\\\" >> /etc/apt/sources.list\""
+  - "sudo sh -c \"echo \\\"deb http://dl.google.com/linux/deb/ stable main\\\" >> /etc/apt/sources.list\""
   - "sudo wget -q -O - https://dl-ssl.google.com/linux/linux_signing_key.pub | sudo apt-key add -"
   - "sudo apt-get -qq update"
   - "sudo apt-get -qq install google-chrome-stable"

data/Gemfile

@@ -1,18 +1,16 @@
 source 'http://rubygems.org'
-gem 'eventmachine', '>= 1.0.0'
-gem 'faye-websocket', '>= 0.4.6'
-gem 'posix-spawn', '>= 0.3.6'
+gem 'ws_sync_client', '>= 0.1.1'
+gem 'posix-spawn', '>= 0.3.8'
 
 group :development do
-  gem 'bundler', '>= 1.2.1'
-  gem 'debugger', '>= 1.2.1'
-  gem 'jeweler', '>= 1.8.4'
-  gem 'minitest', '>= 4.1.0'
-  gem 'puma', '>= 1.6.3'
-  gem 'rack', '>= 1.4.1'
+  gem 'bundler', '>= 1.5.3'
+  gem 'debugger', '>= 1.6.6'
+  gem 'jeweler', '>= 2.0.1'
+  gem 'minitest', '>= 5.3.0'
+  gem 'puma', '>= 2.8.0'
+  gem 'rack', '>= 1.5.2'
   gem 'rack-contrib', '>= 1.1.0'
-  gem 'rdoc', '>= 3.12'
-  gem 'ruby-prof', '>= 0.11.2'
-  gem 'simplecov', '>= 0.7.1'
-  gem 'yard', '>= 0.8.3'
+  gem 'rdoc', '>= 4.1.1'
+  gem 'simplecov', '>= 0.8.2'
+  gem 'yard', '>= 0.8.7.3'
 end

data/Gemfile.lock

@@ -1,57 +1,89 @@
 GEM
   remote: http://rubygems.org/
   specs:
+    addressable (2.3.5)
+    builder (3.2.2)
     columnize (0.3.6)
-    debugger (1.2.1)
+    debugger (1.6.6)
       columnize (>= 0.3.1)
-      debugger-linecache (~> 1.1.1)
-      debugger-ruby_core_source (~> 1.1.4)
-    debugger-linecache (1.1.2)
-      debugger-ruby_core_source (>= 1.1.1)
-    debugger-ruby_core_source (1.1.4)
-    eventmachine (1.0.0)
-    faye-websocket (0.4.6)
-      eventmachine (>= 0.12.0)
-    git (1.2.5)
-    jeweler (1.8.4)
-      bundler (~> 1.0)
+      debugger-linecache (~> 1.2.0)
+      debugger-ruby_core_source (~> 1.3.2)
+    debugger-linecache (1.2.0)
+    debugger-ruby_core_source (1.3.2)
+    descendants_tracker (0.0.3)
+    docile (1.1.3)
+    faraday (0.9.0)
+      multipart-post (>= 1.2, < 3)
+    git (1.2.6)
+    github_api (0.11.3)
+      addressable (~> 2.3)
+      descendants_tracker (~> 0.0.1)
+      faraday (~> 0.8, < 0.10)
+      hashie (>= 1.2)
+      multi_json (>= 1.7.5, < 2.0)
+      nokogiri (~> 1.6.0)
+      oauth2
+    hashie (2.0.5)
+    highline (1.6.21)
+    jeweler (2.0.1)
+      builder
+      bundler (>= 1.0)
       git (>= 1.2.5)
+      github_api
+      highline (>= 1.6.15)
+      nokogiri (>= 1.5.10)
       rake
       rdoc
-    json (1.7.5)
-    minitest (4.2.0)
-    multi_json (1.3.7)
-    posix-spawn (0.3.6)
-    puma (1.6.3)
+    json (1.8.1)
+    jwt (0.1.11)
+      multi_json (>= 1.5)
+    mini_portile (0.5.2)
+    minitest (5.3.1)
+    multi_json (1.9.0)
+    multi_xml (0.5.5)
+    multipart-post (2.0.0)
+    nokogiri (1.6.1)
+      mini_portile (~> 0.5.0)
+    oauth2 (0.9.3)
+      faraday (>= 0.8, < 0.10)
+      jwt (~> 0.1.8)
+      multi_json (~> 1.3)
+      multi_xml (~> 0.5)
       rack (~> 1.2)
-    rack (1.4.1)
+    posix-spawn (0.3.8)
+    puma (2.8.1)
+      rack (>= 1.1, < 2.0)
+    rack (1.5.2)
     rack-contrib (1.1.0)
       rack (>= 0.9.1)
-    rake (10.0.1)
-    rdoc (3.12)
+    rake (10.1.1)
+    rdoc (4.1.1)
       json (~> 1.4)
-    ruby-prof (0.11.2)
-    simplecov (0.7.1)
-      multi_json (~> 1.0)
-      simplecov-html (~> 0.7.1)
-    simplecov-html (0.7.1)
-    yard (0.8.3)
+    simplecov (0.8.2)
+      docile (~> 1.1.0)
+      multi_json
+      simplecov-html (~> 0.8.0)
+    simplecov-html (0.8.0)
+    websocket (1.1.2)
+    websocket-native (1.0.0)
+    ws_sync_client (0.1.1)
+      websocket (>= 1.1.2)
+      websocket-native (>= 1.0.0)
+    yard (0.8.7.3)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  bundler (>= 1.2.1)
-  debugger (>= 1.2.1)
-  eventmachine (>= 1.0.0)
-  faye-websocket (>= 0.4.6)
-  jeweler (>= 1.8.4)
-  minitest (>= 4.1.0)
-  posix-spawn (>= 0.3.6)
-  puma (>= 1.6.3)
-  rack (>= 1.4.1)
+  bundler (>= 1.5.3)
+  debugger (>= 1.6.6)
+  jeweler (>= 2.0.1)
+  minitest (>= 5.3.0)
+  posix-spawn (>= 0.3.8)
+  puma (>= 2.8.0)
+  rack (>= 1.5.2)
   rack-contrib (>= 1.1.0)
-  rdoc (>= 3.12)
-  ruby-prof (>= 0.11.2)
-  simplecov (>= 0.7.1)
-  yard (>= 0.8.3)
+  rdoc (>= 4.1.1)
+  simplecov (>= 0.8.2)
+  ws_sync_client (>= 0.1.1)
+  yard (>= 0.8.7.3)

data/VERSION

@@ -1 +1 @@
-0.4.1
+0.5.0

data/lib/webkit_remote/browser.rb

@@ -66,6 +66,10 @@ class Browser
       debug_url = json_tab['webSocketDebuggerUrl']
       Tab.new self, debug_url, title: title, url: url
     end
+    # HACK(pwnall): work around the nasty Google Hangouts integration
+    tabs.select do |tab|
+      tab.url != 'chrome-extension://nkeimhogjdpnpccoofpliimaahmaaome/background.html'
+    end
   end
 
   # @return [Boolean] if true, a WebkitRemote::Process will be stopped when

data/lib/webkit_remote/client/network_events.rb

@@ -104,55 +104,6 @@ class NetworkCacheHit < WebkitRemote::Event
   end
 end  # class WebkitRemote::Event::NetworkCacheHit
 
-# Emitted when a resource is served from the local cache.
-class NetworkMemoryCacheHit < WebkitRemote::Event
-  register 'Network.requestServedFromMemoryCache'
-
-  # @return [WebkitRemote::Client::NetworkResource] information about the
-  #     resource fetched by this network operation
-  attr_reader :resource
-
-  # @return [WebkitRemote::Client::NetworkCacheEntry] cached information used
-  #     to produce the resource
-  attr_reader :cache_data
-
-  # @return [String] the URL of the document that caused this network request
-  attr_reader :document_url
-
-  # @return [WebkitRemote::Client::NetworkRequestInitiator] cause for this
-  #     network request
-  attr_reader :initiator
-
-  # @return [Number] the event timestamp
-  attr_reader :timestamp
-
-  # @private Use Event#for instead of calling this constructor directly.
-  def initialize(rpc_event, client)
-    super
-
-    if raw_data['resource']
-      @cache_data = WebkitRemote::Client::NetworkCacheEntry.new(
-          raw_data['resource'])
-    end
-    @document_url = raw_data['documentURL']
-    if raw_data['initiator']
-      @initiator = WebkitRemote::Client::NetworkRequestInitiator.new(
-          raw_data['initiator'])
-    end
-    @loader_id = raw_data['loaderId']
-    @timestamp = raw_data['timestamp']
-
-    @resource = client.network_resource raw_data['requestId']
-    @resource.set_document_url @document_url
-    @resource.set_initiator @initiator
-    if @cache_data
-      @resource.set_response @cache_data.response
-      @resource.set_type @cache_data.type
-    end
-    @resource.add_event self
-  end
-end  # class WebkitRemote::Event::NetworkMemoryCacheHit
-
 # Emitted right before a network request.
 class NetworkRequest < WebkitRemote::Event
   register 'Network.requestWillBeSent'

data/lib/webkit_remote/process.rb

@@ -28,12 +28,25 @@ class Process
     @data_dir = Dir.mktmpdir 'webkit-remote'
     @pid = nil
     @xvfb_pid = nil
-    @cli = chrome_cli opts
+    if opts[:window]
+      @window = opts[:window]
+    else
+      @window = { }
+    end
     if opts[:xvfb]
       @xvfb_cli = xvfb_cli opts
+      if opts[:xvfb].respond_to? :[]
+        @window[:width] ||= opts[:xvfb][:width]
+        @window[:height] ||= opts[:xvfb][:height]
+      end
     else
       @xvfb_cli = nil
     end
+    @window[:top] ||= 0
+    @window[:left] ||= 0
+    @window[:width] ||= 256
+    @window[:height] ||= 256
+    @cli = chrome_cli opts
   end
 
   # Starts the browser process.
@@ -52,7 +65,7 @@ class Process
     end
 
     unless @pid = POSIX::Spawn.spawn(*@cli)
-      # The launch failed
+      # The launch failed.
       stop
       return nil
     end
@@ -135,20 +148,21 @@ class Process
     [
       chrome_env(opts),
       self.class.chrome_binary,
+      '--bwsi',  # disable extensions, sync, bookmarks
       '--disable-default-apps',  # no bundled apps
-      '--disable-desktop-shortcuts',  # don't mess with the desktop
       '--disable-extensions',  # no extensions
-      '--disable-internal-flash',  # no plugins
       '--disable-java',  # no plugins
       '--disable-logging',  # don't trash stdout / stderr
       '--disable-plugins',  # no native content
       '--disable-prompt-on-repost',   # no confirmation dialog on POST refresh
       '--disable-sync',  # no talking with the Google servers
+      '--disable-translate',  # no Google Translate calls
       '--incognito',  # don't use old state, don't preserve state
       '--homepage=about:blank',  # don't go to Google in new tabs
       '--keep-alive-for-test',  # don't kill process if the last window dies
       '--lang=en-US',  # set a default language
       '--log-level=3',  # FATAL, because there's no setting for "none"
+      '--mute-audio',  # don't let the computer make noise
       '--no-default-browser-check',  # don't hang when Chrome isn't default
       '--no-experiments',  # not sure this is useful
       '--no-first-run',  # don't show the help UI
@@ -158,8 +172,9 @@ class Process
       '--noerrdialogs',  # don't hang on error dialogs
       "--remote-debugging-port=#{@port}",  # Webkit remote debugging
       "--user-data-dir=#{@data_dir}",  # really ensure a clean slate
-      '--window-position=0,0',  # remove randomness source
-      '--window-size=256,256',  # remove randomness source
+      "--window-position=#{@window[:left]},#{@window[:top]}",  # randomness--
+      "--window-size=#{@window[:width]},#{@window[:height]}",  # randomness--
+
       'about:blank',  # don't load the homepage
       {
         chdir: @data_dir,

data/lib/webkit_remote/rpc.rb

@@ -1,7 +1,5 @@
-require 'eventmachine'
-require 'faye/websocket'
 require 'json'
-require 'thread'
+require 'ws_sync_client'
 
 module WebkitRemote
 
@@ -17,21 +15,17 @@ class Rpc
       raise ArgumentError, 'Target tab not specified'
     end
     @closed = false
-    @send_queue = EventMachine::Queue.new
-    @recv_queue = Queue.new
     @next_id = 2
     @events = []
 
-    self.class.em_start
     @debug_url = tab.debug_url
-    @web_socket = Faye::WebSocket::Client.new @debug_url
-    setup_web_socket
+    @web_socket = WsSyncClient.new @debug_url
   end
 
   # Remote debugging RPC call.
   #
   # See the following URL for implemented calls.
-  #     https://developers.google.com/chrome-developer-tools/docs/protocol/1.0/index
+  #     https://developers.google.com/chrome-developer-tools/docs/protocol/1.1/index
   #
   # @param [String] method name of the RPC method to be invoked
   # @param [Hash<String, Object>, nil] params parameters for the RPC method to
@@ -47,7 +41,7 @@ class Rpc
     }
     request[:params] = params if params
     request_json = JSON.dump request
-    @send_queue.push request_json
+    @web_socket.send_frame request_json
 
     loop do
       result = receive_message request_id
@@ -83,7 +77,6 @@ class Rpc
     @closed = true
     @web_socket.close
     @web_socket = nil
-    self.class.em_stop
     self
   end
 
@@ -95,39 +88,6 @@ class Rpc
   # @return [String] points to this client's Webkit remote debugging server
   attr_reader :debug_url
 
-  # Hooks up the event handlers of the WebSocket client.
-  def setup_web_socket
-    @web_socket.onopen = lambda do |event|
-      send_request
-      @web_socket.onmessage = lambda do |event|
-        data = event.data
-        EventMachine.defer do
-          @recv_queue.push data
-        end
-      end
-      @web_socket.onclose = lambda do |event|
-        code = event.code
-        EventMachine.defer do
-          @recv_queue.push code
-        end
-      end
-    end
-  end
-  private :setup_web_socket
-
-  # One iteration of the request sending loop.
-  #
-  # RPC requests are JSON-serialized on the sending thread, then pushed into
-  # the send queue, which is an EventMachine queue. On the reactor thread, the
-  # serialized message is sent as a WebSocket frame.
-  def send_request
-    @send_queue.pop do |json|
-      @web_socket.send json
-      send_request
-    end
-  end
-  private :send_request
-
   # Blocks until a WebKit message is received, then parses it.
   #
   # RPC notifications are added to the @events array.
@@ -137,11 +97,7 @@ class Rpc
   # @return [Hash<String, Object>, nil] a Hash containing the RPC result if an
   #     expected RPC response was received; nil if an RPC notice was received
   def receive_message(expected_id)
-    json = @recv_queue.pop
-    unless json.respond_to? :to_str
-      close
-      raise RuntimeError, 'The Webkit debugging server closed the WebSocket'
-    end
+    json = @web_socket.recv_frame
     begin
       data = JSON.parse json
     rescue JSONError
@@ -155,7 +111,9 @@ class Rpc
         raise RuntimeError, 'Out of sequence RPC response id'
       end
       if data['error']
-        raise RuntimeError, "Error #{data['error']['code']}"
+        code = data['error']['code']
+        message = data['error']['message']
+        raise RuntimeError, "RPC Error #{code}: #{message}"
       end
       return data['result']
     elsif data['method']
@@ -169,41 +127,6 @@ class Rpc
     end
   end
   private :receive_message
-
-  # Sets up an EventMachine reactor if necessary.
-  def self.em_start
-    @em_start_lock.synchronize do
-      if @em_clients == 0 and @em_thread.nil?
-        em_ready = ConditionVariable.new
-        @em_thread = Thread.new do
-          EventMachine.run do
-            @em_start_lock.synchronize { em_ready.signal }
-          end
-        end
-        em_ready.wait @em_start_lock
-      end
-      @em_clients += 1
-    end
-  end
-  @em_clients = 0
-  @em_start_lock = Mutex.new
-  @em_thread = nil
-
-  # Shuts down an EventMachine reactor if necessary.
-  def self.em_stop
-    @em_start_lock.synchronize do
-      @em_clients -= 1
-      if @em_clients == 0
-        if @em_thread
-          EventMachine.stop_event_loop
-          # HACK(pwnall): having these in slows down the code a lot
-          # EventMachine.reactor_thread.join
-          # @em_thread.join
-        end
-        @em_thread = nil
-      end
-    end
-  end
 end  # class WebkitRemote::Rpc
 
-end  # namespace webkitRemote
+end  # namespace WebkitRemote

data/lib/webkit_remote/top_level.rb

@@ -3,6 +3,7 @@ module WebkitRemote
   # Launches a WebKit process locally, and sets up a debugger client for it.
   #
   # @param (see WebkitRemote::Process#initialize)
+  # @option (see WebkitRemote::Process#initialize)
   # @return [WebkitRemote::Client] a debugging client connected to a local
   #     WebKit process; the client will automatically stop the process when
   #     closed

data/test/helper.rb

@@ -7,7 +7,7 @@ rescue Bundler::BundlerError => e
   $stderr.puts "Run `bundle install` to install missing gems"
   exit e.status_code
 end
-require 'minitest/unit'
+require 'minitest/autorun'
 require 'minitest/spec'
 
 require 'simplecov'
@@ -23,20 +23,35 @@ require 'thread'
 Thread.abort_on_exception = true
 
 # Launch a dev server and wait until it starts.
-pid = Process.spawn 'bundle exec puma --port 9969 --quiet --threads 1:1 ' +
-    'test/fixtures/config.ru', :in => '/dev/null', :out => '/dev/null'
-Process.detach pid
-at_exit { Process.kill 'TERM', pid }
-loop do
-  begin
-    response = Net::HTTP.get_response URI.parse('http://localhost:9969')
-    break if response.kind_of?(Net::HTTPSuccess)
-  rescue SystemCallError
-    sleep 0.1
+module RunPumaInMinitest
+  def before_setup
+    super
+    @_puma_pid = Process.spawn 'bundle exec puma --port 9969 --quiet ' +
+        '--threads 1:1 test/fixtures/config.ru', in: '/dev/null',
+        out: '/dev/null'
+    Process.detach @_puma_pid
+
+    loop do
+      begin
+        response = Net::HTTP.get_response URI.parse('http://localhost:9969')
+        break if response.kind_of?(Net::HTTPSuccess)
+      rescue SystemCallError
+        sleep 0.1
+      end
+    end
+  end
+
+  def after_teardown
+    Process.kill 'TERM', @_puma_pid
+    super
   end
 end
+class MiniTest::Test
+  include RunPumaInMinitest
+end
 
-class MiniTest::Unit::TestCase
+#class MiniTest::Test
+class MiniTest::Test
   # URL for a file in the test/fixtures directory.
   def fixture_url(name, type = :html)
     "http://localhost:9969/#{type}/#{name}.#{type}"
@@ -46,5 +61,3 @@ class MiniTest::Unit::TestCase
     File.join File.dirname(__FILE__), "fixtures/#{type}/#{name}.#{type}"
   end
 end
-
-MiniTest::Unit.autorun

data/test/webkit_remote/client/js_object_test.rb

@@ -37,21 +37,6 @@ describe WebkitRemote::Client::JsObject do
                 keys.sort.must_equal ['answer', 'test']
       end
 
-      it 'recognizes writable properties' do
-        @object.properties['answer'].writable?.must_equal true
-        @object.properties['constructor'].writable?.must_equal false
-      end
-
-      it 'recognizes configurable properties' do
-        @object.properties['answer'].configurable?.must_equal true
-        @object.properties['constructor'].configurable?.must_equal false
-      end
-
-      it 'recognizes enumerable properties' do
-        @object.properties['answer'].enumerable?.must_equal true
-        @object.properties['constructor'].enumerable?.must_equal false
-      end
-
       describe 'after property update' do
         before do
           @object.properties['DONE']
@@ -73,15 +58,52 @@ describe WebkitRemote::Client::JsObject do
       end
     end
 
-    describe 'with the XMHttpRequest built-in' do
+    describe 'with an object with custom properties' do
       before :each do
-        @object = @client.remote_eval 'XMLHttpRequest'
-      end
-
-      it 'recognizes configurable, non-writable, enumerable properties' do
-        @object.properties['DONE'].configurable?.must_equal true
-        @object.properties['DONE'].writable?.must_equal false
-        @object.properties['DONE'].enumerable?.must_equal true
+        @object = @client.remote_eval <<JS_END
+(function() {
+  var o = new Object();
+  Object.defineProperty(o, 'hidden', {
+    enumerable: false, configurable: true,
+    get: function() { return 'hidden'; },
+    set: function(newValue) { }
+  });
+  Object.defineProperty(o, 'readOnly', {
+    enumerable: true, configurable: true,
+    get: function() { return 'hidden'; }
+  });
+  Object.defineProperty(o, 'writable', {
+    enumerable: true, configurable: true, writable: true,
+    value: 42
+  });
+  Object.defineProperty(o, 'fixed', {
+    enumerable: true, configurable: false,
+    get: function() { return 'hidden'; },
+    set: function(newValue) { }
+  });
+  return o;
+})();
+JS_END
+      end
+
+      it 'recognizes non-writable properties' do
+        @object.properties['readOnly'].writable?.must_equal false
+        @object.properties['readOnly'].configurable?.must_equal true
+        @object.properties['readOnly'].enumerable?.must_equal true
+
+        @object.properties['writable'].writable?.must_equal true
+        @object.properties['writable'].configurable?.must_equal true
+        @object.properties['writable'].enumerable?.must_equal true
+      end
+
+      it 'recognizes non-enumerable properties' do
+        @object.properties['hidden'].configurable?.must_equal true
+        @object.properties['hidden'].enumerable?.must_equal false
+      end
+
+      it 'recognizes non-configurable properties' do
+        @object.properties['fixed'].configurable?.must_equal false
+        @object.properties['fixed'].enumerable?.must_equal true
       end
     end
   end

data/test/webkit_remote/client/network_test.rb

@@ -1,12 +1,12 @@
 require File.expand_path('../../helper.rb', File.dirname(__FILE__))
 
 describe WebkitRemote::Client::Network do
-  before :all do
+  before :each do
     @client = WebkitRemote.local port: 9669
     @client.console_events = true
     @client.disable_cache = true
   end
-  after :all do
+  after :each do
     @client.close
   end
 
@@ -23,11 +23,11 @@ describe WebkitRemote::Client::Network do
   end
 
   describe 'without network events enabled' do
-    before :all do
+    before :each do
       @client.network_events = false
       @client.navigate_to fixture_url(:network)
       @events = @client.wait_for type: WebkitRemote::Event::ConsoleMessage,
-                                 level: :log
+                                 level: :log, text: 'Test done'
     end
 
     it 'does not receive any network event' do
@@ -47,12 +47,12 @@ describe WebkitRemote::Client::Network do
   end
 
   describe 'with network events enabled' do
-    before :all do
+    before :each do
       @client.disable_cache = true
       @client.network_events = true
       @client.navigate_to fixture_url(:network)
       @events = @client.wait_for type: WebkitRemote::Event::ConsoleMessage,
-                                 level: :log
+                                 level: :log, text: 'Test done'
       @requests = @events.select do |event|
         event.kind_of? WebkitRemote::Event::NetworkRequest
       end
@@ -65,7 +65,7 @@ describe WebkitRemote::Client::Network do
       @chunks = @events.select do |event|
         event.kind_of? WebkitRemote::Event::NetworkData
       end
-      @failures = @events.select do |event|
+      @failure_events = @events.select do |event|
         event.kind_of? WebkitRemote::Event::NetworkFailure
       end
       @resources = @client.network_resources
@@ -125,7 +125,7 @@ describe WebkitRemote::Client::Network do
     it 'parses the initial response inside a NetworkResponse event' do
       @responses[0].type.must_equal :document
       @responses[0].response.
-                   must_be_kind_of WebkitRemote::Client::NetworkResponse
+                    must_be_kind_of WebkitRemote::Client::NetworkResponse
       @responses[0].response.url.must_equal fixture_url(:network)
       @responses[0].response.status.must_equal 200
       @responses[0].response.status_text.must_equal 'OK'
@@ -133,8 +133,8 @@ describe WebkitRemote::Client::Network do
       @responses[0].response.headers['X-Unit-Test'].must_equal 'webkit-remote'
       @responses[0].response.mime_type.must_equal 'text/html'
       @responses[0].response.request_headers.must_include 'User-Agent'
-      @responses[0].response.request_headers['User-Agent']
-                   .must_match(/webkit/i)
+      @responses[0].response.request_headers['User-Agent'].
+                    must_match(/webkit/i)
       @responses[0].response.from_cache.must_equal false
       @responses[0].response.connection_reused.must_equal false
     end
@@ -142,7 +142,7 @@ describe WebkitRemote::Client::Network do
     it 'parses a 404 response inside a NetworkResponse event' do
       @responses[1].type.must_equal :script
       @responses[1].response.
-                   must_be_kind_of WebkitRemote::Client::NetworkResponse
+                    must_be_kind_of WebkitRemote::Client::NetworkResponse
       @responses[1].response.url.
                     must_equal fixture_url(:network_not_found, :js)
       @responses[1].response.status.must_equal 404
@@ -151,8 +151,8 @@ describe WebkitRemote::Client::Network do
       @responses[1].response.headers['X-Unit-Test'].must_equal 'webkit-remote'
       @responses[1].response.mime_type.must_equal 'text/plain'
       @responses[1].response.request_headers.must_include 'User-Agent'
-      @responses[1].response.request_headers['User-Agent']
-                   .must_match(/webkit/i)
+      @responses[1].response.request_headers['User-Agent'].
+                    must_match(/webkit/i)
       @responses[1].response.from_cache.must_equal false
     end
 
@@ -183,13 +183,13 @@ describe WebkitRemote::Client::Network do
     end
 
     it 'receives NetworkFailure events' do
-      @failures.wont_be :empty?
+      @failure_events.wont_be :empty?
     end
 
     it 'parses NetworkFailure events' do
-      @failures[0].resource.must_equal @requests[1].resource
-      @failures[0].error.wont_equal nil
-      @failures[0].canceled.must_equal true
+      @failure_events[0].resource.must_equal @requests[1].resource
+      @failure_events[0].error.wont_equal nil
+      @failure_events[0].canceled.must_equal true
     end
 
     it 'collects request and response data in NetworkResources' do
@@ -200,8 +200,8 @@ describe WebkitRemote::Client::Network do
       @resources[1].document_url.must_equal fixture_url(:network)
       @resources[1].initiator.must_equal @requests[1].initiator
       @resources[1].canceled.must_equal true
-      @resources[1].error.must_equal @failures[0].error
-      @resources[1].last_event.must_equal @failures[0]
+      @resources[1].error.must_equal @failure_events[0].error
+      @resources[1].last_event.must_equal @failure_events[0]
       @resources[1].client.must_equal @client
 
       @resources[2].must_equal @requests[2].resource
@@ -215,7 +215,18 @@ describe WebkitRemote::Client::Network do
       @resources[2].last_event.must_equal @loads[1]
       @resources[2].client.must_equal @client
 
-      @resources[-1].last_event.must_equal @chunks[-1]
+      @resources[3].must_equal @requests[3].resource
+      @resources[3].request.must_equal @requests[3].request
+      @resources[3].response.must_equal @responses[3].response
+      @resources[3].type.must_equal :xhr
+      @resources[3].document_url.must_equal fixture_url(:network)
+      @resources[3].initiator.must_equal @requests[3].initiator
+      @resources[3].canceled.must_equal false
+      @resources[3].error.must_equal nil
+      @resources[3].last_event.must_equal @loads[2]
+      @resources[3].client.must_equal @client
+
+      @resources[-1].last_event.must_equal @loads[-1]
     end
 
     it 'retrieves the body for a text NetworkResource' do
@@ -224,21 +235,22 @@ describe WebkitRemote::Client::Network do
 
     it 'retrieves the body for a binary NetworkResource' do
       skip 'waiting for http://crbug.com/160397'
-      @resources[2].body.must_equal File.binread(fixture_path(:network, :png))
+      @resources[3].body.must_equal File.binread(fixture_path(:network, :png))
     end
   end
 
   describe 'and a cached request' do
-    before :all do
+    before :each do
       @client.disable_cache = false
       @client.navigate_to fixture_url(:network)
-      @client.wait_for type: WebkitRemote::Event::ConsoleMessage, level: :log
+      @client.wait_for type: WebkitRemote::Event::ConsoleMessage, level: :log,
+                       text: 'Test done'
       @client.clear_all
 
       @client.network_events = true
       @client.navigate_to fixture_url(:network)
       @events = @client.wait_for type: WebkitRemote::Event::ConsoleMessage,
-                                 level: :log
+                                 level: :log, text: 'Test done'
       @requests = @events.select do |event|
         event.kind_of? WebkitRemote::Event::NetworkRequest
       end
@@ -254,9 +266,6 @@ describe WebkitRemote::Client::Network do
       @hits = @events.select do |event|
         event.kind_of? WebkitRemote::Event::NetworkCacheHit
       end
-      @memory_hits = @events.select do |event|
-        event.kind_of? WebkitRemote::Event::NetworkMemoryCacheHit
-      end
 
       @resources = @client.network_resources
     end
@@ -268,10 +277,5 @@ describe WebkitRemote::Client::Network do
     it 'parses NetworkCacheHits events' do
       @hits[0].resource.must_equal @requests[2].resource
     end
-
-    it 'receives NetworkMemoryCacheHit events' do
-      skip 'waiting for http://crbug.com/160404'
-      @memory_hits.wont_be :empty?
-    end
   end
 end

data/test/webkit_remote/event_test.rb

@@ -24,10 +24,10 @@ describe WebkitRemote::Event do
 
     describe 'matches' do
       it 'handles single conditions' do
-        @event.matches?(:class => WebkitRemote::Event::PageLoaded).
+        @event.matches?(class: WebkitRemote::Event::PageLoaded).
                must_equal true
         @event.matches?(type: WebkitRemote::Event).must_equal true
-        @event.matches?(:class => WebkitRemote::Event::PageDomReady).
+        @event.matches?(class: WebkitRemote::Event::PageDomReady).
                must_equal false
         @event.matches?(name: 'Page.loadEventFired').must_equal true
         @event.matches?(name: 'loadEventFired').must_equal false

data/test/webkit_remote/process_test.rb

@@ -51,6 +51,8 @@ describe WebkitRemote::Process do
             pass
           rescue Errno::ECONNRESET
             pass
+          rescue Errno::ECONNREFUSED
+            pass
           end
         end
       end
@@ -96,6 +98,8 @@ describe WebkitRemote::Process do
             pass
           rescue Errno::ECONNRESET
             pass
+          rescue Errno::ECONNREFUSED
+            pass
           end
         end
       end

data/test/webkit_remote/rpc_test.rb

@@ -17,7 +17,7 @@ describe WebkitRemote::Rpc do
   describe 'call' do
     before do
       @result = @rpc.call 'Runtime.evaluate', expression: '1 + 2',
-                                                returnByValue: true
+                                              returnByValue: true
     end
 
     it 'produces the correct result' do

data/webkit_remote.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "webkit_remote"
-  s.version = "0.4.1"
+  s.version = "0.5.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Victor Costan"]
-  s.date = "2012-11-16"
+  s.date = "2014-03-18"
   s.description = "Launches Google Chrome instances and controls them via the Remote Debugging server"
   s.email = "victor@costan.us"
   s.extra_rdoc_files = [
@@ -69,58 +69,52 @@ Gem::Specification.new do |s|
   s.homepage = "http://github.com/pwnall/webkit_remote"
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.24"
+  s.rubygems_version = "2.0.14"
   s.summary = "Client for the Webkit Remote Debugging server"
 
   if s.respond_to? :specification_version then
-    s.specification_version = 3
+    s.specification_version = 4
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<eventmachine>, [">= 1.0.0"])
-      s.add_runtime_dependency(%q<faye-websocket>, [">= 0.4.6"])
-      s.add_runtime_dependency(%q<posix-spawn>, [">= 0.3.6"])
-      s.add_development_dependency(%q<bundler>, [">= 1.2.1"])
-      s.add_development_dependency(%q<debugger>, [">= 1.2.1"])
-      s.add_development_dependency(%q<jeweler>, [">= 1.8.4"])
-      s.add_development_dependency(%q<minitest>, [">= 4.1.0"])
-      s.add_development_dependency(%q<puma>, [">= 1.6.3"])
-      s.add_development_dependency(%q<rack>, [">= 1.4.1"])
+      s.add_runtime_dependency(%q<ws_sync_client>, [">= 0.1.1"])
+      s.add_runtime_dependency(%q<posix-spawn>, [">= 0.3.8"])
+      s.add_development_dependency(%q<bundler>, [">= 1.5.3"])
+      s.add_development_dependency(%q<debugger>, [">= 1.6.6"])
+      s.add_development_dependency(%q<jeweler>, [">= 2.0.1"])
+      s.add_development_dependency(%q<minitest>, [">= 5.3.0"])
+      s.add_development_dependency(%q<puma>, [">= 2.8.0"])
+      s.add_development_dependency(%q<rack>, [">= 1.5.2"])
       s.add_development_dependency(%q<rack-contrib>, [">= 1.1.0"])
-      s.add_development_dependency(%q<rdoc>, [">= 3.12"])
-      s.add_development_dependency(%q<ruby-prof>, [">= 0.11.2"])
-      s.add_development_dependency(%q<simplecov>, [">= 0.7.1"])
-      s.add_development_dependency(%q<yard>, [">= 0.8.3"])
+      s.add_development_dependency(%q<rdoc>, [">= 4.1.1"])
+      s.add_development_dependency(%q<simplecov>, [">= 0.8.2"])
+      s.add_development_dependency(%q<yard>, [">= 0.8.7.3"])
     else
-      s.add_dependency(%q<eventmachine>, [">= 1.0.0"])
-      s.add_dependency(%q<faye-websocket>, [">= 0.4.6"])
-      s.add_dependency(%q<posix-spawn>, [">= 0.3.6"])
-      s.add_dependency(%q<bundler>, [">= 1.2.1"])
-      s.add_dependency(%q<debugger>, [">= 1.2.1"])
-      s.add_dependency(%q<jeweler>, [">= 1.8.4"])
-      s.add_dependency(%q<minitest>, [">= 4.1.0"])
-      s.add_dependency(%q<puma>, [">= 1.6.3"])
-      s.add_dependency(%q<rack>, [">= 1.4.1"])
+      s.add_dependency(%q<ws_sync_client>, [">= 0.1.1"])
+      s.add_dependency(%q<posix-spawn>, [">= 0.3.8"])
+      s.add_dependency(%q<bundler>, [">= 1.5.3"])
+      s.add_dependency(%q<debugger>, [">= 1.6.6"])
+      s.add_dependency(%q<jeweler>, [">= 2.0.1"])
+      s.add_dependency(%q<minitest>, [">= 5.3.0"])
+      s.add_dependency(%q<puma>, [">= 2.8.0"])
+      s.add_dependency(%q<rack>, [">= 1.5.2"])
       s.add_dependency(%q<rack-contrib>, [">= 1.1.0"])
-      s.add_dependency(%q<rdoc>, [">= 3.12"])
-      s.add_dependency(%q<ruby-prof>, [">= 0.11.2"])
-      s.add_dependency(%q<simplecov>, [">= 0.7.1"])
-      s.add_dependency(%q<yard>, [">= 0.8.3"])
+      s.add_dependency(%q<rdoc>, [">= 4.1.1"])
+      s.add_dependency(%q<simplecov>, [">= 0.8.2"])
+      s.add_dependency(%q<yard>, [">= 0.8.7.3"])
     end
   else
-    s.add_dependency(%q<eventmachine>, [">= 1.0.0"])
-    s.add_dependency(%q<faye-websocket>, [">= 0.4.6"])
-    s.add_dependency(%q<posix-spawn>, [">= 0.3.6"])
-    s.add_dependency(%q<bundler>, [">= 1.2.1"])
-    s.add_dependency(%q<debugger>, [">= 1.2.1"])
-    s.add_dependency(%q<jeweler>, [">= 1.8.4"])
-    s.add_dependency(%q<minitest>, [">= 4.1.0"])
-    s.add_dependency(%q<puma>, [">= 1.6.3"])
-    s.add_dependency(%q<rack>, [">= 1.4.1"])
+    s.add_dependency(%q<ws_sync_client>, [">= 0.1.1"])
+    s.add_dependency(%q<posix-spawn>, [">= 0.3.8"])
+    s.add_dependency(%q<bundler>, [">= 1.5.3"])
+    s.add_dependency(%q<debugger>, [">= 1.6.6"])
+    s.add_dependency(%q<jeweler>, [">= 2.0.1"])
+    s.add_dependency(%q<minitest>, [">= 5.3.0"])
+    s.add_dependency(%q<puma>, [">= 2.8.0"])
+    s.add_dependency(%q<rack>, [">= 1.5.2"])
     s.add_dependency(%q<rack-contrib>, [">= 1.1.0"])
-    s.add_dependency(%q<rdoc>, [">= 3.12"])
-    s.add_dependency(%q<ruby-prof>, [">= 0.11.2"])
-    s.add_dependency(%q<simplecov>, [">= 0.7.1"])
-    s.add_dependency(%q<yard>, [">= 0.8.3"])
+    s.add_dependency(%q<rdoc>, [">= 4.1.1"])
+    s.add_dependency(%q<simplecov>, [">= 0.8.2"])
+    s.add_dependency(%q<yard>, [">= 0.8.7.3"])
   end
 end
 

metadata

@@ -1,240 +1,183 @@
 --- !ruby/object:Gem::Specification
 name: webkit_remote
 version: !ruby/object:Gem::Version
-  version: 0.4.1
-  prerelease: 
+  version: 0.5.0
 platform: ruby
 authors:
 - Victor Costan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-16 00:00:00.000000000 Z
+date: 2014-03-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: eventmachine
+  name: ws_sync_client
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 0.1.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 1.0.0
-- !ruby/object:Gem::Dependency
-  name: faye-websocket
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 0.4.6
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 0.4.6
+        version: 0.1.1
 - !ruby/object:Gem::Dependency
   name: posix-spawn
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 0.3.6
+        version: 0.3.8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 0.3.6
+        version: 0.3.8
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 1.2.1
+        version: 1.5.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 1.2.1
+        version: 1.5.3
 - !ruby/object:Gem::Dependency
   name: debugger
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 1.2.1
+        version: 1.6.6
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 1.2.1
+        version: 1.6.6
 - !ruby/object:Gem::Dependency
   name: jeweler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 1.8.4
+        version: 2.0.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 1.8.4
+        version: 2.0.1
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 4.1.0
+        version: 5.3.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 4.1.0
+        version: 5.3.0
 - !ruby/object:Gem::Dependency
   name: puma
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 1.6.3
+        version: 2.8.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 1.6.3
+        version: 2.8.0
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 1.4.1
+        version: 1.5.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 1.4.1
+        version: 1.5.2
 - !ruby/object:Gem::Dependency
   name: rack-contrib
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.1.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.1.0
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '3.12'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '3.12'
-- !ruby/object:Gem::Dependency
-  name: ruby-prof
-  requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 0.11.2
+        version: 4.1.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 0.11.2
+        version: 4.1.1
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 0.7.1
+        version: 0.8.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 0.7.1
+        version: 0.8.2
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 0.8.3
+        version: 0.8.7.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 0.8.3
+        version: 0.8.7.3
 description: Launches Google Chrome instances and controls them via the Remote Debugging
   server
 email: victor@costan.us
@@ -295,29 +238,25 @@ files:
 homepage: http://github.com/pwnall/webkit_remote
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 3710674464370196221
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 2.0.14
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Client for the Webkit Remote Debugging server
 test_files: []