celerity 0.8.0 → 0.8.1

data/Rakefile

@@ -1,6 +1,6 @@
 require 'rubygems'
 require 'rake'
-require "lib/celerity/version"
+require File.expand_path("lib/celerity/version", File.dirname(__FILE__))
 
 Dir['tasks/**/*.rake'].each do |rake|
   begin

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
 :major: 0
 :minor: 8
-:patch: 0
+:patch: 1

data/celerity.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{celerity}
-  s.version = "0.8.0"
+  s.version = "0.8.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jari Bakken", "T. Alexander Lystad", "Knut Johannes Dahle"]
-  s.date = %q{2010-08-18}
+  s.date = %q{2010-09-01}
   s.description = %q{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 provides a superset of Watir's API.}
   s.email = %q{jari.bakken@gmail.com}
   s.extra_rdoc_files = [
@@ -56,10 +56,10 @@ Gem::Specification.new do |s|
      "lib/celerity/htmlunit/commons-codec-1.4.jar",
      "lib/celerity/htmlunit/commons-collections-3.2.1.jar",
      "lib/celerity/htmlunit/commons-io-1.4.jar",
-     "lib/celerity/htmlunit/commons-lang-2.4.jar",
+     "lib/celerity/htmlunit/commons-lang-2.5.jar",
      "lib/celerity/htmlunit/commons-logging-1.1.1.jar",
      "lib/celerity/htmlunit/cssparser-0.9.5.jar",
-     "lib/celerity/htmlunit/htmlunit-2.8.jar",
+     "lib/celerity/htmlunit/htmlunit-2.9-SNAPSHOT.jar",
      "lib/celerity/htmlunit/htmlunit-core-js-2.8.jar",
      "lib/celerity/htmlunit/httpclient-4.0.1.jar",
      "lib/celerity/htmlunit/httpcore-4.0.1.jar",
@@ -98,14 +98,14 @@ Gem::Specification.new do |s|
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
   s.rubyforge_project = %q{celerity}
-  s.rubygems_version = %q{1.3.6}
+  s.rubygems_version = %q{1.3.7}
   s.summary = %q{Celerity is a JRuby library for easy and fast functional test automation for web applications.}
 
   if s.respond_to? :specification_version then
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_development_dependency(%q<rspec>, [">= 0"])
       s.add_development_dependency(%q<yard>, [">= 0"])
       s.add_development_dependency(%q<sinatra>, [">= 1.0"])

data/lib/celerity/browser.rb

@@ -135,7 +135,7 @@ module Celerity
 
     def url
       assert_exists
-      @page.getWebResponse.getRequestUrl.toString
+      @page.getWebResponse.getWebRequest.getUrl.toString
     end
 
     #
@@ -306,6 +306,18 @@ module Celerity
     def clear_cache
       @webclient.cache.clear
     end
+    
+    #
+    # Set the maximum number of files to cache.
+    #
+    
+    def cache_limit=(size)
+      @webclient.cache.setMaxSize(size)
+    end
+    
+    def cache_limit
+      @webclient.cache.getMaxSize
+    end
 
     #
     # Get the cookies for this session. (Celerity only)
@@ -814,11 +826,15 @@ module Celerity
       browser = (opts.delete(:browser) || :firefox3).to_sym
 
       browser_version = case browser
-                        when :firefox, :ff, :ff2
-                          ::HtmlUnit::BrowserVersion::FIREFOX_2
-                        when :firefox3, :ff3
+                        when :firefox, :ff, :firefox3, :ff3 # default :firefox
+                          ::HtmlUnit::BrowserVersion::FIREFOX_3
+                        when :firefox_3_6, :ff36
                           ::HtmlUnit::BrowserVersion::FIREFOX_3
-                        when :internet_explorer, :ie
+                        when :internet_explorer_6, :ie6
+                          ::HtmlUnit::BrowserVersion::INTERNET_EXPLORER_6
+                        when :internet_explorer, :ie, :internet_explorer7, :ie7  # default :ie
+                          ::HtmlUnit::BrowserVersion::INTERNET_EXPLORER_7
+                        when :internet_explorer_8, :ie8
                           ::HtmlUnit::BrowserVersion::INTERNET_EXPLORER_7
                         else
                           raise ArgumentError, "unknown browser: #{browser.inspect}"
@@ -842,6 +858,7 @@ module Celerity
       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]
+      self.cache_limit            = opts.delete(:cache_limit) if opts[:cache_limit]
 
       if opts.delete(:resynchronize)
         controller = ::HtmlUnit::NicelyResynchronizingAjaxController.new

data/lib/celerity/collections.rb

@@ -152,5 +152,13 @@ module Celerity
   class H6s < ElementCollection
     def element_class; H6; end
   end
+  
+  class Inses < ElementCollection
+    def element_class; Ins; end
+  end
+
+  class Dels < ElementCollection
+    def element_class; Del; end
+  end
 
 end

data/lib/celerity/container.rb

@@ -169,6 +169,22 @@ module Celerity
       Dds.new(self)
     end
 
+    #
+    # @return [Celerity::Del]
+    #
+
+    def del(*args)
+      Del.new(self, *args)
+    end
+
+    #
+    # @return [Celerity::Dels]
+    #
+
+    def dels
+      Dels.new(self)
+    end
+
     #
     # @return [Celerity::Div]
     #
@@ -393,6 +409,23 @@ module Celerity
       Hiddens.new(self)
     end
 
+    #
+    # @return [Celerity::Ins]
+    #
+
+    def ins(*args)
+      Ins.new(self, *args)
+    end
+
+    #
+    # @return [Celerity::Inses]
+    #
+
+    def inses(*args)
+      Inses.new(self, *args)
+    end
+
+
     #
     # @return [Celerity::Image]
     #

data/lib/celerity/element.rb

@@ -44,6 +44,8 @@ module Celerity
         else
           raise ArgumentError, "wrong number of arguments (1 for 2)"
         end
+      when 0
+        @conditions = { :index => Celerity.index_offset }
       else
         raise ArgumentError, "wrong number of arguments (#{args.size} for 2)"
       end

data/lib/celerity/element_locator.rb

@@ -94,7 +94,12 @@ module Celerity
 
     def find_by_xpath(what)
       what = ".#{what}" if what[0].chr == "/"
-      @object.getByXPath(what).to_a.first
+      object = @object.getByXPath(what).to_a.first || return
+      
+      return unless @idents.any? { |id| id.match?(object) }
+      
+      
+      object
     end
 
     def find_by_label(what)
@@ -139,7 +144,7 @@ module Celerity
           Please report this failure and the code/HTML that caused it at http://github.com/jarib/celerity/issues}
       end
 
-      @object.getAllHtmlChildElements
+      @object.getHtmlElementDescendants
     end
 
     # HtmlUnit throws NPEs sometimes when we're locating elements

data/lib/celerity/elements/non_control_elements.rb

@@ -37,6 +37,10 @@ module Celerity
     TAGS = [ Identifier.new('dd')]
   end
 
+  class Del < NonControlElement
+    TAGS = [ Identifier.new('del')]
+  end
+
   class Div < NonControlElement
     TAGS = [ Identifier.new('div')]
   end
@@ -76,6 +80,10 @@ module Celerity
   class H6 < NonControlElement
     TAGS = [ Identifier.new('h6') ]
   end
+  
+  class Ins < NonControlElement
+    TAGS = [ Identifier.new('ins') ]
+  end
 
   class Li < NonControlElement
     TAGS = [ Identifier.new('li') ]

data/lib/celerity/elements/select_list.rb

@@ -26,8 +26,7 @@ module Celerity
     #
 
     def clear
-      # assert_exists called by SelectList#type here
-      @object.getSelectedOptions.each { |e| e.setSelected(false) } unless type() == 'select-one'
+      @object.getSelectedOptions.each { |e| e.setSelected(false) } if multiple?
     end
 
     #
@@ -144,4 +143,4 @@ module Celerity
     end
 
   end # SelectList
-end # Celerity
+end # Celerity

data/lib/celerity/elements/table.rb

@@ -22,11 +22,6 @@ module Celerity
     def locate
       super
       if @object
-
-        unless @object.kind_of?(HtmlUnit::Html::HtmlTable)
-          raise TypeError, "expected HtmlTable, got #{@object.class}"
-        end
-
         @rows = @object.getRows
         @cells = []
         @rows.each do |row|

data/lib/celerity/htmlunit.rb

@@ -45,7 +45,7 @@ end unless Java::JavaLang::Iterable < Enumerable # depends on JRuby version
 
 class Java::ComGargoylesoftwareHtmlunitHtml::HtmlPage
   def inspect
-    '#<HtmlPage:0x%s(%s)>' % [self.hash.to_s(16), getWebResponse.getRequestUrl.toString]
+    '#<HtmlPage:0x%s(%s)>' % [self.hash.to_s(16), getWebResponse.getWebRequest.getUrl.toString]
   end
 end
 

data/lib/celerity/util.rb

@@ -15,6 +15,7 @@ module Celerity
       HtmlUnit::Html::HtmlDefinitionDescription => Celerity::Dd,
       HtmlUnit::Html::HtmlDefinitionList        => Celerity::Dl,
       HtmlUnit::Html::HtmlDefinitionTerm        => Celerity::Dt,
+      HtmlUnit::Html::HtmlDeletedText           => Celerity::Del,
       HtmlUnit::Html::HtmlDivision              => Celerity::Div,
       HtmlUnit::Html::HtmlFileInput             => Celerity::FileField,
       HtmlUnit::Html::HtmlForm                  => Celerity::Form,
@@ -47,7 +48,8 @@ module Celerity
       HtmlUnit::Html::HtmlTableRow              => Celerity::TableRow,
       HtmlUnit::Html::HtmlTextArea              => Celerity::TextField,
       HtmlUnit::Html::HtmlTextInput             => Celerity::TextField,
-      HtmlUnit::Html::HtmlUnorderedList         => Celerity::Ul
+      HtmlUnit::Html::HtmlUnorderedList         => Celerity::Ul,
+      HtmlUnit::Html::HtmlInsertedText          => Celerity::Ins
     }
 
     def htmlunit2celerity(klass)

data/lib/celerity/version.rb

@@ -1,3 +1,3 @@
 module Celerity
-  VERSION = "0.8.0"
+  VERSION = "0.8.1"
 end

data/tasks/snapshot.rake

@@ -4,7 +4,7 @@ task :snapshot, :file do |t, args|
     sh "cp #{args.file} ./"
     basename = File.basename(args.file)
   else
-    url = "http://build.canoo.com/htmlunit/artifacts/htmlunit-2.8-SNAPSHOT-with-dependencies.zip"
+    url = "http://build.canoo.com/htmlunit/artifacts/htmlunit-2.9-SNAPSHOT-with-dependencies.zip"
     sh "curl -O #{url}"
     basename = File.basename(url)
   end

metadata

@@ -3,71 +3,75 @@ name: celerity
 version: !ruby/object:Gem::Version 
   prerelease: false
   segments: 
-    - 0
-    - 8
-    - 0
-  version: 0.8.0
+  - 0
+  - 8
+  - 1
+  version: 0.8.1
 platform: ruby
 authors: 
-  - Jari Bakken
-  - T. Alexander Lystad
-  - Knut Johannes Dahle
+- Jari Bakken
+- T. Alexander Lystad
+- Knut Johannes Dahle
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2010-08-18 00:00:00 +02:00
+date: 2010-09-01 00:00:00 +02:00
 default_executable: 
 dependencies: 
-  - !ruby/object:Gem::Dependency 
-    name: rspec
-    prerelease: false
-    requirement: &id001 !ruby/object:Gem::Requirement 
-      requirements: 
-        - - ">="
-          - !ruby/object:Gem::Version 
-            segments: 
-              - 0
-            version: "0"
-    type: :development
-    version_requirements: *id001
-  - !ruby/object:Gem::Dependency 
-    name: yard
-    prerelease: false
-    requirement: &id002 !ruby/object:Gem::Requirement 
-      requirements: 
-        - - ">="
-          - !ruby/object:Gem::Version 
-            segments: 
-              - 0
-            version: "0"
-    type: :development
-    version_requirements: *id002
-  - !ruby/object:Gem::Dependency 
-    name: sinatra
-    prerelease: false
-    requirement: &id003 !ruby/object:Gem::Requirement 
-      requirements: 
-        - - ">="
-          - !ruby/object:Gem::Version 
-            segments: 
-              - 1
-              - 0
-            version: "1.0"
-    type: :development
-    version_requirements: *id003
-  - !ruby/object:Gem::Dependency 
-    name: mongrel
-    prerelease: false
-    requirement: &id004 !ruby/object:Gem::Requirement 
-      requirements: 
-        - - ">="
-          - !ruby/object:Gem::Version 
-            segments: 
-              - 0
-            version: "0"
-    type: :development
-    version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: rspec
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: yard
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: sinatra
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 0
+        version: "1.0"
+  type: :development
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: mongrel
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id004
 description: "Celerity is a JRuby wrapper around HtmlUnit \xE2\x80\x93 a headless Java browser with JavaScript support. It provides a simple API for programmatic navigation through web applications. Celerity provides a superset of Watir's API."
 email: jari.bakken@gmail.com
 executables: []
@@ -75,112 +79,114 @@ executables: []
 extensions: []
 
 extra_rdoc_files: 
-  - LICENSE
-  - README.rdoc
+- LICENSE
+- README.rdoc
 files: 
-  - HISTORY
-  - LICENSE
-  - README.rdoc
-  - Rakefile
-  - VERSION.yml
-  - celerity.gemspec
-  - lib/celerity.rb
-  - lib/celerity/browser.rb
-  - lib/celerity/clickable_element.rb
-  - lib/celerity/collections.rb
-  - lib/celerity/container.rb
-  - lib/celerity/default_viewer.rb
-  - lib/celerity/disabled_element.rb
-  - lib/celerity/element.rb
-  - lib/celerity/element_collection.rb
-  - lib/celerity/element_locator.rb
-  - lib/celerity/elements/button.rb
-  - lib/celerity/elements/file_field.rb
-  - lib/celerity/elements/form.rb
-  - lib/celerity/elements/frame.rb
-  - lib/celerity/elements/image.rb
-  - lib/celerity/elements/label.rb
-  - lib/celerity/elements/link.rb
-  - lib/celerity/elements/meta.rb
-  - lib/celerity/elements/non_control_elements.rb
-  - lib/celerity/elements/option.rb
-  - lib/celerity/elements/radio_check.rb
-  - lib/celerity/elements/select_list.rb
-  - lib/celerity/elements/table.rb
-  - lib/celerity/elements/table_cell.rb
-  - lib/celerity/elements/table_elements.rb
-  - lib/celerity/elements/table_row.rb
-  - lib/celerity/elements/text_field.rb
-  - lib/celerity/exception.rb
-  - lib/celerity/htmlunit.rb
-  - lib/celerity/htmlunit/apache-mime4j-0.6.jar
-  - lib/celerity/htmlunit/commons-codec-1.4.jar
-  - lib/celerity/htmlunit/commons-collections-3.2.1.jar
-  - lib/celerity/htmlunit/commons-io-1.4.jar
-  - 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.8.jar
-  - lib/celerity/htmlunit/htmlunit-core-js-2.8.jar
-  - lib/celerity/htmlunit/httpclient-4.0.1.jar
-  - lib/celerity/htmlunit/httpcore-4.0.1.jar
-  - lib/celerity/htmlunit/httpmime-4.0.1.jar
-  - lib/celerity/htmlunit/nekohtml-1.9.14.jar
-  - lib/celerity/htmlunit/sac-1.3.jar
-  - lib/celerity/htmlunit/serializer-2.7.1.jar
-  - lib/celerity/htmlunit/xalan-2.7.1.jar
-  - lib/celerity/htmlunit/xercesImpl-2.9.1.jar
-  - lib/celerity/htmlunit/xml-apis-1.3.04.jar
-  - lib/celerity/identifier.rb
-  - lib/celerity/ignoring_web_connection.rb
-  - lib/celerity/input_element.rb
-  - lib/celerity/javascript_debugger.rb
-  - lib/celerity/listener.rb
-  - lib/celerity/resources/no_viewer.png
-  - lib/celerity/short_inspect.rb
-  - lib/celerity/util.rb
-  - lib/celerity/version.rb
-  - lib/celerity/viewer_connection.rb
-  - lib/celerity/watir_compatibility.rb
-  - lib/celerity/xpath_support.rb
-  - tasks/benchmark.rake
-  - tasks/check.rake
-  - tasks/clean.rake
-  - tasks/fix.rake
-  - tasks/jar.rake
-  - tasks/jeweler.rake
-  - tasks/rdoc.rake
-  - tasks/snapshot.rake
-  - tasks/spec.rake
-  - tasks/website.rake
-  - tasks/yard.rake
+- HISTORY
+- LICENSE
+- README.rdoc
+- Rakefile
+- VERSION.yml
+- celerity.gemspec
+- lib/celerity.rb
+- lib/celerity/browser.rb
+- lib/celerity/clickable_element.rb
+- lib/celerity/collections.rb
+- lib/celerity/container.rb
+- lib/celerity/default_viewer.rb
+- lib/celerity/disabled_element.rb
+- lib/celerity/element.rb
+- lib/celerity/element_collection.rb
+- lib/celerity/element_locator.rb
+- lib/celerity/elements/button.rb
+- lib/celerity/elements/file_field.rb
+- lib/celerity/elements/form.rb
+- lib/celerity/elements/frame.rb
+- lib/celerity/elements/image.rb
+- lib/celerity/elements/label.rb
+- lib/celerity/elements/link.rb
+- lib/celerity/elements/meta.rb
+- lib/celerity/elements/non_control_elements.rb
+- lib/celerity/elements/option.rb
+- lib/celerity/elements/radio_check.rb
+- lib/celerity/elements/select_list.rb
+- lib/celerity/elements/table.rb
+- lib/celerity/elements/table_cell.rb
+- lib/celerity/elements/table_elements.rb
+- lib/celerity/elements/table_row.rb
+- lib/celerity/elements/text_field.rb
+- lib/celerity/exception.rb
+- lib/celerity/htmlunit.rb
+- lib/celerity/htmlunit/apache-mime4j-0.6.jar
+- lib/celerity/htmlunit/commons-codec-1.4.jar
+- lib/celerity/htmlunit/commons-collections-3.2.1.jar
+- lib/celerity/htmlunit/commons-io-1.4.jar
+- lib/celerity/htmlunit/commons-lang-2.5.jar
+- lib/celerity/htmlunit/commons-logging-1.1.1.jar
+- lib/celerity/htmlunit/cssparser-0.9.5.jar
+- lib/celerity/htmlunit/htmlunit-2.9-SNAPSHOT.jar
+- lib/celerity/htmlunit/htmlunit-core-js-2.8.jar
+- lib/celerity/htmlunit/httpclient-4.0.1.jar
+- lib/celerity/htmlunit/httpcore-4.0.1.jar
+- lib/celerity/htmlunit/httpmime-4.0.1.jar
+- lib/celerity/htmlunit/nekohtml-1.9.14.jar
+- lib/celerity/htmlunit/sac-1.3.jar
+- lib/celerity/htmlunit/serializer-2.7.1.jar
+- lib/celerity/htmlunit/xalan-2.7.1.jar
+- lib/celerity/htmlunit/xercesImpl-2.9.1.jar
+- lib/celerity/htmlunit/xml-apis-1.3.04.jar
+- lib/celerity/identifier.rb
+- lib/celerity/ignoring_web_connection.rb
+- lib/celerity/input_element.rb
+- lib/celerity/javascript_debugger.rb
+- lib/celerity/listener.rb
+- lib/celerity/resources/no_viewer.png
+- lib/celerity/short_inspect.rb
+- lib/celerity/util.rb
+- lib/celerity/version.rb
+- lib/celerity/viewer_connection.rb
+- lib/celerity/watir_compatibility.rb
+- lib/celerity/xpath_support.rb
+- tasks/benchmark.rake
+- tasks/check.rake
+- tasks/clean.rake
+- tasks/fix.rake
+- tasks/jar.rake
+- tasks/jeweler.rake
+- tasks/rdoc.rake
+- tasks/snapshot.rake
+- tasks/spec.rake
+- tasks/website.rake
+- tasks/yard.rake
 has_rdoc: true
 homepage: http://github.com/jarib/celerity
 licenses: []
 
 post_install_message: 
 rdoc_options: 
-  - --charset=UTF-8
+- --charset=UTF-8
 require_paths: 
-  - lib
+- lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-          - 0
-        version: "0"
+  - - ">="
+    - !ruby/object:Gem::Version 
+      segments: 
+      - 0
+      version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-          - 0
-        version: "0"
+  - - ">="
+    - !ruby/object:Gem::Version 
+      segments: 
+      - 0
+      version: "0"
 requirements: []
 
 rubyforge_project: celerity
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Celerity is a JRuby library for easy and fast functional test automation for web applications.