klepto 0.2.9 → 0.3.0

data/lib/klepto/bot.rb

@@ -46,18 +46,19 @@ EOS
         # 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.success? || (browser.failure? && !config.abort_on_failure?)
-          resources << __structure(browser.page)
-        else
+        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)
-          end
+          end          
+        else
+          resources << __structure(browser.page)
         end
       end
 

data/lib/klepto/config.rb

@@ -5,6 +5,7 @@ module Klepto
     def initialize
       @headers = {}
       @abort_on_failure = true
+      @abort_on_redirect = false
       @urls    = []
       @after_handlers   = {
         :each => [], 
@@ -32,11 +33,19 @@ module Klepto
       !!@abort_on_failure
     end
 
+    def abort_on_redirect?
+      !!@abort_on_redirect
+    end
+
     # 4xx, 5xx
     def abort_on_failure(aof)
       @abort_on_failure = aof
     end
 
+    def abort_on_redirect(aor)
+      @abort_on_redirect = aor
+    end    
+
     def on_http_status(*statuses,&block)
       statuses.each do |status|
         @status_handlers[status] ||= []

data/lib/klepto/version.rb

@@ -1,3 +1,3 @@
 module Klepto
-  VERSION = "0.2.9"
+  VERSION = "0.3.0"
 end

data/spec/lib/klepto/bot_spec.rb

@@ -3,28 +3,54 @@ require 'spec_helper'
 describe Klepto::Bot do  
   describe 'Klepto::Bot.new' do
     describe 'create a bot with a redirect' do
-      before(:each) do
-        @bot = Klepto::Bot.new("https://www.twitter.com/justinbieber"){
-          name      'h1.fullname'
-          config.on_http_status(:redirect){
-            StatusLog.create message: 'redirect'
-          }
-          config.on_http_status(200){
-            StatusLog.create message: '200'
-          }            
-        }      
-        @structure = @bot.resources
+      describe 'that aborts on redirect' do
+        before(:each) do
+          @bot = Klepto::Bot.new("https://www.twitter.com/justinbieber"){
+            name      'h1.fullname'
+            config.abort_on_redirect true
+            
+            config.after(:abort){
+              StatusLog.create message: 'Abort!'
+            }            
+          }      
+          @structure = @bot.resources
+        end
+
+        it 'should structure not have structured the data' do
+          @structure.should be_empty
+        end      
+
+        it 'should have dispatched abort handlers' do
+          statuses = StatusLog.all.map(&:message)
+          statuses.should include 'Abort!'
+        end
       end
 
-      it 'should structure the data' do
-        @structure.first[:name].should match(/Justin/i)
-      end      
-
-      it 'should have dispatched status handlers' do
-        statuses = StatusLog.all.map(&:message)
-        statuses.should include 'redirect'
-        statuses.should include '200'
+      describe 'that follows a redirect' do
+        before(:each) do
+          @bot = Klepto::Bot.new("https://www.twitter.com/justinbieber"){
+            name      'h1.fullname'
+            config.on_http_status(:redirect){
+              StatusLog.create message: 'redirect'
+            }
+            config.on_http_status(200){
+              StatusLog.create message: '200'
+            }            
+          }      
+          @structure = @bot.resources
+        end
+
+        it 'should structure the data' do
+          @structure.first[:name].should match(/Justin/i)
+        end      
+
+        it 'should have dispatched status handlers' do
+          statuses = StatusLog.all.map(&:message)
+          statuses.should include 'redirect'
+          statuses.should include '200'
+        end
       end
+
     end
 
     describe 'aborting after a failure' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: klepto
 version: !ruby/object:Gem::Version
-  version: 0.2.9
+  version: 0.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2013-04-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: poltergeist
-  requirement: &70208580722140 !ruby/object:Gem::Requirement
+  requirement: &70212079013140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -21,10 +21,10 @@ dependencies:
         version: 1.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *70208580722140
+  version_requirements: *70212079013140
 - !ruby/object:Gem::Dependency
   name: capybara
-  requirement: &70208580720340 !ruby/object:Gem::Requirement
+  requirement: &70212079012420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -32,10 +32,10 @@ dependencies:
         version: 2.0.2
   type: :runtime
   prerelease: false
-  version_requirements: *70208580720340
+  version_requirements: *70212079012420
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &70208580719740 !ruby/object:Gem::Requirement
+  requirement: &70212079011740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 1.5.6
   type: :runtime
   prerelease: false
-  version_requirements: *70208580719740
+  version_requirements: *70212079011740
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70208580719040 !ruby/object:Gem::Requirement
+  requirement: &70212079011320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70208580719040
+  version_requirements: *70212079011320
 - !ruby/object:Gem::Dependency
   name: multi_json
-  requirement: &70208580716800 !ruby/object:Gem::Requirement
+  requirement: &70212079010680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,7 +65,7 @@ dependencies:
         version: '1.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70208580716800
+  version_requirements: *70212079010680
 description: Tearing up web pages into ActiveRecord resources
 email:
 - github@coryodaniel.com