jarib-celerity 0.0.6.8 → 0.0.6.9

data/lib/celerity/browser.rb

@@ -26,10 +26,6 @@ module Celerity
       raise NotImplementedError, "use ClickableElement#click_and_attach instead"
     end
 
-    def inspect
-      short_inspect :exclude => %w[@webclient @browser @object @options]
-    end
-
     #
     # Creates a browser object.
     #
@@ -77,6 +73,10 @@ module Celerity
       find_viewer
     end
 
+    def inspect
+      short_inspect :exclude => %w[@webclient @browser @object @options]
+    end
+
     #
     # Goto the given URL
     #
@@ -139,6 +139,14 @@ module Celerity
       @page ? @page.getTitleText : ''
     end
 
+    #
+    # @return [String] the value of window.status
+    #
+
+    def status
+      execute_script "window.status" # avoid the listener overhead
+    end
+
     #
     # @return [String] the HTML content of the current page
     #
@@ -491,9 +499,9 @@ module Celerity
     #   :incorrectness    => IncorrectnessListener
     #   :confirm          => ConfirmHandler ( window.confirm() )
     #   :prompt           => PromptHandler ( window.prompt() )
-    # 
+    #
     # Examples:
-    # 
+    #
     #   browser.add_listener(:status) { |page, message| ... }
     #   browser.add_listener(:alert) { |page, message| ... }
     #   browser.add_listener(:web_window_event) { |web_window_event| ... }
@@ -563,7 +571,7 @@ module Celerity
     #
 
     def log_level
-      logger_for('com.gargoylesoftware.htmlunit').level.to_s.downcase.to_sym
+      Celerity::Util.logger_for('com.gargoylesoftware.htmlunit').level.to_s.downcase.to_sym
     end
 
     #
@@ -577,8 +585,9 @@ module Celerity
 
       [ 'com.gargoylesoftware.htmlunit',
         'com.gargoylesoftware.htmlunit.html',
+        'com.gargoylesoftware.htmlunit.javascript',
         'org.apache.commons.httpclient'
-      ].each { |package| logger_for(package).level = log_level }
+      ].each { |package| Celerity::Util.logger_for(package).level = log_level }
 
       level
     end
@@ -774,7 +783,7 @@ module Celerity
     def find_viewer
       # needed to avoid DRb raising and rescuing lots exceptions
       DRb.start_service unless DRb.primary_server
-      
+
       viewer = DRbObject.new_with_uri("druby://127.0.0.1:6429")
       if viewer.respond_to?(:render_html)
         @viewer = viewer
@@ -794,10 +803,6 @@ module Celerity
       element_class.new(self, :object, obj)
     end
 
-    def logger_for(class_string)
-      java.util.logging.Logger.getLogger(class_string)
-    end
-
     def listener
       @listener ||= Celerity::Listener.new(@webclient)
     end

data/lib/celerity/clickable_element.rb

@@ -49,6 +49,7 @@ module Celerity
 
     #
     # Click the element and just return the content as IO. Current page stays unchanged.
+    # This can be used to download content that normally isn't rendered in a browser.
     #
     # @return [IO]
     #

data/lib/celerity/container.rb

@@ -61,7 +61,7 @@ module Celerity
     #
 
     def inspect
-      short_inspect :exclude => %w[@browser @container]
+      short_inspect :include => %w[@conditions @object]
     end
 
     #

data/lib/celerity/element.rb

@@ -97,15 +97,26 @@ module Celerity
     def locate
       @object = ElementLocator.new(@container, self.class).find_by_conditions(@conditions)
     end
-    
-    # 
+
+    #
     # Returns the HtmlUnit object backing this element
-    # 
+    #
 
     def object
       @object || locate
     end
 
+    #
+    # Returns a JavaScript object representing the receiver
+    #
+    # @api internal - subject to change
+    #
+
+    def javascript_object
+      assert_exists
+      @object.getScriptObject
+    end
+
     #
     # @return [String] A string representation of the element.
     #
@@ -146,7 +157,7 @@ module Celerity
     #
 
     def assert_exists
-      locate
+      locate unless @object
       unless @object
         raise UnknownObjectException, "Unable to locate #{self.class.name[/::(.*)$/, 1]}, using #{identifier_string}"
       end

data/lib/celerity/elements/text_field.rb

@@ -37,6 +37,8 @@ module Celerity
       assert_not_readonly
       clear
       type_string(value.to_s)
+
+      value
     end
 
     #
@@ -76,7 +78,7 @@ module Celerity
     def append(value)
       assert_enabled
       assert_not_readonly
-      type_string(value)
+      type_string value
     end
 
 

data/lib/celerity/htmlunit.rb

@@ -48,3 +48,14 @@ class Java::ComGargoylesoftwareHtmlunitHtml::HtmlElement
     '#<%s:0x%s>' % [self.class.name.split("::").last, self.hash.to_s(16)]
   end
 end
+
+class Java::ComGargoylesoftwareHtmlunitJavascriptHostHtml::HTMLElement
+  def method_missing(meth, *args, &blk)
+    m = ["jsxGet_#{meth}", "jsx_get_#{meth}"].find { |m| respond_to?(m) }
+    if m
+      __send__ m
+    else
+      super
+    end
+  end
+end

data/lib/celerity/util.rb

@@ -83,5 +83,9 @@ module Celerity
              strip
     end
 
+    def logger_for(package_string)
+      java.util.logging.Logger.getLogger(package_string)
+    end
+
   end
 end

data/lib/celerity/version.rb

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

data/lib/celerity/watir_compatibility.rb

@@ -25,8 +25,6 @@ module Celerity
     def bring_to_front; true; end
     # Added for Watir compatibility - not in use by Celerity
     def speed=(s); s end
-    # Added for Watir compatibility - not in use by Celerity
-    def status; '' end
   end
 
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: jarib-celerity
 version: !ruby/object:Gem::Version 
-  version: 0.0.6.8
+  version: 0.0.6.9
 platform: ruby
 authors: 
 - Jari Bakken
@@ -11,7 +11,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-06-04 00:00:00 -07:00
+date: 2009-06-13 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency