jarib-celerity 0.0.6.16 → 0.0.6.17

data/README.markdown

@@ -0,0 +1,86 @@
+Celerity
+========
+
+* [http://celerity.rubyforge.org/](http://celerity.rubyforge.org/)
+
+Description
+------------
+
+Celerity is a JRuby wrapper around HtmlUnit – a headless Java browser with 
+JavaScript support. It provides a simple API for programmatic navigation through
+web applications. Celerity aims at being API compatible with Watir.
+
+Features
+--------
+
+* *Fast*: No time-consuming GUI rendering or unessential downloads
+* *Scalable*: Java threads lets you run tests in parallel
+* *Easy to use*: Simple API
+* *Portable*: Cross-platform thanks to the JVM
+* *Unintrusive*: No browser window interrupting your workflow (runs in background)
+	
+Requirements
+------------
+
+* JRuby 1.2.0 or higher
+* Java 6
+
+Install
+-------
+
+    `jruby -S gem install celerity`
+  
+  or from GitHub (updated frequently)
+  
+    `jruby -S gem install jarib-celerity`
+  
+  
+Example
+-------
+
+    require "rubygems"
+    require "celerity" 
+
+    browser = Celerity::Browser.new
+    browser.goto('http://www.google.com')
+    browser.text_field(:name, 'q').value = 'Celerity'
+    browser.button(:name, 'btnG').click
+
+    puts "yay" if browser.text.include? 'celerity.rubyforge.org'
+  
+Source
+------
+
+The source code is available on [GitHub](http://github.com/jarib/celerity/tree/master).
+
+
+Wiki & Bug Tracker
+-------------------
+
+* [Wiki](http://github.com/jarib/celerity/wikis)
+* [Bug Tracker](http://github.com/jarib/celerity/issues)
+
+Related projects
+----------------
+
+* [WatirSpec](http://github.com/jarib/watirspec/tree/master)
+* [Celerity Viewers](http://github.com/jarib/celerity-viewers)
+
+License
+-------
+
+Celerity - JRuby wrapper for HtmlUnit
+Copyright (c) 2008 FINN.no AS
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.

data/lib/celerity/browser.rb

@@ -46,6 +46,7 @@ module Celerity
     # @option opts :ignore_pattern [Regexp] See Browser#ignore_pattern=
     # @option opts :viewer [Boolean] (true) Connect to a CelerityViewer on port 6429 if available.
     # @option opts :render [:html, :xml] (:html) What DOM representation to send to connected viewers.
+    # @option opts :refresh_handler [:immediat, :waiting, :threaded] (:immediate) Set HtmlUnit's refresh handler.
     #
     # @return [Celerity::Browser]     An instance of the browser.
     #
@@ -659,6 +660,21 @@ module Celerity
       @webclient.cssEnabled
     end
 
+    def refresh_handler=(symbol)
+      handler = case symbol
+                when :waiting
+                  HtmlUnit::WaitingRefreshHandler.new
+                when :threaded
+                  HtmlUnit::ThreadedRefreshHandler.new
+                when :immediate
+                  HtmlUnit::ImmediateRefreshHandler.new
+                else
+                  raise ArgumentError, "expected :waiting, :threaded or :immediate"
+                end
+
+      @webclient.setRefreshHandler handler
+    end
+
     #
     # Turn on/off secure SSL
     #
@@ -809,8 +825,13 @@ module Celerity
       self.javascript_enabled     = opts.delete(:javascript_enabled) != false
       self.secure_ssl             = opts.delete(:secure_ssl) == false
       self.ignore_pattern         = opts.delete(:ignore_pattern) if opts[:ignore_pattern]
+      self.refresh_handler        = opts.delete(:refresh_handler) if opts[:refresh_handler]
+
+      if opts.delete(:resynchronize)
+        controller = ::HtmlUnit::NicelyResynchronizingAjaxController.new
+        @webclient.setAjaxController controller
+      end
 
-      @webclient.setAjaxController(::HtmlUnit::NicelyResynchronizingAjaxController.new) if opts.delete(:resynchronize)
       enable_event_listener
     end
 
@@ -818,16 +839,14 @@ module Celerity
       @viewer = DefaultViewer
       return if option == false
 
-      begin
-        host_string = option.kind_of?(String) ? option : "127.0.0.1:6429"
-        host, port  = host_string.split(":")
+      host_string = option.kind_of?(String) ? option : "127.0.0.1:6429"
+      host, port  = host_string.split(":")
 
-        if viewer = ViewerConnection.create(host, port.to_i)
-          @viewer = viewer
-        end
-      rescue Errno::ECONNREFUSED => e
-        raise e if option.kind_of?(String)
+      if viewer = ViewerConnection.create(host, port.to_i)
+        @viewer = viewer
       end
+    rescue Errno::ECONNREFUSED => e
+      nil
     end
 
     #

data/lib/celerity/version.rb

@@ -3,7 +3,7 @@ module Celerity #:nodoc:
     MAJOR = 0
     MINOR = 0
     TINY  = 6
-    PATCH = 16 # Set to nil for official release
+    PATCH = 17 # Set to nil for official release
 
     STRING = [MAJOR, MINOR, TINY, PATCH].compact.join('.')
   end

data/lib/celerity/viewer_connection.rb

@@ -1,7 +1,12 @@
 module Celerity
   class ViewerConnection
 
+    #
+    # Create a new connection to the given host/port
+    #
+
     def self.create(host, port)
+      # if the connection fails, we won't spend time loading json
       socket = TCPSocket.new(host, port)
       require "json"
       new(socket)
@@ -11,22 +16,48 @@ module Celerity
       @socket = socket
     end
 
+    #
+    # Tells the viewer to render the given HTML, with the given URL as base url.
+    #
+
     def render_html(html, url)
       send_data({'method' => 'page_changed', 'html' => html, 'url' => url}.to_json)
     end
 
-    def save(path = nil)
+    #
+    # Tells the viewer to save a screenshot of the current page to the given path.
+    # May not be available on all viewers.
+    #
+
+    def save(path)
       send_data({'method' => 'save', 'path' => path}.to_json)
     end
 
+    #
+    # Tells the viewer to dump the render tree to the given path.
+    # Only available on the Qt viewer.
+    #
+
+    def save_render_tree(path)
+      send_data({'method' => 'save_render_tree', 'path' => path}.to_json)
+    end
+
+    #
+    # Close the connection.
+    #
+
     def close
-      @socket.close
+      @socket.close rescue nil
     end
 
     private
 
-    def send_data(data)
-      @socket.write ["Content-Length: #{data.size}", data].join("\n\n")
+    def send_data(json)
+      data = "Content-Length: #{json.size}\n\n#{json}"
+      @socket.write data
+      @socket.flush
+
+      nil
     end
 
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: jarib-celerity
 version: !ruby/object:Gem::Version 
-  version: 0.0.6.16
+  version: 0.0.6.17
 platform: ruby
 authors: 
 - Jari Bakken
@@ -11,7 +11,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-08-10 00:00:00 -07:00
+date: 2009-08-16 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -43,7 +43,6 @@ extensions: []
 extra_rdoc_files: 
 - History.txt
 - License.txt
-- README.txt
 files: 
 - History.txt
 - lib
@@ -95,7 +94,7 @@ files:
 - lib/celerity/htmlunit/cssparser-0.9.5.jar
 - lib/celerity/htmlunit/htmlunit-2.6-SNAPSHOT.jar
 - lib/celerity/htmlunit/htmlunit-core-js-2.6-SNAPSHOT.jar
-- lib/celerity/htmlunit/nekohtml-1.9.13-20090714.153721-7.jar
+- lib/celerity/htmlunit/nekohtml-1.9.13-20090812.213532-11.jar
 - lib/celerity/htmlunit/sac-1.3.jar
 - lib/celerity/htmlunit/serializer-2.7.1.jar
 - lib/celerity/htmlunit/xalan-2.7.1.jar
@@ -104,7 +103,7 @@ files:
 - lib/celerity/resources/no_viewer.png
 - License.txt
 - Rakefile
-- README.txt
+- README.markdown
 - tasks
 - tasks/jar.rake
 - tasks/rdoc.rake
@@ -114,7 +113,7 @@ licenses:
 post_install_message: 
 rdoc_options: 
 - --main
-- README.txt
+- README.markdown
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 

data/README.txt

@@ -1,74 +0,0 @@
-= Celerity
-
-* http://celerity.rubyforge.org/
-
-== DESCRIPTION:
-
-Celerity is a JRuby wrapper around HtmlUnit – a headless Java browser with 
-JavaScript support. It provides a simple API for programmatic navigation through
-web applications. Celerity aims at being API compatible with Watir.
-
-== FEATURES:
-
-* Fast: No time-consuming GUI rendering or unessential downloads
-* Scalable: Java threads lets you run tests in parallel
-* Easy to use: Simple API
-* Portable: Cross-platform
-* Unintrusive: No browser window interrupting your workflow (runs in background)
-	
-== REQUIREMENTS:
-
-* JRuby 1.2.0 or higher
-* Java 6
-
-== INSTALL:
-
-  `jruby -S gem install celerity`
-  
-  or from GitHub
-  
-  `jruby -S gem install jarib-celerity`
-  
-  
-== EXAMPLE:
-
-  require "rubygems"
-  require "celerity" 
-
-  browser = Celerity::Browser.new
-  browser.goto('http://www.google.com')
-  browser.text_field(:name, 'q').value = 'Celerity'
-  browser.button(:name, 'btnG').click
-
-  puts "yay" if browser.text.include? 'celerity.rubyforge.org'
-  
-== SOURCE
-
-The source code is available at http://github.com/jarib/celerity/tree/master.
-Most of Celerity's spec suite is available as a separate project, at http://github.com/jarib/watirspec/tree/master.
-
-== WIKI:
-
-* http://github.com/jarib/celerity/wikis
-
-== BUG TRACKER:
-
-* http://github.com/jarib/celerity/issues
-
-== LICENSE:
-
-Celerity - JRuby wrapper for HtmlUnit
-Copyright (c) 2008 FINN.no AS
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.