win 0.1.9 → 0.1.11

data/README.rdoc

@@ -116,10 +116,10 @@ Contributors always welcome!
 == SYNOPSIS
 === Using pre-defined Windows API functions:
 
-    require 'win/gui'
+    require 'win/gui/window'
 
     class MyClass
-    include Win::Gui::Window
+    include Win::GUI::Window
 
     fg_window = foreground_window
     puts window_text(fg_window)
@@ -134,6 +134,9 @@ Contributors always welcome!
     module YourLibModule
       include Win::Library
 
+      # Customizing method behavior: zeronil forces function to return nil instead of 0, rename renames method
+      function :FindWindow, [:pointer, :pointer], :ulong, zeronil: true, rename: :my_find
+
       # Customizing even further: your own method extension in attached block
       function :GetWindowText, [ :ulong, :pointer, :int ], :int do |api, handle|
         buffer = FFI::MemoryPointer.new :char, 512
@@ -142,8 +145,6 @@ Contributors always welcome!
         num_chars == 0 ? nil : buffer.get_bytes(0, num_chars)
       end
 
-      # Customizing method behavior: zeronil forces function to return nil instead of 0, rename renames method
-      function :FindWindow, [:pointer, :pointer], :ulong, zeronil: true, rename: :my_find
     end
 
     include YourLibModule

data/VERSION

@@ -1 +1 @@
-0.1.9
+0.1.11

data/lib/win/dde.rb

@@ -13,10 +13,8 @@ module Win
     # DDE name service afCmd commands used by DdeNameService function:
 
     # Registers the service name.
-
     DNS_REGISTER = 1
-    # Unregisters the service name. If the hsz1 parameter is 0L, ALL service names registered by the server will be
-    # unregistered.
+    # Unregisters the service name. When hsz1 == 0L, ALL service names registered by the server will be unregistered.
     DNS_UNREGISTER = 2
     # Turns on service name initiation filtering. The filter prevents a server from receiving
     # XTYP_CONNECT transactions for service names it has not registered. This is the default
@@ -30,28 +28,51 @@ module Win
 
     # Transaction types:
 
+    XTYPF_NOBLOCK       = 0x0002
+    XTYPF_NODATA        = 0x0004
+    XTYPF_ACKREQ        = 0x0008
+
+    XCLASS_MASK         = 0xFC00
+    XCLASS_BOOL         = 0x1000
+    XCLASS_DATA         = 0x2000
+    XCLASS_FLAGS        = 0x4000
+    XCLASS_NOTIFICATION = 0x8000
+
+    XTYP_ERROR           = XCLASS_NOTIFICATION | XTYPF_NOBLOCK
+    XTYP_ADVDATA         = 0x0010 | XCLASS_FLAGS
+    XTYP_ADVREQ          = 0x0020 | XCLASS_DATA | XTYPF_NOBLOCK
+    XTYP_ADVSTART        = 0x0030 | XCLASS_BOOL
+    XTYP_ADVSTOP         = 0x0040 | XCLASS_NOTIFICATION
+    XTYP_EXECUTE         = 0x0050 | XCLASS_FLAGS
     # A client uses the XTYP_CONNECT transaction to establish a conversation. A DDE server callback function,
     # DdeCallback, receives this transaction when a client specifies a service name that the server supports
     # (and a topic name that is not NULL) in a call to the DdeConnect function.
-    XTYP_CONNECT = 0x60
-    XTYP_DISCONNECT = 0xC0
-
-    # A client uses the XTYP_POKE transaction to send unsolicited data to the server. DDE server callback function, 
+    XTYP_CONNECT         = 0x0060 | XCLASS_BOOL | XTYPF_NOBLOCK
+    XTYP_CONNECT_CONFIRM = 0x0070 | XCLASS_NOTIFICATION | XTYPF_NOBLOCK
+    XTYP_XACT_COMPLETE   = 0x0080 | XCLASS_NOTIFICATION
+    # A client uses the XTYP_POKE transaction to send unsolicited data to the server. DDE server callback function,
     # DdeCallback, receives this transaction when a client specifies XTYP_POKE in the DdeClientTransaction function.
-    XTYP_POKE = 0x90
-    XTYP_ERROR = 0x00
+    XTYP_POKE            = 0x0090 | XCLASS_FLAGS
+    XTYP_REGISTER        = 0x00A0 | XCLASS_NOTIFICATION | XTYPF_NOBLOCK
+    XTYP_REQUEST         = 0x00B0 | XCLASS_DATA
+    XTYP_DISCONNECT      = 0x00C0 | XCLASS_NOTIFICATION | XTYPF_NOBLOCK
+    XTYP_UNREGISTER      = 0x00D0 | XCLASS_NOTIFICATION | XTYPF_NOBLOCK
+    XTYP_WILDCONNECT     = 0x00E0 | XCLASS_DATA | XTYPF_NOBLOCK
+    XTYP_MONITOR         = 0X00F0 | XCLASS_NOTIFICATION | XTYPF_NOBLOCK
+    XTYP_MASK            = 0x00F0
+    XTYP_SHIFT           = 0x0004
 
     # Transaction confirmations:
 
     # Transaction confirmation
-    DDE_FACK    = 0x8000
+    DDE_FACK        = 0x8000
     # Server is too busy to process transaction
-    DDE_FBUSY    = 0x4000
-    DDE_FDEFERUPD    = 0x4000
-    DDE_FACKREQ    = 0x8000
+    DDE_FBUSY       = 0x4000
+    DDE_FDEFERUPD   = 0x4000
+    DDE_FACKREQ     = 0x8000
     DDE_FRELEASE    = 0x2000
-    DDE_FREQUESTED =    0x1000
-    DDE_FAPPSTATUS =    0x00ff
+    DDE_FREQUESTED  = 0x1000
+    DDE_FAPPSTATUS  = 0x00ff
     # Transaction rejected
     DDE_FNOTPROCESSED    = 0
 
@@ -130,10 +151,23 @@ module Win
 
     # Returned if DDE Init successful
     DMLERR_NO_ERROR           = 0x00
+    # First (lowest) error code
+    DMLERR_FIRST         = 0x4000
+    # A request for a synchronous advise transaction has timed out.
+    DMLERR_ADVACKTIMEOUT = DMLERR_FIRST
+    # The response to the transaction caused the DDE_FBUSY flag to be set
+    DMLERR_BUSY = 0x4001
+    # A request for a synchronous data transaction has timed out.
+    DMLERR_DATAACKTIMEOUT = 0x4002
+    # A DDEML function was called without first calling the DdeInitialize function, or an invalid instance
+    # identifier was passed to a DDEML function.
+    DMLERR_DLL_NOT_INITIALIZED = 0x4003
     # An application initialized as APPCLASS_MONITOR has attempted to perform a Dynamic Data Exchange (DDE) transaction,
-    # or an application initialized as APPCMD_CLIENTONLY has attempted to perform server transactions. 
+    # or an application initialized as APPCMD_CLIENTONLY has attempted to perform server transactions.
     DMLERR_DLL_USAGE          = 0x4004
-    # DMLERR_INVALIDPARAMETER A parameter failed to be validated by the DDEML. Some of the possible causes follow:
+    # A request for a synchronous execute transaction has timed out.
+    DMLERR_EXECACKTIMEOUT = 0x4005
+    # A parameter failed to be validated by the DDEML. Some of the possible causes follow:
     # - The application used a data handle initialized with a different item name handle than was required by the
     #   transaction.
     # - The application used a data handle that was initialized with a different clipboard data format than was
@@ -142,24 +176,68 @@ module Win
     # - The application used a freed data handle or string handle.
     # - More than one instance of the application used the same object.
     DMLERR_INVALIDPARAMETER   = 0x4006
-    # DMLERR_SYS_ERROR An internal error has occurred in the DDEML.
-    DMLERR_SYS_ERROR          = 0x400f
-    #  DMLERR_ADVACKTIMEOUT A request for a synchronous advise transaction has timed out.
-    #  DMLERR_BUSY The response to the transaction caused the DDE_FBUSY flag to be set.
-    #  DMLERR_DATAACKTIMEOUT A request for a synchronous data transaction has timed out.
-    #  DMLERR_DLL_NOT_INITIALIZED A DDEML function was called without first calling the DdeInitialize function, or an invalid instance identifier was passed to a DDEML function.
-    #  DMLERR_DLL_USAGE
-    #  DMLERR_EXECACKTIMEOUT A request for a synchronous execute transaction has timed out.
     #  DMLERR_LOW_MEMORY A DDEML application has created a prolonged race condition (in which the server application outruns the client), causing large amounts of memory to be consumed.
+    DMLERR_LOW_MEMORY    = 0x4007
     #  DMLERR_MEMORY_ERROR A memory allocation has failed.
-    #  DMLERR_NO_CONV_ESTABLISHED A client's attempt to establish a conversation has failed.
+    DMLERR_MEMORY_ERROR    = 0x4008
     #  DMLERR_NOTPROCESSED A transaction has failed.
+    DMLERR_NOTPROCESSED    = 0x4009
+    #  DMLERR_NO_CONV_ESTABLISHED A client's attempt to establish a conversation has failed.
+    DMLERR_NO_CONV_ESTABLISHED    = 0x400a
     #  DMLERR_POKEACKTIMEOUT A request for a synchronous poke transaction has timed out.
+    DMLERR_POKEACKTIMEOUT    = 0x400b
     #  DMLERR_POSTMSG_FAILED An internal call to the PostMessage function has failed.
+    DMLERR_POSTMSG_FAILED    = 0x400c
     #  DMLERR_REENTRANCY An application instance with a synchronous transaction already in progress attempted to initiate another synchronous transaction, or the DdeEnableCallback function was called from within a DDEML callback function.
+    DMLERR_REENTRANCY    = 0x400d
     #  DMLERR_SERVER_DIED A server-side transaction was attempted on a conversation terminated by the client, or the server terminated before completing a transaction.
+    DMLERR_SERVER_DIED    = 0x400e
+    # DMLERR_SYS_ERROR An internal error has occurred in the DDEML.
+    DMLERR_SYS_ERROR    = 0x400f
     #  DMLERR_UNADVACKTIMEOUT A request to end an advise transaction has timed out.
+    DMLERR_UNADVACKTIMEOUT    = 0x4010
     #  DMLERR_UNFOUND_QUEUE_ID An invalid transaction identifier was passed to a DDEML function. Once the application has returned from an XTYP_XACT_COMPLETE callback, the transaction identifier for that callback function is no longer valid.
+    DMLERR_UNFOUND_QUEUE_ID = 0x4011
+    # Last (highest) error code
+    DMLERR_LAST          = DMLERR_UNFOUND_QUEUE_ID
+
+    # Hash {ERROR_CODE=>'Error description')}
+    ERRORS = {
+            DMLERR_ADVACKTIMEOUT => 'A request for a synchronous advise transaction has timed out.',
+            DMLERR_BUSY => 'The response to the transaction caused the DDE_FBUSY flag to be set.',
+            DMLERR_DATAACKTIMEOUT => 'A request for a synchronous data transaction has timed out.',
+            DMLERR_DLL_NOT_INITIALIZED => 'A DDEML function was called without first calling the DdeInitialize ' +
+                    'function, or an invalid instance identifier was passed to a DDEML function.',
+            DMLERR_DLL_USAGE => 'An application initialized as APPCLASS_MONITOR has attempted to perform a DDE ' +
+                    'transaction, or an application initialized as APPCMD_CLIENTONLY has attempted to perform ' +
+                    'server transactions.',
+            DMLERR_EXECACKTIMEOUT => 'A request for a synchronous execute transaction has timed out.',
+            DMLERR_INVALIDPARAMETER => 'A parameter failed to be validated by the DDEML. Possible causes: ' +
+                    'Application used a data handle initialized with a different item name handle than was required ' +
+                    'by the transaction.' +
+                    'The application used a data handle that was initialized with a different clipboard data format ' +
+                    'than was required by the transaction. ' +
+                    'The application used a client-side conversation handle with server-side function or vice versa. ' +
+                    'The application used a freed data handle or string handle. ' +
+                    'More than one instance of the application used the same object.',
+            DMLERR_LOW_MEMORY => 'A DDEML application has created a prolonged race condition (in which the server ' +
+                    'application outruns the client), causing large amounts of memory to be consumed.',
+            DMLERR_MEMORY_ERROR => 'A memory allocation has failed.',
+            DMLERR_NO_CONV_ESTABLISHED => 'A client`s attempt to establish a conversation has failed.',
+            DMLERR_NOTPROCESSED => 'A transaction has failed.',
+            DMLERR_POKEACKTIMEOUT => 'A request for a synchronous poke transaction has timed out.',
+            DMLERR_POSTMSG_FAILED => 'An internal call to the PostMessage function has failed.',
+            DMLERR_REENTRANCY => 'An application instance with a synchronous transaction already in progress ' +
+                    'attempted to initiate another synchronous transaction, or the DdeEnableCallback function ' +
+                    'was called from within a DDEML callback function.',
+            DMLERR_SERVER_DIED => 'A server-side transaction was attempted on a conversation terminated by the ' +
+                    'client, or the server terminated before completing a transaction.',
+            DMLERR_SYS_ERROR => 'An internal error has occurred in the DDEML.',
+            DMLERR_UNADVACKTIMEOUT => 'A request to end an advise transaction has timed out.',
+            DMLERR_UNFOUND_QUEUE_ID => 'An invalid transaction identifier was passed to a DDEML function. Once the ' +
+                    'application has returned from an XTYP_XACT_COMPLETE callback, the transaction identifier for ' +
+                    'that callback function is no longer valid.'
+    }
 
     ##
     # The RegisterClipboardFormat function registers a new clipboard format.
@@ -575,7 +653,7 @@ module Win
     #   during the XTYP_REGISTER and XTYP_UNREGISTER transactions.
     # - All members of the default CONVCONTEXT structure are set to zero except cb, which specifies the size of the
     #   structure, and iCodePage, which specifies CP_WINANSI (the default code page) or CP_WINUNICODE, depending on
-    #   whether the ANSI or Unicode version of the DdeInitialize function was called by the client application. 
+    #   whether the ANSI or Unicode version of the DdeInitialize function was called by the client application.
     #
     # :call-seq:
     #  conversation_handle = dde_connect( instance_id, [service = nil, topic = nil, context = nil] )

data/lib/win/extensions.rb

@@ -1,12 +1,16 @@
 class String
+  # returns snake_case representation of string
   def snake_case
     gsub(/([a-z])([A-Z0-9])/, '\1_\2' ).downcase
   end
   
+  # converts string to 'wide char' (Windows Unicode) format
   def to_w
     (self+"\x00").encode('utf-16LE')
   end
   
+  # converts one-char string into keyboard-scan 'Virtual key' code
+  # only letters and numbers convertable so far, need to be extended
   def to_vkeys
     unless size == 1
       raise "Can't convert but a single character: #{self}"

data/lib/win/gui/dialog.rb

@@ -2,12 +2,12 @@ require 'win/library'
 require 'win/gui/window'
 
 module Win
-  module Gui
+  module GUI
     # Contains constants and Win32API functions related to dialog manipulation
     #
     module Dialog
       include Win::Library
-      include Win::Gui::Window
+      include Win::GUI::Window
 
       # The GetDlgItem function retrieves a handle to a control in the specified dialog box.
       #

data/lib/win/gui/input.rb

@@ -1,7 +1,7 @@
 require 'win/library'
 
 module Win
-  module Gui
+  module GUI
     # Contains constants and Win32API functions related to end user input
     #
     module Input

data/lib/win/gui/message.rb

@@ -1,7 +1,7 @@
 require 'win/library'
 
 module Win
-  module Gui
+  module GUI
     # Contains constants and Win32API functions related to inter-Window messaging
     #
     module Message

data/lib/win/gui/window/window.rb

@@ -4,19 +4,20 @@ require 'win/gui/message'
 require 'win/gui/input'
 
 module Win
-  module Gui
+  module GUI
     module Window
       # This class is a thin wrapper around window handle
+      # It should be probably moved out of this lib since it's supposed to be "close to metal"
       class Window
         # Wait delay
         SLEEP_DELAY = 0.001
         # Timeout waiting for Window to be closed
         CLOSE_TIMEOUT = 1
 
-        include Win::Gui::Window
-        extend Win::Gui::Window
-        include Win::Gui::Message
-        include Win::Gui::Input
+        include Win::GUI::Window
+        extend Win::GUI::Window
+        include Win::GUI::Message
+        include Win::GUI::Input
 
         attr_reader :handle
 

data/lib/win/gui/window.rb

@@ -1,7 +1,7 @@
 require 'win/library'
 
 module Win
-  module Gui
+  module GUI
     # Contains constants and Win32API functions related to window manipulation
     #
     module Window
@@ -367,7 +367,8 @@ module Win
       #:call-seq:
       #   was_visible = show_window( win_handle, cmd )
       #
-      function :ShowWindow, [:ulong, :int], :int, boolean: true
+      function :ShowWindow, [:ulong, :int], :int, boolean: true,
+               &->(api, handle, cmd=SW_SHOW) { api.call handle, cmd }
 
       ##
       # GetWindowThreadProcessId retrieves the identifier of the thread that created the specified window

data/lib/win/gui.rb

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

data/lib/win/library.rb

@@ -5,8 +5,9 @@ require 'win/extensions'
 # that also contain related constants and convenience methods. For example, Win::DDE module
 # contains only functions related to DDE protocol such as DdeInitialize() as well as constants
 # such as DMLERR_NO_ERROR, APPCLASS_STANDARD, etc. So if you need only DDE-related functions,
-# there is no need to load all the other modules, clogging your namespaces - just require 'win/dde'
-# and be done with it. Win is just a top level namespace (container) that holds all the other modules. 
+# there is no need to load all the other modules, clogging your namespaces - just <b> require 'win/dde' </b>
+# and be done with it. Win is just a top level namespace (container) that holds all the other modules.
+#
 module Win
 
   module Errors                         # :nodoc:
@@ -23,6 +24,7 @@ module Win
   # and declare them using ‘function’ class method (macro) - it does a lot of heavy lifting for you and
   # can be customized with options and code blocks to give you reusable API wrapper methods with the exact
   # behavior you need.
+  #
   module Library
 
     # Win::Library::API is a wrapper for callable function API object that mimics Win32::API
@@ -287,34 +289,34 @@ module Win
 
       ##
       # Defines new method wrappers for Windows API function call:
-      #   - Defines method with original (CamelCase) API function name and original signature (matches MSDN description)
-      #   - Defines method with snake_case name (converted from CamelCase function name) with enhanced API signature
-      #       When defined snake_case method is called, it converts the arguments you provided into ones required by
-      #       original API (adding defaults, mute and transitory args as necessary), executes API function call
-      #       and (optionally) transforms the result before returning it. If a block is attached to
-      #       method invocation, raw result is yielded to this block before final transformation take place
-      #   - Defines aliases for enhanced method with more Rubyesque names for getters, setters and tests:
-      #       GetWindowText -> window_test, SetWindowText -> window_text=, IsZoomed -> zoomed?
-      #
-      # You may modify default behavior of defined method by providing optional &def_block to function.
-      #   If you do so, snake_case method is defined based on your def_block. It receives callable API
-      #   object for function being defined, arguments and (optional) runtime block with which the method
-      #   will be called. Results coming from &def_block are then transformed and returned.
-      #   So, your &def_block should define all the behavior of defined method. You can use define_block to:
-      #   - Change original signature of API function, provide argument defaults, check argument types
-      #   - Pack arguments into strings/structs for [in] or [in/out] parameters that expect a pointer
-      #   - Allocate buffers/structs for pointers required by API functions [out] parameters
-      #   - Unpack [out] and [in/out] parameters returned as pointers
-      #   - Explicitly return results of API call that are returned in [out] and [in/out] parameters
-      #   - Convert attached runtime blocks into callback functions and stuff them into [in] callback parameters
-      #   - do other stuff that you think is appropriate to make Windows API function behavior more Ruby-like
-      #
+      # - Defines method with original (CamelCase) API function name and original signature (matches MSDN description)
+      # - Defines method with snake_case name (converted from CamelCase function name) with enhanced API signature
+      #   When defined snake_case method is called, it converts the arguments you provided into ones required by
+      #   original API (adding defaults, mute and transitory args as necessary), executes API function call
+      #   and (optionally) transforms the result before returning it. If a block is attached to
+      #   method invocation, raw result is yielded to this block before final transformation take place
+      # - Defines aliases for enhanced method with more Rubyesque names for getters, setters and tests:
+      #   GetWindowText -> window_test, SetWindowText -> window_text=, IsZoomed -> zoomed?
+      # ---
+      # You may modify default behavior of defined method by providing optional *def_block* to function definition.
+      # If you do so, snake_case method is defined based on your *def_block*. It receives callable API
+      # object for function being defined, arguments and (optional) runtime block with which the method
+      # will be called. Results coming from &def_block are then transformed and returned.
+      # So, your *def_block* should specify all the behavior of the method being defined. You can use *def_block* to:
+      # - Change original signature of API function, provide argument defaults, check argument types
+      # - Pack arguments into strings/structs for [in] or [in/out] parameters that expect a pointer
+      # - Allocate buffers/structs for pointers required by API functions [out] parameters
+      # - Unpack [out] and [in/out] parameters returned as pointers
+      # - Explicitly return results of API call that are returned in [out] and [in/out] parameters
+      # - Convert attached runtime blocks into callback functions and stuff them into [in] callback parameters
+      # - do other stuff that you think is appropriate to make Windows API function behavior more Ruby-like...
+      # ---
       # Accepts following options:
-      #   :dll:: Use this dll instead of default 'user32'
-      #   :rename:: Use this name instead of standard (conventional) function name
-      #   :alias(es):: Provides additional alias(es) for defined method
-      #   :boolean:: Forces method to return true/false instead of nonzero/zero
-      #   :zeronil:: Forces method to return nil if function result is zero
+      # :dll:: Use this dll instead of default 'user32'
+      # :rename:: Use this name instead of standard (conventional) function name
+      # :alias(es):: Provides additional alias(es) for defined method
+      # :boolean:: Forces method to return true/false instead of nonzero/zero
+      # :zeronil:: Forces method to return nil if function result is zero
       #
       def function(name, params, returns, options={}, &def_block)
         method_name, effective_names, aliases = generate_names(name, options)
@@ -395,6 +397,7 @@ module Win
       ##
       # Wrapper for FFI::Library#callback() that converts Win32/shortcut argument types into FFI-compliant types.
       # This method overrides FFI.callback which must be aliased to FFI.attach_callback
+      #
       def callback(name, params, returns)
         params, returns = generate_signature(params, returns)
         attach_callback name.to_sym, params, returns
@@ -402,8 +405,8 @@ module Win
 
       ##
       # :method: namespace
-      # This method is meta-generated when Win::Library module is included into other module/class
-      # It returns reference to including (host) module for use by Win::Library::API and class methods.
+      # This method is meta-generated when Win::Library module is included into other module/class.
+      # It returns reference to including (host) class/module for use by Win::Library::API and class methods.
 
       ##
       # Ensures that args count is equal to params count plus diff
@@ -421,6 +424,7 @@ module Win
     ##
     # Hook executed when Win::Library is included into class or module. It extends host class/module
     # with both FFI::Library methods and Win::Library macro methods like 'function'.
+    #
     def self.included(klass)
       klass.extend FFI::Library
 

data/spec/spec_helper.rb

@@ -79,8 +79,8 @@ end
 module WinTestApp
 
   include WinTest
-  include Win::Gui
-  #include Win::Gui::Convenience
+  include Win::GUI
+  #include Win::GUI::Convenience
 
   def launch_test_app
     system TEST_APP_START

data/spec/win/dde_spec.rb

@@ -127,6 +127,12 @@ module WinDDETest
           end
         end
 
+        it 'created different handles for two different strings ' do
+          string_handle1 = dde_create_string_handle(@instance_id, 'My String')
+          string_handle2 = dde_create_string_handle(@instance_id, 'My String1')
+          string_handle1.should_not == string_handle2
+        end
+
         it 'returns nil if unable to register handle to a string' do
           string_handle = dde_create_string_handle(@instance_id, "", CP_WINANSI)
           string_handle.should == nil

data/spec/win/gui/dialog_spec.rb

@@ -5,9 +5,9 @@ require 'win/gui/input'
 module WinWindowTest
 
   include WinTestApp
-  include Win::Gui::Dialog
+  include Win::GUI::Dialog
 
-  describe Win::Gui::Dialog do
+  describe Win::GUI::Dialog do
 
     describe '#get_dlg_item' do
       spec{ use{ control_handle = get_dlg_item(handle = 0, item_id = 1) }}
@@ -30,7 +30,7 @@ module WinWindowTest
       end
     end
 
-    describe Win::Gui::Dialog, ' defines convenience/service methods on top of Windows API' do
+    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)  }}
 

data/spec/win/gui/input_spec.rb

@@ -5,9 +5,9 @@ require 'win/gui/input'
 module WinWindowTest
 
   include WinTestApp
-  include Win::Gui::Input
+  include Win::GUI::Input
 
-  describe Win::Gui::Input do
+  describe Win::GUI::Input do
 
     describe '#keydb_event' do
       spec{ use{ keybd_event(vkey = 0, bscan = 0, flags = 0, extra_info = 0) }}
@@ -38,7 +38,7 @@ module WinWindowTest
     end
   end
 
-  describe Win::Gui::Input, ' defines convenience/service methods on top of Windows API' do
+  describe Win::GUI::Input, ' defines convenience/service methods on top of Windows API' do
     describe '#keystroke' do
       spec{ use{ keystroke( vkey = 30, vkey = 30) }}
 

data/spec/win/gui/message_spec.rb

@@ -2,12 +2,12 @@ require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
 require 'win/gui/input'
 #require 'win/gui/window'
 
-module WinGuiMessageTest
+module WinGUIMessageTest
 
   include WinTestApp
-  include Win::Gui::Message
+  include Win::GUI::Message
 
-  describe Win::Gui::Message do
+  describe Win::GUI::Message do
 
     describe '#post_message' do
       spec{ use{ success = PostMessage(handle = 0, msg = 0, w_param = 0, l_param = 0) }}

data/spec/win/gui/window/window_spec.rb

@@ -2,12 +2,12 @@ require File.expand_path(File.dirname(__FILE__) + '/../../../spec_helper')
 require 'win/gui/window'
 require 'win/gui/window/window'
 
-module WinGuiTest
+module WinGUITest
   include WinTestApp
-  include Win::Gui::Window
-  include Win::Gui::Input    
+  include Win::GUI::Window
+  include Win::GUI::Input    
 
-  describe Win::Gui::Window::Window, ' 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 }
 
@@ -44,7 +44,7 @@ module WinGuiTest
         start = Time.now
         @app.close
         @app.wait_for_close
-        (Time.now - start).should be <= Win::Gui::Window::Window::CLOSE_TIMEOUT
+        (Time.now - start).should be <= Win::GUI::Window::Window::CLOSE_TIMEOUT
         window_visible?(@app.handle).should be false
       end
     end

data/spec/win/gui/window_spec.rb

@@ -4,7 +4,7 @@ require 'win/gui/window'
 module WinWindowTest
 
   include WinTestApp
-  include Win::Gui::Window
+  include Win::GUI::Window
 
   def commands_should_show_window *cmds, tests
     cmds.each do |cmd|
@@ -27,7 +27,7 @@ module WinWindowTest
     end
   end
 
-  describe Win::Gui::Window, ' defines a set user32 API functions related to Window manipulation' do
+  describe Win::GUI::Window, ' defines a set user32 API functions related to Window manipulation' do
     describe '#window?' do
       spec{ use{ IsWindow(any_handle) }}
       spec{ use{ is_window(any_handle) }}
@@ -311,13 +311,11 @@ module WinWindowTest
     describe '#show_window ', 'LI', 'I' do
       spec{ use{ was_visible = show_window(handle = any_handle, cmd = SW_SHOWNA) }}
 
-      it 'was_visible = hide_window(handle = any_handle)  # derived method (not a separate API function)' do
+      it 'defaults to SW_SHOW if no command given' do
         test_app do |app|
-          use{ @was_visible = hide_window(app.handle) }
-          @was_visible.should == true
-          visible?(app.handle).should == false
-          hide_window(app.handle).should == false
-          visible?(app.handle).should == false
+          hide_window(app.handle)
+          use{show_window(app.handle)}
+          visible?(app.handle).should == true
         end
       end
 
@@ -354,7 +352,7 @@ module WinWindowTest
       end
 
       it 'SW_SHOWMINNOACTIVE, SW_SHOWMINIMIZED displays the window as a minimized foreground window' do
-        commands_should_show_window SW_SHOWMINNOACTIVE, SW_SHOWMINIMIZED,    #!
+        commands_should_show_window SW_SHOWMINNOACTIVE, SW_SHOWMINIMIZED, #!
                                     :minimized? => true, :maximized? => false, :visible? => true, :foreground? => true
       end
 
@@ -418,7 +416,7 @@ module WinWindowTest
 
       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}
@@ -461,20 +459,24 @@ module WinWindowTest
       end
     end
 
-    describe Win::Gui::Window, ' defines convenience/service methods on top of Windows API' do
+    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) }}
+        spec{ use{ was_visible = hide_window(any_handle) }}
 
-      end
         it 'hides window: same as show_window(handle, SW_HIDE)' do
           test_app do |app|
-            hide_window(app.handle)
+            was_visible = hide_window(app.handle)
+            was_visible.should == true
+            visible?(app.handle).should == false
+            hide_window(app.handle).should == false
             visible?(app.handle).should == false
           end
         end
       end
+    end
   end
 end

data/win.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{win}
-  s.version = "0.1.9"
+  s.version = "0.1.11"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["arvicco"]
-  s.date = %q{2010-02-19}
+  s.date = %q{2010-02-20}
   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 = [

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: win
 version: !ruby/object:Gem::Version 
-  version: 0.1.9
+  version: 0.1.11
 platform: ruby
 authors: 
 - arvicco
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-19 00:00:00 +03:00
+date: 2010-02-20 00:00:00 +03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency