jarib-celerity 0.0.5.6 → 0.0.5.7

data/lib/celerity/browser.rb

@@ -125,8 +125,7 @@ module Celerity
 
     def url
       assert_exists
-      # will be renamed getUrl => getRequestUrl
-      @page.getWebResponse.getUrl.toString
+      @page.getWebResponse.getRequestUrl.toString
     end
 
     #
@@ -506,6 +505,14 @@ module Celerity
     def assert_exists
       raise UnknownObjectException, "no page loaded" unless exist?
     end
+    
+    #
+    # Returns the element that currently has the focus (Celerity only)
+    #
+
+    def focused_element
+      element_from_dom_node(page.getFocusedElement())
+    end    
 
     private
 

data/lib/celerity/collections.rb

@@ -51,6 +51,10 @@ module Celerity
   class Dts < ElementCollection
     def element_class; Dt; end
   end
+  
+  class Ems < ElementCollection
+    def element_class; Em; end
+  end
 
   class Maps < ElementCollection
     def element_class; Map; end

data/lib/celerity/container.rb

@@ -228,6 +228,22 @@ module Celerity
     def dts
       Dts.new(self)
     end
+    
+    #
+    # @return [Celerity::Em]
+    # 
+    
+    def em(*args)
+      Em.new(self, *args)
+    end
+    
+    #
+    # @return [Celerity::Ems]
+    # 
+    
+    def ems
+      Ems.new(self)
+    end
 
     #
     # @return [Celerity::FileField]

data/lib/celerity/element.rb

@@ -237,6 +237,12 @@ module Celerity
       Log.warn "Element\#method_missing calling super with #{meth.inspect}"
       super
     end
+    
+    def methods(*args)
+      ms = super 
+      ms += self.class::ATTRIBUTES.map { |e| e.to_s }
+      ms.sort
+    end
 
     def respond_to?(meth, include_private = false)
       meth = selector_to_attribute(meth)

data/lib/celerity/element_collection.rb

@@ -0,0 +1,106 @@
+module Celerity
+  
+  #
+  # This class is the superclass for the iterator classes (Buttons, Links, Spans etc.)
+  # It would normally only be accessed by the iterator methods (Browser#spans, Browser#links, ...).
+  # 
+  
+  class ElementCollection
+    include Enumerable
+    
+    #
+    # @api private
+    #
+
+    def initialize(container, how = nil, what = nil)
+      @container = container
+      @object = (how == :object ? what : nil)
+      @length = length
+    end
+    
+    #
+    # @return [Fixnum] The number of elements in this collection.
+    # 
+
+    def length
+      if @object
+        @object.length
+      else
+        @elements ||= ElementLocator.new(@container, element_class).elements_by_idents
+        @elements.size
+      end
+    end
+    alias_method :size, :length
+
+    #
+    # @yieldparam [Celerity::Element] element Iterate through the elements in this collection.
+    #
+
+    def each
+      if @elements
+        @elements.each { |e| yield(element_class.new(@container, :object, e)) }
+      else
+        0.upto(@length - 1) { |i| yield iterator_object(i) }
+      end
+
+      @length
+    end
+    
+    #
+    # Get the element at the given index.
+    # This is 1-indexed to keep compatibility with Watir - subject to change.
+    # Also note that because of Watir's lazy loading, this will return an Element
+    # instance even if the index is out of bounds.
+    #
+    # @param [Fixnum] n Index of wanted element, 1-indexed.
+    # @return [Celerity::Element] Returns a subclass of Celerity::Element
+    # 
+
+    def [](n)
+      if @elements && @elements[n - INDEX_OFFSET]
+        element_class.new(@container, :object, @elements[n - INDEX_OFFSET])
+      else
+        iterator_object(n - INDEX_OFFSET)
+      end
+    end
+
+    #
+    # Get the first element in this collection. (Celerity-specific)
+    #
+    # @return [Celerity::Element] Returns a subclass of Celerity::Element
+    # 
+    
+    def first
+      self[INDEX_OFFSET]
+    end
+
+    #
+    # Get the last element in this collection. (Celerity-specific)
+    #
+    # @return [Celerity::Element] Returns a subclass of Celerity::Element
+    # 
+    
+    def last
+      self[INDEX_OFFSET - 1]
+    end
+
+    #
+    # Note: This can be quite useful in irb:
+    #
+    #   puts browser.text_fields
+    #
+    # @return [String] A string representation of all elements in this collection.
+    # 
+    
+    def to_s
+      map { |e| e.to_s }.join("\n")
+    end
+
+    private
+
+    def iterator_object(i)
+      element_class.new(@container, :index, i+1)
+    end
+
+  end # ElementCollection
+end # Celerity

data/lib/celerity/elements/link.rb

@@ -7,6 +7,24 @@ module Celerity
                                     :target, :rel, :rev, :accesskey, :shape,
                                     :coords, :tabindex, :onfocus, :onblur]
     DEFAULT_HOW = :href
-  end
+    
+    #
+    # Returns the absolute URL for this link (Celerity-specific)
+    # 
+    # (Watir/IE does this for href(), but we don't want that.)
+    # 
 
-end
+    def absolute_url
+      assert_exists
+      href = @object.getAttributeValue('href')
+
+      unless href.empty? || URI.parse(href).absolute?
+        href = URI.join(browser.url, href).to_s
+      end
+
+      href
+    end
+
+    
+  end # Link
+end # Celerity

data/lib/celerity/elements/non_control_elements.rb

@@ -39,6 +39,10 @@ module Celerity
     TAGS = [ Identifier.new('dt')]
   end
 
+  class Em < NonControlElement
+    TAGS = [ Identifier.new('em')]
+  end
+
   class H1 < NonControlElement
     TAGS = [ Identifier.new('h1') ]
   end

data/lib/celerity/version.rb

@@ -3,7 +3,7 @@ module Celerity #:nodoc:
     MAJOR = 0
     MINOR = 0
     TINY  = 5
-    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.5.6
+  version: 0.0.5.7
 platform: ruby
 authors: 
 - Jari Bakken
@@ -11,7 +11,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-02-19 00:00:00 -08:00
+date: 2009-02-20 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -46,7 +46,7 @@ files:
 - lib/celerity/default_viewer.rb
 - lib/celerity/disabled_element.rb
 - lib/celerity/element.rb
-- lib/celerity/element_collections.rb
+- lib/celerity/element_collection.rb
 - lib/celerity/element_locator.rb
 - lib/celerity/elements
 - lib/celerity/elements/button.rb