win 0.1.0 → 0.1.2

data/lib/win/gui.rb

@@ -2,7 +2,7 @@ require 'win/gui/window'
 require 'win/gui/input'
 require 'win/gui/message'
 require 'win/gui/dialog'
-require 'win/gui/convenience'
+require 'win/gui/window/window'
 
 module Win
   # Contains several modules defining Win32 API functions and constants related to Windows GUI (Graphical User Interface)
@@ -12,6 +12,5 @@ module Win
     include Win::Gui::Input
     include Win::Gui::Message
     include Win::Gui::Dialog
-    include Win::Gui::Convenience
   end
 end

data/lib/win/library.rb

@@ -364,7 +364,6 @@ module Win
       ##
       # Generates possible effective names for function in Win32 dll (name+A/W),
       # Rubyesque name and aliases for method(s) defined based on function name,
-      # sets boolean flag for test functions (Is...)
       #
       def generate_names(name, options={})
         name = name.to_s
@@ -375,7 +374,6 @@ module Win
         case method_name
           when /^is_/
             aliases << method_name.sub(/^is_/, '') + '?'
-            options[:boolean] = true
           when /^set_/
             aliases << method_name.sub(/^set_/, '')+ '='
           when /^get_/

data/spec/spec_helper.rb

@@ -47,7 +47,7 @@ module WinTest
   TEST_KEY_DELAY = 0.001
   TEST_IMPOSSIBLE = 'Impossible'
   TEST_CONVERSION_ERROR = /Can.t convert/
-  TEST_SLEEP_DELAY = 0.01
+  TEST_SLEEP_DELAY = 0.02
   TEST_APP_PATH = File.join(File.dirname(__FILE__), "test_apps/locknote/LockNote.exe" )
   TEST_APP_START = 'start "" "' + TEST_APP_PATH + '"'
   TEST_WIN_TITLE = 'LockNote - Steganos LockNote'
@@ -69,13 +69,13 @@ module WinTestApp
 
   include WinTest
   include Win::Gui
-  include Win::Gui::Convenience
+  #include Win::Gui::Convenience
 
   def launch_test_app
     system TEST_APP_START
     sleep TEST_SLEEP_DELAY until (handle = find_window(nil, TEST_WIN_TITLE))
 
-    @launched_test_app = WrapWindow.new handle
+    @launched_test_app = Window::Window.new handle
 #    app = "Test app"    #need to get rid of Window for JRuby
 #    class << app; self; end.send( :define_method, :handle, &lambda {handle})
 #    @launched_test_app = app
@@ -94,7 +94,7 @@ module WinTestApp
     app = launch_test_app
 
     def app.textarea #define singleton method retrieving app's text area
-      WrapWindow.new find_window_ex(self.handle, 0, TEST_TEXTAREA_CLASS, nil)
+      Window::Window.new find_window_ex(self.handle, 0, TEST_TEXTAREA_CLASS, nil)
     end
 
     yield app

data/spec/win/gui/dialog_spec.rb

@@ -11,13 +11,6 @@ module WinWindowTest
 
     describe '#get_dlg_item' do
       spec{ use{ control_handle = get_dlg_item(handle = 0, item_id = 1) }}
-      # handle (L) - Handle of the dialog box that contains the control.
-      # item_id (I) - Specifies the identifier of the control to be retrieved.
-      # Returns (L) - handle of the specified control if success or nil for invalid dialog box handle or a nonexistent control.
-      #   To get extended error information, call GetLastError.
-      #   You can use the GetDlgItem function with any parent-child window pair, not just with dialog boxes. As long as the handle
-      #   parameter specifies a parent window and the child window has a unique id (as specified by the hMenu parameter in the
-      #   CreateWindow or CreateWindowEx function that created the child window), GetDlgItem returns a valid handle to the child window.
 
       it 'returns handle to correctly specified control'
 
@@ -37,6 +30,28 @@ module WinWindowTest
       end
     end
 
+    describe Win::Gui::Dialog, ' defines convenience/service methods on top of Windows API' do
+      describe 'dialog' do
+        spec{ use{ dialog( title ='Dialog Title', timeout_sec = 0.001, &any_block)  }}
+
+        it 'finds top-level dialog window by title' do
+          pending 'Some problems (?with timeouts?) leave window open ~half of the runs'
+          test_app do |app|
+            keystroke(VK_ALT, 'F'.ord, 'A'.ord)
+            @found = false
+            dialog('Save As', 0.5) do |dialog_window|
+              @found = true
+              keystroke(VK_ESCAPE)
+              dialog_window
+            end
+            @found.should == true
+          end
+        end
+
+        it 'yields found dialog window to a given block'
+
+      end
+    end
   end
 end
 

data/spec/win/gui/input_spec.rb

@@ -28,12 +28,42 @@ module WinWindowTest
     end
     
     describe '#mouse_event' do
+      spec { use {mouse_event( flags = MOUSEEVENTF_ABSOLUTE , dx = 0, dy = 0, data=0, extra_info=0 )}}
       it 'Emulates Mouse clicks'
     end
 
     describe '#set_cursor_pos' do
+      spec { use {success = set_cursor_pos(x=0, y=0)}}
       it 'how to test set_cursor_pos?'
     end
   end
+
+  describe Win::Gui::Input, ' defines convenience/service methods on top of Windows API' do
+    describe '#keystroke' do
+      spec{ use{ keystroke( vkey = 30, vkey = 30) }}
+
+      it 'emulates combinations of keys pressed (Ctrl+Alt+P+M, etc)' do
+        test_app do |app|
+          keystroke(VK_CONTROL, 'A'.ord)
+          keystroke(VK_SPACE)
+          app.textarea.text.should == ' '
+          2.times {keystroke(VK_CONTROL, 'Z'.ord)} # dirty hack!
+        end
+      end
+    end
+
+    describe '#type_in' do
+      spec{ use{ type_in(message = '') }}
+
+      it 'types text message into the window holding the focus' do
+        test_app do |app|
+          text = '12 34'
+          type_in(text)
+          app.textarea.text.should =~ Regexp.new(text)
+          5.times {keystroke(VK_CONTROL, 'Z'.ord)} # dirty hack!
+        end
+      end
+    end
+  end
 end
 

data/spec/win/gui/message_spec.rb

@@ -11,13 +11,6 @@ module WinGuiMessageTest
 
     describe '#post_message' do
       spec{ use{ success = post_message(handle = 0, msg = 0, w_param = 0, l_param = 0) }}
-      # handle (L) - Handle to the window whose window procedure will receive the message.
-      #   If this parameter is HWND_BROADCAST, the message is sent to all top-level windows in the system, including disabled or
-      #   invisible unowned windows, overlapped windows, and pop-up windows; but the message is not sent to child windows.
-      # msg (L) - Specifies the message to be posted.
-      # w_param (L) - Specifies additional message-specific information.
-      # l_param (L) - Specifies additional message-specific information.
-      # returns (L) - Nonzero if success, zero if function failed. To get extended error information, call GetLastError.
 
       it 'places (posts) a message in the message queue associated with the thread that created the specified window'
       it 'returns without waiting for the thread to process the message'

data/spec/win/gui/{convenience_spec.rb → window/window_spec.rb}

@@ -1,72 +1,24 @@
-require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
-require 'win/gui/convenience'
+require File.expand_path(File.dirname(__FILE__) + '/../../../spec_helper')
+require 'win/gui/window'
+require 'win/gui/window/window'
 
 module WinGuiTest
   include WinTestApp
   include Win::Gui::Window
-  include Win::Gui::Input
-  include Win::Gui::Convenience
-
-  describe Win::Gui::Convenience, ' defines convenience/service methods on top of Windows API' do
-    describe '#keystroke' do
-      spec{ use{ keystroke( vkey = 30, vkey = 30) }}
-
-      it 'emulates combinations of keys pressed (Ctrl+Alt+P+M, etc)' do
-        test_app do |app|
-          keystroke(VK_CONTROL, 'A'.ord)
-          keystroke(VK_SPACE)
-          app.textarea.text.should == ' '
-          2.times {keystroke(VK_CONTROL, 'Z'.ord)} # dirty hack!
-        end
-      end
-    end
-
-    describe '#type_in' do
-      spec{ use{ type_in(message = '') }}
-
-      it 'types text message into the window holding the focus' do
-        test_app do |app|
-          text = '12 34'
-          type_in(text)
-          app.textarea.text.should =~ Regexp.new(text)
-          5.times {keystroke(VK_CONTROL, 'Z'.ord)} # dirty hack!
-        end
-      end
-    end
-
-    describe 'dialog' do
-      spec{ use{ dialog( title ='Dialog Title', timeout_sec = 0.001, &any_block)  }}
-
-      it 'finds top-level dialog window by title' do
-        pending 'Some problems (?with timeouts?) leave window open ~half of the runs'
-        test_app do |app|
-          keystroke(VK_ALT, 'F'.ord, 'A'.ord)
-          @found = false
-          dialog('Save As', 0.5) do |dialog_window|
-            @found = true
-            keystroke(VK_ESCAPE)
-            dialog_window
-          end
-          @found.should == true
-        end
-      end
-      it 'yields found dialog window to a given block'
-    end
-
-  end
+  include Win::Gui::Input    
 
-  describe Win::Gui::Convenience::WrapWindow, ' thin wrapper class around window handle' do
+  describe Win::Gui::Window::Window, ' thin wrapper class around window handle' do
     before(:each) { @app = launch_test_app }
     after(:each){ close_test_app }
 
     context 'creating' do
       it 'can be wrapped around any existing window' do
         any_handle = find_window(nil, nil)
-        use{ WrapWindow.new any_handle }
+        use{ Window::Window.new any_handle }
       end
 
       it 'can be wrapped around specific window' do
-        use{ WrapWindow.new @app.handle }
+        use{ Window::Window.new @app.handle }
       end
     end
 
@@ -74,7 +26,7 @@ module WinGuiTest
 
       it 'has handle property equal to underlying window handle' do
         any_handle = find_window(nil, nil)
-        any = WrapWindow.new any_handle
+        any = Window::Window.new any_handle
         any.handle.should == any_handle
       end
 
@@ -85,26 +37,26 @@ module WinGuiTest
       it 'closes when asked nicely' do
         @app.close
         sleep TEST_SLEEP_DELAY # needed to ensure window had enough time to close down
-        find_window(nil, TEST_WIN_TITLE).should == nil #!!!!!
+        find_window(nil, TEST_WIN_TITLE).should == nil #!!!!!!
       end
 
       it 'waits f0r window to disappear (NB: this happens before handle is released!)' do
         start = Time.now
         @app.close
         @app.wait_for_close
-        (Time.now - start).should be <= Win::Gui::Convenience::CLOSE_TIMEOUT
+        (Time.now - start).should be <= Win::Gui::Window::Window::CLOSE_TIMEOUT
         window_visible?(@app.handle).should be false
       end
     end
 
     context '.top_level class method' do
       it 'finds any top-level window (title = nil) and wraps it in a Window object' do
-        use { @win = WrapWindow.top_level(title = nil, timeout_sec = 3) }
-        @win.should be_a_kind_of WrapWindow
+        use { @win = Window::Window.top_level(title = nil, timeout_sec = 3) }
+        @win.should be_a_kind_of Window
       end
 
       it 'finds top-level window by title and wraps it in a Window object' do
-        win = WrapWindow.top_level( TEST_WIN_TITLE, 1)
+        win = Window::Window.top_level( TEST_WIN_TITLE, 1)
         win.handle.should == @app.handle
       end
     end

data/spec/win/gui/window_spec.rb

@@ -266,9 +266,9 @@ module WinWindowTest
       it 'returns correct window class name' do
         test_app do |app|
           get_class_name(app.handle).should == TEST_WIN_CLASS
-          get_class_name_w(app.handle).should == TEST_WIN_CLASS #!!!! nil?
-          class_name_w(app.handle).should == TEST_WIN_CLASS  #!!!!!!! nil?
           class_name(app.handle).should == TEST_WIN_CLASS
+          class_name_w(app.handle).should == TEST_WIN_CLASS  #!!!!!!!!! nil?
+          get_class_name_w(app.handle).should == TEST_WIN_CLASS #!!!!!! nil?
         end
       end
     end
@@ -408,6 +408,17 @@ module WinWindowTest
       end
     end
 
+    describe '#enum_desktop_windows' do
+      before(:all){@app = launch_test_app}
+      after(:all){close_test_app}
+
+      spec{ use{ handles = enum_desktop_windows(0, value = 13)   }}
+      spec{ use{ enum_desktop_windows(0) do |handle, message|
+      end  }}
+
+      it 'iterates through all the top-level windows for a given desktop'
+    end
+    
     describe '#enum_child_windows' do
       before(:all){@app = launch_test_app}
       after(:all){close_test_app}
@@ -449,6 +460,21 @@ module WinWindowTest
         end
       end
     end
-  end
-end
 
+    describe Win::Gui::Window, ' defines convenience/service methods on top of Windows API' do
+      describe '#foreground' do
+        spec{ use{ foreground?( any_handle) }}
+      end
+      describe '#hide_window' do
+        spec{ use{ hide_window(any_handle) }}
+
+      end
+        it 'hides window: same as show_window(handle, SW_HIDE)' do
+          test_app do |app|
+            hide_window(app.handle)
+            visible?(app.handle).should == false
+          end
+        end
+      end
+  end
+end

data/spec/win/library_spec.rb

@@ -162,33 +162,6 @@ module WinLibraryTest
       end
     end
 
-    context 'auto-defining Ruby-like boolean methods if API function name starts with "Is_"' do
-      before(:each) {MyLib.function 'IsWindow', 'L', 'L'}
-
-      it 'defines new instance method name dropping Is_ and adding ?' do
-        respond_to?(:window?).should be_true
-        respond_to?(:is_window).should be_true
-        respond_to?(:IsWindow).should be_true
-      end
-
-      it 'defined CamelCase method returns zero/non-zero as expected' do
-        IsWindow(any_handle).should_not == true
-        IsWindow(any_handle).should_not == 0
-        IsWindow(not_a_handle).should == 0
-      end
-
-      it 'defined snake_case method returns false/true instead of zero/non-zero' do
-        window?(any_handle).should == true
-        window?(not_a_handle).should == false
-        is_window(any_handle).should == true
-        is_window(not_a_handle).should == false
-      end
-
-      it 'defined methods enforce the argument count' do
-        should_count_args :window?, :is_window, :IsWindow,  [not_a_handle], [nil, not_a_handle, any_handle]
-      end
-    end
-
     context 'defining API with :boolean option converts result to boolean' do
       before(:each) { MyLib.function 'FindWindow', 'PP', 'L', :boolean => true }
 

data/win.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{win}
-  s.version = "0.1.0"
+  s.version = "0.1.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["arvicco"]
-  s.date = %q{2010-02-15}
+  s.date = %q{2010-02-16}
   s.description = %q{Rubyesque interfaces and wrappers for Windows API functions pre-defined using FFI }
   s.email = %q{arvitallian@gmail.com}
   s.extra_rdoc_files = [
@@ -29,21 +29,21 @@ Gem::Specification.new do |s|
      "lib/win/dde.rb",
      "lib/win/extensions.rb",
      "lib/win/gui.rb",
-     "lib/win/gui/convenience.rb",
      "lib/win/gui/dialog.rb",
      "lib/win/gui/input.rb",
      "lib/win/gui/message.rb",
      "lib/win/gui/window.rb",
+     "lib/win/gui/window/window.rb",
      "lib/win/library.rb",
      "spec/spec.opts",
      "spec/spec_helper.rb",
      "spec/test_apps/locknote/LockNote.exe",
      "spec/win/dde_spec.rb",
      "spec/win/extensions_spec.rb",
-     "spec/win/gui/convenience_spec.rb",
      "spec/win/gui/dialog_spec.rb",
      "spec/win/gui/input_spec.rb",
      "spec/win/gui/message_spec.rb",
+     "spec/win/gui/window/window_spec.rb",
      "spec/win/gui/window_spec.rb",
      "spec/win/library_spec.rb",
      "win.gemspec"
@@ -57,10 +57,10 @@ Gem::Specification.new do |s|
     "spec/spec_helper.rb",
      "spec/win/dde_spec.rb",
      "spec/win/extensions_spec.rb",
-     "spec/win/gui/convenience_spec.rb",
      "spec/win/gui/dialog_spec.rb",
      "spec/win/gui/input_spec.rb",
      "spec/win/gui/message_spec.rb",
+     "spec/win/gui/window/window_spec.rb",
      "spec/win/gui/window_spec.rb",
      "spec/win/library_spec.rb"
   ]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: win
 version: !ruby/object:Gem::Version 
-  version: 0.1.0
+  version: 0.1.2
 platform: ruby
 authors: 
 - arvicco
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-15 00:00:00 +03:00
+date: 2010-02-16 00:00:00 +03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -64,21 +64,21 @@ files:
 - lib/win/dde.rb
 - lib/win/extensions.rb
 - lib/win/gui.rb
-- lib/win/gui/convenience.rb
 - lib/win/gui/dialog.rb
 - lib/win/gui/input.rb
 - lib/win/gui/message.rb
 - lib/win/gui/window.rb
+- lib/win/gui/window/window.rb
 - lib/win/library.rb
 - spec/spec.opts
 - spec/spec_helper.rb
 - spec/test_apps/locknote/LockNote.exe
 - spec/win/dde_spec.rb
 - spec/win/extensions_spec.rb
-- spec/win/gui/convenience_spec.rb
 - spec/win/gui/dialog_spec.rb
 - spec/win/gui/input_spec.rb
 - spec/win/gui/message_spec.rb
+- spec/win/gui/window/window_spec.rb
 - spec/win/gui/window_spec.rb
 - spec/win/library_spec.rb
 - win.gemspec
@@ -114,9 +114,9 @@ test_files:
 - spec/spec_helper.rb
 - spec/win/dde_spec.rb
 - spec/win/extensions_spec.rb
-- spec/win/gui/convenience_spec.rb
 - spec/win/gui/dialog_spec.rb
 - spec/win/gui/input_spec.rb
 - spec/win/gui/message_spec.rb
+- spec/win/gui/window/window_spec.rb
 - spec/win/gui/window_spec.rb
 - spec/win/library_spec.rb