uia 0.0.7.1 → 0.0.7.2

data/ChangeLog

@@ -1,3 +1,7 @@
+=== Version 0.0.7.2 / 2013-11-02
+*	Enhancements
+	*	Element#find can specify the scope of the search
+
 === Version 0.0.7.1 / 2013-11-01
 *	Bug Fixes
 	*	Fixes issue with ComboBox controls for Selection#selection_items

data/ext/UiaDll/UIA.Helper/Element.cs

@@ -97,9 +97,9 @@ namespace UIA.Helper
             return FindFirst(automationId.IdCondition());
         }
 
-        public Element ChildById(string automationId)
+        public Element ChildById(string automationId, TreeScope scope)
         {
-            return FindFirst(TreeScope.Descendants, automationId.IdCondition());
+            return FindFirst(scope, automationId.IdCondition());
         }
 
         public static Element ByName(string name)
@@ -107,9 +107,9 @@ namespace UIA.Helper
             return FindFirst(new PropertyCondition(AutomationElement.NameProperty, name));
         }
 
-        public Element ChildByName(string name)
+        public Element ChildByName(string name, TreeScope scope)
         {
-            return FindFirst(TreeScope.Descendants, new PropertyCondition(AutomationElement.NameProperty, name));
+            return FindFirst(scope, new PropertyCondition(AutomationElement.NameProperty, name));
         }
 
         public static Element ByProcessId(int processId)

data/ext/UiaDll/UiaDll/ElementMethods.cpp

@@ -37,9 +37,10 @@ extern "C" {
     return NULL;
   }
 
-  __declspec(dllexport) ElementInformationPtr Element_FindChildById(ElementInformationPtr parent, const char* automationId, char* errorInfo, const int errorLength) {
+  __declspec(dllexport) ElementInformationPtr Element_FindChildById(ElementInformationPtr parent, const char* automationId, const char* treeScope, char* errorInfo, const int errorLength) {
     try {
-      return ElementInformation::From(Find(parent)->ChildById(gcnew String(automationId)));
+      auto scope = (TreeScope) Enum::Parse(TreeScope::typeid, gcnew String(treeScope));
+      return ElementInformation::From(Find(parent)->ChildById(gcnew String(automationId), scope));
     } catch(Exception^ error) {
       StringHelper::CopyToUnmanagedString(error->Message, errorInfo, errorLength);
     }
@@ -57,9 +58,10 @@ extern "C" {
     return NULL;
   }
 
-  __declspec(dllexport) ElementInformationPtr Element_FindChildByName(ElementInformationPtr parent, const char* name, char* errorInfo, const int errorLength) {
+  __declspec(dllexport) ElementInformationPtr Element_FindChildByName(ElementInformationPtr parent, const char* name, const char* treeScope, char* errorInfo, const int errorLength) {
     try {
-      return ElementInformation::From(Find(parent)->ChildByName(gcnew String(name)));
+      auto scope = (TreeScope) Enum::Parse(TreeScope::typeid, gcnew String(treeScope));
+      return ElementInformation::From(Find(parent)->ChildByName(gcnew String(name), scope));
     } catch(Exception^ error) {
       StringHelper::CopyToUnmanagedString(error->Message, errorInfo, errorLength);
     }

data/lib/uia/element.rb

@@ -27,11 +27,13 @@ module Uia
     end
 
     def find(locator)
+      scope = (locator[:scope] || :descendants).to_s.capitalize
+
       case
         when locator[:id]
-          Library::find_child_by_id(@element, locator[:id])
+          Library::find_child_by_id(@element, locator[:id], scope)
         when locator[:name]
-          Library::find_child_by_name(@element, locator[:name])
+          Library::find_child_by_name(@element, locator[:name], scope)
       end
     end
 

data/lib/uia/library.rb

@@ -61,8 +61,8 @@ module Uia
     attach_function :Element_FindByRuntimeId, [:pointer, :int, :pointer, :int], ManagedElementStruct.by_ref
 
     # element methods
-    attach_throwable_function :find_child_by_id, :Element_FindChildById, [:pointer, :string], ManagedElementStruct.by_ref, &element_or_nil
-    attach_throwable_function :find_child_by_name, :Element_FindChildByName, [:pointer, :string], ManagedElementStruct.by_ref, &element_or_nil
+    attach_throwable_function :find_child_by_id, :Element_FindChildById, [:pointer, :string, :string], ManagedElementStruct.by_ref, &element_or_nil
+    attach_throwable_function :find_child_by_name, :Element_FindChildByName, [:pointer, :string, :string], ManagedElementStruct.by_ref, &element_or_nil
     elements_from :children, :Element_Children, [:pointer]
     elements_from :descendants, :Element_Descendants, [:pointer]
     attach_throwable_function :click, :Element_Click, [:pointer], :void

data/lib/uia/version.rb

@@ -1,3 +1,3 @@
 module Uia
-  VERSION = '0.0.7.1'
+  VERSION = '0.0.7.2'
 end

data/spec/uia/element_spec.rb

@@ -58,6 +58,10 @@ describe Uia::Element do
       Then { element.find(name: 'No option selected') != nil }
       Then { element.find(name: 'does not exist') == nil }
     end
+
+    context 'limiting scope' do
+      Then { element.find(name: 'label2', scope: :children) == nil }
+    end
   end
 
   context '#select' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: uia
 version: !ruby/object:Gem::Version
-  version: 0.0.7.1
+  version: 0.0.7.2
   prerelease: 
 platform: ruby
 authors:
@@ -239,7 +239,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1001089377
+      hash: -527449199
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -248,7 +248,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1001089377
+      hash: -527449199
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24