akephalos 0.0.4 → 0.0.5

data/TODO.txt

@@ -1,7 +1,11 @@
 0.0.5
 =======================================================================================
-  * DRb server should never shut down prematurely -- missing methods, 500 errors,
-    even java errors (NPE error from bad javascript).
+  * Upgrade to htmlunit-2.7
+  * Fix DRb recycled object errors
+  * Define NativeException on ruby side so that uncaught exceptions are displayed with
+    a proper backtrace.
+  * Add Akephalos.filter() for enabling FakeWeb style request/response mocking in the
+    HtmlUnit browser.
 
 0.0.4
 =======================================================================================

data/VERSION

@@ -1 +1 @@
-0.0.4
+0.0.5

data/akephalos.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{akephalos}
-  s.version = "0.0.4"
+  s.version = "0.0.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Bernerd Schaefer"]
-  s.date = %q{2010-06-15}
+  s.date = %q{2010-06-24}
   s.default_executable = %q{akephalos}
   s.description = %q{}
   s.email = %q{bj.schaefer@gmail.com}
@@ -28,14 +28,19 @@ Gem::Specification.new do |s|
      "lib/akephalos.rb",
      "lib/akephalos/capybara.rb",
      "lib/akephalos/client.rb",
+     "lib/akephalos/client/filter.rb",
+     "lib/akephalos/client/listener.rb",
+     "lib/akephalos/configuration.rb",
      "lib/akephalos/console.rb",
      "lib/akephalos/cucumber.rb",
      "lib/akephalos/htmlunit.rb",
+     "lib/akephalos/htmlunit/ext/http_method.rb",
      "lib/akephalos/node.rb",
      "lib/akephalos/page.rb",
      "lib/akephalos/remote_client.rb",
      "lib/akephalos/server.rb",
      "spec/driver/akephalos_driver_spec.rb",
+     "spec/filter_spec.rb",
      "spec/session/akephalos_session_spec.rb",
      "spec/slow_page_loads_spec.rb",
      "spec/spec.opts",
@@ -47,10 +52,10 @@ Gem::Specification.new do |s|
      "src/commons-lang-2.4.jar",
      "src/commons-logging-1.1.1.jar",
      "src/cssparser-0.9.5.jar",
-     "src/htmlunit-2.6.jar",
-     "src/htmlunit-core-js-2.6.jar",
+     "src/htmlunit-2.7.jar",
+     "src/htmlunit-core-js-2.7.jar",
      "src/jruby-complete-1.5.0.jar",
-     "src/nekohtml-1.9.13.jar",
+     "src/nekohtml-1.9.14.jar",
      "src/sac-1.3.jar",
      "src/serializer-2.7.1.jar",
      "src/xalan-2.7.1.jar",
@@ -64,6 +69,7 @@ Gem::Specification.new do |s|
   s.summary = %q{}
   s.test_files = [
     "spec/driver/akephalos_driver_spec.rb",
+     "spec/filter_spec.rb",
      "spec/session/akephalos_session_spec.rb",
      "spec/slow_page_loads_spec.rb",
      "spec/spec_helper.rb"

data/lib/akephalos/capybara.rb

@@ -92,7 +92,9 @@ class Capybara::Driver::Akephalos < Capybara::Driver::Base
     private
 
     def all_unfiltered(selector)
-      node.find(selector).map { |node| Node.new(driver, node) }
+      nodes = []
+      node.find(selector).each { |node| nodes << Node.new(driver, node) }
+      nodes
     end
 
     def type
@@ -129,7 +131,9 @@ class Capybara::Driver::Akephalos < Capybara::Driver::Base
   end
 
   def find(selector)
-    page.find(selector).map { |node| Node.new(self, node) }
+    nodes = []
+    page.find(selector).each { |node| nodes << Node.new(self, node) }
+    nodes
   end
 
   def evaluate_script(script)

data/lib/akephalos/client.rb

@@ -1,44 +1,45 @@
+require 'akephalos/configuration'
+
 if RUBY_PLATFORM != "java"
   require 'akephalos/remote_client'
   Akephalos::Client = Akephalos::RemoteClient
 else
   require 'akephalos/htmlunit'
+  require 'akephalos/htmlunit/ext/http_method'
+
   require 'akephalos/page'
   require 'akephalos/node'
 
+  require 'akephalos/client/filter'
+  require 'akephalos/client/listener'
+
   module Akephalos
     class Client
+      java_import 'com.gargoylesoftware.htmlunit.NicelyResynchronizingAjaxController'
+      java_import 'com.gargoylesoftware.htmlunit.SilentCssErrorHandler'
+
       attr_reader :page
 
       def initialize
-        @_client = WebClient.new
-
-        @_client.setAjaxController(com.gargoylesoftware.htmlunit.NicelyResynchronizingAjaxController.new)
+        @_client = java.util.concurrent.FutureTask.new do
+          client = WebClient.new
 
-        listener = Class.new do
-          include com.gargoylesoftware.htmlunit.WebWindowListener
+          Filter.new(client)
+          client.addWebWindowListener(Listener.new(self))
+          client.setAjaxController(NicelyResynchronizingAjaxController.new)
+          client.setCssErrorHandler(SilentCssErrorHandler.new)
 
-          def initialize(client)
-            @client = client
-          end
-
-          def webWindowContentChanged(event)
-            @client.page = event.getNewPage
-            if latch = Thread.current[:latch]
-              latch.countDown
-              Thread.current[:latch] = nil
-            end
-          end
+          client
         end
+        Thread.new { @_client.run }
+      end
 
-        @_client.addWebWindowListener(listener.new(self))
-        @_client.setCssErrorHandler(com.gargoylesoftware.htmlunit.SilentCssErrorHandler.new)
+      def configuration=(config)
+        Akephalos.configuration = config
       end
 
       def visit(url)
-        self.class.wait_for_result do
-          @_client.getPage(url)
-        end
+        client.getPage(url)
       end
 
       def page=(_page)
@@ -48,16 +49,10 @@ else
         @page
       end
 
-      def self.wait_for_result(timeout = 3)
-        latch = java.util.concurrent.CountDownLatch.new(1)
-        Thread.new do
-          Thread.current[:latch] = latch
-          yield
-        end.join
-        start = Time.now
-        latch.await(timeout, java.util.concurrent.TimeUnit::SECONDS)
+      private
+      def client
+        @client ||= @_client.get
       end
-
     end
   end
 end

data/lib/akephalos/client/filter.rb

@@ -0,0 +1,82 @@
+module Akephalos
+  class Client
+    class Filter < WebConnectionWrapper
+      java_import 'com.gargoylesoftware.htmlunit.util.NameValuePair'
+      java_import 'com.gargoylesoftware.htmlunit.WebResponseData'
+      java_import 'com.gargoylesoftware.htmlunit.WebResponseImpl'
+
+      def filter(request)
+        if filter = Akephalos.filters.find { |filter| request.http_method === filter[:method] && request.url.to_s =~ filter[:filter] }
+          start_time = Time.now
+          headers = filter[:headers].map { |name, value| NameValuePair.new(name.to_s, value.to_s) }
+          response = 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)
+        end
+      end
+
+      def getResponse(request)
+        filter(request) || super
+      end
+
+      HTTP_STATUS_CODES = {
+        100 => "Continue",
+        101 => "Switching Protocols",
+        102 => "Processing",
+        200 => "OK",
+        201 => "Created",
+        202 => "Accepted",
+        203 => "Non-Authoritative Information",
+        204 => "No Content",
+        205 => "Reset Content",
+        206 => "Partial Content",
+        207 => "Multi-Status",
+        300 => "Multiple Choices",
+        301 => "Moved Permanently",
+        302 => "Found",
+        303 => "See Other",
+        304 => "Not Modified",
+        305 => "Use Proxy",
+        306 => "Switch Proxy",
+        307 => "Temporary Redirect",
+        400 => "Bad Request",
+        401 => "Unauthorized",
+        402 => "Payment Required",
+        403 => "Forbidden",
+        404 => "Not Found",
+        405 => "Method Not Allowed",
+        406 => "Not Acceptable",
+        407 => "Proxy Authentication Required",
+        408 => "Request Timeout",
+        409 => "Conflict",
+        410 => "Gone",
+        411 => "Length Required",
+        412 => "Precondition Failed",
+        413 => "Request Entity Too Large",
+        414 => "Request-URI Too Long",
+        415 => "Unsupported Media Type",
+        416 => "Requested Range Not Satisfiable",
+        417 => "Expectation Failed",
+        418 => "I'm a teapot",
+        421 => "There are too many connections from your internet address",
+        422 => "Unprocessable Entity",
+        423 => "Locked",
+        424 => "Failed Dependency",
+        425 => "Unordered Collection",
+        426 => "Upgrade Required",
+        449 => "Retry With",
+        450 => "Blocked by Windows Parental Controls",
+        500 => "Internal Server Error",
+        501 => "Not Implemented",
+        502 => "Bad Gateway",
+        503 => "Service Unavailable",
+        504 => "Gateway Timeout",
+        505 => "HTTP Version Not Supported",
+        506 => "Variant Also Negotiates",
+        507 => "Insufficient Storage",
+        509 => "Bandwidth Limit Exceeded",
+        510 => "Not Extended",
+        530 => "User access denied"
+      }.freeze
+    end
+  end
+end

data/lib/akephalos/client/listener.rb

@@ -0,0 +1,18 @@
+module Akephalos
+  class Client
+    class Listener
+      include com.gargoylesoftware.htmlunit.WebWindowListener
+
+      def initialize(client)
+        @client = client
+      end
+
+      def webWindowClosed(event)
+      end
+
+      def webWindowContentChanged(event)
+        @client.page = event.getNewPage
+      end
+    end
+  end
+end

data/lib/akephalos/configuration.rb

@@ -0,0 +1,22 @@
+module Akephalos
+  def self.configuration
+    @configuration ||= {}
+  end
+
+  def self.configuration=(config)
+    @configuration = config
+  end
+
+  module Filters
+    def filters
+      configuration[:filters] ||= []
+    end
+
+    def filter(method, regex, options = {})
+      regex = Regexp.new(Regexp.escape(regex)) if regex.is_a?(String)
+      filters << {:method => method, :filter => regex, :status => 200, :body => "", :headers => {}}.merge!(options)
+    end
+  end
+
+  extend Filters
+end

data/lib/akephalos/htmlunit.rb

@@ -9,20 +9,23 @@ require "commons-io-1.4.jar"
 require "commons-lang-2.4.jar"
 require "commons-logging-1.1.1.jar"
 require "cssparser-0.9.5.jar"
-require "htmlunit-2.6.jar"
-require "htmlunit-core-js-2.6.jar"
-require "nekohtml-1.9.13.jar"
+require "htmlunit-2.7.jar"
+require "htmlunit-core-js-2.7.jar"
+require "nekohtml-1.9.14.jar"
 require "sac-1.3.jar"
 require "serializer-2.7.1.jar"
 require "xalan-2.7.1.jar"
 require "xercesImpl-2.9.1.jar"
 require "xml-apis-1.3.04.jar"
 
-logger = org.apache.commons.logging.LogFactory.getLog('com.gargoylesoftware.htmlunit') 
-logger.getLogger().setLevel(java.util.logging.Level::SEVERE)
+java.lang.System.setProperty("org.apache.commons.logging.Log", "org.apache.commons.logging.impl.SimpleLog")
+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'
 
 com.gargoylesoftware.htmlunit.BrowserVersion.setDefault(
-    com.gargoylesoftware.htmlunit.BrowserVersion::FIREFOX_3
+  com.gargoylesoftware.htmlunit.BrowserVersion::FIREFOX_3
 )

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

@@ -0,0 +1,18 @@
+class HttpMethod
+  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

data/lib/akephalos/node.rb

@@ -1,6 +1,7 @@
 module Akephalos
   class Node
     def initialize(node)
+      @nodes = []
       @_node = node
     end
 
@@ -64,7 +65,9 @@ module Akephalos
     end
 
     def find(selector)
-      @_node.getByXPath(selector).map { |node| Node.new(node) }
+      nodes = @_node.getByXPath(selector).map { |node| Node.new(node) }
+      @nodes << nodes
+      nodes
     end
   end
 end

data/lib/akephalos/remote_client.rb

@@ -1,5 +1,7 @@
 require 'drb/drb'
 
+class NativeException < StandardError; end
+
 module Akephalos
   class RemoteClient
     @socket_file = "/tmp/akephalos.#{Process.pid}.sock"
@@ -17,7 +19,9 @@ module Akephalos
     def self.new
       start!
       DRb.start_service
-      DRbObject.new_with_uri("drbunix://#{@socket_file}")
+      client = DRbObject.new_with_uri("drbunix://#{@socket_file}")
+      client.configuration = Akephalos.configuration.extend(DRbUndumped)
+      client
     end
   end
 end

data/spec/filter_spec.rb

@@ -0,0 +1,24 @@
+require 'spec_helper'
+
+describe "Filters" do
+  before do
+    @session = Capybara::Session.new(:akephalos, TestApp)
+  end
+
+  context "with no filter" do
+    it "returns the page's source" do
+      @session.visit "/"
+      @session.source.should == "Hello world!"
+    end
+  end
+
+  context "with a filter" do
+    after { Akephalos.filters.clear }
+
+    it "returns the filter's source" do
+      Akephalos.filter :get, %r{.*}, :body => "Howdy!"
+      @session.visit "/"
+      @session.source.should == "Howdy!"
+    end
+  end
+end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 4
-  version: 0.0.4
+  - 5
+  version: 0.0.5
 platform: ruby
 authors: 
 - Bernerd Schaefer
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-15 00:00:00 -05:00
+date: 2010-06-24 00:00:00 -05:00
 default_executable: akephalos
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -76,14 +76,19 @@ files:
 - lib/akephalos.rb
 - lib/akephalos/capybara.rb
 - lib/akephalos/client.rb
+- lib/akephalos/client/filter.rb
+- lib/akephalos/client/listener.rb
+- lib/akephalos/configuration.rb
 - lib/akephalos/console.rb
 - lib/akephalos/cucumber.rb
 - lib/akephalos/htmlunit.rb
+- lib/akephalos/htmlunit/ext/http_method.rb
 - lib/akephalos/node.rb
 - lib/akephalos/page.rb
 - lib/akephalos/remote_client.rb
 - lib/akephalos/server.rb
 - spec/driver/akephalos_driver_spec.rb
+- spec/filter_spec.rb
 - spec/session/akephalos_session_spec.rb
 - spec/slow_page_loads_spec.rb
 - spec/spec.opts
@@ -95,10 +100,10 @@ files:
 - src/commons-lang-2.4.jar
 - src/commons-logging-1.1.1.jar
 - src/cssparser-0.9.5.jar
-- src/htmlunit-2.6.jar
-- src/htmlunit-core-js-2.6.jar
+- src/htmlunit-2.7.jar
+- src/htmlunit-core-js-2.7.jar
 - src/jruby-complete-1.5.0.jar
-- src/nekohtml-1.9.13.jar
+- src/nekohtml-1.9.14.jar
 - src/sac-1.3.jar
 - src/serializer-2.7.1.jar
 - src/xalan-2.7.1.jar
@@ -136,6 +141,7 @@ specification_version: 3
 summary: ""
 test_files: 
 - spec/driver/akephalos_driver_spec.rb
+- spec/filter_spec.rb
 - spec/session/akephalos_session_spec.rb
 - spec/slow_page_loads_spec.rb
 - spec/spec_helper.rb