klepto 0.5.7 → 0.5.8

data/lib/klepto/bot.rb

@@ -48,7 +48,9 @@ EOS
                 
         # Dispatch all the handlers for HTTP Status Codes.
         @browser.statuses.each do |status|
-          @config.dispatch_status_handlers(status, @browser)
+          (@config.status_handlers[status] || []).each do |sh|
+            sh.call(status, @browser)
+          end
         end
         
         # If the page was not a failure or if not aborting, structure that bad boy.
@@ -65,7 +67,13 @@ EOS
           @structure = __structure(@browser.page)
         end          
       rescue Capybara::Poltergeist::TimeoutError => ex
-        config.dispatch_timeout_handler(ex, @browser, @config.url)
+        if @config.has_timeout_handler?
+          @config.status_handlers[:timeout].each do |th|
+            th.call(ex, @browser, @config.url)
+          end
+        else
+          raise ex
+        end
       end
 
       @structure

data/lib/klepto/config.rb

@@ -2,6 +2,7 @@ module Klepto
   class Config
     attr_reader :after_handlers
     attr_reader :before_handlers
+    attr_reader :status_handlers
 
     def initialize
       @headers = {}
@@ -60,16 +61,6 @@ module Klepto
       @status_handlers[:timeout].push block
     end
 
-    def dispatch_timeout_handler(ex, url)
-      if @status_handlers[:timeout]
-        @status_handlers[:timeout].each do |handler|
-          handler.call(ex, url)
-        end
-      else
-        raise ex
-      end
-    end
-
     def on_http_status(*statuses,&block)
       statuses.each do |status|
         @status_handlers[status] ||= []
@@ -77,14 +68,6 @@ module Klepto
       end
     end
 
-    def dispatch_status_handlers(status, page)
-      if @status_handlers[status]
-        @status_handlers[status].each do |handler|
-          handler.call(page)
-        end
-      end
-    end
-
     def after(which = :structure, &block)
       @after_handlers[which] ||= []
       @after_handlers[which].push block

data/lib/klepto/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: klepto
 version: !ruby/object:Gem::Version
-  version: 0.5.7
+  version: 0.5.8
   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: &70151609865620 !ruby/object:Gem::Requirement
+  requirement: &70282140348500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -21,10 +21,10 @@ dependencies:
         version: 1.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *70151609865620
+  version_requirements: *70282140348500
 - !ruby/object:Gem::Dependency
   name: capybara
-  requirement: &70151609865120 !ruby/object:Gem::Requirement
+  requirement: &70282136786600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -32,10 +32,10 @@ dependencies:
         version: 2.0.2
   type: :runtime
   prerelease: false
-  version_requirements: *70151609865120
+  version_requirements: *70282136786600
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &70151609864660 !ruby/object:Gem::Requirement
+  requirement: &70282136786140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 1.5.6
   type: :runtime
   prerelease: false
-  version_requirements: *70151609864660
+  version_requirements: *70282136786140
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70151609864280 !ruby/object:Gem::Requirement
+  requirement: &70282136785760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70151609864280
+  version_requirements: *70282136785760
 - !ruby/object:Gem::Dependency
   name: multi_json
-  requirement: &70151609863740 !ruby/object:Gem::Requirement
+  requirement: &70282136785220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,7 +65,7 @@ dependencies:
         version: '1.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70151609863740
+  version_requirements: *70282136785220
 description: Tearing up web pages into ActiveRecord resources
 email:
 - github@coryodaniel.com