win_gui 0.2.9 → 0.2.10

data/HISTORY

@@ -41,3 +41,7 @@
 == 0.2.9 / 2010-06-04
 
 * Window: Full feature parity with Book code
+
+== 0.2.10 / 2010-06-04
+
+* Window#child now searches all descendant windows with :indirect option

data/VERSION

@@ -1 +1 @@
-0.2.9
+0.2.10

data/lib/win_gui/window.rb

@@ -5,8 +5,6 @@ module WinGui
 
     def initialize(handle)
       @handle = handle
-#      puts "Window #{handle} created "
-#      p self.class.ancestors
     end
 
     attr_reader :handle
@@ -48,12 +46,25 @@ module WinGui
     # :id:: integer control id (such as IDOK, IDCANCEL, etc)
     # :title:: window title
     # :class:: window class
+    # :indirect:: search all descendants, not only direct children
     # :timeout:: timeout (seconds)
     # :raise:: raise this exception instead of returning nil if nothing found
+    # TODO: add the ability to nail indirect children as well
     #
     def child(opts={})
-      self.class.lookup_window(opts) do
-        opts[:id] ? get_dlg_item(opts[:id]) : find_window_ex(0, opts[:class], opts[:title])
+      if opts[:indirect]
+        self.class.lookup_window opts do
+          found = children.find do |child|
+            (opts[:id] ? child.id == opts[:id] : true) &&
+                    (opts[:class] ? child.class_name == opts[:class] : true) &&
+                    (opts[:title] ? child.title == opts[:title] : true)
+          end
+          found.handle if found
+        end
+      else
+        self.class.lookup_window opts do
+          opts[:id] ? get_dlg_item(opts[:id]) : find_window_ex(0, opts[:class], opts[:title])
+        end
       end
     end
 
@@ -121,6 +132,25 @@ module WinGui
       shut_window
     end
 
+    # Alias for [get_]window_text
+    #
+    def title
+      get_window_text
+    end
+
+    def thread
+      get_window_thread_process_id.first
+    end
+
+    def process
+      get_window_thread_process_id.last
+    end
+
+    # Control ID associated with the window (only makes sense for controls)
+    def id
+      get_dlg_ctrl_id
+    end
+
     # Since Window instances wrap actual window handles, they should directly support Win32 API functions
     # manipulating these handles. Therefore, when unsupported instance method is invoked, we check if
     # WinGui responds to such method, and if yes, call it with our window handle as a first argument.

data/spec/win_gui/window_spec.rb

@@ -14,11 +14,6 @@ module WinGuiTest
     end
 
     context 'manipulating' do
-      it 'has handle property equal to underlying window handle' do
-        any = Window.new any_handle
-        any.handle.should == any_handle
-      end
-
       it 'closes when asked nicely' do
         @app.close
         sleep SLEEP_DELAY # needed to ensure window had enough time to close down
@@ -48,13 +43,32 @@ module WinGuiTest
         @app.window_thread_process_id.should be_an Array
         @app.enum_child_windows.should be_an Array
       end
+   end
 
-      it 'has class_name and text properties (derived from WinGui function calls)' do
+    context 'derived properties' do
+      it 'has handle property equal to underlying window handle' do
+        any = Window.new any_handle
+        any.handle.should == any_handle
+      end
+
+      it 'has class_name and text/title properties (derived from WinGui function calls)' do
         @app.class_name.should == WIN_CLASS
-        # window_text propery accessed via GetWindowText
-        @app.window_text.should == WIN_TITLE
         # text propery accessed by sending WM_GETTEXT directly to window (convenience method in WinGui)
         @app.text.should == WIN_TITLE
+        # window_text propery accessed via GetWindowText
+        @app.window_text.should == WIN_TITLE
+        # title property is just an alias for window_text
+        @app.title.should == WIN_TITLE
+      end
+
+      it 'has thread and process properties derived from get_window_thread_process_id' do
+        thread = @app.thread
+        process = @app.process
+        [thread, process].should == get_window_thread_process_id(@app.handle)
+      end
+
+      it 'has id property that only makes sense for controls' do
+        use{ @app.id } 
       end
     end
 
@@ -132,7 +146,6 @@ module WinGuiTest
 
       it 'finds child with specific text and returns it as a Window object' do
         with_dialog(:save) do |dialog|
-#          @dialog.children.each{|child| puts "#{child.handle}, #{child.class_name}, #{child.window_text}"}
           child = dialog.child( title: "Cancel")
           child.should_not == nil
           dialog.child?(child.handle).should == true
@@ -153,6 +166,47 @@ module WinGuiTest
           child.text.should == "Cancel"
         end
       end
+
+      context 'indirect child' do
+        it 'returns nil if specified child not found' do
+          @app.child( title: IMPOSSIBLE, indirect: true).should == nil
+        end
+
+        it 'finds ANY child window without other args' do
+          use { @child = @app.child(indirect: true) }
+          @child.should_not == nil
+          @app.child?(@child.handle).should == true
+        end
+
+        it 'finds child window by class' do
+          child = @app.child( class: TEXTAREA_CLASS, indirect: true)
+          child.should_not == nil
+          @app.child?(child.handle).should == true
+        end
+
+        it 'finds child with specific text' do
+          with_dialog(:save) do |dialog|
+            child = dialog.child( title: "Cancel", indirect: true)
+            child.should_not == nil
+            dialog.child?(child.handle).should == true
+            child.id.should == IDCANCEL
+
+            child = dialog.child( title: "&Save", indirect: true)
+            child.should_not == nil
+            dialog.child?(child.handle).should == true
+            child.id.should == IDOK
+          end
+        end
+
+        it 'finds child control with a given ID ' do
+          with_dialog(:save) do |dialog|
+            child = dialog.child( id: IDCANCEL, indirect: true)
+            child.should_not == nil
+            dialog.child?(child.handle).should == true
+            child.text.should == "Cancel"
+          end
+        end
+      end # context indirect
     end # describe child
 
     describe '#children' do
@@ -169,6 +223,13 @@ module WinGuiTest
     end # describe #children
 
     describe '#click' do
+#      it 'tests' do
+#        with_dialog(:save) do |dialog|
+#          dialog.children.each{|child| puts "#{child.handle}, #{child.class_name}, #{child.window_text}, #{dialog.child?(child.handle)}"}
+#          true.should == false
+#        end
+#      end
+
       it 'emulates left click of the control identified by id, returns click coords' do
         with_dialog(:save) do |dialog|
           point = dialog.click(id: IDCANCEL)

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 2
-  - 9
-  version: 0.2.9
+  - 10
+  version: 0.2.10
 platform: ruby
 authors: 
 - arvicco