iegrip 0.1.0 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6a78290a723f60f0929a7e1d8b6e7d97b2bb566b
-  data.tar.gz: b30e5c693a66a4ad3fb61db39fc91de3d2df02a9
+  metadata.gz: a55cb782794185c96981b40e9d8fb3dbc581c790
+  data.tar.gz: 53e9fcd29af463de2f01bf242b66eb6507c9c691
 SHA512:
-  metadata.gz: 1c8952c817e112b7bb4bb795927f738063c424a9ca3dc06180e4ac2adcfa38649584a089e3e9d1594d6a6d0c66d640533e1091d0fe8ad11bfcb1c345d34d4387
-  data.tar.gz: a11a97cd49eee04f2c31591ab3321bf53d15cad44707b7692b7e6aee1ad6ced7bf50950aa4333c53fc717050840f5da6762ad0c12ba9870ac8a96e245d05efc7
+  metadata.gz: 5e38a0226fa11e5407f714207501babe0f66aea10496e931cdc2aa7ad26912c7d007f6d49076470700a8d8c744f47b639039ddb75adc4936943fad78b3ea05d8
+  data.tar.gz: d1502bb2bc459d062624f1be74e936ca0beaf1792c389b92574135ef580e19ee1f05efd9e914d59a06138da74b3e589a25a2b015ea42d670c5024fdfbba2fbd4

data/lib/iegrip/version.rb

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

data/lib/iegrip.rb

@@ -21,9 +21,8 @@ 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 = 0
-      #setup_event()
+      @event = WIN32OLE_EVENT.new(@raw_object,"DWebBrowserEvents2")
+      setup_event()
     end
     
     def version
@@ -35,22 +34,23 @@ module IEgrip
     end
     
     def navigate(url)
+      before_wait()
       @raw_object.navigate(url)
-      sleep 0.5
       wait_stable()
     end
     
+    def before_wait()
+      @location_url = nil
+      @complete_flag = nil
+    end
+    
     COMPLETE_STATE = 4
-    def wait_stable()
-      stable_counter = 0
+    def wait_stable(timeout=30)
+      start_time = Time.now
       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 @complete_flag
+        break if (Time.now - start_time) > timeout
+        WIN32OLE_EVENT.message_loop
       end
     end
     
@@ -61,52 +61,16 @@ module IEgrip
     private
     
     def setup_event()
-      @event.on_event("BeforeNavigate2") {
-        @downloading += 1
-        #puts "  BeforeNavigate2. @downloading=#{@downloading}"
+      @event.on_event("NavigateComplete2") {|param|
+        unless @location_url  # Keep First location
+          @location_url = param.LocationURL
+        end
       }
-      #@event.on_event("CommandStateChange") {
-      #  puts "  CommandStateChange"
-      #}
       @event.on_event("DocumentComplete") {|param|
-        # a document is completely loaded and initialized.
-        if param.LocationURL == @raw_object.LocationURL
-          @downloading = 0
-          #puts "  DocumentComplete. LocationURL match! : #{param.LocationURL} @downloading=#{@downloading}"
-        else
-          @downloading -= 1 if @downloading > 0
-          #puts "  DocumentComplete. #{param.LocationURL} @downloading=#{@downloading}"
+        if @location_url == param.LocationURL
+          @complete_flag = true
         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
   
@@ -213,6 +177,7 @@ module IEgrip
     
     def get_inner(tag)
       inner = [tag.tagName]
+      
       outer = nil
       inner.push "id='#{tag.ID}'" if tag.ID != ""
       case tag.tagName
@@ -473,6 +438,7 @@ module IEgrip
     alias text value
     
     def click
+      @ie_obj.before_wait()
       if @ie_obj.version >= 10
         @raw_object.click(false)
       else
@@ -545,6 +511,10 @@ module IEgrip
       end
     end
     
+    def document
+      Document.new(@raw_object.document, @ie_obj)
+    end
+    
     private
     
     def replace_cr_code(text)

metadata

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