klepto 0.3.2 → 0.3.3

data/lib/klepto/bot.rb

@@ -33,8 +33,13 @@ EOS
         browser   = Klepto::Browser.new
 
         browser.set_headers config.headers
-        browser.fetch! url
-
+        
+        begin
+          browser.fetch! url
+        rescue Capybara::Poltergeist::TimeoutError => ex
+          dispatch_timeout_handler(ex, url)
+        end
+        
         # Fire callbacks on GET
         config.after_handlers[:get].each do |ah|
           ah.call(browser.page)

data/lib/klepto/config.rb

@@ -29,6 +29,10 @@ module Klepto
       @headers
     end
 
+    def has_timeout_handler?
+      @status_handlers[:timeout] && @status_handlers[:timeout].any?
+    end
+
     def abort_on_failure?
       !!@abort_on_failure
     end
@@ -46,6 +50,21 @@ module Klepto
       @abort_on_redirect = aor
     end    
 
+    def on_http_timeout(&block)
+      @status_handlers[:timeout] ||= []
+      @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] ||= []
@@ -54,8 +73,7 @@ module Klepto
     end
 
     def dispatch_status_handlers(status, page)
-      handlers = @status_handlers[status]
-      if handlers.present?
+      if @status_handlers[status]
         @status_handlers[status].each do |handler|
           handler.call(page)
         end

data/lib/klepto/version.rb

@@ -1,3 +1,3 @@
 module Klepto
-  VERSION = "0.3.2"
+  VERSION = "0.3.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: klepto
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.3
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2013-05-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: poltergeist
-  requirement: &70339577781640 !ruby/object:Gem::Requirement
+  requirement: &70174422733860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -21,10 +21,10 @@ dependencies:
         version: 1.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *70339577781640
+  version_requirements: *70174422733860
 - !ruby/object:Gem::Dependency
   name: capybara
-  requirement: &70339577780940 !ruby/object:Gem::Requirement
+  requirement: &70174422733120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -32,10 +32,10 @@ dependencies:
         version: 2.0.2
   type: :runtime
   prerelease: false
-  version_requirements: *70339577780940
+  version_requirements: *70174422733120
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &70339577780120 !ruby/object:Gem::Requirement
+  requirement: &70174422732120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 1.5.6
   type: :runtime
   prerelease: false
-  version_requirements: *70339577780120
+  version_requirements: *70174422732120
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70339577778420 !ruby/object:Gem::Requirement
+  requirement: &70174422731560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70339577778420
+  version_requirements: *70174422731560
 - !ruby/object:Gem::Dependency
   name: multi_json
-  requirement: &70339577777160 !ruby/object:Gem::Requirement
+  requirement: &70174422729660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,7 +65,7 @@ dependencies:
         version: '1.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70339577777160
+  version_requirements: *70174422729660
 description: Tearing up web pages into ActiveRecord resources
 email:
 - github@coryodaniel.com