jarib-celerity 0.0.5.11 → 0.0.6

data/History.txt

@@ -1,3 +1,36 @@
+== 0.0.6 2009-03-19
+* Support for meta, strong, dl, dt, dd, and em HTML elements.
+* Update to HtmlUnit 2.5-SNAPSHOT.
+* New options for Browser#new: :proxy, :charset, :render, :log_level
+* Methods added:
+  - Browser#add_cookie
+  - Browser#asynchronized
+  - Browser#add_listener
+  - Browser#content_type
+  - Browser#cookies
+  - Browser#debug_web_connection
+  - Browser#focused_element
+  - Browser#io
+  - Browser#remove_cookie
+  - Browser#response_headers
+  - Browser#wait
+  - Browser#xml
+  - Browser#{element,elements}_by_xpath
+  - ClickableElement#{double,right}_click
+  - ElementCollection#{first,last}
+* Methods removed:
+  - Browser#show_*
+* Methods renamed:
+  - SelectList#get_all_contents   => SelectList#options
+  - SelectList#get_selected_items => selected_options
+  - SelectList#clear_selection    => SelectList#clear
+* Add support for finding elements by their corresponding <label>.
+* Recognize buttons of type image, reset, submit.
+* Proxy support (see Browser.new)
+* Lots of refactorings, bug fixes and minor enhancements.
+
+Thanks to Hirobumi Hama, Kamal Fariz Mahyuddin and Thomas Marek for contributions in this release.
+
 == 0.0.4 2008-08-18
 * Minor enhancements
   * Update HtmlUnit to 2.2

data/README.txt

@@ -18,7 +18,7 @@ web applications. Celerity aims at being API compatible with Watir.
 	
 == REQUIREMENTS:
 
-* JRuby 1.1.5 or higher
+* JRuby 1.2.0 or higher
 * Java 6
 
 == INSTALL:

data/lib/celerity/browser.rb

@@ -231,7 +231,7 @@ module Celerity
     # Get all the elements matching the given XPath.
     #
     # @param [String] xpath
-    # @retrun [Array<Celerity::Element>] array of elements
+    # @return [Array<Celerity::Element>] array of elements
     #
     
     def elements_by_xpath(xpath)
@@ -288,17 +288,60 @@ module Celerity
     #
     # Get the cookies for this session. (Celerity only)
     # 
+    # @return [Hash<domain, Hash<name, value>>] 
+    #
 
     def cookies
-      result = {}
+      result = Hash.new { |hash, key| hash[key] = {} }
       
-      cookies = @webclient.getCookieManager.getCookies.to_a
+      cookies = @webclient.getCookieManager.getCookies
       cookies.each do |cookie|
-        result[cookie.getName] = cookie.getValue
+        result[cookie.getDomain][cookie.getName] = cookie.getValue
       end
       
       result
     end
+    
+    #
+    # Add a cookie with the given parameters (Celerity only)
+    # 
+    # @param [String] domain
+    # @param [String] name
+    # @param [String] value
+    #
+    # @option opts :path    [String]  ("/") A path 
+    # @option opts :max_age [Fixnum]  (??) A max age
+    # @option opts :secure  [Boolean] (false) 
+    #
+    
+    def add_cookie(domain, name, value, opts = {})
+      path    = opts.delete(:path) || "/"
+      max_age = opts.delete(:max_age) || (Time.now + 60*60*24) # not sure if this is correct
+      secure  = opts.delete(:secure) || false
+
+      raise "unknown option: #{opts.inspect}" unless opts.empty?
+
+      cookie = Cookie.new(domain, name, value, path, max_age, secure)
+      @webclient.getCookieManager.addCookie(cookie)
+    end
+    
+    #
+    # Remove the cookie with the given domain and name (Celerity only)
+    #
+    # @param [String] domain
+    # @param [String] name
+    #
+    
+    def remove_cookie(domain, name)
+      cm = @webclient.getCookieManager
+      cookie = cm.getCookies.find { |c| c.getDomain == domain && c.getName == name }
+      
+      if cookie.nil?
+        raise "no cookie with domain #{domain.inspect} and name #{name.inspect}"
+      end
+      
+      cm.removeCookie(cookie)
+    end
 
     #
     # Execute the given JavaScript on the current page.
@@ -310,7 +353,7 @@ module Celerity
       @page.executeJavaScript(source.to_s).getJavaScriptResult
     end
 
-    # experimental
+    # experimental - should be removed?
     def send_keys(keys)
       keys = keys.gsub(/\s*/, '').scan(/((?:\{[A-Z]+?\})|.)/u).flatten
       keys.each do |key|

data/lib/celerity/element_locator.rb

@@ -40,7 +40,7 @@ module Celerity
         when :xpath
           return find_by_xpath(what)
         when :label
-          return find_by_label(what)
+          return find_by_label(what) unless @attributes.include?(:label)
         when :class_name
           how = :class
         when :url

data/lib/celerity/elements/option.rb

@@ -22,5 +22,11 @@ module Celerity
       assert_exists
       @object.isSelected
     end
+    
+    def label
+      # overrides Container#label
+      assert_exists
+      @object.getAttribute("label")
+    end
   end
 end

data/lib/celerity/htmlunit.rb

@@ -1,8 +1,11 @@
 module Celerity
   Jars = Dir[File.dirname(__FILE__) + '/htmlunit/*.jar']
+  Jars.each { |jar| require(jar) }
+  
+  include_class org.apache.commons.httpclient.Cookie
 end
 
-Celerity::Jars.each { |jar| require(jar) }
+
 
 module HtmlUnit
   include_package 'com.gargoylesoftware.htmlunit'

data/lib/celerity/version.rb

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

metadata

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