akephalos 0.0.1 → 0.0.2

data/.gitignore

@@ -1,2 +1,4 @@
+.rvmrc
+burn
 pkg
 tags

data/TODO.txt

@@ -0,0 +1,18 @@
+0.0.3
+=======================================================================================
+  * DRb server should never shut down prematurely -- missing methods, 500 errors,
+    even java errors (NPE error from bad javascript).
+
+0.0.2  -  10 May 2010
+=======================================================================================
+
+  - Ensure users cannot accidently call non-existant methods on DRb objects
+  - Refactor akephalos classes to expose HTMLUnit behavior, instead of shipping
+    objects directly to remote process.
+
+
+0.0.1  -  03 May 2010
+=======================================================================================
+  - DRb server starts automatically when needed
+  - DRb objects are undumped, and references are kept on the server
+  - All capybara provided specs pass.

data/VERSION

@@ -1 +1 @@
-0.0.1
+0.0.2

data/akephalos.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{akephalos}
-  s.version = "0.0.1"
+  s.version = "0.0.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Bernerd Schaefer"]
-  s.date = %q{2010-05-05}
+  s.date = %q{2010-05-10}
   s.default_executable = %q{akephalos}
   s.description = %q{}
   s.email = %q{bj.schaefer@gmail.com}
@@ -17,17 +17,18 @@ Gem::Specification.new do |s|
   s.files = [
     ".gitignore",
      "Rakefile",
+     "TODO.txt",
      "VERSION",
      "akephalos.gemspec",
      "bin/akephalos",
      "lib/akephalos.rb",
      "lib/akephalos/capybara.rb",
+     "lib/akephalos/client.rb",
      "lib/akephalos/cucumber.rb",
      "lib/akephalos/htmlunit.rb",
-     "lib/akephalos/htmlunit/html_element.rb",
-     "lib/akephalos/htmlunit/html_page.rb",
-     "lib/akephalos/htmlunit/html_select.rb",
-     "lib/akephalos/htmlunit/web_client.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/session/akephalos_session_spec.rb",

data/bin/akephalos

@@ -5,7 +5,9 @@ raise "Usage: akephalos socket_file" unless ARGV[0]
 require 'pathname'
 
 root = Pathname(__FILE__).expand_path.dirname.parent
+lib = root + 'lib'
 jruby = root + "src/jruby-complete-1.4.0.jar"
-server = root + "lib/akephalos/server"
+server = 'akephalos/server'
 
-exec "java -Xmx2048M -jar #{jruby} -r#{server} -e 'Akephalos::Server.start!(#{ARGV[0].inspect})'"
+command = %Q(java -Xmx2048M -jar #{jruby} -I#{lib} -r #{server} -e 'Akephalos::Server.start!(%s)')
+exec command % ARGV[0].inspect

data/lib/akephalos.rb

@@ -1,8 +1,11 @@
+require 'java' if RUBY_PLATFORM == 'java'
 require 'capybara'
 
 module Akephalos
+  BIN_DIR = Pathname(__FILE__).expand_path.dirname.parent + 'bin'
 end
 
+require 'akephalos/client'
 require 'akephalos/capybara'
 
 if Object.const_defined? :Cucumber

data/lib/akephalos/capybara.rb

@@ -6,41 +6,36 @@ class Capybara::Driver::Akephalos < Capybara::Driver::Base
       name = name.to_s
       case name
       when 'checked'
-        node.isChecked
+        node.checked?
       else
         node[name.to_s]
       end
     end
 
     def text
-      node.asText
+      node.text
     end
 
     def value
       if tag_name == "select" && self[:multiple]
-        values = []
-        results = node.getSelectedOptions
-        while (i ||= 0) < results.size
-          values << results[i].asText
-          i += 1
-        end
-        values
+        node.selected_options.map { |option| option.text }
       elsif tag_name == "select"
-        node.getSelectedOptions.first.asText
+        selected_option = node.selected_options.first
+        selected_option ? selected_option.text : nil
       else
-        super
+        self[:value]
       end
     end
 
     def set(value)
       if tag_name == 'textarea'
-        node.setText(value.to_s)
+        node.value = value.to_s
       elsif tag_name == 'input' and type == 'radio'
-        node.click
+        click
       elsif tag_name == 'input' and type == 'checkbox'
-        node.click
+        click
       elsif tag_name == 'input'
-        node.setValueAttribute(value.to_s)
+        node.value = value.to_s
       end
     end
 
@@ -48,13 +43,7 @@ class Capybara::Driver::Akephalos < Capybara::Driver::Base
       result = node.select_option(option)
 
       if result == nil
-        options = []
-        results = node.getOptions
-        while (i ||= 0) < results.size
-          options << results[i].asText
-          i += 1
-        end
-        options = options.join(", ")
+        options = node.options.map(&:text).join(", ")
         raise Capybara::OptionNotFound, "No such option '#{option}' in this select box. Available options: #{options}"
       else
         result
@@ -69,13 +58,7 @@ class Capybara::Driver::Akephalos < Capybara::Driver::Base
       result = node.unselect_option(option)
 
       if result == nil
-        options = []
-        results = node.getOptions
-        while (i ||= 0) < results.size
-          options << results[i].asText
-          i += 1
-        end
-        options = options.join(", ")
+        options = node.options.map(&:text).join(", ")
         raise Capybara::OptionNotFound, "No such option '#{option}' in this select box. Available options: #{options}"
       else
         result
@@ -87,17 +70,17 @@ class Capybara::Driver::Akephalos < Capybara::Driver::Base
     end
 
     def tag_name
-      node.getNodeName
+      node.tag_name
     end
 
     def visible?
-      node.isDisplayed
+      node.visible?
     end
 
     def drag_to(element)
-      node.fire_event('mousedown')
-      element.node.fire_event('mousemove')
-      element.node.fire_event('mouseup')
+      trigger('mousedown')
+      element.trigger('mousemove')
+      element.trigger('mouseup')
     end
 
     def click
@@ -107,13 +90,7 @@ class Capybara::Driver::Akephalos < Capybara::Driver::Base
     private
 
     def all_unfiltered(selector)
-      nodes = []
-      results = node.getByXPath(selector)
-      while (i ||= 0) < results.size
-        nodes << Node.new(driver, results[i])
-        i += 1
-      end
-      nodes
+      node.find(selector).map { |node| Node.new(driver, node) }
     end
 
     def type
@@ -124,28 +101,7 @@ class Capybara::Driver::Akephalos < Capybara::Driver::Base
   attr_reader :app, :rack_server
 
   def self.driver
-    if RUBY_PLATFORM == "java"
-      require '/usr/local/projects/personal/htmlunit-ruby/jruby'
-      @driver ||= WebClient.new
-    else
-      @driver ||= begin
-        socket_file = "/tmp/akephalos.#{Process.pid}.sock"
-        uri = "drbunix://#{socket_file}"
-
-        server = fork do
-          exec("#{Pathname(__FILE__).dirname.parent.parent + 'bin/akephalos'} #{socket_file}")
-        end
-
-        DRb.start_service
-
-        sleep 1 until File.exists?(socket_file)
-
-        client_class = DRbObject.new_with_uri(uri)
-
-        at_exit { Process.kill(:INT, server); File.unlink(socket_file) }
-        client_class
-      end
-    end
+    @driver ||= Akephalos::Client.new
   end
 
   def initialize(app)
@@ -171,13 +127,7 @@ class Capybara::Driver::Akephalos < Capybara::Driver::Base
   end
 
   def find(selector)
-    nodes = []
-    results = page.find(selector)
-    while (i ||= 0) < results.size
-      nodes << Node.new(self, results[i])
-      i += 1
-    end
-    nodes
+    page.find(selector).map { |node| Node.new(self, node) }
   end
 
   def evaluate_script(script)

data/lib/akephalos/client.rb

@@ -0,0 +1,28 @@
+if RUBY_PLATFORM != "java"
+  require 'akephalos/remote_client'
+  Akephalos::Client = Akephalos::RemoteClient
+else
+  require 'akephalos/htmlunit'
+  require 'akephalos/page'
+  require 'akephalos/node'
+
+  module Akephalos
+    class Client
+      def initialize
+        @_client = WebClient.new
+        @_client.setCssErrorHandler(com.gargoylesoftware.htmlunit.SilentCssErrorHandler.new)
+      end
+
+      def visit(url)
+        @page = Page.new(@_client.getPage(url))
+      end
+
+      def page
+        if @page != (page = @_client.getCurrentWindow.getEnclosedPage)
+          @page = Page.new(page)
+        end
+        @page
+      end
+    end
+  end
+end

data/lib/akephalos/htmlunit.rb

@@ -21,17 +21,8 @@ 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_import 'java.io.StringWriter'
-java_import 'java.io.PrintWriter'
 java_import "com.gargoylesoftware.htmlunit.WebClient"
-java_import "com.gargoylesoftware.htmlunit.html.HtmlPage"
-java_import "com.gargoylesoftware.htmlunit.html.HtmlSubmitInput"
 
 com.gargoylesoftware.htmlunit.BrowserVersion.setDefault(
     com.gargoylesoftware.htmlunit.BrowserVersion::FIREFOX_3
 )
-
-require Pathname(__FILE__).dirname + "htmlunit/html_element"
-require Pathname(__FILE__).dirname + "htmlunit/html_page"
-require Pathname(__FILE__).dirname + "htmlunit/html_select"
-require Pathname(__FILE__).dirname + "htmlunit/web_client"

data/lib/akephalos/node.rb

@@ -0,0 +1,68 @@
+module Akephalos
+  class Node
+    def initialize(node)
+      @_node = node
+    end
+
+    def checked?
+      @_node.isChecked
+    end
+
+    def text
+      @_node.asText
+    end
+
+    def [](name)
+      @_node.hasAttribute(name.to_s) ? @_node.getAttribute(name.to_s) : nil
+    end
+
+    def value=(value)
+      case tag_name
+      when "textarea"
+        @_node.setText(value)
+      when "input"
+        @_node.setValueAttribute(value)
+      end
+    end
+
+    def select_option(option)
+      opt = @_node.getOptions.detect { |o| o.asText == option }
+
+      opt && opt.setSelected(true)
+    end
+
+    def unselect_option(option)
+      opt = @_node.getOptions.detect { |o| o.asText == option }
+
+      opt && opt.setSelected(false)
+    end
+
+    def options
+      @_node.getOptions.map { |node| Node.new(node) }
+    end
+
+    def selected_options
+      @_node.getSelectedOptions.map { |node| Node.new(node) }
+    end
+
+    def fire_event(name)
+      @_node.fireEvent(name)
+    end
+
+    def tag_name
+      @_node.getNodeName
+    end
+
+    def visible?
+      @_node.isDisplayed
+    end
+
+    def click
+      @_node.click
+    end
+
+    def find(selector)
+      @_node.getByXPath(selector).map { |node| Node.new(node) }
+    end
+  end
+end

data/lib/akephalos/page.rb

@@ -0,0 +1,34 @@
+module Akephalos
+  class Page
+    def initialize(page)
+      @nodes = []
+      @_page = page
+    end
+
+    def find(selector)
+      nodes = @_page.getByXPath(selector).map { |node| Node.new(node) }
+      @nodes << nodes
+      nodes
+    end
+
+    def modified_source
+      @_page.asXml
+    end
+
+    def source
+      @_page.getWebResponse.getContentAsString
+    end
+
+    def current_url
+      @_page.getWebResponse.getRequestSettings.getUrl.toString
+    end
+
+    def execute_script(script)
+      @_page.executeJavaScript(script).getJavaScriptResult
+    end
+
+    def ==(other)
+      @_page == other
+    end
+  end
+end

data/lib/akephalos/remote_client.rb

@@ -0,0 +1,21 @@
+module Akephalos
+  class RemoteClient
+    @socket_file = "/tmp/akephalos.#{Process.pid}.sock"
+
+    def self.start!
+      remote_client = fork do
+        exec("#{Akephalos::BIN_DIR + 'akephalos'} #{@socket_file}")
+      end
+
+      sleep 1 until File.exists?(@socket_file)
+
+      at_exit { Process.kill(:INT, remote_client); File.unlink(@socket_file) }
+    end
+
+    def self.new
+      start!
+      DRb.start_service
+      DRbObject.new_with_uri("drbunix://#{@socket_file}")
+    end
+  end
+end

data/lib/akephalos/server.rb

@@ -1,6 +1,12 @@
 require "pathname"
 require "drb/drb"
-require Pathname(__FILE__).expand_path.dirname + "htmlunit"
+require "akephalos/client"
+
+class NameError::Message
+  def _dump
+    to_s
+  end
+end
 
 [
   java.net.URL,
@@ -17,34 +23,10 @@ require Pathname(__FILE__).expand_path.dirname + "htmlunit"
   com.gargoylesoftware.htmlunit.WebRequestSettings
 ].each { |klass| klass.send(:include, DRbUndumped) }
 
-class WebClient
-  def page
-    @page = getCurrentWindow.getEnclosedPage
-  end
-end
-
-class HtmlPage
-  def find(selector)
-    @present_nodes = getByXPath(selector).to_a
-    (@nodes ||= []).push(*@present_nodes)
-    @present_nodes
-  end
-end
-
-class HtmlSubmitInput
-  def click
-    super
-  rescue => e
-    puts e
-    puts e.backtrace.join("\n")
-  end
-end
-
 module Akephalos
   class Server
     def self.start!(socket_file)
-      client = WebClient.new
-      client.setCssErrorHandler(com.gargoylesoftware.htmlunit.SilentCssErrorHandler.new)
+      client = Client.new
       DRb.start_service("drbunix://#{socket_file}", client)
       DRb.thread.join
     end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 1
-  version: 0.0.1
+  - 2
+  version: 0.0.2
 platform: ruby
 authors: 
 - Bernerd Schaefer
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-05 00:00:00 -05:00
+date: 2010-05-10 00:00:00 -05:00
 default_executable: akephalos
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -68,17 +68,18 @@ extra_rdoc_files: []
 files: 
 - .gitignore
 - Rakefile
+- TODO.txt
 - VERSION
 - akephalos.gemspec
 - bin/akephalos
 - lib/akephalos.rb
 - lib/akephalos/capybara.rb
+- lib/akephalos/client.rb
 - lib/akephalos/cucumber.rb
 - lib/akephalos/htmlunit.rb
-- lib/akephalos/htmlunit/html_element.rb
-- lib/akephalos/htmlunit/html_page.rb
-- lib/akephalos/htmlunit/html_select.rb
-- lib/akephalos/htmlunit/web_client.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/session/akephalos_session_spec.rb

data/lib/akephalos/htmlunit/html_element.rb

@@ -1,11 +0,0 @@
-module Akephalos
-  module Htmlunit
-    module HtmlElement
-      def [](name)
-        hasAttribute(name.to_s) ? getAttribute(name.to_s) : nil
-      end
-
-      com.gargoylesoftware.htmlunit.html.HtmlElement.send(:include, self)
-    end
-  end
-end

data/lib/akephalos/htmlunit/html_page.rb

@@ -1,28 +0,0 @@
-module Akephalos
-  module Htmlunit
-    module HtmlPage
-
-      def modified_source
-        asXml
-      end
-
-      def source
-        getWebResponse.getContentAsString
-      end
-
-      def current_url
-        getWebResponse.getRequestSettings.getUrl.toString
-      end
-
-      def find(selector)
-        getByXPath(selector)
-      end
-
-      def execute_script(script)
-        executeJavaScript(script).getJavaScriptResult
-      end
-
-      com.gargoylesoftware.htmlunit.html.HtmlPage.send(:include, self)
-    end
-  end
-end

data/lib/akephalos/htmlunit/html_select.rb

@@ -1,19 +0,0 @@
-module Akephalos
-  module Htmlunit
-    module HtmlSelect
-      def select_option(option)
-        opt = getOptions.detect { |o| o.asText == option }
-
-        opt && opt.setSelected(true)
-      end
-
-      def unselect_option(option)
-        opt = getOptions.detect { |o| o.asText == option }
-
-        opt && opt.setSelected(false)
-      end
-
-      com.gargoylesoftware.htmlunit.html.HtmlSelect.send(:include, self)
-    end
-  end
-end

data/lib/akephalos/htmlunit/web_client.rb

@@ -1,16 +0,0 @@
-module Akephalos
-  module Htmlunit
-    module WebClient
-
-      def visit(url)
-        getPage(url)
-      end
-
-      def page
-        getCurrentWindow.getEnclosedPage
-      end
-
-      com.gargoylesoftware.htmlunit.WebClient.send(:include, self)
-    end
-  end
-end