klepto 0.5.8 → 0.5.9

data/lib/klepto/bot.rb

@@ -45,32 +45,30 @@ EOS
         @config.after_handlers[:get].each do |ah|
           ah.call(@browser, @config.url)
         end
+
+        if @browser.was_redirected?
+          @config.status_handler(:redirect).each {|sh| sh.call(:redirect, @browser) }
+
+          if @config.abort_on_redirect?
+            @config.after_handlers[:abort].each {|ah| ah.call(@browser) }
+            return
+          end
+        end
                 
         # Dispatch all the handlers for HTTP Status Codes.
         @browser.statuses.each do |status|
-          (@config.status_handlers[status] || []).each do |sh|
-            sh.call(status, @browser)
-          end
+          @config.status_handler(status).each {|sh| sh.call(status, @browser) }
         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,{
-              browser_failure:    @browser.failure?,
-              abort_on_failure:   @config.abort_on_failure?,
-              abort_on_redirect:  @config.abort_on_redirect?,
-              redirect:           @browser.was_redirected?
-            })
-          end          
+        if (@browser.failure? && @config.abort_on_failure?) 
+          @config.after_handlers[:abort].each {|ah| ah.call(@browser) }
         else
           @structure = __structure(@browser.page)
         end          
       rescue Capybara::Poltergeist::TimeoutError => ex
         if @config.has_timeout_handler?
-          @config.status_handlers[:timeout].each do |th|
-            th.call(ex, @browser, @config.url)
-          end
+          @config.status_handlers[:timeout].each{|th| th.call(ex, @browser, @config.url) }
         else
           raise ex
         end

data/lib/klepto/browser.rb

@@ -42,11 +42,7 @@ module Klepto
     # 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
+      [status, statusx]
     end
 
     def statusx

data/lib/klepto/config.rb

@@ -2,8 +2,7 @@ module Klepto
   class Config
     attr_reader :after_handlers
     attr_reader :before_handlers
-    attr_reader :status_handlers
-
+    
     def initialize
       @headers = {}
       @abort_on_failure = true
@@ -54,6 +53,10 @@ module Klepto
 
     def abort_on_redirect(aor)
       @abort_on_redirect = aor
+    end
+
+    def status_handler(status)
+      @status_handlers[status] || []
     end    
 
     def on_http_timeout(&block)

data/lib/klepto/version.rb

@@ -1,3 +1,3 @@
 module Klepto
-  VERSION = "0.5.8"
+  VERSION = "0.5.9"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: klepto
 version: !ruby/object:Gem::Version
-  version: 0.5.8
+  version: 0.5.9
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2013-06-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: poltergeist
-  requirement: &70282140348500 !ruby/object:Gem::Requirement
+  requirement: &70095952127860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -21,10 +21,10 @@ dependencies:
         version: 1.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *70282140348500
+  version_requirements: *70095952127860
 - !ruby/object:Gem::Dependency
   name: capybara
-  requirement: &70282136786600 !ruby/object:Gem::Requirement
+  requirement: &70095952127360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -32,10 +32,10 @@ dependencies:
         version: 2.0.2
   type: :runtime
   prerelease: false
-  version_requirements: *70282136786600
+  version_requirements: *70095952127360
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &70282136786140 !ruby/object:Gem::Requirement
+  requirement: &70095952126900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 1.5.6
   type: :runtime
   prerelease: false
-  version_requirements: *70282136786140
+  version_requirements: *70095952126900
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70282136785760 !ruby/object:Gem::Requirement
+  requirement: &70095952126520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70282136785760
+  version_requirements: *70095952126520
 - !ruby/object:Gem::Dependency
   name: multi_json
-  requirement: &70282136785220 !ruby/object:Gem::Requirement
+  requirement: &70095952125980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,7 +65,7 @@ dependencies:
         version: '1.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70282136785220
+  version_requirements: *70095952125980
 description: Tearing up web pages into ActiveRecord resources
 email:
 - github@coryodaniel.com