iegrip 0.0.9 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e91fd4dcf3f4cf53da481257929fb1321eee53cc
-  data.tar.gz: 8803be8bcd4a6851797b656044847c17c4ca6176
+  metadata.gz: 6a78290a723f60f0929a7e1d8b6e7d97b2bb566b
+  data.tar.gz: b30e5c693a66a4ad3fb61db39fc91de3d2df02a9
 SHA512:
-  metadata.gz: 1fb8fe242cb7830c5b3cb59d6d5ade187152bebcf51a9c0e2a4e92430275bb836fb575a67321e6d6717fb3019bb1a534f133430347415236d1dac56de4fc9f9f
-  data.tar.gz: 359e4dcd2c17b93afa419da88ed3189c1ebb9eb712526c3de6379eeca95121d3e5e1a40f7dc674be5433bdf8323b5ee4e942b94de20ee2b410f7f4457026c223
+  metadata.gz: 1c8952c817e112b7bb4bb795927f738063c424a9ca3dc06180e4ac2adcfa38649584a089e3e9d1594d6a6d0c66d640533e1091d0fe8ad11bfcb1c345d34d4387
+  data.tar.gz: a11a97cd49eee04f2c31591ab3321bf53d15cad44707b7692b7e6aee1ad6ced7bf50950aa4333c53fc717050840f5da6762ad0c12ba9870ac8a96e245d05efc7

data/lib/iegrip/version.rb

@@ -1,3 +1,3 @@
 module IEgrip
-  VERSION = "0.0.9"
+  VERSION = "0.1.0"
 end

data/lib/iegrip.rb

@@ -21,9 +21,9 @@ module IEgrip
       ver = fs.GetFileVersion(@raw_object.FullName)
       @majorVersion = ver.split(/\./)[0].to_i
       @urlDownloadToFile = Win32API.new('urlmon', 'URLDownloadToFileA', %w(l p p l l), 'l')
-      @event = WIN32OLE_EVENT.new(@raw_object,"DWebBrowserEvents2")
-      @downloading = nil
-      setup_event()
+      #@event = WIN32OLE_EVENT.new(@raw_object,"DWebBrowserEvents2")
+      @downloading = 0
+      #setup_event()
     end
     
     def version
@@ -42,13 +42,15 @@ module IEgrip
     
     COMPLETE_STATE = 4
     def wait_stable()
+      stable_counter = 0
       loop do
-        break if (@raw_object.Busy != true) and (@raw_object.ReadyState == COMPLETE_STATE)
-        WIN32OLE_EVENT.message_loop
-      end
-      loop do
-        break unless @downloading
-        WIN32OLE_EVENT.message_loop
+        break if stable_counter >= 3
+        if (@raw_object.Busy != true) and (@raw_object.ReadyState == COMPLETE_STATE)
+          stable_counter += 1
+        else
+          sleep 0.5
+          stable_counter = 0
+        end
       end
     end
     
@@ -60,8 +62,8 @@ module IEgrip
     
     def setup_event()
       @event.on_event("BeforeNavigate2") {
-        #puts "  BeforeNavigate2"
-        @downloading = true
+        @downloading += 1
+        #puts "  BeforeNavigate2. @downloading=#{@downloading}"
       }
       #@event.on_event("CommandStateChange") {
       #  puts "  CommandStateChange"
@@ -69,10 +71,11 @@ module IEgrip
       @event.on_event("DocumentComplete") {|param|
         # a document is completely loaded and initialized.
         if param.LocationURL == @raw_object.LocationURL
-          #puts "  DocumentComplete. LocationURL match! : #{param.LocationURL}"
-          @downloading = false
+          @downloading = 0
+          #puts "  DocumentComplete. LocationURL match! : #{param.LocationURL} @downloading=#{@downloading}"
         else
-          #puts "  DocumentComplete. "
+          @downloading -= 1 if @downloading > 0
+          #puts "  DocumentComplete. #{param.LocationURL} @downloading=#{@downloading}"
         end
       }
       #@event.on_event("DownloadBegin") {

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: iegrip
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.1.0
 platform: ruby
 authors:
 - yac4423
@@ -51,6 +51,7 @@ files:
 - README.md
 - Rakefile
 - iegrip-0.0.2.gem
+- iegrip-0.0.9.gem
 - iegrip.gemspec
 - lib/iegrip.rb
 - lib/iegrip/GripWrapper.rb