au3 0.1.0 → 0.1.1

data/lib/AutoItX3/au3.rb

@@ -83,7 +83,7 @@ module AutoItX3
   INTDEFAULT = -2147483647
   
   #The version of this au3 library. 
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
   
   #This is the buffer size used for AutoItX3's text "returning" functions. 
   #It will be subtracted by 1 due to the trailing 0 of wchar_t * type strings. 
@@ -112,10 +112,12 @@ module AutoItX3
     "WinWaitDelay" => 250
   }
   
+  #All yet assigned functions. 
   def self.functions
     @functions
   end
   
+  #Reset all functions to the given hash. 
   def self.functions=(val)
     @functions = val
   end

data/lib/AutoItX3/control.rb

@@ -40,10 +40,12 @@ module AutoItX3
     #the window holding the control (or "" if you don't want to specify one of them) 
     #and the ID of the control. Instead of the ID you may use the name of the 
     #control in combination width the occurence number of it, like "Edit1" and "Edit2". 
+    #Raises an Au3Error if the control doesn't exist. 
     def initialize(title, text, control_id)
       @title = title
       @text = text
       @c_id = control_id.to_s
+      visible? #Raises an error if the control doesn't exist
     end
     
     #Clicks +self+ with the given mouse +button+ (<tt>"Primary"</tt> by default) 
@@ -183,12 +185,12 @@ module AutoItX3
     
     #Returns wheather or not a control is visible. 
     def visible?
-      send_command_to_control("IsVisible") == 1
+      send_command_to_control("IsVisible").to_i == 1
     end
     
     #Returns true if a control can interact with the user (i.e. it's not "grayed out"). 
     def enabled?
-      send_command_to_control("IsEnabled") == 1
+      send_command_to_control("IsEnabled").to_i == 1
     end
     
     private

data/lib/AutoItX3/keyboard.rb

@@ -161,6 +161,37 @@ module AutoItX3
       @functions[__method__].call(keys.wide, flag)
     end
     
+    #Allows you to do things like 
+    #  AutoItX3.ctrl_c
+    #.Every _ will be used to separate a key press from another, so 
+    #you can't send _ with this function. Possible shortcuts are: 
+    #* ctrl
+    #* shift
+    #* alt
+    #* win
+    #* enter (or return)
+    #* del
+    #This text sequences can't be sent, too. 
+    def method_missing(sym, *args, &block)
+      super if !args.empty? or block
+      cmds = sym.to_s.split("_")
+      callsequence = ""
+      cmds.each do |cmd|
+        callsequence << case cmd.downcase
+          when "ctrl" then "^"
+          when "shift" then "+"
+          when "alt" then "!"
+          when "win" then "#"
+          when "enter" then "{ENTER}"
+          when "return" then "{ENTER}"
+          when "del" then "{DEL}"
+          else
+            cmd
+        end
+      end
+      send_keys(callsequence)
+    end
+    
   end
   
 end

data/lib/HISTORY.rdoc

@@ -1,5 +1,15 @@
 =History of au3
-Important changes are marked <b>bold</b>. 
+Important changes are marked <b>bold</b>. Bugfixes are written <i>italic</i>. 
+==0.1.1
+*  Corrected documentation main page set by the Rakefile
+* <b>Added ##method_missing to the AutoItX3 module to allow shortcuts like <tt>AutoItX3.ctrl_c</tt>. </b>
+* Renamed test_tray.rb to test_misc.rb
+* Added sleep test
+* <i>Control#enabled? and Control#visible? never returned true. This has been fixed. </i>
+* Added a control test
+* Added a test for the ::set_option method. 
+* Added a test for the ::method_missing shortcut trick
+
 ==0.1.0
 * <b>Changed the API to use win32-api now instead of a C extension</b>
 * <b>Added wide, wide!, normal and normal! to Ruby's String class</b>

data/lib/README.rdoc

@@ -21,7 +21,7 @@ bin directory. If you want to deploy your program, the final recipient need not
 to have AutoIt installed - it's enough if you just include the AutoItX3.dll in your 
 application (and make sure you've read the AutoItX3 license - it's quite short). 
 ==Usage
-The majority of +au3+'s methods is bundled the AutoItX3 module 
+The majority of +au3+'s methods is bundled in the AutoItX3 module 
 and accessable via it's module methods. In order to get them, 
 just require +au3+: 
   require "au3"

data/test/test_control.rb

@@ -0,0 +1,68 @@
+#Encoding: Windows-1252
+#This file is part of au3. 
+#Copyright (c) 2009 Marvin G�lker
+begin
+  require_relative "../lib/au3"
+rescue LoadError
+  #Aha, this is the gem, not the build environment
+  require "au3"
+end
+require "test/unit"
+
+class ControlTest < Test::Unit::TestCase
+  
+  def setup
+    AutoItX3::Window.new(AutoItX3::Window::DESKTOP_WINDOW).activate #Needed, because Win+R is "eaten" by a console window
+    AutoItX3.send_keys("#r")
+    sleep 1 #I can't ise Window.wait here, because the window has a different title in different languages
+    @run_window = AutoItX3::Window.new(AutoItX3::Window::ACTIVE_WINDOW)
+    @edit = AutoItX3::Edit.from_control(@run_window.focused_control)
+  end
+  
+  def teardown
+    @run_window.close
+  end
+  
+  def test_from_control
+    AutoItX3.send_keys("Test")
+    assert_equal("Test", @edit.text)
+  end
+  
+  def test_new
+    AutoItX3.send_keys("Test")
+    edit = AutoItX3::Edit.new(@run_window.title, "", "Edit1")
+    assert_equal("Test", edit.text)
+  end
+  
+  def test_disable
+    @edit.disable
+    sleep 0.2
+    assert(!@edit.enabled?)
+    sleep 1
+    @edit.enable
+    sleep 0.2
+    assert(@edit.enabled?)
+  end
+  
+  def test_hide
+    @edit.hide
+    sleep 0.2
+    assert(!@edit.visible?)
+    sleep 1
+    @edit.show
+    sleep 0.2
+    assert(@edit.visible?)
+  end
+  
+  def test_set_text
+    @edit.text = "Test"
+    AutoItX3.ctrl_a
+    AutoItX3.ctrl_c
+    assert_equal("Test", AutoItX3.cliptext)
+  end
+  
+  def test_nonexistant
+    assert_raise(AutoItX3::Au3Error){AutoItX3::Control.new(@run_window.title, "", "Nonexistant")}
+  end
+  
+end

data/test/test_keyboard.rb

@@ -58,4 +58,13 @@ class KeyboardTest < Test::Unit::TestCase
     assert_equal(TEXT3, AutoItX3.cliptext)
   end
   
+  def test_shortcuts
+    AutoItX3.send_keys(TEXT1)
+    AutoItX3.ctrl_a
+    AutoItX3.msleep(200)
+    AutoItX3.ctrl_c
+    AutoItX3.msleep(200)
+    assert_equal(TEXT1, AutoItX3.cliptext)
+  end
+  
 end

data/test/test_misc.rb

@@ -0,0 +1,48 @@
+#Encoding: UTF-8
+#This file is part of au3. 
+#Copyright (c) 2009 Marvin Gülker
+begin
+  require_relative "../lib/au3"
+rescue LoadError
+  #Aha, this is the gem, not the build environment
+  require "au3"
+end
+require "test/unit"
+
+class MiscTest < Test::Unit::TestCase
+  
+  TEST_TRAY = "E:"
+  
+  def test_cd_open
+    assert(AutoItX3.open_cd_tray(TEST_TRAY))
+  end
+  
+  def test_cd_close
+    AutoItX3.open_cd_tray(TEST_TRAY)
+    if !AutoItX3.close_cd_tray(TEST_TRAY)
+      notify "Could not close your CD tray. Are you running on a laptop?"
+    else
+      assert(true)
+    end
+  end
+  
+  def test_sleep
+    than = Time.now
+    AutoItX3.msleep(1000)
+    now = Time.now
+    assert_in_delta(1.0, now - than, 0.01)
+  end
+  
+  def test_opt
+    AutoItX3.run("mspaint.exe")
+    AutoItX3.opt("WinTitleMatchMode", 2) do
+      assert(AutoItX3::Window.wait("Paint", "", 3)) #Timeout means false
+    end
+    assert_equal(false, AutoItX3::Window.wait("Paint", "", 3))
+    AutoItX3.set_option("WinTitleMatchMode", 2)
+    assert(AutoItX3::Window.wait("Paint", "", 3))
+    AutoItX3.opt("WinTitleMatchMode", 1)
+    assert_equal(false, AutoItX3::Window.wait("Paint", "", 3))
+  end
+  
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: au3
 version: !ruby/object:Gem::Version 
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors: 
 - Marvin Guelker
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-10 00:00:00 +02:00
+date: 2009-12-27 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -24,7 +24,7 @@ dependencies:
     version: 
 - !ruby/object:Gem::Dependency 
   name: test-unit
-  type: :runtime
+  type: :development
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
@@ -43,11 +43,12 @@ extra_rdoc_files: []
 
 files: 
 - test/test_clipboard.rb
+- test/test_control.rb
 - test/test_ini.rb
 - test/test_keyboard.rb
+- test/test_misc.rb
 - test/test_mouse.rb
 - test/test_process.rb
-- test/test_tray.rb
 - test/test_window.rb
 - lib/HISTORY.rdoc
 - lib/README.rdoc
@@ -62,13 +63,15 @@ files:
 - lib/AutoItX3/process.rb
 - lib/AutoItX3/window.rb
 has_rdoc: true
-homepage: 
+homepage: http://wiki.github.com/Quintus/Automations
 licenses: []
 
 post_install_message: 
 rdoc_options: 
-- " -m 'lib/README.rdoc'"
-- -t 'au3 RDocs'
+- --title
+- au3 RDocs
+- --main
+- lib/README.rdoc
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -93,9 +96,10 @@ specification_version: 3
 summary: A binding to the AutoItX3 Windows automation tool.
 test_files: 
 - test/test_clipboard.rb
+- test/test_control.rb
 - test/test_ini.rb
 - test/test_keyboard.rb
+- test/test_misc.rb
 - test/test_mouse.rb
 - test/test_process.rb
-- test/test_tray.rb
 - test/test_window.rb

data/test/test_tray.rb

@@ -1,29 +0,0 @@
-#Encoding: Windows-1252
-#This file is part of au3. 
-#Copyright (c) 2009 Marvin G�lker
-begin
-  require_relative "../lib/au3"
-rescue LoadError
-  #Aha, this is the gem, not the build environment
-  require "au3"
-end
-require "test/unit"
-
-class CDTrayTest < Test::Unit::TestCase
-  
-  TEST_TRAY = "E:"
-  
-  def test_open
-    assert(AutoItX3.open_cd_tray(TEST_TRAY))
-  end
-  
-  def test_close
-    AutoItX3.open_cd_tray(TEST_TRAY)
-    if !AutoItX3.close_cd_tray(TEST_TRAY)
-      notify "Could not close your CD tray. Are you running on a laptop?"
-    else
-      assert(true)
-    end
-  end
-  
-end