iegrip 0.0.8 → 0.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dad32bc2791aa090957ea0d0c02bc83fb2302b37
-  data.tar.gz: 4d09269287ca0fe1b29451a6cbafd904c67cac16
+  metadata.gz: e91fd4dcf3f4cf53da481257929fb1321eee53cc
+  data.tar.gz: 8803be8bcd4a6851797b656044847c17c4ca6176
 SHA512:
-  metadata.gz: f1c3f4648ee93d2d2cb7af0b4df9f064d78af402ec4dc4eee42ab354a265068e4cd58904c118e01a873c8a9eeb2d35f0f8350ed856196cb3441ac70980fc51b7
-  data.tar.gz: 644a401a1ee9a5c2494257e05238b69babe24abf562a1df5c41bffbd560d8f280218cbdcef4dfb5da2703019a2ff8ec43ca878825403d8c1c5050d1d2f1f3353
+  metadata.gz: 1fb8fe242cb7830c5b3cb59d6d5ade187152bebcf51a9c0e2a4e92430275bb836fb575a67321e6d6717fb3019bb1a534f133430347415236d1dac56de4fc9f9f
+  data.tar.gz: 359e4dcd2c17b93afa419da88ed3189c1ebb9eb712526c3de6379eeca95121d3e5e1a40f7dc674be5433bdf8323b5ee4e942b94de20ee2b410f7f4457026c223

data/lib/iegrip/version.rb

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

data/lib/iegrip.rb

@@ -21,6 +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()
     end
     
     def version
@@ -39,21 +42,69 @@ module IEgrip
     
     COMPLETE_STATE = 4
     def wait_stable()
-      stable_counter = 0
       loop do
-        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
+        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
       end
     end
     
     def export(href, filename)
       @urlDownloadToFile.call(0, href, filename, 0, 0)
     end
+    
+    private
+    
+    def setup_event()
+      @event.on_event("BeforeNavigate2") {
+        #puts "  BeforeNavigate2"
+        @downloading = true
+      }
+      #@event.on_event("CommandStateChange") {
+      #  puts "  CommandStateChange"
+      #}
+      @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
+        else
+          #puts "  DocumentComplete. "
+        end
+      }
+      #@event.on_event("DownloadBegin") {
+      #  # a navigation operation begins.
+      #  puts "  DownloadBegin. "
+      #}
+      #@event.on_event("DownloadComplete") { 
+      #  # a navigation operation finishes, is halted, or fails.
+      #  puts "  Download Complete."
+      #}
+      #@event.on_event("NavigateComplete2") {
+      #  # a navigation to a link is completed on a window element or a frameSet element.
+      #  puts "  NavigateComplete2."
+      #}
+      #@event.on_event("NewProcess") {
+      #  puts "  NewProcess"
+      #}
+      #@event.on_event("ProgressChange") {
+      #  puts "  ProgressChange"
+      #}
+      #@event.on_event("PropertyChange") {
+      #  puts "  PropertyChange"
+      #}
+      #@event.on_event("StatusTextChange") {
+      #  puts "  StatusTextChange"
+      #}
+      #@event.on_event("UpdatePageStatus") {
+      #  puts "  UpdatePageStatus"
+      #}
+      
+      
+    end
   end
   
   module ElementParent
@@ -171,7 +222,11 @@ module IEgrip
       when "img"
         inner.push "src='#{tag.src}'"
       when "input"
-        inner.push "type='#{tag.Type}'"
+        attr_list = []
+        attr_list.push("type='#{tag.Type}'")
+        attr_list.push("name='#{tag.Name}'")   if tag.Name != ""
+        attr_list.push("value='#{tag.value}'") if tag.value != ""
+        inner.push attr_list.join(" ")
       when "form"
         inner.push "action='#{tag.action}' method='#{tag.Method}'"
       when "option"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: iegrip
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
 platform: ruby
 authors:
 - yac4423
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-19 00:00:00.000000000 Z
+date: 2014-10-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler