uia 0.0.7.2 → 0.0.7.3

data/ChangeLog

@@ -1,3 +1,8 @@
+=== Version 0.0.7.3 / 2013-11-02
+*	Enhancements
+	*	Element#visible?
+	*	added support for RangeValuePattern
+
 === Version 0.0.7.2 / 2013-11-02
 *	Enhancements
 	*	Element#find can specify the scope of the search

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

@@ -47,6 +47,11 @@ namespace UIA.Helper
             get { return _element.Current.IsEnabled; }
         }
 
+        public virtual bool IsVisible
+        {
+            get { return _element.Current.IsOffscreen == false; }
+        }
+
         public virtual int NativeWindowHandle
         {
             get { return _element.Current.NativeWindowHandle; }

data/ext/UiaDll/UiaDll.Test/ElementStub.h

@@ -34,6 +34,12 @@ public:
     void set(bool value) { _isEnabled = value; }
   }
 
+  virtual property bool IsVisible
+  {
+    bool get() override { return _isVisible; }
+    void set(bool value) { _isVisible = value; }
+  }
+
   virtual property array<int>^ RuntimeId
   {
     array<int>^ get() override { return _runtimeIds; }
@@ -70,4 +76,5 @@ private:
   int _nativeWindowHandle;
   int _controlTypeId;
   bool _isEnabled;
+  bool _isVisible;
 };

data/ext/UiaDll/UiaDll/ElementStructures.h

@@ -14,6 +14,7 @@ typedef struct _ElementInformation {
   char* id;
 
   bool isEnabled;
+  bool isVisible;
 
   _ElementInformation() : name(NULL), nativeWindowHandle(0), runtimeId(NULL), patterns(NULL), id(NULL), className(NULL) {}
 
@@ -50,6 +51,7 @@ typedef struct _ElementInformation {
     patternsLength = element->SupportedPatternIds->Length;
 
     isEnabled = element->IsEnabled;
+    isVisible = element->IsVisible;
   }
 
   ~_ElementInformation() {

data/ext/UiaDll/UiaDll/PatternInformationStructures.h

@@ -163,4 +163,22 @@ typedef struct _TableItemInformation {
     Row = tableItemInfo->Row;
   }
 
-} TableItemInformation, *TableItemInformationPtr;
+} TableItemInformation, *TableItemInformationPtr;
+
+typedef struct _RangeValueInformation {
+  double Value;
+  double Minimum;
+  double Maximum;
+  double SmallChange;
+  double LargeChange;
+  bool IsReadOnly;
+
+  _RangeValueInformation(RangeValuePattern::RangeValuePatternInformation^ rangeValueInfo) {
+    Value = rangeValueInfo->Value;
+    Minimum = rangeValueInfo->Minimum;
+    Maximum = rangeValueInfo->Maximum;
+    SmallChange =  rangeValueInfo->SmallChange;
+    LargeChange = rangeValueInfo->LargeChange;
+    IsReadOnly = rangeValueInfo->IsReadOnly;
+  }
+} RangeValueInformation, *RangeValueInformationPtr;

data/ext/UiaDll/UiaDll/RangeValueMethods.cpp

@@ -0,0 +1,25 @@
+#include "Stdafx.h"
+
+extern "C" {
+  __declspec(dllexport) void RangeValue_Release(RangeValueInformationPtr rangeValueInfo) {
+    delete rangeValueInfo;
+  }
+
+  __declspec(dllexport) RangeValueInformationPtr RangeValue_Information(ElementInformationPtr element, char* errorInfo, const int errorInfoLength) {
+    try {
+      return new RangeValueInformation(Find(element)->As<RangeValuePattern^>(RangeValuePattern::Pattern)->Current);
+    } catch(Exception^ e) {
+      StringHelper::CopyToUnmanagedString(e->Message, errorInfo, errorInfoLength);
+      return NULL;
+    }
+  }
+
+  __declspec(dllexport) void RangeValue_SetValue(ElementInformationPtr element, double value, char* errorInfo, const int errorInfoLength) {
+    try {
+      return Find(element)->As<RangeValuePattern^>(RangeValuePattern::Pattern)->SetValue(value);
+    } catch(Exception^ e) {
+      StringHelper::CopyToUnmanagedString(e->Message, errorInfo, errorInfoLength);
+    }
+  }
+
+}

data/ext/UiaDll/UiaDll/UiaDll.vcxproj

@@ -92,6 +92,7 @@
     <ClCompile Include="ElementMethods.cpp" />
     <ClCompile Include="ExpandCollapseMethods.cpp" />
     <ClCompile Include="InvokePatternMethods.cpp" />
+    <ClCompile Include="RangeValueMethods.cpp" />
     <ClCompile Include="SelectionItemMethods.cpp" />
     <ClCompile Include="SelectionMethods.cpp" />
     <ClCompile Include="Stdafx.cpp">

data/ext/UiaDll/UiaDll/UiaDll.vcxproj.filters

@@ -80,5 +80,8 @@
     <ClCompile Include="TableItemMethods.cpp">
       <Filter>Source Files\Patterns</Filter>
     </ClCompile>
+    <ClCompile Include="RangeValueMethods.cpp">
+      <Filter>Source Files\Patterns</Filter>
+    </ClCompile>
   </ItemGroup>
 </Project>

data/lib/uia/element.rb

@@ -1,4 +1,5 @@
 require 'uia/library/element_attributes'
+require 'uia/library/pattern_info_attributes'
 
 module Uia
   class UnsupportedPattern < StandardError
@@ -15,7 +16,9 @@ module Uia
       @default = lambda { [:unknown] }
     end
 
-    element_attr :id, :name, :handle, :runtime_id, :enabled?, :class_name, :children, :descendants
+    element_attr :id, :name, :handle, :runtime_id,
+                 :class_name, :children, :descendants
+    refreshed_element_attr :enabled?, :visible?
 
     def control_type
       Library::Constants::ControlTypes.find(@default) { |_, v| v == @element.control_type_id }.first

data/lib/uia/library.rb

@@ -49,6 +49,7 @@ module Uia
     attach_function :release_table_info, :Table_Release, [:pointer], :void
     attach_function :release_table_item_info, :TableItem_Release, [:pointer], :void
     attach_function :release_expand_collapse_info, :ExpandCollapse_Release, [:pointer], :void
+    attach_function :release_range_value_info, :RangeValue_Release, [:pointer], :void
 
     # root methods
     elements_from :root_children, :Root_Children, []
@@ -103,6 +104,10 @@ module Uia
     # TableItemPattern methods
     attach_throwable_function :table_item_info, :TableItem_Information, [:pointer], TableItemInformation.by_ref
 
+    # RangeValuePattern methods
+    attach_throwable_function :range_value_info, :RangeValue_Information, [:pointer], RangeValueInformation.by_ref
+    attach_throwable_function :set_range_value, :RangeValue_SetValue, [:pointer, :double], :void
+
     def self.find_by_runtime_id(id)
       p = FFI::MemoryPointer.new :int, id.count
       p.write_array_of_int(id)

data/lib/uia/library/element_attributes.rb

@@ -7,5 +7,14 @@ module Uia
         end
       end
     end
+
+    def refreshed_element_attr(*attrs)
+      attrs.each do |attr|
+        define_method(attr) do
+          refresh
+          @element.send(attr)
+        end
+      end
+    end
   end
 end

data/lib/uia/library/element_structs.rb

@@ -1,10 +1,14 @@
 require 'ffi'
 
+require 'uia/library/struct_attributes'
+
 module Uia
   module Library
     module ElementLayout
       def self.included(base)
         base.class_eval do
+          extend StructAttributes
+
           layout :handle, :int,
                  :runtime_id, :pointer,
                  :number_of_ids, :int,
@@ -14,28 +18,16 @@ module Uia
                  :patterns, :pointer,
                  :patterns_length, :int,
                  :id, :string,
-                 :is_enabled, :bool
-
-          def id
-            self[:id]
-          end
+                 :is_enabled, :bool,
+                 :is_visible, :bool
 
-          def name
-            self[:name]
-          end
-
-          def handle
-            self[:handle]
-          end
+          struct_attr :id, :name, :handle, :control_type_id, :class_name,
+                      [:enabled?, :is_enabled], [:visible?, :is_visible]
 
           def runtime_id
             self[:runtime_id].read_array_of_int(number_of_ids)
           end
 
-          def control_type_id
-            self[:control_type_id]
-          end
-
           def pattern_ids
             self[:patterns].read_array_of_int(self[:patterns_length])
           end
@@ -52,14 +44,6 @@ module Uia
             to_ptr.address == 0
           end
 
-          def enabled?
-            self[:is_enabled]
-          end
-
-          def class_name
-            self[:class_name]
-          end
-
           private
           def number_of_ids
             self[:number_of_ids]

data/lib/uia/library/pattern_info_attributes.rb

@@ -0,0 +1,11 @@
+module Uia
+  module PatternInfoAttributes
+    def pattern_attr(*attrs)
+      attrs.each do |attr|
+        define_method(attr) do
+          pattern_info.send(attr)
+        end
+      end
+    end
+  end
+end

data/lib/uia/library/pattern_structs.rb

@@ -1,16 +1,14 @@
+require 'uia/library/struct_attributes'
+
 module Uia
   module Library
     class ValueInformation < FFI::ManagedStruct
+      extend StructAttributes
+
       layout :is_read_only, :bool,
              :value, :string
 
-      def read_only?
-        self[:is_read_only]
-      end
-
-      def value
-        self[:value]
-      end
+      struct_attr [:read_only?, :is_read_only], :value
 
       def self.release(pointer)
         Library.release_value_info(pointer)
@@ -76,6 +74,8 @@ module Uia
     end
 
     class WindowInformation < FFI::ManagedStruct
+      extend StructAttributes
+
       layout :visual_state, :string,
              :interaction_state, :string,
              :can_minimize, :bool,
@@ -83,29 +83,8 @@ module Uia
              :is_modal, :bool,
              :is_topmost, :bool
 
-      def visual_state
-        self[:visual_state]
-      end
-
-      def can_minimize?
-        self[:can_minimize]
-      end
-
-      def can_maximize?
-        self[:can_maximize]
-      end
-
-      def modal?
-        self[:is_modal]
-      end
-
-      def topmost?
-        self[:is_topmost]
-      end
-
-      def interaction_state
-        self[:interaction_state]
-      end
+      struct_attr :visual_state, [:can_minimize?, :can_minimize], [:can_maximize?, :can_maximize],
+                  [:modal?, :is_modal], [:topmost?, :is_topmost], :interaction_state
 
       def self.release(pointer)
         Library.release_window_info(pointer)
@@ -113,17 +92,13 @@ module Uia
     end
 
     class TableInformation < FFI::ManagedStruct
+      extend StructAttributes
+
       layout :row_count, :int,
              :column_count, :int,
              :headers, Elements.ptr
 
-      def row_count
-        self[:row_count]
-      end
-
-      def column_count
-        self[:column_count]
-      end
+      struct_attr :row_count, :column_count
 
       def headers
         self[:headers].children
@@ -135,21 +110,33 @@ module Uia
     end
 
     class TableItemInformation < FFI::ManagedStruct
+      extend StructAttributes
+
       layout :column, :int,
              :row, :int
 
-      def column
-        self[:column]
-      end
-
-      def row
-        self[:row]
-      end
+      struct_attr :column, :row
 
       def self.release(pointer)
         Library.release_table_item_info(pointer)
       end
     end
 
+    class RangeValueInformation < FFI::ManagedStruct
+      extend StructAttributes
+
+      layout :value, :double,
+             :minimum, :double,
+             :maximum, :double,
+             :small_change, :double,
+             :large_change, :double,
+             :is_read_only, :bool
+
+      struct_attr :value, :minimum, :maximum, :small_change, :large_change, [:read_only?, :is_read_only]
+
+      def self.release(pointer)
+        Library.release_range_value_info(pointer)
+      end
+    end
   end
 end

data/lib/uia/library/struct_attributes.rb

@@ -0,0 +1,12 @@
+module Uia
+  module StructAttributes
+    def struct_attr(*attrs)
+      attrs.each do |attr|
+        meth, aka = attr
+        define_method(meth) do
+          self[aka || meth]
+        end
+      end
+    end
+  end
+end

data/lib/uia/patterns/range_value.rb

@@ -0,0 +1,19 @@
+module Uia
+  module Patterns
+    module RangeValue
+      extend PatternInfoAttributes
+
+      pattern_attr :value, :minimum, :maximum,
+                   :small_change, :large_change, :read_only?
+
+      def value=(num)
+        Library.set_range_value @element, num
+      end
+
+      private
+      def pattern_info
+        Library.range_value_info @element
+      end
+    end
+  end
+end

data/lib/uia/version.rb

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

data/spec/uia/element_spec.rb

@@ -3,6 +3,7 @@ require 'spec_helper'
 describe Uia::Element do
   Given(:element) { Uia.find_element(id: 'MainFormWindow') }
   Given(:about_box) { Uia.find_element(id: 'AboutBox') }
+  Given { element.as(:window).visual_state = :normal }
 
   context 'properties' do
     let(:raw_element) { element.instance_variable_get(:@element) }
@@ -12,6 +13,11 @@ describe Uia::Element do
     Then { element.class_name =~ /Forms.*app/i }
     Then { expect(element.find(id: 'textField')).to be_enabled }
 
+    context 'visibility' do
+      When { element.as(:window).visual_state = :minimized }
+      Then { element.visible? == false }
+    end
+
     context '#control_type' do
       Then { element.control_type == :window }
 

data/spec/uia/patterns/range_value_spec.rb

@@ -0,0 +1,19 @@
+require 'spec_helper'
+
+describe Uia::Patterns::RangeValue do
+  Given(:range_value) { Uia.find_element(id: /MainForm/).find(id: 'numericUpDown1').as :range_value }
+
+  context 'properties' do
+    Then { range_value.value == 0.0 }
+    Then { range_value.minimum == 0.0 }
+    Then { range_value.maximum == 100.0 }
+    Then { range_value.small_change == 1.0 }
+    Then { range_value.large_change == 0.0 }
+    Then { range_value.read_only? == false }
+  end
+
+  context '#value=' do
+    When { range_value.value = 37.3 }
+    Then { range_value.value == 37.3 }
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: uia
 version: !ruby/object:Gem::Version
-  version: 0.0.7.2
+  version: 0.0.7.3
   prerelease: 
 platform: ruby
 authors:
@@ -170,6 +170,7 @@ files:
 - ext/UiaDll/UiaDll/ExpandCollapseMethods.cpp
 - ext/UiaDll/UiaDll/InvokePatternMethods.cpp
 - ext/UiaDll/UiaDll/PatternInformationStructures.h
+- ext/UiaDll/UiaDll/RangeValueMethods.cpp
 - ext/UiaDll/UiaDll/ReadMe.txt
 - ext/UiaDll/UiaDll/SelectionItemMethods.cpp
 - ext/UiaDll/UiaDll/SelectionMethods.cpp
@@ -195,9 +196,12 @@ files:
 - lib/uia/library/constants.rb
 - lib/uia/library/element_attributes.rb
 - lib/uia/library/element_structs.rb
+- lib/uia/library/pattern_info_attributes.rb
 - lib/uia/library/pattern_structs.rb
+- lib/uia/library/struct_attributes.rb
 - lib/uia/patterns/expand_collapse.rb
 - lib/uia/patterns/invoke.rb
+- lib/uia/patterns/range_value.rb
 - lib/uia/patterns/selection.rb
 - lib/uia/patterns/selection_item.rb
 - lib/uia/patterns/table.rb
@@ -213,6 +217,7 @@ files:
 - spec/uia/element_spec.rb
 - spec/uia/patterns/expand_collapse_spec.rb
 - spec/uia/patterns/invoke_spec.rb
+- spec/uia/patterns/range_value_spec.rb
 - spec/uia/patterns/selection_item_spec.rb
 - spec/uia/patterns/selection_spec.rb
 - spec/uia/patterns/table_item_spec.rb
@@ -239,7 +244,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -527449199
+      hash: 100309903
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -248,7 +253,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -527449199
+      hash: 100309903
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24
@@ -263,6 +268,7 @@ test_files:
 - spec/uia/element_spec.rb
 - spec/uia/patterns/expand_collapse_spec.rb
 - spec/uia/patterns/invoke_spec.rb
+- spec/uia/patterns/range_value_spec.rb
 - spec/uia/patterns/selection_item_spec.rb
 - spec/uia/patterns/selection_spec.rb
 - spec/uia/patterns/table_item_spec.rb