uia 0.3.2 → 0.3.3

data/ChangeLog

@@ -1,3 +1,7 @@
+=== Version 0.3.3 / 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

data/ext/UiaDll/UiaDll/MenuItemMethods.cpp

@@ -1,27 +1,60 @@
 #include "Stdafx.h"
 
 extern "C" {
+  public ref class MenuItemNotFound : Exception {
+  public:
+    MenuItemNotFound(String^ message) : Exception(message) {}
+  };
+
+  void SelectMenuItemPath(ElementInformationPtr, char*, const int, list<const char*>&);
+  bool HasMenuItemPath(ElementInformationPtr, char*, const int, list<const char*>&);
+  InvokePattern^ MenuItemPath(ElementInformationPtr, list<const char*>&);
+
+  __declspec(dllexport) bool MenuItem_HasPath(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);
+  }
+
+  __declspec(dllexport) void MenuItem_SelectPath(ElementInformationPtr element, char* errorInfo, const int errorInfoLength, const int n, const char* arg0, ...) {
+    GRAB_VARARGS(menuItems, const char*, n);
+    SelectMenuItemPath(element, errorInfo, errorInfoLength, menuItems);
+  }
+
   void SelectMenuItemPath(ElementInformationPtr element, char* errorInfo, const int errorInfoLength, list<const char*>& items) {
     try {
-      auto current = ElementFrom(element);
+      MenuItemPath(element, items)->Invoke();
+    } catch(Exception^ e) {
+      StringHelper::CopyToUnmanagedString(e->Message, errorInfo, errorInfoLength);
+    }
+  }
 
-      for(auto item = items.begin(); item != items.end(); ++item) {
-        auto name = gcnew String(*item);
+  bool HasMenuItemPath(ElementInformationPtr element, char* errorInfo, const int errorInfoLength, list<const char*>& items) {
+    try {
+      return nullptr != MenuItemPath(element, items);
+    } catch(MenuItemNotFound^) {
+      return false;
+    } catch(Exception^ e) { 
+      StringHelper::CopyToUnmanagedString(e->Message, errorInfo, errorInfoLength);
+      return false;
+    }
+  }
 
-        current = current->MenuItem(name);
-        if( nullptr == current) {
-          throw gcnew Exception(String::Format("the menu item \"{0}\" was not found", name));
-        }
+  InvokePattern^ MenuItemPath(ElementInformationPtr element, list<const char*>& items) {
+    auto current = ElementFrom(element);
+
+    for(auto item = items.begin(); item != items.end(); ++item) {
+      auto name = gcnew String(*item);
+
+      current = current->MenuItem(name);
+      if( nullptr == current) {
+        throw gcnew MenuItemNotFound(String::Format("the menu item \"{0}\" was not found", name));
+      }
 
+      if( *item != items.back() ) {
         current->As<InvokePattern^>(InvokePattern::Pattern)->Invoke();
       }
-    } catch(Exception^ e) {
-      StringHelper::CopyToUnmanagedString(e->Message, errorInfo, errorInfoLength);
     }
-  }
 
-  __declspec(dllexport) void MenuItem_SelectPath(ElementInformationPtr element, char* errorInfo, const int errorInfoLength, const int n, const char* arg0, ...) {
-    GRAB_VARARGS(menuItems, const char*, n);
-    SelectMenuItemPath(element, errorInfo, errorInfoLength, menuItems);
+    return current->As<InvokePattern^>(InvokePattern::Pattern);
   }
 }

data/lib/uia/control_types/menu_item.rb

@@ -5,6 +5,10 @@ module Uia
         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
+      end
     end
   end
 end

data/lib/uia/library.rb

@@ -153,10 +153,16 @@ module Uia
 
     # MenuItem methods
     attach_function :MenuItem_SelectPath, [:pointer, :pointer, :int, :int, :varargs], :void
+    attach_function :MenuItem_HasPath, [:pointer, :pointer, :int, :int, :varargs], :bool
+
     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) }
+    end
+
     def self.find_by_runtime_id(id)
       p = FFI::MemoryPointer.new :int, id.count
       p.write_array_of_int(id)

data/lib/uia/version.rb

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

data/spec/uia/control_types/menu_item_spec.rb

@@ -1,13 +1,21 @@
 require 'spec_helper'
 
 describe Uia::ControlTypes::MenuItems do
-  Given(:main)  { Uia.find_element(title: 'MainFormWindow').with(:menu_items) }
+  Given(:main) { Uia.find_element(title: 'MainFormWindow').with(:menu_items) }
 
   after(:each) do
     about = Uia.find_element(title: 'About')
     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' }
+
+    Then { expect(main).to have_menu_item 'File' }
+    Then { expect(main).to have_menu_item 'File', 'Roundabout Way', 'To' }
+  end
+
   context 'selecting individually' do
     When { main.select_menu_item 'About' }
     Then { Uia.find_element(title: 'About') != nil }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: uia
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-13 00:00:00.000000000 Z
+date: 2014-05-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
@@ -261,7 +261,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 59019763
+      hash: -227578093
 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: 59019763
+      hash: -227578093
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.28