celerity 0.0.1 → 0.0.2

data/lib/celerity/elements/frame.rb

@@ -2,41 +2,38 @@ module Celerity
   class Frame < Element
     include Container
     attr_accessor :page
-    TAGS = {'frame' => nil, 'iframe' => nil}
+    
+    TAGS = [Identifier.new('frame'), Identifier.new('iframe')]
+    
     ATTRIBUTES = BASE_ATTRIBUTES | [:longdesc, :name, :src, :frameborder, :marginwidth, :marginheight, :noresize, :scrolling]
     DEFAULT_HOW = :name
     
     def locate
-      # Log.debug(@container.object.inspect)
-      frame_elements = @container.object.getByXPath(".//iframe | .//frame").collect { |frame| frame.getEnclosedWindow.getFrameElement }
-      unless frame_elements.empty?
-        case @how
-          when :id, :name, :src, :class
-            matching_frame_elements = frame_elements.select { |frame_element| matches?(frame_element.getAttribute(@how.to_s), @what) }
-            if @frame_element = matching_frame_elements.first
-              @object = @frame_element.getEnclosedPage.getDocumentElement  
-            end
-          when :index
-            if @frame_element = frame_elements[@what-1]
-              @object = @frame_element.getEnclosedPage.getDocumentElement
-            end
-          when :xpath
-            raise NotImplementedError
-          else
-            raise MissingWayOfFindingObjectException
+      super
+      if @object
+        @inline_frame_object = @object.getEnclosedWindow.getFrameElement
+        if (frame = @object.getEnclosedPage.getDocumentElement)
+          @object = frame
+        else
+          @object = nil
         end
       end
-      raise UnknownFrameException unless @object
+    end
+    
+    def assert_exists
+      locate unless @object
+      unless @object
+        raise UnknownFrameException, "unable to locate frame, using #{identifier_string}"
+      end
     end
     
     def update_page(value)
-      # Log.debug(value.asXml) 
       @page_container.set_page(value.getEnclosingWindow.getTopWindow.getEnclosedPage)
     end
 
     def to_s
       assert_exists
-      create_string(@frame_element)
+      create_string(@inline_frame_object)
     end
     
   end

data/lib/celerity/elements/image.rb

@@ -9,7 +9,7 @@ module Celerity
     include ClickableElement
     include DisabledElement
     
-    TAGS = ['img']
+    TAGS = [ Identifier.new('img') ]
     ATTRIBUTES = BASE_ATTRIBUTES | [:src, :alt, :longdesc, :name, :height, :width, :usemap, :ismap, :align, :border, :hspace, :vspace]
     
     # this method returns the file created date of the image
@@ -39,13 +39,7 @@ module Celerity
       assert_exists
       @object.getHeight
     end
-    
-    def disabled?
-      assert_exists
-      raise NotImplementedError
-    end
-    alias_method :disabled, :disabled?
-    
+        
     def loaded?
       assert_exists
       begin 

data/lib/celerity/elements/label.rb

@@ -1,10 +1,8 @@
 module Celerity
   
   class Label < Element
-    TAGS = ['label']
+    TAGS = [ Identifier.new('label') ]
     ATTRIBUTES = BASE_ATTRIBUTES | [:for, :accesskey, :onfocus, :onblur]
-    
-    
   end
   
 end

data/lib/celerity/elements/link.rb

@@ -1,6 +1,6 @@
 module Celerity
   class Link < Element
-    TAGS = ['a']
+    TAGS = [ Identifier.new('a') ]
     ATTRIBUTES = BASE_ATTRIBUTES | [:charset, :type, :name, :href, :hreflang, :target, :rel, :rev, :accesskey, :shape, :coords, :tabindex, :onfocus, :onblur]
     
     def click

data/lib/celerity/elements/option.rb

@@ -0,0 +1,16 @@
+module Celerity
+  class Option < Element
+    include ClickableElement
+    include DisabledElement
+    
+    TAGS = [ Identifier.new('option')]
+    ATTRIBUTES = BASE_ATTRIBUTES | [:selected, :disabled, :label, :value]
+
+    alias_method :select, :click
+
+    def selected?
+      assert_exists
+      @object.isSelected
+    end
+  end
+end

data/lib/celerity/elements/radio_check.rb

@@ -6,14 +6,17 @@ module Celerity
   # most of the methods available to this element are inherited from the Element class
   #
   class RadioCheckCommon < InputElement
-    def locate
-      @object = @container.locate_input_element(self, @how, @what, @value)
-    end
-    
-    def initialize(container, how, what, type, value = nil)
+    def initialize(container, type, *args)
       @type = type
-      @value = value
-      super(container, how, what)
+
+      case args.size
+      when 2
+        super(container, args[0] => args[1])
+      when 3
+        super(container, args[0] => args[1], :value => args[2])
+      else
+        super(container, *args)
+      end
     end
     
     def set?
@@ -35,6 +38,10 @@ module Celerity
   class Radio < RadioCheckCommon
     TAGS = [Identifier.new('input', :type => %w(radio))]
 
+    def initialize(container, *args)
+      super(container, ['radio'], *args)
+    end
+
     def set(value = true)
       assert_exists
       assert_enabled
@@ -47,6 +54,10 @@ module Celerity
   class CheckBox < RadioCheckCommon
     TAGS = [Identifier.new('input', :type => %w(checkbox))]
 
+    def initialize(container, *args)
+      super(container, ['checkbox'], *args)
+    end
+
     def set(value = true)
       assert_exists
       assert_enabled

data/lib/celerity/elements/select_list.rb

@@ -43,7 +43,7 @@ module Celerity
   
     def selected?(value)
       assert_exists
-      # This should probably raise NoValueFoundException as well?
+      # This should probably raise NoValueFoundException?
       raise UnknownObjectException, "unknown option with value #{value.inspect}" unless include?(value)
       !!@object.getOptions.find { |e| matches?(e.asText, value) && e.isSelected }
     end
@@ -65,20 +65,4 @@ module Celerity
       Option.new(self, attribute, value)
     end
   end
-
-  class Option < Element
-    TAGS = ['option']
-    ATTRIBUTES = BASE_ATTRIBUTES | [:selected, :disabled, :label, :value]
-
-    def select
-      assert_exists
-      # click?
-      @object.setSelected(true)
-    end
-  
-    def selected?
-      assert_exists
-      @object.isSelected
-    end
-  end
 end

data/lib/celerity/elements/table.rb

@@ -2,13 +2,13 @@ module Celerity
 
   class Table < Element
     include Container
-    TAGS = ['table']
+    TAGS = [ Identifier.new('table') ]
     ATTRIBUTES = BASE_ATTRIBUTES | [:summary, :width, :border, :frame, :rules, :cellspacing, :cellpadding, :align, :bgcolor]
     DEFAULT_HOW = :name
     
     def locate
-      @object = @container.locate_tagged_element(self, @how, @what)
-      if @object # cant call the assert_exists here, as an exists? method call will fail
+      super
+      if @object # cant call assert_exists here, as an exists? method call will fail
         @rows = @object.getRows
         @cells = []
         @rows.each do |row| 
@@ -73,7 +73,7 @@ module Celerity
     
     def body(how, what)
       assert_exists
-      return TableBody.new(@container, how, what, self)
+      return TableBody.new(@container, how, what)
     end
     
     def bodies

data/lib/celerity/elements/table_body.rb

@@ -1,15 +1,12 @@
 module Celerity
   
   class TableBody < Element
-    TAGS = ['tbody']
+    TAGS = [ Identifier.new('tbody') ]
 
     def locate
-      if @how == :object
-        @object = @what
-      else
-          @object = @container.locate_tagged_element(self, @how, @what)
-      end
-      if @object # cant call the assert_exists here, as an exists? method call will fail
+      super
+      # can't call the assert_exists here, as an exists? method call will fail
+      if @object 
         @rows = @object.getRows
         @cells = []
         @rows.each do |row| 
@@ -31,7 +28,8 @@ module Celerity
     end
     
     def each
-      0.upto(length-1) { |index| yield TableRow.new(self, :object, @rows[index]) }
+      assert_exists
+      @rows.each { |row| yield TableRow.new(self, :object, row) }
     end
 
   end

data/lib/celerity/elements/table_cell.rb

@@ -4,27 +4,16 @@ module Celerity
     include Celerity::Exception
     include Container
 
-    TAGS = ['td']
+    TAGS = [ Identifier.new('td') ]
     ATTRIBUTES = BASE_ATTRIBUTES | [:abbr, :axis, :headers, :scope, :rowspan, :colspan] | CELLHALIGN_ATTRIBUTES | CELLVALIGN_ATTRIBUTES
     
-    def locate
-      if @how == :object
-        @object = @what
-      else
-          @object = @container.locate_tagged_element(self, @how, @what)
-      end
-    end
+    alias_method :to_s, :text
 
     def colspan
       assert_exists
       attribute_value = @object.getAttributeValue('colspan').to_i
-      if attribute_value > 0
-        attribute_value
-      else
-        1
-      end
+      attribute_value > 0 ? attribute_value : 1
     end
 
-    alias_method :to_s, :text
   end
 end

data/lib/celerity/elements/table_row.rb

@@ -1,22 +1,16 @@
 module Celerity
   
   class TableRow < Element
-    TAGS = ['tr']
+    TAGS = [ Identifier.new('tr') ]
 
     def locate
-      if @how == :object
-        @object = @what
-      else
-          @object = @container.locate_tagged_element(self, @how, @what)
-      end
-      if @object # cant call the assert_exists here, as an exists? method call will fail
-        @cells = @object.getCells
-      end
+      super
+      @cells = @object.getCells if @object
     end
 
     def each
       locate
-      0.upto(@cells.length-1) { |index| yield TableCell.new(self, :object, @cells[index]) }
+      @cells.each { |cell| yield TableCell.new(self, :object, cell) }
     end
 
     def [](index)

data/lib/celerity/elements/text_field.rb

@@ -6,7 +6,7 @@ module Celerity
   # Normally a user would not need to create this object as it is returned by the Watir::Container#text_field method
   class TextField < InputElement
     TAGS = [ Identifier.new('textarea'), 
-             Identifier.new('input', :type => %w(text password))  ]
+             Identifier.new('input', :type => ["text", "password", /^(?!(file|radio|checkbox|submit|reset|image|button|hidden)$)/])  ]
 
     def clear
       assert_exists
@@ -22,11 +22,11 @@ module Celerity
       assert_enabled
       assert_not_readonly
       clear
-      # not sure what else to do here
+      # workaround for bug in HtmlPasswordInput - should be fixed soon (Jari - 2008-05-14)
       if @object.class == com.gargoylesoftware.htmlunit.html.HtmlPasswordInput
         @object.setValueAttribute(value.to_s)
       else
-        value.to_s.to_java_bytes.each do |char| 
+        java.lang.String.new(value.to_s).toCharArray.each do |char| 
           @container.update_page @object.type(char) 
         end
       end
@@ -43,11 +43,23 @@ module Celerity
         @object.setValueAttribute(value.to_s)
       end
     end
+    
+    def value
+      assert_exists
+      case @object.getTagName
+      when 'textarea'
+        @object.getText
+      when 'input'
+        @object.getValueAttribute
+      end
+    end
 
     def append(value)
       assert_enabled
       assert_not_readonly
-      value.to_s.to_java_bytes.each { |char| @container.update_page @object.type(char) }
+      java.lang.String.new(value.to_s).toCharArray.each do |char| 
+        @container.update_page @object.type(char) 
+      end
     end
 
     # This bascially just moves the text to the other text field using TextField#append

data/lib/celerity/extra/method_generator.rb

@@ -0,0 +1,144 @@
+require "rubygems"
+require "uri"
+require "active_support"
+
+# http://api.rubyonrails.com/classes/Inflector.html#M001621
+class String
+  def underscore
+     gsub(/::/, '/').
+     gsub(/([A-Z]+)([A-Z][a-z])/,'\1_\2').
+     gsub(/([a-z\d])([A-Z])/,'\1_\2').
+     tr("-", "_").
+     downcase
+  end
+end
+
+module Celerity
+  class MethodGenerator
+
+    ELEMENTS = %w(text_field select_list radio checkbox button).map { |e| e.to_sym }
+    BUGGY_ELEMENTS = %w(radio checkbox).map { |e| e.to_sym }
+  
+    def initialize(ie, opts = {})
+      @ie = ie
+      @opts = opts
+      @browser = @opts[:browser] || '@ie'
+
+      @docs = "  # Fills in the page at #{@ie.url}\n  #\n"
+      @docs << "  # Parameters:\n  #\n"
+      @doc_elements = []
+
+      @method = "  def #{@opts[:method_name] || 'generated_method'}(opts = {})\n\n"
+    end
+  
+    def parse
+      ELEMENTS.each do |elem|
+        @method << "    # buggy!\n" if BUGGY_ELEMENTS.include?(elem)
+        add_elements(elem)
+      end
+      add_elements(:link) if @opts[:include_links]
+      @method << "  end\n\n"
+
+      # fix docs
+      max = @doc_elements.map { |symbol, _| symbol.to_s.size }.max
+      @doc_elements.each do |sym, desc|
+        @docs << "  #  #{sym.to_s.ljust(max)} => #{desc}\n"
+      end
+      @docs << "  #\n"*2
+      @docs + @method
+    end
+  
+    private
+  
+    def add_elements(symbol)
+      symbol = symbol.to_sym
+      symbol_pluralized = symbol.to_s.pluralize.to_sym 
+      @ie.send(symbol_pluralized).each_with_index do |elem, idx|
+        self.send("add_#{symbol}".to_sym, elem, idx)
+      end
+      @method << "\n"
+    end
+  
+    def add_text_field(elem, idx)
+      how, what = find_identifier(elem) || [:index, (idx + 1).to_s]
+      @method << "    #{@browser}.text_field(#{how.inspect}, #{what.inspect}).value = "
+      symbol = (how == :index) ? ":text_field_#{what.underscore}" : ":#{what.underscore}"
+      @method << "opts[#{symbol}]\n"
+      @doc_elements << [symbol, "value for text field #{what.inspect}"]
+    end
+  
+    def add_select_list(elem, idx)
+      how, what = find_identifier(elem) || [:index, (idx + 1).to_s]
+      @method << "    #{@browser}.select_list(#{how.inspect}, #{what.inspect}).select("
+      symbol = (how == :index) ? ":select_list_#{what.underscore}" : ":#{what.underscore}"
+      @method << "opts[#{symbol}])\n"
+      @doc_elements << [symbol, "option to select for select list #{what.inspect}"]
+    end
+  
+    def add_radio(elem, idx)
+      how, what = find_identifier(elem) || [:index, (idx + 1).to_s]
+      @method << "    #{@browser}.radio(#{how.inspect}, #{what.inspect}, "
+      if (value = elem.value).empty?
+        symbol = (how == :index) ? ":radio_#{what.underscore}" : ":#{what.underscore}"
+      else
+        symbol = ":#{what.underscore}_#{value.underscore}"
+        @method << "#{value.inspect}).set if opts[#{symbol}]\n"
+      end
+      @doc_elements << [symbol, "set the radio with id/value #{what.inspect}"]
+    end
+  
+    def add_checkbox(elem, idx)
+      how, what = find_identifier(elem) || [:index, (idx + 1).to_s]
+      @method << "    #{@browser}.checkbox(#{how.inspect}, #{what.inspect}, "
+      symbol = (how == :index) ? ":checkbox_#{what.underscore}" : ":#{what.underscore}"
+      @method << "#{elem.value.inspect}).set if opts[#{symbol}]\n"
+      @doc_elements << [symbol, "set the checkbox with id/value #{what.inspect}"]
+    end
+  
+    def add_button(elem, idx)
+      how, what = find_identifier(elem) || [:index, (idx + 1).to_s]
+      @method << "    #{@browser}.button(#{how.inspect}, #{what.inspect}).click\n"
+    end
+  
+    def add_link(elem, idx)
+      if (href = elem.href) =~ /javascript/
+        how, what = :index, (idx + 1).to_s
+      else
+        how = :url
+        uri = URI.parse(href)
+        what = Regexp.new(Regexp.escape(uri.to_s.sub(/.*#{uri.host}\//, '')))
+      end
+      @method << "    #{@browser}.link(#{how.inspect}, #{what.inspect}).click\n"
+    end
+  
+    def find_identifier(element)
+      # could use these if they were 'weighted' ?
+      attrs = element.class::ATTRIBUTES
+      [:id, :name].each do |attribute|
+        return [attribute, element.send(attribute)] if attrs.include?(attribute) && !element.send(attribute).empty?
+      end
+      nil
+    end
+  
+  end # MethodGenerator
+  
+  class IE
+    def generate_method
+      MethodGenerator.new(self).parse
+    end
+  end
+   
+end # Celerity
+
+
+
+# if __FILE__ == $0
+#   require File.dirname(__FILE__) + "/../spec/spec_helper"
+#   $stdout.sync = true
+#   @ie = IE.new
+#   @ie.goto(TEST_HOST + "/forms_with_input_elements.html")
+# 
+#   puts MethodGenerator.new(@ie).parse
+#   @ie.goto(TEST_HOST + "/forms3.html")
+#   puts MethodGenerator.new(@ie).parse
+# end