selenium_surfer 0.0.3 → 0.1.1

data/lib/selenium_surfer/errors.rb

@@ -17,11 +17,22 @@ module SeleniumSurfer
     def initialize(_msg, _context)
       super _msg
       @context = _context
-      @source = _context.root_context.page_source # cache page source for future reference
+      @source = _context.root_context.page_source rescue nil # cache page source for future reference
     end
   end
 
   # Error thrown when an element operation is attempted in an empty search result set
   class EmptySetError < ContextError; end
 
+  # Wraps a web driver error adding
+  class WebDriverError < ContextError
+
+    attr_reader :original
+
+    def initialize(_original, _context)
+      super _original.message, _context
+      @original = _original
+    end
+  end
+
 end

data/lib/selenium_surfer/search_context.rb

@@ -46,19 +46,23 @@ module SeleniumSurfer
     # clears and sends_keys to this context main element
     def fill(_value)
       raise EmptySetError.new('Cannot call \'fill\' on an empty set', self) if empty?
-      context.first.clear
-      context.first.send_keys _value
+      wrap_errors do
+        context.first.clear
+        context.first.send_keys _value
+      end
     end
 
     # Any methods missing are forwarded to the main element (first).
     def method_missing(_method, *_args, &_block)
-      m = /^(.*)_all$/.match _method.to_s
-      if m then
-        return [] if empty?
-        context.map { |e| e.send(m[1], *_args, &_block) }
-      else
-        raise EmptySetError.new("Cannot call '#{_method}' on an empty set", self) if empty?
-        context.first.send(_method, *_args, &_block)
+      wrap_errors do
+        m = /^(.*)_all$/.match _method.to_s
+        if m then
+          return [] if empty?
+          context.map { |e| e.send(m[1], *_args, &_block) }
+        else
+          raise EmptySetError.new("Cannot call '#{_method}' on an empty set", self) if empty?
+          context.first.send(_method, *_args, &_block)
+        end
       end
     end
 
@@ -76,12 +80,25 @@ module SeleniumSurfer
 
   private
 
+    # wrap every selenium errors that happen inside block.
+    def wrap_errors
+      begin
+        yield
+      rescue Selenium::WebDriver::Error::WebDriverError => e
+        raise WebDriverError.new e, self
+      end
+    end
+
+    # base filtering method, expands current context
     def search_elements(_options)
-      context.inject([]) do |r, element|
-        r + element.find_elements(_options)
+      wrap_errors do
+        context.inject([]) do |r, element|
+          r + element.find_elements(_options)
+        end
       end
     end
 
+    # returns the current context
     def context
       @elements
     end

data/lib/selenium_surfer/version.rb

@@ -1,3 +1,3 @@
 module SeleniumSurfer
-  VERSION = "0.0.3"
+  VERSION = "0.1.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: selenium_surfer
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-14 00:00:00.000000000 Z
+date: 2013-09-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: selenium-webdriver