async-webdriver 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bb124e522f9bb2e4f525b56b1f2633a396844c1ec033de92bcb863ba5a202d76
-  data.tar.gz: d4d70538d5ce3e4c41883be74169c71dcfda403f1e3e24c28cc9ca28d2614509
+  metadata.gz: 10af3bfaf7f567c54aaa67fc66865b60e8797756762fb13b3e7f32701d234de5
+  data.tar.gz: 91a457bdbc9343cd41eb4c3ba9d63a9f81b571c1f91ffc5c315b81130c0c1d76
 SHA512:
-  metadata.gz: 329f215f5e863a1a8b01a12bf5595e5603ebd7754779ec386ba11bff7b7afd537ac5e57d73cf10c08cc760b11d1455b1344e4d34024b2ee6075a6fc8ec75d59a
-  data.tar.gz: 848396d5cf080dc1e07fcb83368263463aab0dc4151b6fee5b683408d865b14422aad77e46c5132eeeca3ab5e1d436f48f05229c5cd4ff04390e11ed1380a098
+  metadata.gz: 226ca38936a96df93d97b55ed583316a7651b528f70ac9a246e3af784959d6df1137e077903b92e94b0613a792a58ed80800f31c9cd7f4dbd518c211ff099adb
+  data.tar.gz: b1db3afdbaaaef09eb54c495a4d31bcb80a80dfe88bd25d12f6dfae68b4c3dffadc1d24f934f76dc5c643cb3b4d2e225962a91e34a2bfbd8a7eaef46fe3325fb

data/Gemfile.lock

@@ -1,14 +1,14 @@
 PATH
   remote: .
   specs:
-    async-webdriver (0.1.0)
+    async-webdriver (0.1.1)
       async-http
       selenium-webdriver
 
 GEM
   remote: https://rubygems.org/
   specs:
-    async (1.12.0)
+    async (1.13.1)
       nio4r (~> 2.3)
       timers (~> 4.1)
     async-http (0.37.7)

data/lib/async/webdriver/client.rb

@@ -3,12 +3,13 @@ require "async/queue"
 module Async
   module Webdriver
     class Client
-      def initialize(endpoint:)
+      def initialize(endpoint:, desired_capabilities: {})
         @connection = Connection.new endpoint: endpoint
+        @desired_capabilities = desired_capabilities
       end
 
       def session
-        SessionCreator.new connection: @connection
+        SessionCreator.new connection: @connection, desired_capabilities: @desired_capabilities
       end
 
       def status

data/lib/async/webdriver/connection.rb

@@ -12,6 +12,20 @@ module Async
       end
 
       def call(method:, path:nil, headers:[], body:nil)
+        task = begin
+          Async::Task.current.async { async_call(method: method, path: path, headers: headers, body: body) }
+        rescue RuntimeError => e
+          raise unless e.message == "No async task available!"
+
+          Async.run { async_call(method: method, path: path, headers: headers, body: body) }
+        end
+
+        task.wait
+      end
+
+      private
+
+      def async_call(method:, path:, headers:, body:nil)
         body_array = case body
         when Hash
           [body.to_json]
@@ -23,36 +37,32 @@ module Async
           @url
         end
 
-        task = Async.run do |t|
-          r = @internet.call method, path_or_url, headers, body_array
+        r = @internet.call method.upcase, path_or_url, headers, body_array
 
-          body = begin
-            JSON.parse r.read
-          rescue JSON::ParserError => ex
-            p ex
-            exit 1
-          end
+        body = begin
+          JSON.parse r.read
+        rescue JSON::ParserError => ex
+          p ex
+          exit 1
+        end
+
+        @internet.close
 
-          @internet.close
-
-          status = body.dig "status"
-          if status == 0
-            # POST /session has different response structure than other calls
-            if method == "post" && path == "session"
-              {
-                "id" => body.dig("sessionId"),
-                "capabilities" => body.dig("value")
-              }
-            else # everything else works like this
-              body.dig "value"
-            end
-          else
-            p body
-            raise "Error: #{status} - #{body.dig("value", "message")}"
+        status = body.dig "status"
+        if status == 0
+          # POST /session has different response structure than other calls
+          if method == "post" && path == "session"
+            {
+              "id" => body.dig("sessionId"),
+              "capabilities" => body.dig("value")
+            }
+          else # everything else works like this
+            body.dig "value"
           end
+        else
+          p body
+          raise "Error: #{status} - #{body.dig("value", "message")}"
         end
-
-        task.wait
       end
     end
   end

data/lib/async/webdriver/session_creator.rb

@@ -3,14 +3,17 @@ require "async/queue"
 module Async
   module Webdriver
     class SessionCreator
-      def initialize(connection:)
+      def initialize(connection:, desired_capabilities: {})
         @connection = connection
+        @desired_capabilities = desired_capabilities
       end
 
       def create!
-        value = @connection.call method: "post", path: "session", body: {
-          desiredCapabilities: {}
-        }
+        value = @connection.call(
+          method: "post",
+          path: "session",
+          body: { desiredCapabilities: @desired_capabilities }
+        )
 
         Session.new json: value, connection: @connection
       end

data/lib/async/webdriver/version.rb

@@ -1,5 +1,5 @@
 module Async
   module Webdriver
-    VERSION = "0.1.0"
+    VERSION = "0.1.1"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: async-webdriver
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Matti Paksula
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-01-02 00:00:00.000000000 Z
+date: 2019-01-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: async-http