webdrone 0.8.4 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ffeb0f5e4c60f6cc3ecd900650712fd6e38f9a71
-  data.tar.gz: 27921c8433aa30ac2f44d40e59cffcfc0e815656
+  metadata.gz: 61c793edbf7d6662b79f4f592da8880a52cbdfa1
+  data.tar.gz: 4d4741dd41ae4fcbba0d78e925f86611e687831b
 SHA512:
-  metadata.gz: 93ab6cba56cef4059d166dddd7c2b0f33d99fec060f429516fa0f1c81e757f49e7e1dbd4c9dfecf18e2e4b212095a884d1823489a14e40ac27e81e2cfa54b8e4
-  data.tar.gz: 00a7c07aff97b1540419dbac9b8093a331756c24ba5a1ad10927768497486e9431f134a8a25aff436110c173265ac0adf0db81d3c25acecf33578c40dd7819d4
+  metadata.gz: 0e3ae4aae152bcb9964330b789ad386c5a6034db4eca402f7ed777988818e270034c0146409c3f6265cf1ad709bee58806c8267fc442c65717f67ef55db47c4a
+  data.tar.gz: 93f3359c20cd90e8b5c16dfb45318ae0f5e434b1554af73d6335e94d53b54e2b8cd3e4b033fe12859e6a39c8853d35189cf369ab19734ebfd64218e8d517b8ac

data/lib/webdrone/browser.rb

@@ -25,7 +25,7 @@ module Webdrone
       @@chrome_prefs
     end
 
-    def initialize(browser: 'chrome', create_outdir: true, outdir: nil, timeout:, maximize: true, chrome_prefs: nil, firefox_profile: nil)
+    def initialize(browser: 'chrome', create_outdir: true, outdir: nil, timeout:, maximize: true, error: :raise_report, chrome_prefs: nil, firefox_profile: nil)
       if create_outdir or outdir
         outdir ||= File.join("webdrone_output", Time.new.strftime('%Y%m%d_%H%M%S'))
         self.conf.outdir = outdir
@@ -49,6 +49,7 @@ module Webdrone
       else
         @driver = Selenium::WebDriver.for browser.to_sym
       end
+      self.conf.error = error
       self.conf.timeout = timeout if timeout
       self.maximize if maximize
     end

data/lib/webdrone/conf.rb

@@ -6,11 +6,12 @@ module Webdrone
   end
 
   class Conf
-    attr_accessor :a0, :timeout, :outdir
+    attr_accessor :a0, :timeout, :outdir, :error
 
     def initialize(a0)
       @a0 = a0
       @outdir = "."
+      @error = :raise_report
     end
 
     def timeout=(val)
@@ -26,5 +27,12 @@ module Webdrone
     rescue => exception
       Webdrone.report_error(@a0, exception, Kernel.caller_locations)
     end
+
+    def error=(val)
+      raise "Invalid value '#{val}' for error" if not [:raise_report, :raise, :ignore].include? val
+      @error = val
+    rescue => exception
+      Webdrone.report_error(@a0, exception, Kernel.caller_locations)
+    end
   end
 end

data/lib/webdrone/ctxt.rb

@@ -46,7 +46,7 @@ module Webdrone
     
     def reset
       @a0.driver.switch_to.default_content
-      @ramestack = []
+      @framestack = []
     rescue => exception
       Webdrone.report_error(@a0, exception, Kernel.caller_locations)
     end
@@ -64,5 +64,22 @@ module Webdrone
     rescue => exception
       Webdrone.report_error(@a0, exception, Kernel.caller_locations)
     end
+
+    def with_conf(new_config)
+      current_config = {}
+
+      new_config.each do |k, v|
+        current_config[k] = @a0.conf.send k
+        @a0.conf.send "#{k}=", v
+      end
+
+      yield
+    rescue => exception
+      Webdrone.report_error(@a0, exception, Kernel.caller_locations)
+    ensure
+      current_config.each do |k, v|
+        @a0.conf.send "#{k}=", v
+      end
+    end
   end
 end

data/lib/webdrone/error.rb

@@ -10,17 +10,14 @@ module Webdrone
 
       begin
         # find location of user error
-        @caller_locations[1..-1].each do |location|
-          if not location.path.include? 'lib/webdrone/'
+        @caller_locations[0..-1].each do |location|
+          if Gem.path.none? { |path| location.path.include? path }
             @location = location
             break
           end
         end
 
-        report_script
-        report_screenshot
-        report_exception
-        report_time
+        report if a0.conf.error == :raise_report
       rescue
       end
     end
@@ -47,6 +44,13 @@ module Webdrone
       @buffer = []
     end
 
+    def report
+      report_script
+      report_screenshot
+      report_exception
+      report_time
+    end
+
     def report_script
       begin
         ini, fin = [@location.lineno - 10 - 1, @location.lineno + 10 - 1]
@@ -104,10 +108,8 @@ module Webdrone
   end
 
   def self.report_error(a0, exception, caller_locations)
-    if exception.class == WebdroneError
-      raise exception
-    end
-
-    raise WebdroneError.new(exception.message, exception, a0, caller_locations)
+    exception = WebdroneError.new(exception.message, exception, a0, caller_locations) if exception.class != WebdroneError
+    
+    raise exception if a0.conf.error == :raise or a0.conf.error == :raise_report
   end
 end

data/lib/webdrone/open.rb

@@ -17,5 +17,11 @@ module Webdrone
     rescue => exception
       Webdrone.report_error(@a0, exception, Kernel.caller_locations)
     end
+
+    def reload
+      @a0.driver.navigate.refresh
+    rescue => exception
+      Webdrone.report_error(@a0, exception, Kernel.caller_locations)
+    end
   end
 end

data/lib/webdrone/version.rb

@@ -1,3 +1,3 @@
 module Webdrone
-  VERSION = "0.8.4"
+  VERSION = "0.9.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: webdrone
 version: !ruby/object:Gem::Version
-  version: 0.8.4
+  version: 0.9.0
 platform: ruby
 authors:
 - Aldrin Martoq
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-02-17 00:00:00.000000000 Z
+date: 2016-03-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler