uia 0.3.3 → 0.4

data/ChangeLog

@@ -1,11 +1,7 @@
-=== Version 0.3.3 / 2014-05-13
+=== Version 0.4 / 2014-05-13
 *   Enhancements
-    *   MenuItems#has_menu_item?
-
-=== Version 0.3.2 / 2014-05-13
-*   Enhancements
-    *   added #with method to extend an Element based on ControlPatterns
-        *   Uia::ControlPatterns::MenuItems can select a menu item by name or path
+    *   MenuItems#menu_item - find by path
+    *   MenuItems#select_menu_item
 
 === Version 0.3.1 / 2014-05-07
 *   Enhancements

data/ext/UiaDll/UiaDll/MenuItemMethods.cpp

@@ -7,12 +7,12 @@ extern "C" {
   };
 
   void SelectMenuItemPath(ElementInformationPtr, char*, const int, list<const char*>&);
-  bool HasMenuItemPath(ElementInformationPtr, char*, const int, list<const char*>&);
-  InvokePattern^ MenuItemPath(ElementInformationPtr, list<const char*>&);
+  ElementInformationPtr MenuItemByPath(ElementInformationPtr element, char*, const int, list<const char*>& items);
+  Element^ MenuItemPath(ElementInformationPtr, list<const char*>&);
 
-  __declspec(dllexport) bool MenuItem_HasPath(ElementInformationPtr element, char* errorInfo, const int errorInfoLength, const int n, const char* arg0, ...) {
+  __declspec(dllexport) ElementInformationPtr MenuItem_ByPath(ElementInformationPtr element, char* errorInfo, const int errorInfoLength, const int n, const char* arg0, ...) {
     GRAB_VARARGS(menuItems, const char*, n);
-    return HasMenuItemPath(element, errorInfo, errorInfoLength, menuItems);
+    return MenuItemByPath(element, errorInfo, errorInfoLength, menuItems);
   }
 
   __declspec(dllexport) void MenuItem_SelectPath(ElementInformationPtr element, char* errorInfo, const int errorInfoLength, const int n, const char* arg0, ...) {
@@ -22,24 +22,24 @@ extern "C" {
 
   void SelectMenuItemPath(ElementInformationPtr element, char* errorInfo, const int errorInfoLength, list<const char*>& items) {
     try {
-      MenuItemPath(element, items)->Invoke();
+      MenuItemPath(element, items)->As<InvokePattern^>(InvokePattern::Pattern)->Invoke();
     } catch(Exception^ e) {
       StringHelper::CopyToUnmanagedString(e->Message, errorInfo, errorInfoLength);
     }
   }
 
-  bool HasMenuItemPath(ElementInformationPtr element, char* errorInfo, const int errorInfoLength, list<const char*>& items) {
+  ElementInformationPtr MenuItemByPath(ElementInformationPtr element, char* errorInfo, const int errorInfoLength, list<const char*>& items) {
     try {
-      return nullptr != MenuItemPath(element, items);
+      return ElementInformation::From(MenuItemPath(element, items));
     } catch(MenuItemNotFound^) {
-      return false;
+      return NULL;
     } catch(Exception^ e) { 
       StringHelper::CopyToUnmanagedString(e->Message, errorInfo, errorInfoLength);
-      return false;
+      return NULL;
     }
   }
 
-  InvokePattern^ MenuItemPath(ElementInformationPtr element, list<const char*>& items) {
+  Element^ MenuItemPath(ElementInformationPtr element, list<const char*>& items) {
     auto current = ElementFrom(element);
 
     for(auto item = items.begin(); item != items.end(); ++item) {
@@ -55,6 +55,6 @@ extern "C" {
       }
     }
 
-    return current->As<InvokePattern^>(InvokePattern::Pattern);
+    return current;
   }
 }

data/lib/uia/control_types/menu_item.rb

@@ -1,13 +1,12 @@
 module Uia
   module ControlTypes
     module MenuItems
-      def select_menu_path(*path)
+      def select_menu_item(*path)
         Library.select_menu_path @element, *path
       end
-      alias_method :select_menu_item, :select_menu_path
 
-      def has_menu_item?(*path)
-        Library.has_menu_item @element, *path
+      def menu_item(*path)
+        Library.menu_item @element, *path
       end
     end
   end

data/lib/uia/library.rb

@@ -153,14 +153,15 @@ module Uia
 
     # MenuItem methods
     attach_function :MenuItem_SelectPath, [:pointer, :pointer, :int, :int, :varargs], :void
-    attach_function :MenuItem_HasPath, [:pointer, :pointer, :int, :int, :varargs], :bool
+    attach_function :MenuItem_ByPath, [:pointer, :pointer, :int, :int, :varargs], ManagedElementStruct.by_ref
 
     def self.select_menu_path(element, *path)
       try_catch {|s, n| MenuItem_SelectPath element, s, n, path.count, *path.to_var_args(:string) }
     end
 
-    def self.has_menu_item(element, *path)
-      try_catch {|s, n| MenuItem_HasPath element, s, n, path.count, *path.to_var_args(:string) }
+    def self.menu_item(element, *path)
+      e = try_catch {|s, n| MenuItem_ByPath element, s, n, path.count, *path.to_var_args(:string) }
+      Uia::Element.new(e) unless e.empty?
     end
 
     def self.find_by_runtime_id(id)

data/lib/uia/version.rb

@@ -1,3 +1,3 @@
 module Uia
-  VERSION = '0.3.3'
+  VERSION = '0.4'
 end

data/spec/uia/control_types/menu_item_spec.rb

@@ -8,27 +8,22 @@ describe Uia::ControlTypes::MenuItems do
     about.send_keys [:alt, :f4] if about
   end
 
-  context 'existence' do
-    Then { expect(main).not_to have_menu_item 'non-existent' }
-    Then { expect(main).not_to have_menu_item 'File', 'Roundabout Way', 'To', 'Not There' }
+  context '#menu_item' do
+    Then { main.menu_item('non-existent') == nil }
+    Then { main.menu_item('File', 'Roundabout Way', 'To', 'Not There') == nil }
 
-    Then { expect(main).to have_menu_item 'File' }
-    Then { expect(main).to have_menu_item 'File', 'Roundabout Way', 'To' }
+    Then { main.menu_item('File').name == 'File' }
+    Then { main.menu_item('File', 'Roundabout Way', 'To').name == 'To' }
   end
 
-  context 'selecting individually' do
-    When { main.select_menu_item 'About' }
-    Then { Uia.find_element(title: 'About') != nil }
-  end
-
-  context 'selecting a path' do
+  context '#select_menu_item' do
     context 'valid' do
-      When { main.select_menu_path 'File', 'Roundabout Way', 'To', 'About' }
+      When { main.select_menu_item 'File', 'Roundabout Way', 'To', 'About' }
       Then { Uia.find_element(title: 'About') != nil }
     end
 
     context 'invalid' do
-      Given(:bad_path) { main.select_menu_path 'File', 'Roundabout Way', 'To', 'Something Not There' }
+      Given(:bad_path) { main.select_menu_item 'File', 'Roundabout Way', 'To', 'Something Not There' }
       Then { expect { bad_path }.to raise_error(RuntimeError, /Something Not There/) }
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: uia
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: '0.4'
   prerelease: 
 platform: ruby
 authors:
@@ -261,7 +261,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -227578093
+      hash: -662745805
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -270,7 +270,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -227578093
+      hash: -662745805
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.28