watir_crawler 0.0.1 → 0.0.2

data/examples/example.rb

@@ -21,12 +21,6 @@ class CrawlerExample < WatirCrawler::Base
     end
   end
 
-  def goto_login
-    browser_session do
-      goto 'https://myaccount.alagasco.com/ccsuces/public/frameset_top_html.jsp'
-    end
-  end
-
   def google_news
     browser_session do
       goto 'http://news.google.com/'

data/lib/watir_crawler/base.rb

@@ -83,9 +83,8 @@ module WatirCrawler
       browser.execute_script(script)
     end
 
-  #  #####################################################################################################
-
     # --------------------------------------------------------------------------------------------------------------------
+
     def pull *args, &block
       opts, xpaths = args.flatten.partition{|a| a.is_a?(Symbol) }
       opt_mode  =   opts.delete(:exist?) ||  opts.delete(:present?) || :present? # default is :present?
@@ -98,11 +97,19 @@ module WatirCrawler
         nodes_for(xpath) # get all elements
       end.flatten.select do |node|
         node.send(opt_mode) # select elements by mode
+      end.map do |node|
+        subtype = node.to_subtype
+        class << subtype
+          attr_accessor :node_xpath
+        end
+
+        subtype.node_xpath = node.node_xpath
+        subtype
       end
 
       # flash result nodes
       elements = elements.take(1) if opt_first
-      elements.each{|node| node.flash unless node.is_a?(Watir::Frame) }
+      elements.each{|node| node.flash unless node.is_a?(Watir::Frame) || node.is_a?(Watir::IFrame) }
 
       first_element = elements.first
 
@@ -111,11 +118,7 @@ module WatirCrawler
         nodes_path << first_element.node_xpath
         yield
       else
-        if opt_first
-          first_element && first_element.to_subtype
-        else
-          elements.map{|element| element.to_subtype }
-        end
+        opt_first ? first_element : elements
       end
     rescue Selenium::WebDriver::Error::StaleElementReferenceError,
            Selenium::WebDriver::Error::ObsoleteElementError
@@ -186,12 +189,15 @@ module WatirCrawler
       elements = elements.to_a if elements.is_a? Watir::ElementCollection
       elements = [elements].flatten
 
+      has_multiple_elements = elements.size > 1
+
       elements.map.with_index do |element, index|
         class << element
           attr_accessor :node_xpath
         end
 
-        element.node_xpath = xpath + "[#{index + 1}]"
+        element.node_xpath = xpath
+        element.node_xpath += "[#{index + 1}]" if has_multiple_elements
         element
       end
     end

data/lib/watir_crawler/version.rb

@@ -1,3 +1,3 @@
 module WatirCrawler
-  VERSION = '0.0.1'
+  VERSION = '0.0.2'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: watir_crawler
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-21 00:00:00.000000000 Z
+date: 2014-01-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nestegg
@@ -147,7 +147,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -715382381
+      hash: -79542161
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -156,7 +156,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -715382381
+      hash: -79542161
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25