sleipnir-api 0.4.0 → 0.4.1

data/History.txt

@@ -1,3 +1,11 @@
+== 0.4.1 / 2007-11-11
+
+=== Bug fix
+
+* SleipnirAPI::Tab
+  +capture_page+:: find "Internet Explorer_Server" window properly.
+
+
 == 0.4.0 / 2007-10-28
 
 === New API:

data/README.txt

@@ -32,12 +32,13 @@ sleipnir-api は _grepnir_ コマンドが付属しています。
 
 === INSTALL
 
-[Unix]
-    sudo gem install sleipnir-api
-
-[Windows]
+[gem 派]
+  以下のコマンドでインストール。
     gem install sleipnir-api
-
+[非 gem 派]
+  {プロジェクトページ}[http://rubyforge.org/projects/sleipnir-api] から
+  アーカイブをダウンロード・展開して以下のコマンドでインストール。
+    ruby setup.rb
 
 === CAVEATS
 

data/examples/command_list.rb

@@ -80,15 +80,17 @@ __END__
 
       function setup_event() {
         var input = document.getElementById("search");
+        var init_value = "Search...";
+        input.value = init_value;
         input.onfocus = function() {
-          if (input.value == "Search...") {
+          if (input.value == init_value) {
             input.value = "";
             input.style.color = "black";
           }
         };
         input.onblur = function() {
           if (input.value == "") {
-            input.value = "search";
+            input.value = init_value;
             input.style.color = "#393f4c";
           }
         };
@@ -116,7 +118,7 @@ __END__
   <p>Sleipnir 1.66 �p�ł��B2.x �� ExecCommand ���T�|�[�g���Ă��܂���B</p>
 
   <form id="search_box">
-    <input accesskey="a" id="search" value="Search..."/>
+    <input accesskey="a" id="search" value=""/>
   </form>
 
   <table style="width: 100%">

data/examples/screenshot.rb

@@ -9,22 +9,25 @@ pnir = SleipnirAPI.connect
 
 worker = ARGV.collect {|url|
   Thread.start {
-    tab = lock.synchronize {
-      if url =~ /[a-z]+:\/\//
-        pnir.new_tab(url)
+    unless url =~ /[a-z]+:\/\//
+      url = "file://#{File.expand_path(url)}"
+    end
+    tab, new = lock.synchronize {
+      if r = pnir.get_url_tab(url)
+        [r, false]
       else
-        pnir.new_tab("file://#{File.expand_path(url)}")
+        [pnir.open(url), true]
       end
     }
     sleep 0.1 while tab.busy?
-    sleep 1 # �ꉞ
+    sleep 5 # �ꉞ
     lock.synchronize {
       digest = Digest::MD5.hexdigest(url)
       filename = "#{digest}.bmp"
       puts "#{url} => #{filename}"
       tab.capture_page(filename)
     }
-    tab.close
+    tab.close if new
   }
 }
 

data/lib/sleipnir_api/ffi/user32.rb

@@ -9,6 +9,7 @@ module SleipnirAPI::FFI
     GW_HWNDNEXT                = 2
     GW_HWNDPREV                = 3
 
+    define_ffi_entry(:GetClassName, 'LPI', 'I', 'user32', "GetClassNameA")
     define_ffi_entry(:GetWindowThreadProcessId, "LP", "L", "user32")
     define_ffi_entry(:GetDC, 'L', 'L', 'user32')
     define_ffi_entry(:GetWindowDC, 'L', 'L', 'user32')
@@ -25,9 +26,16 @@ module SleipnirAPI::FFI
 
     module_function
 
+    def get_class_name(hwnd)
+      buf = "\0" * 255
+      r = GetClassName(hwnd, buf, buf.length)
+      raise Win32APIError, "GetClassName failed" if r.nil? or r.zero?
+      buf[0...r]
+    end
+
     def get_window_thread_process_id(hwnd)
-      n = "\0" * 4
-      th = GetWindowThreadProcessId.call(hwnd, n)
+      n = [0].pack("L")
+      th = GetWindowThreadProcessId(hwnd, n)
       return [th, n.unpack("L")[0]]
     end
 
@@ -112,5 +120,10 @@ module SleipnirAPI::FFI
       r
     end
 
+    def find_child_window_by_classname(root_hwnd, classname)
+      w = list_window(root_hwnd).flatten
+      w.find{|e| get_class_name(e) == classname}
+    end
+
   end
 end

data/lib/sleipnir_api/screen_captor.rb

@@ -1,4 +1,3 @@
-require "timeout"
 require "sleipnir_api/ffi"
 require "sleipnir_api/bitmap"
 

data/lib/sleipnir_api/sleipnir.rb

@@ -1,3 +1,5 @@
+require "timeout"
+
 require "sleipnir_api/util"
 require "sleipnir_api/tab"
 require "sleipnir_api/output"

data/lib/sleipnir_api/tab.rb

@@ -54,7 +54,7 @@ module SleipnirAPI
     end
 
     def find_embedding_ie_hwnd #:nodoc:
-      SleipnirAPI::FFI::User32.list_window(sleipnir_ieview_hwnd).flatten.last
+      SleipnirAPI::FFI::User32.find_child_window_by_classname(sleipnir_ieview_hwnd, "Internet Explorer_Server")
     end
 
     # call-seq:

data/lib/sleipnir_api/version.rb

@@ -2,7 +2,7 @@ module SleipnirAPI
   module VERSION
     MAJOR = 0
     MINOR = 4
-    TINY  = 0
+    TINY  = 1
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

data/spec/sleipnir_api/ffi_spec.rb

@@ -7,7 +7,9 @@ describe SleipnirAPI::FFI::Kernel32 do
     SleipnirAPI::FFI::Kernel32.should respond_to(:get_long_path_name)
 
     Dir.chdir(File.dirname(__FILE__)) do
-      SleipnirAPI::FFI::Kernel32.get_long_path_name("KEY_ST~2.RB").should == "key_state_mock_spec.rb"
+      long = "dialog_mock_spec.rb"
+      short = `dir /x`[/\s+(\S+)\s+#{long}$/, 1]
+      SleipnirAPI::FFI::Kernel32.get_long_path_name(short).should == long
       SleipnirAPI::FFI::Kernel32.get_long_path_name("ffi_spec.rb").should == "ffi_spec.rb"
       SleipnirAPI::FFI::Kernel32.get_long_path_name("no_such_file.rb").should == ""
     end
@@ -23,7 +25,7 @@ describe SleipnirAPI::FFI::User32 do
     wbem = locator.ConnectServer(".")
     set = wbem.ExecQuery("select * from Win32_Process where Name='Sleipnir.exe'").extend(Enumerable)
 
-    thread_id, proc_id = SleipnirAPI::FFI::User32::GetWindowThreadProcessId.should be_an_instance_of(::Win32API)
+    SleipnirAPI::FFI::User32::GetWindowThreadProcessId.should be_an_instance_of(::Win32API)
     thread_id, proc_id = SleipnirAPI::FFI::User32.get_window_thread_process_id(pnir.handle)
     set.map{|e| e.ProcessId }.should be_include(proc_id)
   end

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.4
 specification_version: 1
 name: sleipnir-api
 version: !ruby/object:Gem::Version 
-  version: 0.4.0
-date: 2007-10-27 00:00:00 +09:00
+  version: 0.4.1
+date: 2007-11-11 00:00:00 +09:00
 summary: Ruby interface to the Sleipnir.API WIN32OLE object.
 require_paths: 
 - lib