wda_lib 0.0.20 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 19883542a4fe2fc7642ded024233e0b232f07d56
-  data.tar.gz: 2af914564729ff76ff75974d1a21907c269b27a7
+  metadata.gz: 221802f6fc6baa68274145fde265c911c7ca03c4
+  data.tar.gz: cb2140ff5d9055afc139c88702b6ec395367d9a7
 SHA512:
-  metadata.gz: aae9e4320f23268979f7cc2aba7af70fd6a7c846da858ebeca93fca8302f4a8e33759b0044d0f94b758b210755b8799a0c30654b120d413d25758e06a60bea28
-  data.tar.gz: d9e6af8060a6d7f0451b6aeea05f2d14189ea04652b795b4b9562fb6cf68f893e261f90b4985858ade51479361869d157295b8da75a97136b18befd1f369acb6
+  metadata.gz: ff14d99fdefaf1f88bb8eddc97e261eb05fb8c7dcb0b51768ff117a51f11f48bba77c8cfe299982567797671112732428bab68b655566b5137c678530d96cea6
+  data.tar.gz: 91195e8815e41f1eabeaa0c0b8ab2aa3a0d54d46a10f55181451316045aebac3cc1bb7a2c406aa6217a0ff3bf5b2aaa155cfe9c96ed466616ee9b26a4616996f

data/lib/wda_lib/debug.rb

@@ -6,18 +6,27 @@ class WDA
   module Debug
     
     # Get all elements on current screen
-    # @param session_id [String], accessible [Boolean], visible [Boolean]
+    # @param session_id [String], not_fetch_inaccessible [Boolean], not_fetch_invisible [Boolean], timeout [Integer]
     # When accessible is true, ignore all elements except for the main window for accessibility tree
     # When accessible is false, and visible is true, ignore all invisible elements
     # @return [Hash]
-    def source(session_id = nil, accessible = true, visible = true)
-      if session_id.nil?
-        post(@base_url + '/source', { accessible: accessible, visible: visible })
-      else
-        post '/source', { accessible: accessible, visible: visible }
-      end 
+    def source(session_id = nil, not_fetch_inaccessible = true, not_fetch_invisible = true, timeout = 60)
+      @timeout = timeout.to_i if !timeout.nil?
+      begin
+        if session_id.nil?
+          res = post(@base_url + '/source', { accessible: not_fetch_inaccessible, visible: not_fetch_invisible }, @timeout)
+        else
+          res = post('/source', { accessible: not_fetch_inaccessible, visible: not_fetch_invisible }, @timeout)
+        end
+      rescue
+        raise Error::NoSuchElementError, "Can't fetch current screen elements within #{@timeout}s" if res['status'].nil?
+      end
+      @timeout = @default_timeout
+      res
     end
 
+    
+
     def get_source
       get(@base_url + '/source')['value']['tree']['children']
     end

data/lib/wda_lib/session.rb

@@ -8,7 +8,7 @@ class WDA
     # Get current status
     # @return [Obj]
     def status
-      @status = get(@base_url + '/status')
+      @status = get(@base_url + '/status', 5)
       @platform_name = @status['value']['os']['name']
       @platform_version = @status['value']['os']['version']
       update_status(@status)

data/lib/wda_lib/touch_id.rb

@@ -12,7 +12,7 @@ class WDA
     end
 
     # Do not match TouchID
-    def match_touchid
+    def unmatch_touchid
       post(@base_url + '/Simulator/touch_id', { match: 0 }.to_json)
     end
   end

data/lib/wda_lib/version.rb

@@ -3,5 +3,5 @@
 # Copyright © 2016 Zenly. All rights reserved.
 #
 class WDA
-  VERSION = '0.0.20'
+  VERSION = '0.1.0'
 end

data/lib/wda_lib.rb

@@ -96,19 +96,19 @@ class WDA
   # HTTP methods for dealing with all supported motheds in FB WDA
   # I don't like to write such pieces of code, it removes all query params and headers,
   # But as FB WDA is doing like this, this can simplify codes
-  def get(path)
+  def get(path, timeout = 60)
     if URI.parse(path).absolute?
-      WDA.get(path)
+      WDA.get(path, timeout: timeout)
     else
-      WDA.get(@url + path)
+      WDA.get(@url + path, timeout: timeout)
     end
   end
 
-  def post(path, body = nil)
+  def post(path, body = nil, timeout = 60)
     if URI.parse(path).absolute?
-      WDA.post(path, body: body.to_json)
+      WDA.post(path, body: body.to_json, timeout: timeout)
     else
-      WDA.post(@url + path, body: body.to_json)
+      WDA.post(@url + path, body: body.to_json, timeout: timeout)
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wda_lib
 version: !ruby/object:Gem::Version
-  version: 0.0.20
+  version: 0.1.0
 platform: ruby
 authors:
 - MIN Yi
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-01-05 00:00:00.000000000 Z
+date: 2017-01-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake