iegrip 0.1.3 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a55cb782794185c96981b40e9d8fb3dbc581c790
-  data.tar.gz: 53e9fcd29af463de2f01bf242b66eb6507c9c691
+  metadata.gz: fb4eb46a0774e719a6a2b3e0588cc92c1039ca43
+  data.tar.gz: 13a01ce09f4cc574732c4b2c857dbf1ee3f3f432
 SHA512:
-  metadata.gz: 5e38a0226fa11e5407f714207501babe0f66aea10496e931cdc2aa7ad26912c7d007f6d49076470700a8d8c744f47b639039ddb75adc4936943fad78b3ea05d8
-  data.tar.gz: d1502bb2bc459d062624f1be74e936ca0beaf1792c389b92574135ef580e19ee1f05efd9e914d59a06138da74b3e589a25a2b015ea42d670c5024fdfbba2fbd4
+  metadata.gz: e293f99a1b2a773cb24a5ebf47d8fe7f11e224d4101ccc18b12bae282e0fe659ea811f92d72bf0b31c26f1630e3e3fc3b1650c855189f1d36772c6be9289fbb3
+  data.tar.gz: 9202f17bb72b3d69607928d55b4b0c1f8c414a8e54883cba8332ec9ff7d6573374f72250cc14a97067f40f1140c81574e0ecdc3c5e34c49544022a411dad1cff

data/lib/iegrip/version.rb

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

data/lib/iegrip.rb

@@ -21,10 +21,11 @@ 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")
-      setup_event()
+      @timeout = 15
     end
     
+    attr_accessor :timeout
+    
     def version
       @majorVersion
     end
@@ -34,23 +35,15 @@ module IEgrip
     end
     
     def navigate(url)
-      before_wait()
       @raw_object.navigate(url)
       wait_stable()
     end
     
-    def before_wait()
-      @location_url = nil
-      @complete_flag = nil
-    end
-    
     COMPLETE_STATE = 4
-    def wait_stable(timeout=30)
-      start_time = Time.now
+    def wait_stable()
       loop do
-        break if @complete_flag
-        break if (Time.now - start_time) > timeout
-        WIN32OLE_EVENT.message_loop
+        break if (@raw_object.Busy != true) and (@raw_object.ReadyState == COMPLETE_STATE)
+        sleep 0.5
       end
     end
     
@@ -58,19 +51,40 @@ module IEgrip
       @urlDownloadToFile.call(0, href, filename, 0, 0)
     end
     
-    private
-    
-    def setup_event()
-      @event.on_event("NavigateComplete2") {|param|
-        unless @location_url  # Keep First location
-          @location_url = param.LocationURL
+  end
+  
+  module Retry
+    RETRY_INTERVAL = 0.1
+    def retryGetTarget(&proc)
+      #puts "retryGetTarget() start.... proc = #{proc.inspect}"
+      retry_count = (@ie_obj.timeout / RETRY_INTERVAL).to_i
+      retry_count.times do
+        target = proc.call
+        #puts "  in retryGetTarget(), target = #{target.inspect}"
+        if target
+          puts "retryGetTarget() Success fin."
+          return target 
         end
-      }
-      @event.on_event("DocumentComplete") {|param|
-        if @location_url == param.LocationURL
-          @complete_flag = true
+        sleep RETRY_INTERVAL
+      end
+      #puts "retryGetTarget(), return nil."
+      return nil
+    end
+    
+    def retryCheck(&proc)
+      #puts "retryCheck() start...."
+      retry_count = (@ie_obj.timeout / RETRY_INTERVAL).to_i
+      retry_count.times do
+        check_result = proc.call
+        #puts "  in retryCheck(), check_result = #{check_result.inspect}"
+        if check_result
+          #puts "retryCheck() Success fin."
+          return check_result 
         end
-      }
+        sleep RETRY_INTERVAL
+      end
+      #puts "retryCheck(), return nil."
+      return nil
     end
   end
   
@@ -100,53 +114,69 @@ module IEgrip
   end
   
   module ElementChild
+    include Retry
+    
     def childNodes
-      raw_childNodes = @raw_object.childNodes
-      raw_childNodes ? NodeList.new(raw_childNodes, @ie_obj) : nil
+      retryGetTarget {
+        raw_childNodes = @raw_object.childNodes
+        raw_childNodes ? NodeList.new(raw_childNodes, @ie_obj) : nil
+      }
     end
     
     def childElements
-      raw_childNodes = @raw_object.childNodes
-      raw_childNodes ? HTMLElementCollection.new(raw_childNodes, @ie_obj) : nil
+      retryGetTarget {
+        raw_childNodes = @raw_object.childNodes
+        raw_childNodes ? HTMLElementCollection.new(raw_childNodes, @ie_obj) : nil
+      }
     end
     
     def previousSibling
-      raw_node = @raw_object.previousSibling()
-      raw_node ? HTMLElement.new(raw_node, @ie_obj) : nil
+      retryGetTarget {
+        raw_node = @raw_object.previousSibling()
+        raw_node ? switch_node_and_element(raw_node) : nil
+      }
     end
     
     def nextSibling
-      raw_node = @raw_object.nextSibling()
-      raw_node ? HTMLElement.new(raw_node, @ie_obj) : nil
+      retryGetTarget {
+        raw_node = @raw_object.nextSibling()
+        raw_node ? switch_node_and_element(raw_node) : nil
+      }
     end
     
     def firstChild
-      raw_node = @raw_object.firstChild()
-      raw_node ? HTMLElement.new(raw_node, @ie_obj) : nil
+      retryGetTarget {
+        raw_node = @raw_object.firstChild()
+        raw_node ? switch_node_and_element(raw_node) : nil
+      }
     end
     
     def lastChild
-      raw_node = @raw_object.lastChild()
-      raw_node ? HTMLElement.new(raw_node, @ie_obj) : nil
+      retryGetTarget {
+        raw_node = @raw_object.lastChild()
+        raw_node ? switch_node_and_element(raw_node) : nil
+      }
     end
     
     def hasChildNodes()
-      @raw_object.childNodes.length > 0
+      chileNodes = retryGetTarget {@raw_object.childNodes}
+      chileNodes.length > 0
     end
     
     def hasChildElements()
-      @raw_object.childNodes.each {|subnode|
+      chileNodes = retryGetTarget {@raw_object.childNodes}
+      chileNodes.each {|subnode|
         return true if (subnode.nodeType != 3) and (subnode.nodeType != 8)
       }
       false
     end
     
     def contains(node)
-      @raw_object.contains(toRaw(node))
+      retryCheck { @raw_object.contains(toRaw(node)) }
     end
     
     def isEqualNode(node)
-      @raw_object.isEqualNode(toRaw(node))
+      retryCheck { @raw_object.isEqualNode(toRaw(node)) }
     end
     
     def struct(level=0)
@@ -201,6 +231,11 @@ module IEgrip
         inner.push "value='#{tag.value}'"
       when "style"
         inner.push "type='#{tag.Type}'"
+      when "script"
+        inner.push "src='#{tag.src}'" if tag.src != ""
+      when "frame"
+        inner.push "src='#{tag.src}'" if tag.src != ""
+        inner.push "name='#{tag.name}'" if tag.name != ""
       end
       unless tag.hasChildElements
         innerText = tag.innerText
@@ -219,46 +254,68 @@ module IEgrip
       end
       return [inner.join(' '), outer]
     end
+    
+    def switch_node_and_element(raw_node)
+      if raw_node.nodeType == 1
+        HTMLElement.new(raw_node, @ie_obj)
+      else
+        Node.new(raw_node, @ie_obj)
+      end
+    end
   end
   
   module GetElements
+    include Retry
+    
     def getElementsByName(name)
-      raw_col = @raw_object.getElementsByName(name)
-      raw_col ? HTMLElementCollection.new(raw_col, @ie_obj) : nil
+      retryGetTarget {
+        raw_col = @raw_object.getElementsByName(name)
+        raw_col ? HTMLElementCollection.new(raw_col, @ie_obj) : nil
+      }
     end
     
     
     def getElementsByTagName(tag_name)
-      raw_col = @raw_object.getElementsByTagName(tag_name)
-      raw_col ? HTMLElementCollection.new(raw_col, @ie_obj) : nil
+      retryGetTarget {
+        raw_col = @raw_object.getElementsByTagName(tag_name)
+        raw_col ? HTMLElementCollection.new(raw_col, @ie_obj) : nil
+      }
     end
     alias elements getElementsByTagName
     
     def getElementsByTitle(target_str)
-      get_elements_by_key(target_str, "VALUE")
+      retryGetTarget { get_elements_by_key(target_str, "VALUE") }
     end
     def getElementsByValue(target_str)
-      get_elements_by_key(target_str, "VALUE")
+      retryGetTarget { get_elements_by_key(target_str, "VALUE") }
     end
     def getElementsByText(target_str)
-      get_elements_by_key(target_str, "INNERTEXT")
+      retryGetTarget { get_elements_by_key(target_str, "INNERTEXT") }
     end
     
     def getElementByTitle(target_str)
-      taglist = get_elements_by_key(target_str, "VALUE")
-      taglist[0]
+      retryGetTarget { 
+        taglist = get_elements_by_key(target_str, "VALUE")
+        taglist[0]
+      }
     end
     def getElementByValue(target_str)
-      taglist = get_elements_by_key(target_str, "VALUE")
-      taglist[0]
+      retryGetTarget { 
+        taglist = get_elements_by_key(target_str, "VALUE")
+        taglist[0]
+      }
     end
     def getElementByText(target_str)
-      taglist = get_elements_by_key(target_str, "INNERTEXT")
-      taglist[0]
+      retryGetTarget { 
+        taglist = get_elements_by_key(target_str, "INNERTEXT")
+        taglist[0]
+      }
     end
     def getElementByName(target_str)
-      taglist = get_elements_by_key(target_str, "NAME")
-      taglist[0]
+      retryGetTarget { 
+        taglist = get_elements_by_key(target_str, "NAME")
+        taglist[0]
+      }
     end
     
     private
@@ -287,6 +344,7 @@ module IEgrip
     end
   end
   
+  
   # ========================
   # Node
   # ========================
@@ -336,24 +394,34 @@ module IEgrip
   class Document  < Node
     include ElementChild
     include GetElements
+    include Retry
     
     def head()
-      raw_head = @raw_object.head
-      raw_head ? HTMLElement.new(raw_head, @ie_obj) : nil
+      retryGetTarget { 
+        raw_head = @raw_object.head
+        raw_head ? HTMLElement.new(raw_head, @ie_obj) : nil
+      }
     end
     
     def body()
-      HTMLElement.new(@raw_object.body, @ie_obj)
+      retryGetTarget {
+        raw_body = @raw_object.body
+        raw_body ? HTMLElement.new(@raw_object.body, @ie_obj) : nil
+      }
     end
     
     def all
-      raw_all = @raw_object.all
-      raw_all ? HTMLElementCollection.new(raw_all, @ie_obj) : nil
+      retryGetTarget {
+        raw_all = @raw_object.all
+        raw_all ? HTMLElementCollection.new(raw_all, @ie_obj) : nil
+      }
     end
     
     def frames(index=nil)
       if index
-        return(nil) if index >= @raw_object.Frames.length
+        frames = retryGetTarget { @raw_object.Frames }
+        return nil unless frames
+        return nil if index >= frames.length
         Frames.new(@raw_object.frames, @ie_obj)[index]
       else
         Frames.new(@raw_object.frames, @ie_obj)
@@ -361,13 +429,17 @@ module IEgrip
     end
     
     def getElementById(element_id)
-      raw_element = @raw_object.getElementById(element_id)
-      raw_element ? HTMLElement.new(raw_element, @ie_obj) : nil
+      retryGetTarget {
+        raw_element = @raw_object.getElementById(element_id)
+        raw_element ? HTMLElement.new(raw_element, @ie_obj) : nil
+      }
     end
     
     def documentElement
-      raw_element = @raw_object.documentElement()
-      raw_element ? HTMLElement.new(raw_element, @ie_obj) : nil
+      retryGetTarget {
+        raw_element = @raw_object.documentElement()
+        raw_element ? HTMLElement.new(raw_element, @ie_obj) : nil
+      }
     end
     
     def createElement(tag_name)
@@ -376,7 +448,7 @@ module IEgrip
     end
     
     def createAttribute(attr_name)
-      raw_attr = @raw_object.createAttribute(attr_name);
+      raw_attr = @raw_object.createAttribute(attr_name)
       Attr.new(raw_attr, @ie_obj)
     end
     
@@ -389,6 +461,8 @@ module IEgrip
     include ElementParent
     include ElementChild
     include GetElements
+    include Retry
+    
     def tagname
       if self.nodeType == 8
         "comment"
@@ -438,7 +512,6 @@ module IEgrip
     alias text value
     
     def click
-      @ie_obj.before_wait()
       if @ie_obj.version >= 10
         @raw_object.click(false)
       else
@@ -448,7 +521,8 @@ module IEgrip
     end
     
     def all
-      HTMLElementCollection.new(@raw_object.all, @ie_obj)
+      all_element = retyGetElement { @raw_object.all }
+      HTMLElementCollection.new(all_element, @ie_obj)
     end
     
     
@@ -512,7 +586,8 @@ module IEgrip
     end
     
     def document
-      Document.new(@raw_object.document, @ie_obj)
+      document = retryGettarget { @raw_object.document }
+      document ? Document.new(document, @ie_obj) : nil
     end
     
     private
@@ -530,7 +605,8 @@ module IEgrip
   # ========================
   class NodeList  < GripWrapper
     def [](index)
-      return(nil) if index >= @raw_object.length
+      result = retryCheck { index < @raw_object.length }
+      return(nil) unless result
       raw_node = @raw_object.item(index)
       if raw_node.nodeType == 1
         HTMLElement.new(raw_node, @ie_obj)
@@ -562,8 +638,11 @@ module IEgrip
   # TAG Element Collection
   # ========================
   class HTMLElementCollection < NodeList
+    include Retry
+    
     def [](index)
-      return(nil) if index >= @raw_object.length
+      result = retryCheck { index < @raw_object.length }
+      return(nil) unless result
       raw_node = @raw_object.item(index)
       HTMLElement.new(raw_node, @ie_obj)
     end
@@ -576,32 +655,32 @@ module IEgrip
     end
     
     def getElementsByTitle(target_str)
-      get_elements_by_key(target_str, "VALUE")
+      retryGetTarget { get_elements_by_key(target_str, "VALUE") }
     end
     def getElementsByValue(target_str)
-      get_elements_by_key(target_str, "VALUE")
+      retryGetTarget { get_elements_by_key(target_str, "VALUE") }
     end
     def getElementsByText(target_str)
-      get_elements_by_key(target_str, "INNERTEXT")
+      retryGetTarget { get_elements_by_key(target_str, "INNERTEXT") }
     end
     def getElementsByName(target_str)
-      get_elements_by_key(target_str, "NAME")
+      retryGetTarget { get_elements_by_key(target_str, "NAME") }
     end
     
     def getElementByTitle(target_str)
-      taglist = get_elements_by_key(target_str, "VALUE")
+      taglist = retryGetTarget { get_elements_by_key(target_str, "VALUE") }
       taglist ? taglist[0]: nil
     end
     def getElementByValue(target_str)
-      taglist = get_elements_by_key(target_str, "VALUE")
+      taglist = retryGetTarget { get_elements_by_key(target_str, "VALUE") }
       taglist ? taglist[0]: nil
     end
     def getElementByText(target_str)
-      taglist = get_elements_by_key(target_str, "INNERTEXT")
+      taglist = retryGetTarget { get_elements_by_key(target_str, "INNERTEXT") }
       taglist ? taglist[0]: nil
     end
     def getElementByName(target_str)
-      taglist = get_elements_by_key(target_str, "NAME")
+      taglist = retryGetTarget { get_elements_by_key(target_str, "NAME") }
       taglist ? taglist[0]: nil
     end
     
@@ -640,8 +719,12 @@ module IEgrip
   # IE.Document.Frames
   # ========================
   class Frames  < GripWrapper
+    include Retry
+    
     def [](index)
-      return(nil) if index >= @raw_object.length
+      result = retryCheck { index < @raw_object.length }
+      return(nil) unless result
+      
       Frame.new(@raw_object.item(index), @ie_obj)
     end
     
@@ -663,8 +746,11 @@ module IEgrip
   # IE.Document.Frames.item(n)
   # ========================
   class Frame  < GripWrapper
+    include Retry
+    
     def document
-      Document.new(@raw_object.document, @ie_obj)
+      document = retryGetTarget { @raw_object.document }
+      document ? Document.new(document, @ie_obj) : nil
     end
   end
   

metadata

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