uia 0.0.6 → 0.0.6.1

data/ChangeLog

@@ -1,3 +1,8 @@
+=== Version 0.0.6.1 / 2013-10-30
+* Bug Fixes
+	*	Fixed issue when finding root children by RegEx initially
+	*	all Find methods consistently return Element classes
+
 === Version 0.0.6 / 2013-10-22
 *	Enhancements
 	* Have implemented the following patterns:

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

@@ -62,6 +62,11 @@ namespace UIA.Helper
             get { return _element.GetSupportedPatterns().Select(x => x.Id).ToArray(); }
         }
 
+        public static Element[] Windows
+        {
+            get { return Find(AutomationElement.RootElement, TreeScope.Children, Condition.TrueCondition); }
+        }
+
         public Element[] Children
         {
             get { return Find(TreeScope.Children, Condition.TrueCondition); }
@@ -124,7 +129,12 @@ namespace UIA.Helper
 
         private Element[] Find(TreeScope scope, Condition condition)
         {
-            return _element.FindAll(scope, condition).Cast<AutomationElement>()
+            return Find(_element, scope, condition);
+        }
+
+        private static Element[] Find(AutomationElement element, TreeScope scope, Condition condition)
+        {
+            return element.FindAll(scope, condition).Cast<AutomationElement>()
                            .Select(x => new Element(x))
                            .ToArray();
         }

data/ext/UiaDll/UiaDll/ElementMethods.cpp

@@ -99,7 +99,7 @@ extern "C" {
 
   __declspec(dllexport) ElementsPtr Root_Children(char* errorInfo, const int errorInfoLength) {
     try {
-      return new Elements(Element::From(AutomationElement::RootElement)->Children);
+      return new Elements(Element::Windows);
     } catch(Exception^ e) {
       StringHelper::CopyToUnmanagedString(e->Message, errorInfo, errorInfoLength);
       return NULL;

data/lib/uia/element.rb

@@ -47,11 +47,11 @@ module Uia
     end
 
     def children
-      @element.children.map { |c| Element.new c }
+      @element.children
     end
 
     def descendants
-      @element.descendants.map { |c| Element.new c }
+      @element.descendants
     end
 
     def click

data/lib/uia/library/structs.rb

@@ -86,7 +86,8 @@ module Uia
 
       def children
         self[:length].times.collect do |i|
-          ElementCast.new(self[:items] + i * ElementCast.size)
+          pointer = self[:items] + i * ElementCast.size
+          Uia::Element.new(ElementCast.new(pointer))
         end
       end
 

data/lib/uia/library.rb

@@ -5,8 +5,6 @@ module Uia
   module Library
     extend FFI::Library
 
-    PropertyId = enum(:is_selection_item, 0)
-
     def self.uia_directory
       File.dirname(__FILE__) + '/../../ext/UiaDll/Release'
     end
@@ -45,7 +43,7 @@ module Uia
     attach_throwable_function :find_by_id, :Element_FindById, [:string], ElementStruct.by_ref, &element_or_nil
     attach_throwable_function :find_by_name, :Element_FindByName, [:string], ElementStruct.by_ref, &element_or_nil
     attach_throwable_function :find_by_pid, :Element_FindByProcessId, [:int], ElementStruct.by_ref, &element_or_nil
-    attach_throwable_function :find_by_handle, :Element_FindByHandle, [:int], ElementStruct.by_ref
+    attach_throwable_function :find_by_handle, :Element_FindByHandle, [:int], ElementStruct.by_ref, &element_or_nil
     attach_function :Element_FindByRuntimeId, [:pointer, :int, :pointer, :int], ElementStruct.by_ref
 
     # element methods

data/lib/uia/version.rb

@@ -1,3 +1,3 @@
 module Uia
-  VERSION = '0.0.6'
+  VERSION = '0.0.6.1'
 end

data/spec/spec_helper.rb

@@ -7,6 +7,8 @@ require 'childprocess'
 require 'ffi'
 require 'uia'
 
+include Uia
+
 RSpec.configure do |config|
   config.before(:all) do
     @app = ChildProcess.build('spec/app/WindowsForms.exe').start

data/spec/uia_spec.rb

@@ -9,24 +9,24 @@ describe Uia do
     Given(:main_window) { Uia.find_element id: 'MainFormWindow' }
 
     context 'by id' do
-      Then { Uia.find_element(id: 'MainFormWindow') != nil }
-      Then { Uia.find_element(id: /[Mm]ain/) != nil }
+      Then { expect(Uia.find_element(id: 'MainFormWindow')).to be_instance_of(Element) }
+      Then { expect(Uia.find_element(id: /[Mm]ain/)).to be_instance_of(Element) }
       Then { Uia.find_element(id: 'not there') == nil }
     end
 
     context 'by name' do
-      Then { Uia.find_element(name: 'MainFormWindow') != nil }
-      Then { Uia.find_element(name: /[Mm]ain.*Window/ ) != nil }
+      Then { expect(Uia.find_element(name: 'MainFormWindow')).to be_instance_of(Element) }
+      Then { expect(Uia.find_element(name: /[Mm]ain.*Window/ )).to be_instance_of(Element) }
       Then { Uia.find_element(name: 'not there') == nil }
     end
 
     context 'by process id' do
-      Then { Uia.find_element(pid: @app.pid) != nil }
+      Then { expect(Uia.find_element(pid: @app.pid)).to be_instance_of(Element) }
       Then { Uia.find_element(pid: -1) == nil }
     end
 
     context 'by runtime id' do
-      Then { Uia.find_element(runtime_id: main_window.runtime_id) != nil }
+      Then { expect(Uia.find_element(runtime_id: main_window.runtime_id)).to be_instance_of(Element) }
 
       context 'can search descendants' do
         Given(:element_with_no_handle) { Uia.find_element(id: 'MainFormWindow').find(name: 'Parent Two') }
@@ -35,7 +35,7 @@ describe Uia do
     end
 
     context 'by window handle' do
-      Then { Uia.find_element(handle: main_window.handle) != nil }
+      Then { expect(Uia.find_element(handle: main_window.handle)).to be_instance_of(Element) }
       Then { expect { Uia.find_element(handle: 0x0) }.to raise_error }
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: uia
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.6.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-23 00:00:00.000000000 Z
+date: 2013-10-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
@@ -211,7 +211,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 149401647
+      hash: 849394065
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -220,7 +220,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 149401647
+      hash: 849394065
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24