akephalos 0.0.3 → 0.0.4

data/TODO.txt

@@ -1,8 +1,14 @@
-0.0.4
+0.0.5
 =======================================================================================
   * DRb server should never shut down prematurely -- missing methods, 500 errors,
     even java errors (NPE error from bad javascript).
 
+0.0.4
+=======================================================================================
+  - Update to jruby 1.5
+  - bin/akephalos for interactive mode
+  - use internally managed java threading instead of capybara's own wait methods
+
 0.0.3
 =======================================================================================
 

data/VERSION

@@ -1 +1 @@
-0.0.3
+0.0.4

data/akephalos.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{akephalos}
-  s.version = "0.0.3"
+  s.version = "0.0.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Bernerd Schaefer"]
-  s.date = %q{2010-06-03}
+  s.date = %q{2010-06-15}
   s.default_executable = %q{akephalos}
   s.description = %q{}
   s.email = %q{bj.schaefer@gmail.com}
@@ -28,6 +28,7 @@ Gem::Specification.new do |s|
      "lib/akephalos.rb",
      "lib/akephalos/capybara.rb",
      "lib/akephalos/client.rb",
+     "lib/akephalos/console.rb",
      "lib/akephalos/cucumber.rb",
      "lib/akephalos/htmlunit.rb",
      "lib/akephalos/node.rb",
@@ -36,6 +37,7 @@ Gem::Specification.new do |s|
      "lib/akephalos/server.rb",
      "spec/driver/akephalos_driver_spec.rb",
      "spec/session/akephalos_session_spec.rb",
+     "spec/slow_page_loads_spec.rb",
      "spec/spec.opts",
      "spec/spec_helper.rb",
      "src/commons-codec-1.4.jar",
@@ -47,7 +49,7 @@ Gem::Specification.new do |s|
      "src/cssparser-0.9.5.jar",
      "src/htmlunit-2.6.jar",
      "src/htmlunit-core-js-2.6.jar",
-     "src/jruby-complete-1.4.0.jar",
+     "src/jruby-complete-1.5.0.jar",
      "src/nekohtml-1.9.13.jar",
      "src/sac-1.3.jar",
      "src/serializer-2.7.1.jar",
@@ -63,6 +65,7 @@ Gem::Specification.new do |s|
   s.test_files = [
     "spec/driver/akephalos_driver_spec.rb",
      "spec/session/akephalos_session_spec.rb",
+     "spec/slow_page_loads_spec.rb",
      "spec/spec_helper.rb"
   ]
 

data/bin/akephalos

@@ -1,13 +1,39 @@
 #!/usr/bin/env ruby
 # vim:set filetype=ruby:
 
-raise "Usage: akephalos socket_file" unless ARGV[0]
-require 'pathname'
+require "pathname"
+require "optparse"
+
+options = { :interactive => false }
+
+parser = OptionParser.new do |opts|
+  opts.banner = "Usage: akephalos [--interactive] | [--server] <socket_file>"
+  opts.on("-s", "--server", "Run in server mode (default)")
+  opts.on("-i", "--interactive", "Run in interactive mode") { options[:interactive] = true }
+
+  opts.on_tail("-h", "--help", "Show this message") { puts opts; exit }
+end
+parser.parse!
 
 root = Pathname(__FILE__).expand_path.dirname.parent
 lib = root + 'lib'
-jruby = root + "src/jruby-complete-1.4.0.jar"
-server = 'akephalos/server'
+jruby = root + "src/jruby-complete-1.5.0.jar"
+jruby_cmd = %Q(java -Xmx2048M -jar #{jruby} -I#{lib})
+
+if options[:interactive]
+  $:.unshift(lib)
+  require 'rubygems'
+  require 'akephalos'
+  require 'akephalos/console'
+  Akephalos::Console.start
+else
+  unless socket_file = ARGV[0]
+    puts parser.help
+    exit
+  end
+
+  server = 'akephalos/server'
 
-command = %Q(java -Xmx2048M -jar #{jruby} -I#{lib} -r #{server} -e 'Akephalos::Server.start!(%s)')
-exec command % ARGV[0].inspect
+  command = %Q(#{jruby_cmd} -r#{server} -e 'Akephalos::Server.start!(%s)')
+  exec command % socket_file.inspect
+end

data/lib/akephalos/capybara.rb

@@ -144,7 +144,9 @@ class Capybara::Driver::Akephalos < Capybara::Driver::Base
     self.class.driver
   end
 
-  def wait?; true end
+  def wait
+    false
+  end
 
 private
 

data/lib/akephalos/client.rb

@@ -8,21 +8,56 @@ else
 
   module Akephalos
     class Client
+      attr_reader :page
+
       def initialize
         @_client = WebClient.new
+
+        @_client.setAjaxController(com.gargoylesoftware.htmlunit.NicelyResynchronizingAjaxController.new)
+
+        listener = Class.new do
+          include com.gargoylesoftware.htmlunit.WebWindowListener
+
+          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
+        end
+
+        @_client.addWebWindowListener(listener.new(self))
         @_client.setCssErrorHandler(com.gargoylesoftware.htmlunit.SilentCssErrorHandler.new)
       end
 
       def visit(url)
-        @page = Page.new(@_client.getPage(url))
+        self.class.wait_for_result do
+          @_client.getPage(url)
+        end
       end
 
-      def page
-        if @page != (page = @_client.getCurrentWindow.getEnclosedPage)
-          @page = Page.new(page)
+      def page=(_page)
+        if @page != _page
+          @page = Page.new(_page)
         end
         @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)
+      end
+
     end
   end
 end

data/lib/akephalos/console.rb

@@ -0,0 +1,27 @@
+def session
+  Capybara.app_host = "http://localhost:8070"
+  @session ||= Capybara::Session.new(:Akephalos)
+end
+alias page session
+
+module Akephalos
+  class Console
+
+    def self.start
+      require 'irb'
+
+      begin
+        require 'irb/completion'
+      rescue Exception
+        # No readline available, proceed anyway.
+      end
+
+      if ::File.exists? ".irbrc"
+        ENV['IRBRC'] = ".irbrc"
+      end
+
+      IRB.start
+    end
+
+  end
+end

data/lib/akephalos/node.rb

@@ -59,6 +59,8 @@ module Akephalos
 
     def click
       @_node.click
+      @_node.getPage.getEnclosingWindow.getJobManager.waitForJobs(1000)
+      @_node.getPage.getEnclosingWindow.getJobManager.waitForJobsStartingBefore(1000)
     end
 
     def find(selector)

data/lib/akephalos/remote_client.rb

@@ -1,3 +1,5 @@
+require 'drb/drb'
+
 module Akephalos
   class RemoteClient
     @socket_file = "/tmp/akephalos.#{Process.pid}.sock"

data/lib/akephalos/server.rb

@@ -9,18 +9,8 @@ class NameError::Message
 end
 
 [
-  java.net.URL,
-  java.util.List,
-  com.gargoylesoftware.htmlunit.html.DomNode,
-  com.gargoylesoftware.htmlunit.html.DomElement,
-  com.gargoylesoftware.htmlunit.html.HtmlAnchor,
-  com.gargoylesoftware.htmlunit.html.HtmlElement,
-  com.gargoylesoftware.htmlunit.html.HtmlPage,
-  org.w3c.dom.Node,
-  org.w3c.dom.NamedNodeMap,
-  com.gargoylesoftware.htmlunit.WebClient,
-  com.gargoylesoftware.htmlunit.WebResponse,
-  com.gargoylesoftware.htmlunit.WebRequestSettings
+  Akephalos::Page,
+  Akephalos::Node
 ].each { |klass| klass.send(:include, DRbUndumped) }
 
 module Akephalos

data/spec/slow_page_loads_spec.rb

@@ -0,0 +1,66 @@
+require 'spec_helper'
+
+class SlowApp < TestApp
+  get '/slow_page' do
+    sleep 1
+    "<p>Loaded!</p>"
+  end
+
+  get '/really_slow_page' do
+    sleep 5
+  end
+
+  get '/slow_ajax_load' do
+    <<-HTML
+  <head>
+    <meta http-equiv="Content-type" content="text/html; charset=utf-8"/>
+    <title>with_js</title>
+    <script src="/jquery.js" type="text/javascript" charset="utf-8"></script>
+    <script type="text/javascript">
+      $(function() {
+       $('#ajax_load').click(function() {
+         // $('body').html("<p>Loaded!</p>");
+         $('body').load('/slow_page');
+         return false;
+       });
+      });
+    </script>
+  </head>
+  <body>
+    <a href="#" id="ajax_load">Click me</a>
+  </body>
+   HTML
+  end
+end
+
+if $0 == __FILE__
+  if __FILE__ == $0
+    Rack::Handler::Mongrel.run SlowApp, :Port => 8070
+  end
+end
+
+describe Capybara::Session do
+  context 'with akephalos driver' do
+
+    before do
+      @session = Capybara::Session.new(:akephalos, SlowApp)
+    end
+
+    context "slow page load" do
+      it "should wait for the page to finish loading" do
+        @session.visit('/slow_page')
+        @session.current_url.should include('/slow_page')
+      end
+    end
+
+    context "slow ajax load" do
+      it "should wait for ajax to load" do
+        @session.visit('/slow_ajax_load')
+        @session.click_link('Click me')
+        @session.should have_xpath("//p[contains(.,'Loaded!')]")
+      end
+    end
+
+  end
+end
+

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 3
-  version: 0.0.3
+  - 4
+  version: 0.0.4
 platform: ruby
 authors: 
 - Bernerd Schaefer
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-03 00:00:00 -05:00
+date: 2010-06-15 00:00:00 -05:00
 default_executable: akephalos
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -76,6 +76,7 @@ files:
 - lib/akephalos.rb
 - lib/akephalos/capybara.rb
 - lib/akephalos/client.rb
+- lib/akephalos/console.rb
 - lib/akephalos/cucumber.rb
 - lib/akephalos/htmlunit.rb
 - lib/akephalos/node.rb
@@ -84,6 +85,7 @@ files:
 - lib/akephalos/server.rb
 - spec/driver/akephalos_driver_spec.rb
 - spec/session/akephalos_session_spec.rb
+- spec/slow_page_loads_spec.rb
 - spec/spec.opts
 - spec/spec_helper.rb
 - src/commons-codec-1.4.jar
@@ -95,7 +97,7 @@ files:
 - src/cssparser-0.9.5.jar
 - src/htmlunit-2.6.jar
 - src/htmlunit-core-js-2.6.jar
-- src/jruby-complete-1.4.0.jar
+- src/jruby-complete-1.5.0.jar
 - src/nekohtml-1.9.13.jar
 - src/sac-1.3.jar
 - src/serializer-2.7.1.jar
@@ -135,4 +137,5 @@ summary: ""
 test_files: 
 - spec/driver/akephalos_driver_spec.rb
 - spec/session/akephalos_session_spec.rb
+- spec/slow_page_loads_spec.rb
 - spec/spec_helper.rb