Allow blocks for searches and polling methods

lib/accessibility/dsl.rb

@@ -374,11 +374,11 @@ def unregister_notifications
   # @options opts [AX::Element] :parent
   # @options opts [AX::Element] :ancestor
   # @return [AX::Element,nil]
-  def wait_for element, opts = {}
+  def wait_for element, opts = {}, &block
     if opts.has_key? :ancestor
-      wait_for_descendant element, opts.delete(:ancestor), opts
+      wait_for_descendant element, opts.delete(:ancestor), opts, &block
     elsif opts.has_key? :parent
-      wait_for_child element, opts.delete(:parent), opts
+      wait_for_child element, opts.delete(:parent), opts, &block
     else
       raise ArgumentError, 'parent/ancestor opt required'
     end
@@ -393,11 +393,11 @@ def wait_for element, opts = {}
   # @param [AX::Element]
   # @param [Hash]
   # @return [AX::Element,nil]
-  def wait_for_descendant descendant, ancestor, opts
+  def wait_for_descendant descendant, ancestor, opts, &block
     timeout = opts.delete(:timeout) || 15
     start   = Time.now
     until Time.now - start > timeout
-      result = ancestor.search(descendant, opts)
+      result = ancestor.search(descendant, opts, &block)
       return result unless result.blank?
       sleep 0.2
     end
@@ -419,10 +419,10 @@ def wait_for_descendant descendant, ancestor, opts
   # @param [AX::Element]
   # @param [Hash]
   # @return [AX::Element,nil]
-  def wait_for_child child, parent, opts
+  def wait_for_child child, parent, opts, &block
     timeout = opts.delete(:timeout) || 15
     start   = Time.now
-    q       = Accessibility::Qualifier.new(child.classify, opts)
+    q       = Accessibility::Qualifier.new(child.classify, opts, &block)
     until Time.now - start > timeout
       result = parent.attribute(:children).find { |x| q.qualifies? x }
       return result unless result.blank?

lib/ax/element.rb

@@ -244,7 +244,8 @@ def search kind, filters = {}
     kind      = kind.camelize
     klass     = kind.singularize
     search    = klass == kind ? :find : :find_all
-    qualifier = Accessibility::Qualifier.new(klass, filters)
+    block     = block_given? ? Proc.new : nil
+    qualifier = Accessibility::Qualifier.new(klass, filters, &block)
     tree      = Accessibility::Enumerators::BreadthFirst.new(self)
 
     tree.send(search) { |element| qualifier.qualifies? element }
@@ -265,7 +266,8 @@ def search kind, filters = {}
   # @param [Hash{Symbol=>Object}]
   # @return [AX::Element]
   def ancestor kind, filters = {}
-    qualifier = Accessibility::Qualifier.new(kind.camelize, filters)
+    block     = block_given? ? Proc.new : nil
+    qualifier = Accessibility::Qualifier.new(kind.camelize, filters, &block)
     element   = attribute :parent
     until qualifier.qualifies? element
       element = element.attribute :parent
@@ -330,7 +332,8 @@ def method_missing method, *args
     end
 
     if @attrs.include? KAXChildrenAttribute
-      result = search method, *args
+      block  = block_given? ? Proc.new : nil
+      result = search method, args.last, &block
       return result unless result.blank?
       raise Accessibility::SearchFailure.new(self, method, args.first)
     end

lib/ax/row.rb

@@ -28,7 +28,8 @@ class AX::Row < AX::Element
   # @param [Hash]
   # @return [AX::Element]
   def child_in_column filters
-    qualifier = Accessibility::Qualifier.new(:Column, filters)
+    block     = block_given? ? Proc.new : nil
+    qualifier = Accessibility::Qualifier.new(:Column, filters, &block)
     column    = self.parent.columns.index { |x| qualifier.qualifies? x }
     return self.children.at(column) if column
     raise Accessibility::SearchFailure.new(self.parent, 'column', filters)