bewildr 0.1.11 → 0.1.12

data/Rakefile

@@ -10,7 +10,7 @@ require 'cucumber/rake/task'
 
 spec = Gem::Specification.new do |s|
   s.name = 'bewildr'
-  s.version = '0.1.11'
+  s.version = '0.1.12'
   s.has_rdoc = true
   s.extra_rdoc_files = ['README.rdoc', 'LICENSE']
   s.summary = 'Test WPF UI apps with IronRuby'

data/lib/bewildr/application.rb

@@ -63,13 +63,10 @@ module Bewildr
     def wait_for_window(input, wait_time = 30)
       begin
         Timeout::timeout(wait_time) do
-          begin
+          loop do
             my_window = window(input)
-            raise if my_window.nil?
-            return my_window
-          rescue
+            return my_window unless my_window.nil?
             sleep 0.2
-            retry
           end
         end
       rescue Timeout::Error

data/lib/bewildr/control_type_additions/combo_box_additions.rb

@@ -5,17 +5,14 @@ module Bewildr
     module ComboBoxAdditions
       #Returns a string array containing the element's item names
       def items
-        my_list_items = list_items
-        return nil if my_list_items.nil?
-        my_list_items.collect {|item| item.name}
+        list_items.collect {|item| item.name}
       end
 
       #Returns an array containing the combobox items
       def list_items
         begin
           expand_combo
-          bewildr_list_items = get(:type => :list_item, :scope => :children, :how_many => :all)
-          bewildr_list_items.nil? ? nil : bewildr_list_items
+          get(:type => :list_item, :scope => :children, :how_many => :all)
         ensure
           collapse_combo
         end
@@ -23,8 +20,7 @@ module Bewildr
 
       #Returns the number of items in the combobox
       def count
-        my_items = items
-        my_items.nil? ? 0 : my_items.size
+        items.size
       end
 
       #Selects a combobox item. Takes a string (and selects the first item whose name matches) or an integer and selects the respective element

data/lib/bewildr/control_type_additions/list_additions.rb

@@ -5,28 +5,23 @@ module Bewildr
     module ListAdditions
       #Select the list item whose name matches the supplied input
       def select(input)
-        selectable_elements = get(:type => :list_item, :scope => :children, :how_many => :all)
-        selectable_elements.find {|selectable_element| selectable_element.name == input}.select
+        list_items.find {|selectable_element| selectable_element.name == input}.select
       end
 
       #Returns a string array containing the list item names
       def items
-        my_list_items = list_items
-        return nil if my_list_items.nil?
-        my_list_items.collect {|item| item.name}
+        list_items.collect {|item| item.name}
       end
 
       #Returns an array containing the list items
       def list_items
         prepare_element
-        bewildr_list_items = get(:type => :list_item, :scope => :children, :how_many => :all)
-        bewildr_list_items.nil? ? nil : bewildr_list_items
+        get(:type => :list_item, :scope => :children, :how_many => :all)
       end
 
       #Returns the number of items in the list
       def count
-        my_items = items
-        my_items.nil? ? 0 : my_items.size
+        items.size
       end
 
       #Selects a list item. Takes a string (and selects the first item whose name matches) or an integer and selects the respective element

data/lib/bewildr/element.rb

@@ -107,12 +107,7 @@ module Bewildr
       case result
       when System::Windows::Automation::AutomationElement, nil then return Bewildr::Element.new(result)
       when System::Windows::Automation::AutomationElementCollection
-        c_array_list = System::Collections::ArrayList.new(result)
-        element_array = c_array_list.to_array.to_a
-        case
-        when element_array.size == 0 then return Bewildr::Element.new(nil)
-        when element_array.size > 0 then return element_array.collect {|element| Bewildr::Element.new(element) }
-        end
+        System::Collections::ArrayList.new(result).to_array.to_a.collect {|element| Bewildr::Element.new(element) }
       end
     end
 
@@ -148,6 +143,20 @@ module Bewildr
       bewildred_children
     end
 
+    #Returns the current element's next sibling, or nil if there is no next sibling
+    def next_sibling
+      walker = System::Windows::Automation::TreeWalker.ControlViewWalker
+      potential_next_sibling = walker.get_next_sibling(@automation_element)
+      potential_next_sibling.nil? ? nil : Bewildr::Element.new(potential_next_sibling)
+    end
+
+    #Returns the current element's previous sibling, or nil if there is no previous sibling
+    def previous_sibling
+      walker = System::Windows::Automation::TreeWalker.ControlViewWalker
+      potential_previous_sibling = walker.get_previous_sibling(@automation_element)
+      potential_previous_sibling.nil? ? nil : Bewildr::Element.new(potential_previous_sibling)
+    end
+
     #Clicks this element - this is done by actual mouse moves and clicks. The automation element's underlying InvokePattern is not used.
     def click
       Bewildr::Mouse.click(clickable_point)

data/lib/bewildr/finder.rb

@@ -17,7 +17,7 @@ module Bewildr
       #These keys can be combined to create more complex search criteria
       def condition_for(condition_hash)
         conditions = condition_hash.select {|key, value| [:id, :name, :type].include?(key) }
-        conditions = Hash[*conditions.flatten] if RUBY_VERSION == "1.8.6"
+        conditions = Hash[*conditions.flatten] if conditions.instance_of?(Array) #if condition deals with ironruby's 1.8.6 emulation
 
         case
         when conditions.length == 0 then raise "Condition needs to include at least an :id, a :name or a :type"

data/lib/bewildr/mouse.rb

@@ -41,7 +41,7 @@ class Bewildr::Mouse
     instance.clickr.set_location(point)
   end
 
-  #Drags the mouse from one location to another, and optionally, via another! Pass a has containing the following keys:
+  #Drags the mouse from one location to another, and optionally, via another! Pass a hash containing the following keys:
   #  :from
   #  :to
   #  :via (optional)

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: bewildr
 version: !ruby/object:Gem::Version 
-  hash: 13
+  hash: 3
   prerelease: false
   segments: 
   - 0
   - 1
-  - 11
-  version: 0.1.11
+  - 12
+  version: 0.1.12
 platform: ruby
 authors: 
 - Nat Ritmeyer
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-10 00:00:00 +00:00
+date: 2011-04-26 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency