klepto 0.4.7 → 0.4.8

data/.gitignore

@@ -6,7 +6,8 @@
 Gemfile.lock
 InstalledFiles
 _yardoc
-coverage
+coverage/*
+debug.log
 doc/
 lib/bundler/man
 pkg

data/README.md

@@ -171,7 +171,8 @@ end
 ## Callbacks & Processing
 
 * before
-  * n/a
+  * :get
+  * :structure  
 * after
   * :each (resource, Hash) - called for each resource parsed
   * :get (page, Capybara::Node) - called after each HTTP GET

data/lib/klepto/browser.rb

@@ -3,6 +3,7 @@ module Klepto
     include Capybara::DSL
 
     def initialize(*args)
+      Klepto.logger.debug("===== Initializing new browser. =====")
       super
     end
 
@@ -35,6 +36,7 @@ module Klepto
     end
     
     def fetch!(url)
+      Klepto.logger.debug("Fetching #{url}")
       #Capybara.using_driver use_driver do
         visit url
         page

data/lib/klepto/config.rb

@@ -9,9 +9,9 @@ module Klepto
       @abort_on_redirect = false
       @urls    = []
       @after_handlers   = {
-        :each => [], 
-        :get  => [],
-        :abort=> []
+        :each => [], #after each call to
+        :get  => [], #after GET, before structure
+        :abort=> []  #after abort
       }
       @before_handlers  = {:each => []}
       @status_handlers  = {}

data/lib/klepto/structure.rb

@@ -11,6 +11,7 @@ module Klepto
     attr_reader :_context
 
     def initialize(_context=nil, _parent=nil)
+      Klepto.logger.debug("\tnew Structure (#{_parent}) -> (#{_context})")
       @_context  = _context
       @_parent   = _parent
       @_hash     = {}
@@ -30,37 +31,41 @@ module Klepto
       options[:limit]   ||= nil
       selector          = args.shift
 
+      Klepto.logger.debug("\t\tDefining attribute: #{meth} -> #{selector}")
+
       if options[:as] == :collection
-        
         @_hash[meth] = []
         result = _context.all( options[:syntax], selector )      
+
+        Klepto.logger.debug("\t\t\tAs: collection, Result? #{!result.nil?}")
+
         options[:limit] ||= result.length
         result[0, options[:limit]].each do |ele|
           @_hash[meth].push Structure.build(ele, self, &block)
         end 
 
       elsif options[:as] == :resource
-        
         result = _context.first( options[:syntax], selector )
+        Klepto.logger.debug("\t\t\tAs: resource, Result? #{!result.nil?}")        
         @_hash[meth] = Structure.build(result, self, &block)
       
       elsif block
-      
         result = selector ? 
           _context.send( options[:match], options[:syntax], selector ) : _context
 
         if options[:match] == :all
-
+          Klepto.logger.debug("\t\t\tAs: block (match all), Result? #{!result.nil?}")
           @_hash[meth] = []
           options[:limit] ||= result.length
           result[0, options[:limit]].each do |node|
             @_hash[meth] << block.call( node )
           end
-
         else
           if result
+            Klepto.logger.debug("\t\t\tAs: block (match one)")
             @_hash[meth] = block.call( result )
           else
+            Klepto.logger.debug("\t\t\tAs: block (no match, default: #{options[:default]})")
             @_hash[meth] = options[:default]
           end
         end
@@ -69,14 +74,17 @@ module Klepto
         result = _context.send( options[:match], options[:syntax], selector )
 
         if options[:match] == :all
+          Klepto.logger.debug("\t\t\tAs: simple (match all), Result? #{!result.nil?}")
           @_hash[meth] = []
           options[:limit] ||= result.length
           result[0, options[:limit]].each do |node|
             @_hash[meth] << (node[options[:attr]] || node.try(:text))
           end        
         elsif result
+          Klepto.logger.debug("\t\t\tAs: block (match one)")
           @_hash[meth] = (result[options[:attr]] || result.try(:text))
         else
+          Klepto.logger.debug("\t\t\tAs: block (no match, default: #{options[:default]})")
           @_hash[meth] = options[:default]
         end
       end

data/lib/klepto/version.rb

@@ -1,3 +1,3 @@
 module Klepto
-  VERSION = "0.4.7"
+  VERSION = "0.4.8"
 end

data/lib/klepto.rb

@@ -14,10 +14,16 @@ end
 Capybara.current_driver = :poltergeist
 
 module Klepto
-  LOG = Logger.new(STDOUT)
-  LOG.level = Logger::WARN
+  def self.logger
+    @@logger
+  end
+  def self.logger=(logger)
+    @@logger = logger
+  end
 end
-
+Klepto.logger       = Logger.new(STDOUT)
+Klepto.logger.level = Logger::INFO
+  
 require 'klepto/version'
 require 'klepto/config'
 require 'klepto/browser'

data/spec/lib/klepto/bot_spec.rb

@@ -55,7 +55,7 @@ describe Klepto::Bot do
 
     describe 'aborting after a failure' do
       before(:each) do
-        @bot = Klepto::Bot.new("https://github.com/coryodaniel/nonexistentproject"){
+        @bot = Klepto::Bot.new("http://coryodaniel.com/nowayjose"){
           name 'h1.fullname'
           config.abort_on_failure true
           config.after(:abort) do |page|
@@ -72,8 +72,8 @@ describe Klepto::Bot do
 
     describe 'structuring a 4xx or 5xx response' do
       before(:each) do
-        @bot = Klepto::Bot.new("https://github.com/coryodaniel/nonexistentproject"){
-          cat 'img#parallax_octocat', :attr => :alt
+        @bot = Klepto::Bot.new("http://coryodaniel.com/nowayjose"){
+          title 'h2'
           config.abort_on_failure false
           config.after(:abort) do |page|
             StatusLog.create message: 'Aborted.'
@@ -83,7 +83,7 @@ describe Klepto::Bot do
       end      
 
       it 'should perform structuring' do
-        @structure.first[:cat].should eq('Octobi Wan Catnobi')
+        @structure.first[:title].should == 'Not Found'
       end
 
       it 'should not abort after a 4xx or 5xx' do

data/spec/spec_helper.rb

@@ -10,6 +10,9 @@ require 'klepto'
 require 'vcr'
 require 'orm/active_record'
 
+Klepto.logger = Logger.new('debug.log')
+Klepto.logger.level = Logger::DEBUG
+
 def page(url="http://example.com")
   Capybara::Node::Simple.new(open(url).read)
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: klepto
 version: !ruby/object:Gem::Version
-  version: 0.4.7
+  version: 0.4.8
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-29 00:00:00.000000000 Z
+date: 2013-05-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: poltergeist
-  requirement: &70244463251940 !ruby/object:Gem::Requirement
+  requirement: &70255695656940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -21,10 +21,10 @@ dependencies:
         version: 1.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *70244463251940
+  version_requirements: *70255695656940
 - !ruby/object:Gem::Dependency
   name: capybara
-  requirement: &70244463250100 !ruby/object:Gem::Requirement
+  requirement: &70255695655600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -32,10 +32,10 @@ dependencies:
         version: 2.0.2
   type: :runtime
   prerelease: false
-  version_requirements: *70244463250100
+  version_requirements: *70255695655600
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &70244471677100 !ruby/object:Gem::Requirement
+  requirement: &70255695653740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 1.5.6
   type: :runtime
   prerelease: false
-  version_requirements: *70244471677100
+  version_requirements: *70255695653740
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70244471676720 !ruby/object:Gem::Requirement
+  requirement: &70255695652860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70244471676720
+  version_requirements: *70255695652860
 - !ruby/object:Gem::Dependency
   name: multi_json
-  requirement: &70244471676180 !ruby/object:Gem::Requirement
+  requirement: &70255695375220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,7 +65,7 @@ dependencies:
         version: '1.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70244471676180
+  version_requirements: *70255695375220
 description: Tearing up web pages into ActiveRecord resources
 email:
 - github@coryodaniel.com