jarib-celerity 0.0.6.6 → 0.0.6.7

data/lib/celerity/browser.rb

@@ -775,7 +775,7 @@ module Celerity
       if element_class = Celerity::Util.htmlunit2celerity(obj.class)
         element_class.new(self, :object, obj)
       else
-        Element.new(self, :object, nil)
+        Element.new(self, :object, obj)
       end
     end
 

data/lib/celerity/element.rb

@@ -8,7 +8,7 @@ module Celerity
     include Exception
     include Container
 
-    attr_reader :container, :object
+    attr_reader :container
 
     # number of spaces that separate the property from the value in the create_string method
     TO_S_SIZE = 14
@@ -97,6 +97,10 @@ module Celerity
     def locate
       @object = ElementLocator.new(@container, self.class).find_by_conditions(@conditions)
     end
+    
+    def object
+      @object || locate
+    end
 
     #
     # @return [String] A string representation of the element.
@@ -233,10 +237,9 @@ module Celerity
 
       meth = selector_to_attribute(meth)
 
-      if self.class::ATTRIBUTES.include?(meth)
+      if self.class::ATTRIBUTES.include?(meth) || (self.class == Element && @object.hasAttribute(meth.to_s))
         return @object.getAttribute(meth.to_s)
       end
-
       Log.warn "Element\#method_missing calling super with #{meth.inspect}"
       super
     end

data/lib/celerity/elements/option.rb

@@ -26,7 +26,7 @@ module Celerity
     def label
       # overrides Container#label
       assert_exists
-      @object.getAttribute("label")
+      @object.getLabelAttribute
     end
   end
 end

data/lib/celerity/elements/select_list.rb

@@ -10,7 +10,7 @@ module Celerity
     def options
       assert_exists
       @object.getOptions.map do |e|
-        e.asText.empty? ? e.getAttribute("label") : e.asText
+        e.asText.empty? ? e.getLabelAttribute : e.asText
       end
     end
     
@@ -20,7 +20,7 @@ module Celerity
     
     def selected_options
       assert_exists
-      @object.getSelectedOptions.map { |e| e.asText.empty? ? e.getAttribute('label') : e.asText }
+      @object.getSelectedOptions.map { |e| e.asText.empty? ? e.getLabelAttribute : e.asText }
     end
     
     #
@@ -48,11 +48,9 @@ module Celerity
       raise NoValueFoundException, "unknown option with value #{value.inspect} for select_list #{@conditions.inspect}" unless include?(value)
       
       selected = nil
-      matching = @object.getOptions.select do |e|
-        matches?(e.asText, value) || matches?(e.getAttribute('label'), value)
-      end
-      
-      matching.each do |option|
+      matching = @object.getOptions.select do |option|
+        next unless matches_option?(option, value)
+        
         selected ||= option.asText
         @container.update_page option.click
       end
@@ -70,7 +68,7 @@ module Celerity
     
     def include?(value)
       assert_exists
-      !!@object.getOptions.find { |e| matches?(e.asText, value) || matches?(e.getAttribute('label'), value) }
+      !!@object.getOptions.find { |e| matches_option?(e, value) }
     end
 
     #
@@ -84,7 +82,7 @@ module Celerity
     def selected?(value)
       assert_exists
       raise UnknownObjectException, "unknown option with value #{value.inspect} for select_list #{@conditions.inspect}" unless include?(value)
-      !!@object.getOptions.find { |e| matches?(e.asText, value) && e.isSelected }
+      !!@object.getOptions.find { |e| matches_option?(e, value) && e.isSelected }
     end
 
     #
@@ -92,7 +90,6 @@ module Celerity
     # defined, otherwise 'select-one'.
     #
     # @return [String]
-    # TODO: Move to watir_compatibility or delete it 2008-05-23 Alexander
     #
     
     def type
@@ -109,12 +106,16 @@ module Celerity
 
     def value
       assert_exists
-      if (optn = @object.getSelectedOptions.to_a.first)
-        optn.getValueAttribute
+      if (option = @object.getSelectedOptions.to_a.first)
+        option.getValueAttribute
       end
     end
     
     private
     
+    def matches_option?(option, value)
+      matches?(option.asText, value) || (option.hasAttribute("label") && matches?(option.getLabelAttribute, value))
+    end
+    
   end # SelectList
 end # Celerity

data/lib/celerity/elements/text_field.rb

@@ -14,6 +14,7 @@ module Celerity
     DEFAULT_HOW = :name
     
     def visible?
+      assert_exists
       type == 'hidden' ? false : super
     end
     

data/lib/celerity/htmlunit.rb

@@ -39,6 +39,6 @@ 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.getUrl.toString]
+    '#<HtmlPage:0x%s(%s)>' % [self.hash.to_s(16), getWebResponse.getRequestUrl.toString]
   end
 end

data/lib/celerity/util.rb

@@ -28,7 +28,6 @@ module Celerity
       HtmlUnit::Html::HtmlHiddenInput           => Celerity::Hidden,
       HtmlUnit::Html::HtmlImage                 => Celerity::Image,
       HtmlUnit::Html::HtmlLabel                 => Celerity::Label,
-      HtmlUnit::Html::HtmlLink                  => Celerity::Link,
       HtmlUnit::Html::HtmlListItem              => Celerity::Li,
       HtmlUnit::Html::HtmlMap                   => Celerity::Map,
       HtmlUnit::Html::HtmlOption                => Celerity::Option,

data/lib/celerity/version.rb

@@ -3,7 +3,7 @@ module Celerity #:nodoc:
     MAJOR = 0
     MINOR = 0
     TINY  = 6
-    PATCH = 6 # Set to nil for official release
+    PATCH = 7 # 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.6.6
+  version: 0.0.6.7
 platform: ruby
 authors: 
 - Jari Bakken
@@ -11,7 +11,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-04-22 00:00:00 -07:00
+date: 2009-04-30 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency