jarib-celerity 0.0.5.2 → 0.0.5.4

data/lib/celerity/browser.rb

@@ -46,21 +46,14 @@ module Celerity
 
       @render_type   = opts.delete(:render)    || :html
       @charset       = opts.delete(:charset)   || "UTF-8"
-      @proxy         = opts.delete(:proxy)     || nil
       self.log_level = opts.delete(:log_level) || :warning
 
       @last_url, @page = nil
       @error_checkers  = []
       @browser         = self # for Container#browser
 
-      browser = case opts.delete(:browser)
-                when :firefox then ::HtmlUnit::BrowserVersion::FIREFOX_2
-                else               ::HtmlUnit::BrowserVersion::INTERNET_EXPLORER_7_0
-                end
-
-      @webclient = ::HtmlUnit::WebClient.new(browser)
-
-      configure_webclient(opts)
+      setup_webclient(opts)
+      
       raise ArgumentError, "unknown option #{opts.inspect}" unless opts.empty?
       find_viewer
     end
@@ -297,7 +290,7 @@ module Celerity
 
     # Allows you to temporarily switch to HtmlUnit's NicelyResynchronizingAjaxController to resynchronize ajax calls.
     #
-    #   @browser.resynchroniced do |b|
+    #   @browser.resynchronized do |b|
     #     b.link(:id, 'load_fancy_ajax_stuff').click
     #   end
     #
@@ -396,17 +389,23 @@ module Celerity
 
     # Configure the webclient according to the options given to #new.
     # @see initialize
-    def configure_webclient(opts)
+    def setup_webclient(opts)
+      browser = case opts.delete(:browser)
+                when :firefox then ::HtmlUnit::BrowserVersion::FIREFOX_2
+                else               ::HtmlUnit::BrowserVersion::INTERNET_EXPLORER_7_0
+                end
+
+      if proxy = opts.delete(:proxy)
+        phost, pport = proxy.split(":")
+        @webclient = ::HtmlUnit::WebClient.new(browser, phost, pport.to_i)
+      else
+        @webclient = ::HtmlUnit::WebClient.new(browser)  
+      end
+      
       @webclient.throwExceptionOnScriptError = false unless opts.delete(:javascript_exceptions)
       @webclient.throwExceptionOnFailingStatusCode = false unless opts.delete(:status_code_exceptions)
       @webclient.cssEnabled = false unless opts.delete(:css)
       @webclient.useInsecureSSL = opts.delete(:secure_ssl) == false
-
-      if @proxy
-        phost, pport = @proxy.split(":")
-        @webclient.proxyHost = phost
-        @webclient.proxyPort = pport.to_i
-      end
       @webclient.setAjaxController(::HtmlUnit::NicelyResynchronizingAjaxController.new) if opts.delete(:resynchronize)
     end
 

data/lib/celerity/element_locator.rb

@@ -77,13 +77,13 @@ module Celerity
     def find_by_id(what)
       case what
       when Regexp
-        elements_by_tag_names.find { |elem| elem.getIdAttribute =~ what }
+        elements_by_tag_names.find { |elem| elem.getId =~ what }
       when String
         obj = @object.getHtmlElementById(what)
         return obj if @tags.include?(obj.getTagName)
 
         $stderr.puts "warning: multiple elements with identical id? (#{what.inspect})" if $VERBOSE
-        elements_by_tag_names.find { |elem| elem.getIdAttribute == what }
+        elements_by_tag_names.find { |elem| elem.getId == what }
       else
         raise TypeError, "expected String or Regexp, got #{what.inspect}:#{what.class}"
       end

data/lib/celerity/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: jarib-celerity
 version: !ruby/object:Gem::Version 
-  version: 0.0.5.2
+  version: 0.0.5.4
 platform: ruby
 authors: 
 - Jari Bakken
@@ -11,7 +11,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-02-03 00:00:00 -08:00
+date: 2009-02-04 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -37,6 +37,7 @@ files:
 - History.txt
 - lib
 - lib/celerity
+- lib/celerity.rb
 - lib/celerity/browser.rb
 - lib/celerity/clickable_element.rb
 - lib/celerity/collections.rb
@@ -68,6 +69,7 @@ files:
 - lib/celerity/extra
 - lib/celerity/extra/method_generator.rb
 - lib/celerity/htmlunit
+- lib/celerity/htmlunit.rb
 - lib/celerity/htmlunit/commons-codec-1.3.jar
 - lib/celerity/htmlunit/commons-collections-3.2.1.jar
 - lib/celerity/htmlunit/commons-httpclient-3.1.jar
@@ -75,7 +77,7 @@ files:
 - lib/celerity/htmlunit/commons-lang-2.4.jar
 - lib/celerity/htmlunit/commons-logging-1.1.1.jar
 - lib/celerity/htmlunit/cssparser-0.9.5.jar
-- lib/celerity/htmlunit/htmlunit-2.4.jar
+- lib/celerity/htmlunit/htmlunit-2.5-SNAPSHOT.jar
 - lib/celerity/htmlunit/htmlunit-core-js-2.4.jar
 - lib/celerity/htmlunit/nekohtml-1.9.11.jar
 - lib/celerity/htmlunit/sac-1.3.jar
@@ -83,7 +85,6 @@ files:
 - lib/celerity/htmlunit/xalan-2.7.1.jar
 - lib/celerity/htmlunit/xercesImpl-2.8.1.jar
 - lib/celerity/htmlunit/xml-apis-1.3.04.jar
-- lib/celerity/htmlunit.rb
 - lib/celerity/identifier.rb
 - lib/celerity/input_element.rb
 - lib/celerity/listener.rb
@@ -92,7 +93,6 @@ files:
 - lib/celerity/util.rb
 - lib/celerity/version.rb
 - lib/celerity/watir_compatibility.rb
-- lib/celerity.rb
 - License.txt
 - Rakefile
 - README.txt