jarib-celerity 0.0.6.17 → 0.0.6.18

data/lib/celerity/browser.rb

@@ -58,7 +58,7 @@ module Celerity
         raise TypeError, "wrong argument type #{opts.class}, expected Hash"
       end
 
-      unless (render_types = [:html, :xml, nil]).include?(opts[:render])
+      unless (render_types = [:html, :xml, nil, 'html', 'xml']).include?(opts[:render])
         raise ArgumentError, "expected one of #{render_types.inspect} for key :render"
       end
 

data/lib/celerity/element_locator.rb

@@ -165,7 +165,7 @@ module Celerity
       raise e if tries >= max_retries
 
       tries += 1
-      $stderr.puts "warning: celerity caught #{e} - retry ##{tries}"
+      warn "warning: celerity caught #{e} - retry ##{tries}"
       retry
     end
 

data/lib/celerity/elements/select_list.rb

@@ -34,31 +34,52 @@ module Celerity
     end
 
     #
-    # Select the option(s) matching the given value.
+    # Select the option(s) whose text or label matches the given string.
     # If several options match the value given, all will be selected.
     #
     # @param [String, Regexp] value A value.
     # @raise [Celerity::Exception::NoValueFoundException] if the value does not exist.
-    # @return [String, nil] The option selected. If multiple options match, returns the first match
+    # @return [String] The option selected. If multiple options match, returns the first match
     #
     #
 
     def select(value)
       assert_exists
-      raise NoValueFoundException, "unknown option with value #{value.inspect} for select_list #{@conditions.inspect}" unless include?(value)
 
       selected = nil
-      matching = @object.getOptions.select do |option|
+      @object.getOptions.select do |option|
         next unless matches_option?(option, value)
 
         selected ||= option.asText
         option.click
       end
 
+      unless selected
+        raise NoValueFoundException, "unknown option with value #{value.inspect} for select_list #{@conditions.inspect}"
+      end
+
       selected
     end
     alias_method :set, :select
 
+    #
+    # Selects the option(s) whose value attribute matches the given string.
+    # @param [String, Regexp] value A value.
+    # @raise [Celerity::Exception::NoValueFoundException] if the value does not exist.
+    # @return [String] The option selected. If multiple options match, returns the first match
+    #
+
+    def select_value(value)
+      assert_exists
+      selected = @object.getOptions.map { |e| e.click if matches?(e.getValueAttribute, value) }.compact.first
+
+      unless selected
+        raise NoValueFoundException, "unknown option with value #{value.inspect} for select_list #{@conditions.inspect}"
+      end
+
+      selected.asText
+    end
+
     #
     # Returns true if the select list has one or more options matching the given value.
     #

data/lib/celerity/version.rb

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

data/lib/celerity/viewer_connection.rb

@@ -21,7 +21,7 @@ module Celerity
     #
 
     def render_html(html, url)
-      send_data({'method' => 'page_changed', 'html' => html, 'url' => url}.to_json)
+      send_data('method' => 'page_changed', 'html' => html, 'url' => url)
     end
 
     #
@@ -30,16 +30,28 @@ module Celerity
     #
 
     def save(path)
-      send_data({'method' => 'save', 'path' => path}.to_json)
+      send_data('method' => 'save', 'path' => path)
     end
 
+
     #
     # Tells the viewer to dump the render tree to the given path.
-    # Only available on the Qt viewer.
+    # Only available in the Qt viewer.
     #
 
     def save_render_tree(path)
-      send_data({'method' => 'save_render_tree', 'path' => path}.to_json)
+      send_data('method' => 'save_render_tree', 'path' => path)
+    end
+
+    #
+    # Get the currently rendered page as a Base64-encoded PNG image.
+    # Only available in the Qt viewer.
+    #
+
+    def image_data
+      send_data('method' => 'image_data')
+      data = read_data
+      data['image'] || data['error']
     end
 
     #
@@ -52,7 +64,8 @@ module Celerity
 
     private
 
-    def send_data(json)
+    def send_data(msg)
+      json = msg.to_json
       data = "Content-Length: #{json.size}\n\n#{json}"
       @socket.write data
       @socket.flush
@@ -60,5 +73,17 @@ module Celerity
       nil
     end
 
+    def read_data
+      buf = ''
+      until buf =~ /\n\n\z/ || @socket.eof? || @socket.closed?
+        buf << @socket.read(1).to_s
+      end
+
+      return if buf.empty?
+
+      length = buf[/Content-Length: (\d+)/, 1].to_i
+      JSON.parse @socket.read(length)
+    end
+
   end
 end

data/lib/celerity/watir_compatibility.rb

@@ -68,7 +68,6 @@ module Celerity
     alias_method :getAllContents,   :options
     alias_method :clearSelection,   :clear
     alias_method :clear_selection,  :clear
-    alias_method :select_value,     :select
     alias_method :includes?,        :include?
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: jarib-celerity
 version: !ruby/object:Gem::Version 
-  version: 0.0.6.17
+  version: 0.0.6.18
 platform: ruby
 authors: 
 - Jari Bakken
@@ -11,7 +11,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-08-16 00:00:00 -07:00
+date: 2009-08-25 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -32,7 +32,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 2.0.0
+        version: 2.3.2
     version: 
 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 aims at being API compatible with Watir."
 email: jari.bakken@finn.no
@@ -46,6 +46,7 @@ extra_rdoc_files:
 files: 
 - History.txt
 - lib
+- lib/celerity
 - lib/celerity/browser.rb
 - lib/celerity/clickable_element.rb
 - lib/celerity/collections.rb
@@ -55,6 +56,7 @@ files:
 - lib/celerity/element.rb
 - lib/celerity/element_collection.rb
 - lib/celerity/element_locator.rb
+- lib/celerity/elements
 - lib/celerity/elements/button.rb
 - lib/celerity/elements/file_field.rb
 - lib/celerity/elements/form.rb
@@ -73,19 +75,8 @@ files:
 - lib/celerity/elements/table_row.rb
 - lib/celerity/elements/text_field.rb
 - lib/celerity/exception.rb
-- lib/celerity/htmlunit.rb
-- lib/celerity/identifier.rb
-- lib/celerity/ignoring_web_connection.rb
-- lib/celerity/input_element.rb
-- lib/celerity/listener.rb
-- 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
-- lib/celerity.rb
-- lib/celerity/htmlunit/commons-codec-1.3.jar
+- lib/celerity/htmlunit
+- 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
@@ -94,13 +85,26 @@ files:
 - lib/celerity/htmlunit/cssparser-0.9.5.jar
 - lib/celerity/htmlunit/htmlunit-2.6-SNAPSHOT.jar
 - lib/celerity/htmlunit/htmlunit-core-js-2.6-SNAPSHOT.jar
-- lib/celerity/htmlunit/nekohtml-1.9.13-20090812.213532-11.jar
+- lib/celerity/htmlunit/nekohtml-1.9.13-20090820.100833-15.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.8.1.jar
+- lib/celerity/htmlunit/xercesImpl-2.9.1.jar
 - lib/celerity/htmlunit/xml-apis-1.3.04.jar
+- lib/celerity/htmlunit.rb
+- lib/celerity/identifier.rb
+- lib/celerity/ignoring_web_connection.rb
+- lib/celerity/input_element.rb
+- lib/celerity/listener.rb
+- lib/celerity/resources
 - 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
+- lib/celerity.rb
 - License.txt
 - Rakefile
 - README.markdown