akephalos2 2.1.2 → 2.1.3

data/lib/akephalos/client.rb

@@ -8,6 +8,7 @@ else
   require 'akephalos/htmlunit/ext/http_method'
   require 'akephalos/htmlunit/ext/confirm_handler'
 
+  require 'akephalos/exception_handling_delegators'
   require 'akephalos/page'
   require 'akephalos/node'
 
@@ -21,6 +22,16 @@ else
     # allowing navigation.
     class Client
 
+      class << self
+
+        alias_method :new_orig, :new
+
+        def new(*args)
+          ExceptionConvertingDelegator.new(new_orig(*args), "NativeException", RuntimeError)
+        end
+
+      end
+
       # @return [Akephalos::Page] the current page
       attr_reader :page
 

data/lib/akephalos/exception_handling_delegators.rb

@@ -0,0 +1,66 @@
+require 'delegate'
+
+##
+# This class can be used to wrap an object so that any exceptions raised by the object's methods are recued and passed to a specified exception_handler block
+#
+class ExceptionCatchingDelegator < SimpleDelegator
+
+  ##
+  # * *Args* :
+  #   - ++ -> delgate - object to be wrapped
+  #   - ++ -> exception_handler - block to handle rescued exeptions (will be called with yield(exception))
+  #
+  def initialize(delegate, exception_handler)
+    super(delegate)
+    @exception_handler = exception_handler
+  end
+
+  ##
+  # Override of method_missing to rescue exceptions and pass them to the exception_handler
+  #
+  def method_missing(m, *args, &block)
+    begin
+      return super(m, *args, &block)
+    rescue Exception => exception
+      @exception_handler.yield(exception)
+    end
+  end
+
+end
+
+##
+# This class can be used to wrap an object so that exceptions matching a given type are rescued and then raised as another type.
+#
+# This kind of exception converting is most of use when dealing with exceptions passed across DRb where a remote
+# exception class may not exist on the client-side.
+#
+class ExceptionConvertingDelegator < ExceptionCatchingDelegator
+  
+  ##
+  # * *Args* :
+  #   - ++ -> delgate - object to be wrapped
+  #   - ++ -> exception_type_to_catch - an exception class or name of an exception class that will be used to match (in a regular-expression sense) the name of exceptions thrown by the delegate's methods
+  #   - ++ -> exception_type_to_throw - the exception class that will be used to create and raise a new exception
+  #
+  def initialize(delegate, exception_type_to_catch = Exception, exception_type_to_throw = RuntimeError)
+
+    handler = lambda do |e|
+      
+      raise e unless e.class.name =~ Regexp.new(exception_type_to_catch.to_s)
+      
+      # Create and raise a RuntimeError
+      message = e.class.name
+      unless e.message.nil? || e.message.size == 0
+        message << " "
+        message << e.message
+      end
+      new_exception = exception_type_to_throw.new(message)
+      new_exception.set_backtrace(e.backtrace)
+      raise new_exception
+    end
+
+    super(delegate, handler)
+
+  end
+
+end

data/lib/akephalos/node.rb

@@ -3,6 +3,17 @@ module Akephalos
   # Akephalos::Node wraps HtmlUnit's DOMNode class, providing a simple API for
   # interacting with an element on the page.
   class Node
+    
+    class << self
+    
+      alias_method :new_orig, :new
+    
+      def new(*args)
+        ExceptionConvertingDelegator.new(new_orig(*args), "NativeException", RuntimeError)
+      end
+    
+    end
+
     # @param [HtmlUnit::DOMNode] node
     def initialize(node)
       @nodes = []

data/lib/akephalos/page.rb

@@ -3,6 +3,17 @@ module Akephalos
   # Akephalos::Page wraps HtmlUnit's HtmlPage class, exposing an API for
   # interacting with a page in the browser.
   class Page
+    
+    class << self
+    
+      alias_method :new_orig, :new
+    
+      def new(*args)
+        ExceptionConvertingDelegator.new(new_orig(*args), "NativeException", RuntimeError)
+      end
+    
+    end
+    
     # @param [HtmlUnit::HtmlPage] page
     def initialize(page)
       @nodes = []

data/lib/akephalos/remote_client.rb

@@ -1,10 +1,6 @@
 require 'socket'
 require 'drb/drb'
 
-# We need to define our own NativeException class for the cases when a native
-# exception is raised by the JRuby DRb server.
-class NativeException < StandardError; end
-
 module Akephalos
 
   # The +RemoteClient+ class provides an interface to an +Akephalos::Client+

data/lib/akephalos/version.rb

@@ -1,3 +1,3 @@
 module Akephalos #:nodoc
-  VERSION = "2.1.2"
+  VERSION = "2.1.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: akephalos2
 version: !ruby/object:Gem::Version
-  version: 2.1.2
+  version: 2.1.3
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-23 00:00:00.000000000 Z
+date: 2012-04-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capybara
-  requirement: &70282950353040 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70282950353040
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70282950368980 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +38,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70282950368980
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: jruby-jars
-  requirement: &70282950368360 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,10 +54,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70282950368360
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: &70282950367560 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,10 +70,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70282950367560
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70282950367120 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -66,7 +86,12 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70282950367120
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Headless Browser for Integration Testing with Capybara
 email:
 - bj.schaefer@gmail.com
@@ -83,6 +108,7 @@ files:
 - lib/akephalos/configuration.rb
 - lib/akephalos/console.rb
 - lib/akephalos/cucumber.rb
+- lib/akephalos/exception_handling_delegators.rb
 - lib/akephalos/htmlunit/ext/confirm_handler.rb
 - lib/akephalos/htmlunit/ext/http_method.rb
 - lib/akephalos/htmlunit.rb
@@ -95,7 +121,8 @@ files:
 - lib/akephalos.rb
 - README.md
 - MIT_LICENSE
-- bin/akephalos
+- !binary |-
+  YmluL2FrZXBoYWxvcw==
 homepage: https://github.com/Nerian/akephalos2
 licenses: []
 post_install_message: 
@@ -109,15 +136,21 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -2791345104495626226
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -2791345104495626226
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.21
 signing_key: 
 specification_version: 3
 summary: Headless Browser for Integration Testing with Capybara