klepto 0.4.9 → 0.5.1

data/lib/klepto/bot.rb

@@ -53,41 +53,33 @@ EOS
         
         begin
           browser.fetch! url
+          
+          # Fire callbacks on GET
+          config.after_handlers[:get].each do |ah|
+            ah.call(browser.page, browser, url)
+          end
+                  
+          # Dispatch all the handlers for HTTP Status Codes.
+          browser.statuses.each do |status|
+            config.dispatch_status_handlers(status, browser.page)
+          end
+          
+          # If the page was not a failure or if not aborting, structure that bad boy.
+          if (browser.failure? && config.abort_on_failure?) || (config.abort_on_redirect? && browser.was_redirected?)
+            config.after_handlers[:abort].each do |ah|
+              ah.call(browser.page,{
+                browser_failure:     browser.failure?,
+                abort_on_failure:   config.abort_on_failure?,
+                abort_on_redirect:  config.abort_on_redirect?,
+                redirect:           browser.was_redirected?
+              })
+            end          
+          else
+            resources << __structure(browser.page)
+          end          
         rescue Capybara::Poltergeist::TimeoutError => ex
           config.dispatch_timeout_handler(ex, url)
         end
-        
-        # Fire callbacks on GET
-        config.after_handlers[:get].each do |ah|
-          ah.call(browser.page, browser, url)
-        end
-        
-        # Capybara automatically follows redirects... Checking the page here
-        # to see if it has changed, and if so add it on to the stack of statuses.
-        # statuses is an array because it holds the actually HTTP response code and an
-        # approximate code (2xx for example). :redirect will be pushed onto the stack if a
-        # redirect happened.
-        statuses = [browser.status, browser.statusx]
-        statuses.push :redirect if url != browser.page.current_url
-        
-        # Dispatch all the handlers for HTTP Status Codes.
-        statuses.each do |status|
-          config.dispatch_status_handlers(status, browser.page)
-        end
-        
-        # If the page was not a failure or if not aborting, structure that bad boy.
-        if (browser.failure? && config.abort_on_failure?) || (config.abort_on_redirect? && statuses.include?(:redirect))
-          config.after_handlers[:abort].each do |ah|
-            ah.call(browser.page,{
-              browser_failure: browser.failure?,
-              abort_on_failure: config.abort_on_failure?,
-              abort_on_redirect: config.abort_on_redirect?,
-              redirect: statuses.include?(:redirect)
-            })
-          end          
-        else
-          resources << __structure(browser.page)
-        end
       end
 
       @resources

data/lib/klepto/browser.rb

@@ -2,6 +2,7 @@ module Klepto
   class Browser
     include Capybara::DSL
 
+    attr_reader :last_url
     def initialize(*args)
       Klepto.logger.debug("===== Initializing new browser. =====")
       super
@@ -31,11 +32,29 @@ module Klepto
       !success?
     end
 
+    def was_redirected?
+      @last_url != page.current_url
+    end
+    
+    # Capybara automatically follows redirects... Checking the page here
+    # to see if it has changed, and if so add it on to the stack of statuses.
+    # statuses is an array because it holds the actually HTTP response code and an
+    # approximate code (2xx for example). :redirect will be pushed onto the stack if a
+    # redirect happened.    
+    def statuses
+      if !was_redirected?
+        [status, statusx]
+      else
+        [status, statusx, :redirect]
+      end
+    end
+
     def statusx
       page.status_code.to_s[0..-3] + "xx"
     end
     
     def fetch!(url)
+      @last_url = url
       Klepto.logger.debug("Fetching #{url}")
       #Capybara.using_driver use_driver do
         visit url

data/lib/klepto/version.rb

@@ -1,3 +1,3 @@
 module Klepto
-  VERSION = "0.4.9"
+  VERSION = "0.5.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: klepto
 version: !ruby/object:Gem::Version
-  version: 0.4.9
+  version: 0.5.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-30 00:00:00.000000000 Z
+date: 2013-05-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: poltergeist
-  requirement: &70325624163420 !ruby/object:Gem::Requirement
+  requirement: &70221809709220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -21,10 +21,10 @@ dependencies:
         version: 1.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *70325624163420
+  version_requirements: *70221809709220
 - !ruby/object:Gem::Dependency
   name: capybara
-  requirement: &70325624162920 !ruby/object:Gem::Requirement
+  requirement: &70221809708720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -32,10 +32,10 @@ dependencies:
         version: 2.0.2
   type: :runtime
   prerelease: false
-  version_requirements: *70325624162920
+  version_requirements: *70221809708720
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &70325624162460 !ruby/object:Gem::Requirement
+  requirement: &70221809708260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 1.5.6
   type: :runtime
   prerelease: false
-  version_requirements: *70325624162460
+  version_requirements: *70221809708260
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70325624162080 !ruby/object:Gem::Requirement
+  requirement: &70221809707880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70325624162080
+  version_requirements: *70221809707880
 - !ruby/object:Gem::Dependency
   name: multi_json
-  requirement: &70325624161540 !ruby/object:Gem::Requirement
+  requirement: &70221797327360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,7 +65,7 @@ dependencies:
         version: '1.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70325624161540
+  version_requirements: *70221797327360
 description: Tearing up web pages into ActiveRecord resources
 email:
 - github@coryodaniel.com