akephalos 0.2.4 → 0.2.5

data/README.md

@@ -38,6 +38,36 @@ Here's some sample RSpec code:
       end
     end
 
+## Configuration
+
+There are now a few configuration options available through Capybara's new
+`register_driver` API.
+
+### Using a different browser
+
+HtmlUnit supports a few browser implementations, and you can choose which
+browser you would like to use through Akephalos. By default, Akephalos uses
+Firefox 3.6.
+
+    Capybara.register_driver :akephalos do |app|
+      # available options:
+      #   :ie6, :ie7, :ie8, :firefox_3, :firefox_3_6
+      Capybara::Driver::Akephalos.new(app, :browser => :ie8)
+    end
+
+### Ignoring javascript errors
+
+By default HtmlUnit (and Akephalos) will raise an exception when an error
+is encountered in javascript files. This is generally desireable, except
+that certain libraries aren't supported by HtmlUnit. If possible, it's
+best to keep the default behavior, and use Filters (see below) to mock
+offending libraries. If needed, however, you can configure Akephalos to
+ignore javascript errors.
+
+    Capybara.register_driver :akephalos do |app|
+      Capybara::Driver::Akephalos.new(app, :validate_scripts => false)
+    end
+
 ## More
 
 * [bin/akephalos](http://bernerdschaefer.github.com/akephalos/akephalos-bin.html)

data/bin/akephalos

@@ -7,7 +7,7 @@ require "optparse"
 options = { :interactive => false }
 
 parser = OptionParser.new do |opts|
-  opts.banner = "Usage: akephalos [--interactive, --use-htmlunit-snapshot] | [--server] <socket_file>"
+  opts.banner = "Usage: akephalos [--interactive, --use-htmlunit-snapshot] | [--server] <port>"
   opts.on("-s", "--server", "Run in server mode (default)")
   opts.on("-i", "--interactive", "Run in interactive mode") { options[:interactive] = true }
   opts.on("--use-htmlunit-snapshot", "Use the snapshot of htmlunit") { options[:use_htmlunit_snapshot] = true }
@@ -30,15 +30,15 @@ when options[:use_htmlunit_snapshot]
   Dir.chdir("vendor") do
     $stdout.print "Downloading latest snapshot... "
     $stdout.flush
-    %x[curl -O http://build.canoo.com/htmlunit/artifacts/htmlunit-2.8-SNAPSHOT-with-dependencies.zip &> /dev/null]
+    %x[curl -O http://build.canoo.com/htmlunit/artifacts/htmlunit-2.9-SNAPSHOT-with-dependencies.zip &> /dev/null]
     puts "done"
 
     $stdout.print "Extracting dependencies... "
     $stdout.flush
-    %x[unzip -j -d htmlunit htmlunit-2.8-SNAPSHOT-with-dependencies.zip htmlunit-2.8-SNAPSHOT/lib htmlunit-2.8-SNAPSHOT/lib/* &> /dev/null]
+    %x[unzip -j -d htmlunit htmlunit-2.9-SNAPSHOT-with-dependencies.zip htmlunit-2.9-SNAPSHOT/lib htmlunit-2.9-SNAPSHOT/lib/* &> /dev/null]
     puts "done"
 
-    File.unlink "htmlunit-2.8-SNAPSHOT-with-dependencies.zip"
+    File.unlink "htmlunit-2.9-SNAPSHOT-with-dependencies.zip"
   end
 
   $stdout.puts "="*40
@@ -50,7 +50,7 @@ when options[:interactive]
   require 'akephalos/console'
   Akephalos::Console.start
 else
-  unless socket_file = ARGV[0]
+  unless port = ARGV[0]
     puts parser.help
     exit
   end
@@ -58,7 +58,7 @@ else
   if RUBY_PLATFORM == "java"
     $:.unshift("vendor", lib, src)
     require 'akephalos/server'
-    Akephalos::Server.start!(socket_file)
+    Akephalos::Server.start!(port)
   else
     require 'rubygems'
     require 'jruby-jars'
@@ -71,10 +71,11 @@ else
       "-cp", [JRubyJars.core_jar_path, JRubyJars.stdlib_jar_path].join(":"),
       "org.jruby.Main"
     ]
-    ruby_args = [
+    ruby_args = [ 
+      "-Ku",
       "-I", "vendor:#{lib}:#{src}",
       "-r", "akephalos/server",
-      "-e", "Akephalos::Server.start!(#{socket_file.inspect})"
+      "-e", "Akephalos::Server.start!(#{port.inspect})"
     ]
 
     # Bundler sets ENV["RUBYOPT"] to automatically load bundler/setup.rb, but

data/lib/akephalos.rb

@@ -5,15 +5,15 @@
 #
 require 'java' if RUBY_PLATFORM == 'java'
 require 'pathname'
-require 'capybara'
 
 module Akephalos
   BIN_DIR = Pathname(__FILE__).expand_path.dirname.parent + 'bin'
 end
 
 require 'akephalos/client'
+require 'capybara'
 require 'akephalos/capybara'
 
-if Object.const_defined? :Cucumber
-  require 'akephalos/cucumber'
+Capybara.register_driver :akephalos do |app|
+  Capybara::Driver::Akephalos.new(app)
 end

data/lib/akephalos/capybara.rb

@@ -6,8 +6,14 @@
 # directly or over DRb.
 class Capybara::Driver::Akephalos < Capybara::Driver::Base
 
-  # Akephalos-specific implementation for Capybara's Node class.
-  class Node < Capybara::Node
+  # Akephalos-specific implementation for Capybara's Driver::Node class.
+  class Node < Capybara::Driver::Node
+
+    # @api capybara
+    # @return [String] the inner text of the node
+    def text
+      native.text
+    end
 
     # @api capybara
     # @param [String] name attribute name
@@ -16,22 +22,16 @@ class Capybara::Driver::Akephalos < Capybara::Driver::Base
       name = name.to_s
       case name
       when 'checked'
-        node.checked?
+        native.checked?
       else
-        node[name.to_s]
+        native[name.to_s]
       end
     end
 
     # @api capybara
-    # @return [String] the inner text of the node
-    def text
-      node.text
-    end
-
-    # @api capybara
-    # @return [String] the form element's value
+    # @return [String, Array<String>] the form element's value
     def value
-      node.value
+      native.value
     end
 
     # Set the form element's value.
@@ -40,7 +40,7 @@ class Capybara::Driver::Akephalos < Capybara::Driver::Base
     # @param [String] value the form element's new value
     def set(value)
       if tag_name == 'textarea'
-        node.value = value.to_s
+        native.value = value.to_s
       elsif tag_name == 'input' and type == 'radio'
         click
       elsif tag_name == 'input' and type == 'checkbox'
@@ -48,77 +48,93 @@ class Capybara::Driver::Akephalos < Capybara::Driver::Base
           click
         end
       elsif tag_name == 'input'
-        node.value = value.to_s
+        native.value = value.to_s
       end
     end
 
-    # Select an option from a select box.
-    #
     # @api capybara
-    # @param [String] option the option to select
-    def select(option)
-      result = node.select_option(option)
-
-      if result == nil
-        options = node.options.map(&:text).join(", ")
-        raise Capybara::OptionNotFound, "No such option '#{option}' in this select box. Available options: #{options}"
-      else
-        result
-      end
+    def select_option
+      native.click
     end
 
     # Unselect an option from a select box.
     #
     # @api capybara
-    # @param [String] option the option to unselect
-    def unselect(option)
-      unless self[:multiple]
-        raise Capybara::UnselectNotAllowed, "Cannot unselect option '#{option}' from single select box."
+    def unselect_option
+      unless select_node.multiple_select?
+        raise Capybara::UnselectNotAllowed, "Cannot unselect option from single select box."
       end
 
-      result = node.unselect_option(option)
+      native.unselect
+    end
 
-      if result == nil
-        options = node.options.map(&:text).join(", ")
-        raise Capybara::OptionNotFound, "No such option '#{option}' in this select box. Available options: #{options}"
-      else
-        result
-      end
+    # Click the element.
+    def click
+      native.click
     end
 
-    # Trigger an event on the element.
+    # Drag the element on top of the target element.
     #
     # @api capybara
-    # @param [String] event the event to trigger
-    def trigger(event)
-      node.fire_event(event.to_s)
+    # @param [Node] element the target element
+    def drag_to(element)
+      trigger('mousedown')
+      element.trigger('mousemove')
+      element.trigger('mouseup')
     end
 
     # @api capybara
     # @return [String] the element's tag name
     def tag_name
-      node.tag_name
+      native.tag_name
     end
 
     # @api capybara
     # @return [true, false] the element's visiblity
     def visible?
-      node.visible?
+      native.visible?
     end
 
-    # Drag the element on top of the target element.
+    # @api capybara
+    # @return [true, false] the element's visiblity
+    def checked?
+      native.checked?
+    end
+
+    # @api capybara
+    # @return [true, false] the element's visiblity
+    def selected?
+      native.selected?
+    end
+
+    # @api capybara
+    # @return [String] the XPath to locate the node
+    def path
+      native.xpath
+    end
+
+    # Trigger an event on the element.
     #
     # @api capybara
-    # @param [Node] element the target element
-    def drag_to(element)
-      trigger('mousedown')
-      element.trigger('mousemove')
-      element.trigger('mouseup')
+    # @param [String] event the event to trigger
+    def trigger(event)
+      native.fire_event(event.to_s)
     end
 
-    # Click the element.
-    def click
-      node.click
+    # @api capybara
+    # @param [String] selector XPath query
+    # @return [Array<Node>] the matched nodes
+    def find(selector)
+      nodes = []
+      native.find(selector).each { |node| nodes << self.class.new(self, node) }
+      nodes
+    end
+
+    protected
+
+    # @return [true, false] whether the node allows multiple-option selection (if the node is a select).
+    def multiple_select?
+      tag_name == "select" && native.multiple_select?
     end
 
     private
@@ -129,25 +145,52 @@ class Capybara::Driver::Akephalos < Capybara::Driver::Base
     # @return [Array<Node>] the matched nodes
     def all_unfiltered(selector)
       nodes = []
-      node.find(selector).each { |node| nodes << Node.new(driver, node) }
+      native.find(selector).each { |node| nodes << self.class.new(driver, node) }
       nodes
     end
 
     # @return [String] the node's type attribute
     def type
-      node[:type]
+      native[:type]
     end
-  end
 
-  attr_reader :app, :rack_server
-
-  # @return [Client] an instance of Akephalos::Client
-  def self.driver
-    @driver ||= Akephalos::Client.new
+    # @return [Node] the select node, if this is an option node
+    def select_node
+      find('./ancestor::select').first
+    end
   end
 
-  def initialize(app)
+  attr_reader :app, :rack_server, :options
+
+  # Creates a new instance of the Akephalos Driver for Capybara. The driver is
+  # registered with Capybara by a name, so that it can be chosen when
+  # Capybara's javascript_driver is changed. By default, Akephalos is
+  # registered like this:
+  #
+  #   Capybara.register_driver :akephalos do |app|
+  #     Capybara::Akephalos::Driver.new(
+  #       app,
+  #       :browser => :firefox_3_6,
+  #       :validate_scripts => true
+  #     )
+  #   end
+  #
+  # @param app the Rack application to run
+  # @param [Hash] options the Akephalos configuration options
+  # @option options [Symbol] :browser (:firefox_3_6) the browser
+  #   compatibility mode to run in. Available options:
+  #       :firefox_3_6
+  #       :firefox_3
+  #       :ie6
+  #       :ie7
+  #       :ie8
+  #
+  # @option options [true, false] :validate_scripts (true) whether to raise
+  #   exceptions on script errors
+  #
+  def initialize(app, options = {})
     @app = app
+    @options = options
     @rack_server = Capybara::Server.new(@app)
     @rack_server.boot if Capybara.run_server
   end
@@ -165,8 +208,19 @@ class Capybara::Driver::Akephalos < Capybara::Driver::Base
   end
 
   # @return [String] the page's modified source
+  # page.modified_source will return a string with
+  # html entities converted into the unicode equivalent
+  # but the string will be marked as ASCII-8BIT
+  # which causes conversion issues so we force the encoding
+  # to UTF-8 (ruby 1.9 only)
   def body
-    page.modified_source
+    body_source = page.modified_source
+
+    if body_source.respond_to?(:force_encoding)
+      body_source.force_encoding("UTF-8")
+    else
+      body_source
+    end
   end
 
   # @return [Hash{String => String}] the page's response headers
@@ -190,8 +244,15 @@ class Capybara::Driver::Akephalos < Capybara::Driver::Base
   end
 
   # Clear all cookie session data.
+  # @deprecated This method is deprecated in Capybara's master branch. Use
+  #   {#reset!} instead.
   def cleanup!
-    browser.clear_cookies
+    reset!
+  end
+
+  # Clear all cookie session data.
+  def reset!
+    cookies.clear
   end
 
   # @return [String] the page's current URL
@@ -232,7 +293,26 @@ class Capybara::Driver::Akephalos < Capybara::Driver::Base
 
   # @return the browser
   def browser
-    self.class.driver
+    @browser ||= Akephalos::Client.new(@options)
+  end
+
+  # @return the session cookies
+  def cookies
+    browser.cookies
+  end
+
+  # @return [String] the current user agent string
+  def user_agent
+    browser.user_agent
+  end
+
+  # Set the User-Agent header for this session. If :default is given, the
+  # User-Agent header will be reset to the default browser's user agent.
+  #
+  # @param [:default] user_agent the default user agent
+  # @param [String] user_agent the user agent string to use
+  def user_agent=(user_agent)
+    browser.user_agent = user_agent
   end
 
   # Disable waiting in Capybara, since waiting is handled directly by
@@ -252,3 +332,7 @@ class Capybara::Driver::Akephalos < Capybara::Driver::Base
   end
 
 end
+
+Capybara.register_driver :akephalos do |app|
+  Capybara::Driver::Akephalos.new(app)
+end

data/lib/akephalos/client.rb

@@ -10,6 +10,7 @@ else
   require 'akephalos/page'
   require 'akephalos/node'
 
+  require 'akephalos/client/cookies'
   require 'akephalos/client/filter'
 
   module Akephalos
@@ -18,34 +19,55 @@ else
     # point for all interaction with the browser, exposing its current page and
     # allowing navigation.
     class Client
-      java_import 'com.gargoylesoftware.htmlunit.NicelyResynchronizingAjaxController'
-      java_import 'com.gargoylesoftware.htmlunit.SilentCssErrorHandler'
 
+      # @return [Akephalos::Page] the current page
       attr_reader :page
 
-      def initialize
+      # @return [HtmlUnit::BrowserVersion] the configured browser version
+      attr_reader :browser_version
+
+      # @return [true/false] whether to raise errors on javascript failures
+      attr_reader :validate_scripts
+
+      # The default configuration options for a new Client.
+      DEFAULT_OPTIONS = {
+        :browser => :firefox_3_6,
+        :validate_scripts => true
+      }
+
+      # Map of browser version symbols to their HtmlUnit::BrowserVersion
+      # instances.
+      BROWSER_VERSIONS = {
+        :ie6         => HtmlUnit::BrowserVersion::INTERNET_EXPLORER_6,
+        :ie7         => HtmlUnit::BrowserVersion::INTERNET_EXPLORER_7,
+        :ie8         => HtmlUnit::BrowserVersion::INTERNET_EXPLORER_8,
+        :firefox_3   => HtmlUnit::BrowserVersion::FIREFOX_3,
+        :firefox_3_6 => HtmlUnit::BrowserVersion::FIREFOX_3_6
+      }
+
+      # @param [Hash] options the configuration options for this client
+      #
+      # @option options [Symbol] :browser (:firefox_3_6) the browser version (
+      #   see BROWSER_VERSIONS)
+      #
+      # @option options [true, false] :validate_scripts (true) whether to raise
+      #   errors on javascript errors
+      def initialize(options = {})
+        process_options!(options)
+
         @_client = java.util.concurrent.FutureTask.new do
-          client = WebClient.new
+          client = HtmlUnit::WebClient.new(browser_version)
 
           Filter.new(client)
-          client.setAjaxController(NicelyResynchronizingAjaxController.new)
-          client.setCssErrorHandler(SilentCssErrorHandler.new)
-
+          client.setThrowExceptionOnFailingStatusCode(false)
+          client.setAjaxController(HtmlUnit::NicelyResynchronizingAjaxController.new)
+          client.setCssErrorHandler(HtmlUnit::SilentCssErrorHandler.new)
+          client.setThrowExceptionOnScriptError(validate_scripts)
           client
         end
         Thread.new { @_client.run }
       end
 
-      # Set the global configuration settings for Akephalos.
-      #
-      # @note This is only used when communicating over DRb, since just a
-      # single client instance is exposed.
-      # @param [Hash] config the configuration settings
-      # @return [Hash] the configuration
-      def configuration=(config)
-        Akephalos.configuration = config
-      end
-
       # Visit the requested URL and return the page.
       #
       # @param [String] url the URL to load
@@ -55,9 +77,29 @@ else
         page
       end
 
-      # Clear all cookies for this browser session.
-      def clear_cookies
-        client.getCookieManager.clearCookies
+      # @return [Cookies] the cookies for this session
+      def cookies
+        @cookies ||= Cookies.new(client.getCookieManager)
+      end
+
+      # @return [String] the current user agent string
+      def user_agent
+        @user_agent || client.getBrowserVersion.getUserAgent
+      end
+
+      # Set the User-Agent header for this session. If :default is given, the
+      # User-Agent header will be reset to the default browser's user agent.
+      #
+      # @param [:default] user_agent the default user agent
+      # @param [String] user_agent the user agent string to use
+      def user_agent=(user_agent)
+        if user_agent == :default
+          @user_agent = nil
+          client.removeRequestHeader("User-Agent")
+        else
+          @user_agent = user_agent
+          client.addRequestHeader("User-Agent", user_agent)
+        end
       end
 
       # @return [Page] the current page
@@ -77,6 +119,23 @@ else
         @page
       end
 
+      # @return [true, false] whether javascript errors will raise exceptions
+      def validate_scripts?
+        !!validate_scripts
+      end
+
+      # Merges the DEFAULT_OPTIONS with those provided to initialize the Client
+      # state, namely, its browser version and whether it should
+      # validate scripts.
+      #
+      # @param [Hash] options the options to process
+      def process_options!(options)
+        options = DEFAULT_OPTIONS.merge(options)
+
+        @browser_version  = BROWSER_VERSIONS.fetch(options.delete(:browser))
+        @validate_scripts = options.delete(:validate_scripts)
+      end
+
       private
 
       # Call the future set up in #initialize and return the WebCLient

data/lib/akephalos/client/cookies.rb

@@ -0,0 +1,73 @@
+module Akephalos
+  class Client
+    # Interface for working with HtmlUnit's CookieManager, providing a basic
+    # API for manipulating the cookies in a session.
+    class Cookies
+      include Enumerable
+
+      # @param [HtmlUnit::CookieManager] cookie manager
+      def initialize(cookie_manager)
+        @cookie_manager = cookie_manager
+      end
+
+      # @param [name] the cookie name
+      # @return [Cookie] the cookie with the given name
+      # @return [nil] when no cookie is found
+      def [](name)
+        cookie = @cookie_manager.getCookie(name)
+        Cookie.new(cookie) if cookie
+      end
+
+      # Clears all cookies for this session.
+      def clear
+        @cookie_manager.clearCookies
+      end
+
+      # Iterator for all cookies in the current session.
+      def each
+        @cookie_manager.getCookies.each do |cookie|
+          yield Cookie.new(cookie)
+        end
+      end
+
+      # Remove the cookie from the session.
+      #
+      # @param [Cookie] the cookie to remove
+      def delete(cookie)
+        @cookie_manager.removeCookie(cookie.native)
+      end
+
+      # @return [true, false] whether there are any cookies
+      def empty?
+        !any?
+      end
+
+      class Cookie
+
+        attr_reader :domain, :expires, :name, :path, :value
+
+        # @param [HtmlUnit::Cookie] the cookie
+        def initialize(cookie)
+          @_cookie = cookie
+          @domain = cookie.getDomain
+          @expires = cookie.getExpires
+          @name = cookie.getName
+          @path = cookie.getPath
+          @value = cookie.getValue
+          @secure = cookie.isSecure
+        end
+
+        def secure?
+          !!@secure
+        end
+
+        # @return [HtmlUnit::Cookie] the native cookie object
+        # @api private
+        def native
+          @_cookie
+        end
+      end
+
+    end
+  end
+end

data/lib/akephalos/client/filter.rb

@@ -9,11 +9,7 @@ module Akephalos
     # found. If no filters are defined, or no filters match the request, then
     # the response will bubble up to HtmlUnit for the normal request/response
     # cycle.
-    class Filter < WebConnectionWrapper
-      java_import 'com.gargoylesoftware.htmlunit.util.NameValuePair'
-      java_import 'com.gargoylesoftware.htmlunit.WebResponseData'
-      java_import 'com.gargoylesoftware.htmlunit.WebResponseImpl'
-
+    class Filter < HtmlUnit::Util::WebConnectionWrapper
       # Filters an outgoing request, and if a match is found, returns the mock
       # response.
       #
@@ -23,14 +19,16 @@ module Akephalos
       def filter(request)
         if filter = find_filter(request)
           start_time = Time.now
-          headers = filter[:headers].map { |name, value| NameValuePair.new(name.to_s, value.to_s) }
-          response = WebResponseData.new(
+          headers = filter[:headers].map do |name, value|
+            HtmlUnit::Util::NameValuePair.new(name.to_s, value.to_s)
+          end
+          response = HtmlUnit::WebResponseData.new(
             filter[:body].to_s.to_java_bytes,
             filter[:status],
             HTTP_STATUS_CODES.fetch(filter[:status], "Unknown"),
             headers
           )
-          WebResponseImpl.new(response, request, Time.now - start_time)
+          HtmlUnit::WebResponseImpl.new(response, request, Time.now - start_time)
         end
       end
 

data/lib/akephalos/console.rb

@@ -1,7 +1,7 @@
 # Begin a new Capybara session, by default connecting to localhost on port
 # 3000.
 def session
-  Capybara.app_host = "http://localhost:3000"
+  Capybara.app_host ||= "http://localhost:3000"
   @session ||= Capybara::Session.new(:Akephalos)
 end
 alias page session

data/lib/akephalos/htmlunit.rb

@@ -13,15 +13,23 @@ java.lang.System.setProperty("org.apache.commons.logging.Log", "org.apache.commo
 java.lang.System.setProperty("org.apache.commons.logging.simplelog.defaultlog", "fatal")
 java.lang.System.setProperty("org.apache.commons.logging.simplelog.showdatetime", "true")
 
-java_import "com.gargoylesoftware.htmlunit.WebClient"
-java_import "com.gargoylesoftware.htmlunit.util.WebConnectionWrapper"
-java_import 'com.gargoylesoftware.htmlunit.HttpMethod'
-
-
-# Disable history tracking
-com.gargoylesoftware.htmlunit.History.field_reader :ignoreNewPages_
-
-# Run in Firefox compatibility mode
-com.gargoylesoftware.htmlunit.BrowserVersion.setDefault(
-  com.gargoylesoftware.htmlunit.BrowserVersion::FIREFOX_3
-)
+# Container module for com.gargoylesoftware.htmlunit namespace.
+module HtmlUnit
+  java_import "com.gargoylesoftware.htmlunit.BrowserVersion"
+  java_import "com.gargoylesoftware.htmlunit.History"
+  java_import "com.gargoylesoftware.htmlunit.HttpMethod"
+  java_import "com.gargoylesoftware.htmlunit.NicelyResynchronizingAjaxController"
+  java_import "com.gargoylesoftware.htmlunit.SilentCssErrorHandler"
+  java_import "com.gargoylesoftware.htmlunit.WebClient"
+  java_import "com.gargoylesoftware.htmlunit.WebResponseData"
+  java_import "com.gargoylesoftware.htmlunit.WebResponseImpl"
+
+  # Container module for com.gargoylesoftware.htmlunit.util namespace.
+  module Util
+    java_import "com.gargoylesoftware.htmlunit.util.NameValuePair"
+    java_import "com.gargoylesoftware.htmlunit.util.WebConnectionWrapper"
+  end
+
+  # Disable history tracking
+  History.field_reader :ignoreNewPages_
+end

data/lib/akephalos/htmlunit/ext/http_method.rb

@@ -1,28 +1,30 @@
-# Reopen com.gargoylesoftware.htmlunit.HttpMethod to add convenience methods.
-class HttpMethod
+module HtmlUnit
+  # Reopen HtmlUnit's HttpMethod class to add convenience methods.
+  class HttpMethod
 
-  # Loosely compare HttpMethod with another object, accepting either an
-  # HttpMethod instance or a symbol describing the method. Note that :any is a
-  # special symbol which will always return true.
-  #
-  # @param [HttpMethod] other an HtmlUnit HttpMethod object
-  # @param [Symbol] other a symbolized representation of an http method
-  # @return [true/false]
-  def ===(other)
-    case other
-    when HttpMethod
-      super
-    when :any
-      true
-    when :get
-      self == self.class::GET
-    when :post
-      self == self.class::POST
-    when :put
-      self == self.class::PUT
-    when :delete
-      self == self.class::DELETE
+    # Loosely compare HttpMethod with another object, accepting either an
+    # HttpMethod instance or a symbol describing the method. Note that :any is a
+    # special symbol which will always return true.
+    #
+    # @param [HttpMethod] other an HtmlUnit HttpMethod object
+    # @param [Symbol] other a symbolized representation of an http method
+    # @return [true/false]
+    def ===(other)
+      case other
+      when HttpMethod
+        super
+      when :any
+        true
+      when :get
+        self == self.class::GET
+      when :post
+        self == self.class::POST
+      when :put
+        self == self.class::PUT
+      when :delete
+        self == self.class::DELETE
+      end
     end
-  end
 
+  end
 end

data/lib/akephalos/node.rb

@@ -11,7 +11,11 @@ module Akephalos
 
     # @return [true, false] whether the element is checked
     def checked?
-      @_node.isChecked
+      if @_node.respond_to?(:isChecked)
+        @_node.isChecked
+      else
+        !! self[:checked]
+      end
     end
 
     # @return [String] inner text of the node
@@ -37,11 +41,13 @@ module Akephalos
       case tag_name
       when "select"
         if self[:multiple]
-          @_node.selected_options.map { |option| option.text }
+          selected_options.map { |option| option.value }
         else
           selected_option = @_node.selected_options.first
-          selected_option ? selected_option.text : nil
+          selected_option ? Node.new(selected_option).value : nil
         end
+      when "option"
+        self[:value] || text
       when "textarea"
         @_node.getText
       else
@@ -55,28 +61,43 @@ module Akephalos
     def value=(value)
       case tag_name
       when "textarea"
-        @_node.setText(value)
+        @_node.setText("")
+        type(value)
       when "input"
-        @_node.setValueAttribute(value)
+        if file_input?
+          @_node.setValueAttribute(value)
+        else
+          @_node.setValueAttribute("")
+          type(value)
+        end
       end
     end
 
-    # Select an option from a select box by its value.
+    # Types each character into a text or input field.
     #
-    # @return [true, false] whether the selection was successful
-    def select_option(option)
-      opt = @_node.getOptions.detect { |o| o.asText == option }
+    # @param [String] value the string to type
+    def type(value)
+      value.each_char do |c|
+        @_node.type(c)
+      end
+    end
+
+    # @return [true, false] whether the node allows multiple-option selection (if the node is a select).
+    def multiple_select?
+      !self[:multiple].nil?
+    end
 
-      opt && opt.setSelected(true)
+    # @return [true, false] whether the node is a file input
+    def file_input?
+      tag_name == "input" && @_node.getAttribute("type") == "file"
     end
 
-    # Unselect an option from a select box by its value.
+
+    # Unselect an option.
     #
     # @return [true, false] whether the unselection was successful
-    def unselect_option(option)
-      opt = @_node.getOptions.detect { |o| o.asText == option }
-
-      opt && opt.setSelected(false)
+    def unselect
+      @_node.setSelected(false)
     end
 
     # Return the option elements for a select box.
@@ -114,6 +135,16 @@ module Akephalos
       @_node.isDisplayed
     end
 
+    # @return [true, false] whether the node is selected to the user accounting
+    # for CSS.
+    def selected?
+      if @_node.respond_to?(:isSelected)
+        @_node.isSelected
+      else
+        !! self[:selected]
+      end
+    end
+
     # Click the node and then wait for any triggered JavaScript callbacks to
     # fire.
     def click
@@ -131,6 +162,11 @@ module Akephalos
       @nodes << nodes
       nodes
     end
+
+    # @return [String] the XPath expression for this node
+    def xpath
+      @_node.getCanonicalXPath
+    end
   end
 
 end

data/lib/akephalos/remote_client.rb

@@ -1,3 +1,4 @@
+require 'socket'
 require 'drb/drb'
 
 # We need to define our own NativeException class for the cases when a native
@@ -14,44 +15,78 @@ module Akephalos
   #     client.visit "http://www.oinopa.com"
   #     client.page.source # => "<!DOCTYPE html PUBLIC..."
   class RemoteClient
-    @socket_file = "/tmp/akephalos.#{Process.pid}.sock"
+    # @return [DRbObject] a new instance of Akephalos::Client from the DRb
+    #   server
+    def self.new(options = {})
+      manager.new_client(options)
+    end
 
-    # Start a remote akephalos server and return the remote Akephalos::Client
-    # instance.
+    # Starts a remove JRuby DRb server unless already running and returns an
+    # instance of Akephalos::ClientManager.
     #
-    # @return [DRbObject] the remote client instance
-    def self.new
-      start!
+    # @return [DRbObject] an instance of Akephalos::ClientManager
+    def self.manager
+      return @manager if defined?(@manager)
+
+      server_port = start!
+
       DRb.start_service
-      client = DRbObject.new_with_uri("drbunix://#{@socket_file}")
+      manager = DRbObject.new_with_uri("druby://127.0.0.1:#{server_port}")
+
       # We want to share our local configuration with the remote server
       # process, so we share an undumped version of our configuration. This
       # lets us continue to make changes locally and have them reflected in the
       # remote process.
-      client.configuration = Akephalos.configuration.extend(DRbUndumped)
-      client
+      manager.configuration = Akephalos.configuration.extend(DRbUndumped)
+
+      @manager = manager
     end
 
     # Start a remote server process and return when it is available for use.
     def self.start!
-      remote_client = fork do
-        exec("#{Akephalos::BIN_DIR + 'akephalos'} #{@socket_file}")
-      end
+      port = find_available_port
+
+      remote_client = IO.popen("#{Akephalos::BIN_DIR + 'akephalos'} #{port}")
 
       # Set up a monitor thread to detect if the forked server exits
       # prematurely.
-      server_monitor = Thread.new { Thread.current[:exited] = Process.wait }
+      server_monitor = Thread.new { Thread.current[:exited] = Process.wait(remote_client.pid) }
 
       # Wait for the server to be accessible on the socket we specified.
-      until File.exists?(@socket_file)
+      until responsive?(port)
         exit!(1) if server_monitor[:exited]
-        sleep 1
+        sleep 0.5
       end
       server_monitor.kill
 
       # Ensure that the remote server shuts down gracefully when we are
       # finished.
-      at_exit { Process.kill(:INT, remote_client); File.unlink(@socket_file) }
+      at_exit { Process.kill(:INT, remote_client.pid) }
+
+      port
+    end
+
+    private
+
+    # @api private
+    # @param [Integer] port the port to check for responsiveness
+    # @return [true, false] whether the port is responsive
+    def self.responsive?(port)
+      socket = TCPSocket.open('127.0.0.1', port)
+      true
+    rescue Errno::ECONNREFUSED
+      false
+    ensure
+      socket.close if socket
+    end
+
+    # @api private
+    # @return [Integer] the next available port
+    def self.find_available_port
+      server = TCPServer.new('127.0.0.1', 0)
+      server.addr[1]
+    ensure
+      server.close if server
     end
   end
 end

data/lib/akephalos/server.rb

@@ -14,21 +14,66 @@ class NameError::Message
   end
 end
 
-[Akephalos::Page, Akephalos::Node].each { |klass| klass.send(:include, DRbUndumped) }
+[
+  Akephalos::Page,
+  Akephalos::Node,
+  Akephalos::Client::Cookies,
+  Akephalos::Client::Cookies::Cookie
+].each { |klass| klass.send(:include, DRbUndumped) }
 
 module Akephalos
 
+  # The ClientManager is shared over DRb with the remote process, and
+  # facilitates communication between the processes.
+  #
+  # @api private
+  class ClientManager
+    include DRbUndumped
+
+    # @return [Akephalos::Client] a new client instance
+    def self.new_client(options = {})
+      # Store the client to ensure it isn't prematurely garbage collected.
+      @client = Client.new(options)
+    end
+
+    # Set the global configuration settings for Akephalos.
+    #
+    # @param [Hash] config the configuration settings
+    # @return [Hash] the configuration
+    def self.configuration=(config)
+      Akephalos.configuration = config
+    end
+
+  end
+
   # Akephalos::Server is used by `akephalos --server` to start a DRb server
-  # serving an instance of Akephalos::Client.
+  # serving Akephalos::ClientManager.
   class Server
-    # Start DRb service for an Akephalos::Client.
+
+    # Start DRb service for Akephalos::ClientManager.
     #
-    # @param [String] socket_file path to socket file to start
-    def self.start!(socket_file)
-      client = Client.new
-      DRb.start_service("drbunix://#{socket_file}", client)
+    # @param [String] port attach server to
+    def self.start!(port)
+      abort_on_parent_exit!
+      DRb.start_service("druby://127.0.0.1:#{port}", ClientManager)
       DRb.thread.join
     end
+
+    private
+
+    # Exit if STDIN is no longer readable, which corresponds to the process
+    # which started the server exiting prematurely.
+    #
+    # @api private
+    def self.abort_on_parent_exit!
+      Thread.new do
+        begin
+          STDIN.read
+        rescue IOError
+          exit
+        end
+      end
+    end
   end
 
 end

data/lib/akephalos/version.rb

@@ -1,3 +1,3 @@
 module Akephalos #:nodoc
-  VERSION = "0.2.4"
+  VERSION = "0.2.5"
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 2
-  - 4
-  version: 0.2.4
+  - 5
+  version: 0.2.5
 platform: ruby
 authors: 
 - Bernerd Schaefer
@@ -14,27 +14,29 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-14 00:00:00 -05:00
+date: 2011-02-04 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: capybara
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
         segments: 
         - 0
-        - 3
-        - 8
-        version: 0.3.8
+        - 4
+        - 0
+        version: 0.4.0
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: jruby-jars
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
@@ -47,6 +49,7 @@ dependencies:
   name: sinatra
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
@@ -59,14 +62,15 @@ dependencies:
   name: rspec
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
-    - - "="
+    - - ">="
       - !ruby/object:Gem::Version 
         segments: 
-        - 1
+        - 2
         - 3
         - 0
-        version: 1.3.0
+        version: 2.3.0
   type: :development
   version_requirements: *id004
 description: Headless Browser for Integration Testing with Capybara
@@ -79,6 +83,7 @@ extra_rdoc_files: []
 
 files: 
 - lib/akephalos/capybara.rb
+- lib/akephalos/client/cookies.rb
 - lib/akephalos/client/filter.rb
 - lib/akephalos/client.rb
 - lib/akephalos/configuration.rb
@@ -112,6 +117,7 @@ files:
 - src/htmlunit/xml-apis-1.3.04.jar
 - README.md
 - MIT_LICENSE
+- bin/akephalos
 has_rdoc: true
 homepage: http://bernerdschaefer.github.com/akephalos
 licenses: []
@@ -123,6 +129,7 @@ require_paths:
 - lib
 - src
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
@@ -130,6 +137,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
@@ -141,7 +149,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: akephalos
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Headless Browser for Integration Testing with Capybara