celerity 0.7.9 → 0.8.0.beta.1

data/VERSION.yml

@@ -1,5 +1,5 @@
 --- 
 :major: 0
-:minor: 7
-:patch: 9
-:build: 
+:minor: 8
+:patch: 0
+:build: beta.1

data/celerity.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{celerity}
-  s.version = "0.7.9"
+  s.version = "0.8.0.beta.1"
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jari Bakken", "T. Alexander Lystad", "Knut Johannes Dahle"]
-  s.date = %q{2010-02-10}
+  s.date = %q{2010-07-06}
   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 = [
@@ -52,16 +52,19 @@ Gem::Specification.new do |s|
      "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-httpclient-3.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.7-SNAPSHOT.jar",
-     "lib/celerity/htmlunit/htmlunit-core-js-2.7-SNAPSHOT.jar",
-     "lib/celerity/htmlunit/nekohtml-1.9.14-20100122.114035-12.jar",
+     "lib/celerity/htmlunit/htmlunit-2.8-SNAPSHOT.jar",
+     "lib/celerity/htmlunit/htmlunit-core-js-2.8-SNAPSHOT.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",
@@ -95,26 +98,29 @@ 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.5}
+  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>, [">= 0.9.4"])
+      s.add_development_dependency(%q<sinatra>, [">= 1.0"])
+      s.add_development_dependency(%q<mongrel>, [">= 0"])
     else
       s.add_dependency(%q<rspec>, [">= 0"])
       s.add_dependency(%q<yard>, [">= 0"])
-      s.add_dependency(%q<sinatra>, [">= 0.9.4"])
+      s.add_dependency(%q<sinatra>, [">= 1.0"])
+      s.add_dependency(%q<mongrel>, [">= 0"])
     end
   else
     s.add_dependency(%q<rspec>, [">= 0"])
     s.add_dependency(%q<yard>, [">= 0"])
-    s.add_dependency(%q<sinatra>, [">= 0.9.4"])
+    s.add_dependency(%q<sinatra>, [">= 1.0"])
+    s.add_dependency(%q<mongrel>, [">= 0"])
   end
 end
 

data/lib/celerity/browser.rb

@@ -159,7 +159,9 @@ module Celerity
     #
 
     def html
-      @page ? @page.getWebResponse.getContentAsString(@charset) : ''
+      return '' unless @page
+
+      @page.getWebResponse.getContentAsString(@charset)
     end
 
     #
@@ -179,16 +181,13 @@ module Celerity
     def text
       return '' unless @page
 
-      if @page.respond_to?("getContent")
-        string = @page.getContent.strip
-      elsif doc = @page.documentElement
-        string = doc.asText.strip
+      if @page.respond_to?(:getContent)
+        @page.getContent.strip
+      elsif @page.respond_to?(:getDocumentElement) && doc = @page.getDocumentElement
+        doc.asText.strip
       else
-        string = ''
+        ''
       end
-
-      # Celerity::Util.normalize_text(string)
-      string
     end
 
     #
@@ -838,7 +837,7 @@ module Celerity
 
       self.javascript_exceptions  = false unless opts.delete(:javascript_exceptions)
       self.status_code_exceptions = false unless opts.delete(:status_code_exceptions)
-      self.css                    = false unless opts.delete(:css)
+      self.css                    = opts.delete(:css) if opts[:css]
       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]

data/lib/celerity/elements/table.rb

@@ -21,7 +21,12 @@ module Celerity
 
     def locate
       super
-      if @object # cant call assert_exists here, as an exists? method call will fail
+      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/version.rb

@@ -1,3 +1,3 @@
 module Celerity
-  VERSION = "0.7.9"
+  VERSION = "0.8.0.beta.1"
 end

data/tasks/jeweler.rake

@@ -1,23 +1,26 @@
+# encoding: utf-8
+
 begin
   require 'jeweler'
   Jeweler::Tasks.new do |gem|
     # see http://www.rubygems.org/read/chapter/20 for additional settings
     gem.name              = "celerity"
     gem.summary           = "Celerity is a JRuby library for easy and fast functional test automation for web applications."
-    gem.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.}
+    gem.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 provides a superset of Watir's API."
     gem.email             = "jari.bakken@gmail.com"
     gem.homepage          = "http://github.com/jarib/celerity"
     gem.authors           = ["Jari Bakken", "T. Alexander Lystad", "Knut Johannes Dahle"]
     gem.rubyforge_project = "celerity"
     gem.test_files        = [] # the gem is big enough as it is
-    
+
     gem.files.reject! { |f| f =~ /^(website|doc|benchmark|log|spec|\.)/}
-    
-    gem.add_development_dependency "rspec"
-    gem.add_development_dependency "yard"
-    gem.add_development_dependency 'sinatra', '>= 0.9.4'
+
+    gem.add_development_dependency 'rspec'
+    gem.add_development_dependency 'yard'
+    gem.add_development_dependency 'sinatra', '>= 1.0'
+    gem.add_development_dependency 'mongrel'
   end
-  
+
   Jeweler::GemcutterTasks.new
   Jeweler::RubyforgeTasks.new { |rf| rf.doc_task = "yardoc" }
 rescue LoadError

data/tasks/snapshot.rake

@@ -1,6 +1,6 @@
 desc 'Download and unpack the latest HtmlUnit assembly'
 task :snapshot do
-  files = %w[ http://build.canoo.com/htmlunit/artifacts/htmlunit-2.7-SNAPSHOT-with-dependencies.zip ]
+  files = %w[ http://build.canoo.com/htmlunit/artifacts/htmlunit-2.8-SNAPSHOT-with-dependencies.zip ]
   
   files.each do |url|
     basename = File.basename(url)

metadata

@@ -1,7 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: celerity
 version: !ruby/object:Gem::Version 
-  version: 0.7.9
+  hash: -724544884
+  prerelease: true
+  segments: 
+  - 0
+  - 8
+  - 0
+  - beta
+  - 1
+  version: 0.8.0.beta.1
 platform: ruby
 authors: 
 - Jari Bakken
@@ -11,39 +19,66 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-10 00:00:00 +01:00
+date: 2010-07-06 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rspec
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :development
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: yard
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
         version: "0"
-    version: 
+  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 
+        hash: 15
+        segments: 
+        - 1
+        - 0
+        version: "1.0"
   type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: mongrel
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.9.4
-    version: 
+        hash: 3
+        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: []
@@ -89,16 +124,19 @@ files:
 - 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-httpclient-3.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.7-SNAPSHOT.jar
-- lib/celerity/htmlunit/htmlunit-core-js-2.7-SNAPSHOT.jar
-- lib/celerity/htmlunit/nekohtml-1.9.14-20100122.114035-12.jar
+- lib/celerity/htmlunit/htmlunit-2.8-SNAPSHOT.jar
+- lib/celerity/htmlunit/htmlunit-core-js-2.8-SNAPSHOT.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
@@ -137,21 +175,29 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version 
-      version: "0"
-  version: 
+      hash: 25
+      segments: 
+      - 1
+      - 3
+      - 1
+      version: 1.3.1
 requirements: []
 
 rubyforge_project: celerity
-rubygems_version: 1.3.5
+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.