klepto 0.5.6 → 0.5.7

data/README.md

@@ -171,12 +171,11 @@ end
 ## Callbacks & Processing
 
 * before
-  * :get
-  * :structure  
+  * :get (browser, url)
 * after
-  * :each (resource, Hash) - called for each resource parsed
-  * :get (page, Capybara::Node) - called after each HTTP GET
-  * :abort (page, Capybara::Node) - called after a 4xx or 5xx if config.abort_on_failure is true (default)
+  * :structure (Hash) - receives the structure from the page
+  * :get (browser, url) - called after each HTTP GET
+  * :abort (browser, hash(details)) - called after a 4xx or 5xx if config.abort_on_failure is true (default)
 
 
 ## Stuff I'm going to add.

data/lib/klepto/bot.rb

@@ -34,9 +34,8 @@ EOS
       @browser.set_headers @config.headers
       #browser.set_driver  config.driver
 
-      # Call before(:each) handlers...
-      @config.before_handlers[:each].each { |bh| 
-        bh.call(url, browser) 
+      @config.before_handlers[:get].each { |bh| 
+        bh.call(@browser,@config.url) 
       }
       
       begin
@@ -44,18 +43,18 @@ EOS
 
         # Fire callbacks on GET
         @config.after_handlers[:get].each do |ah|
-          ah.call(@browser.page, @browser, @config.url)
+          ah.call(@browser, @config.url)
         end
                 
         # Dispatch all the handlers for HTTP Status Codes.
         @browser.statuses.each do |status|
-          @config.dispatch_status_handlers(status, @browser.page)
+          @config.dispatch_status_handlers(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.page,{
+            ah.call(@browser,{
               browser_failure:    @browser.failure?,
               abort_on_failure:   @config.abort_on_failure?,
               abort_on_redirect:  @config.abort_on_redirect?,
@@ -66,7 +65,7 @@ EOS
           @structure = __structure(@browser.page)
         end          
       rescue Capybara::Poltergeist::TimeoutError => ex
-        config.dispatch_timeout_handler(ex, @config.url)
+        config.dispatch_timeout_handler(ex, @browser, @config.url)
       end
 
       @structure
@@ -85,7 +84,7 @@ EOS
       end
 
       # Call after(:each) handlers...
-      config.after_handlers[:each].each { |ah| ah.call(structure._hash) }
+      config.after_handlers[:structure].each { |ah| ah.call(structure._hash) }
     
       structure._hash
     end

data/lib/klepto/browser.rb

@@ -2,7 +2,7 @@ module Klepto
   class Browser
     include Capybara::DSL
 
-    attr_reader :desired_url
+    attr_reader :url_to_structure
     def initialize(*args)
       Klepto.logger.debug("===== Initializing new browser. =====")
       super

data/lib/klepto/config.rb

@@ -8,11 +8,11 @@ module Klepto
       @abort_on_failure = true
       @abort_on_redirect = false
       @after_handlers   = {
-        :each => [], #after each call to
+        :structure => [], #after each call to
         :get  => [], #after GET, before structure
         :abort=> []  #after abort
       }
-      @before_handlers  = {:each => []}
+      @before_handlers  = {:get => []}
       @status_handlers  = {}
       @handlers = {}
     end
@@ -85,7 +85,7 @@ module Klepto
       end
     end
 
-    def after(which = :each, &block)
+    def after(which = :structure, &block)
       @after_handlers[which] ||= []
       @after_handlers[which].push block
     end

data/lib/klepto/version.rb

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

data/spec/lib/klepto/bot_spec.rb

@@ -137,7 +137,7 @@ describe Klepto::Bot do
             StatusLog.create message: '200'
           }
 
-          config.after(:each) do |resource|
+          config.after(:structure) do |resource|
             @user = User.new
             @user.name = resource[:name]
             @user.username = resource[:username]
@@ -255,7 +255,7 @@ describe Klepto::Bot do
             permalink '.time a', :css, :attr => :href
           end
 
-          config.after(:each) do |resource|
+          config.after(:structure) do |resource|
             @user = User.new
             @user.name = resource[:name]
             @user.username = resource[:username]

metadata

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