klepto 0.2.8 → 0.2.9

data/README.md

@@ -183,8 +183,8 @@ end
 * Add after(:all)
 * :if, :unless for as: (:collection|:resource) to. context should be captured node that block is run against
 * Access to hash from within a block (for bulk assignment of other attributes) ?
-* :default => value|Proc should be an option
 * config.allow_rescue_in_block #should exceptions in blocks be auto rescued with nil as the return value
+* :default should be able to take a proc
 
 Async 
 --------

data/lib/klepto/structure.rb

@@ -26,46 +26,59 @@ module Klepto
       options[:syntax]  ||= :css
       options[:match]   ||= :first
       options[:attr]    ||= nil
+      options[:default] ||= nil
       options[:limit]   ||= nil
       selector          = args.shift
 
       if options[:as] == :collection
+        
         @_hash[meth] = []
         result = _context.all( options[:syntax], selector )      
         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 )
         @_hash[meth] = Structure.build(result, self, &block)
+      
       elsif block
+      
         result = selector ? 
           _context.send( options[:match], options[:syntax], selector ) : _context
 
         if options[:match] == :all
+
           @_hash[meth] = []
           options[:limit] ||= result.length
           result[0, options[:limit]].each do |node|
             @_hash[meth] << block.call( node )
           end
+
         else
+          
           begin
             @_hash[meth] = block.call( result )
           rescue Exception => ex
-            @_hash[meth] = nil
+            @_hash[meth] = options[:default]
           end
         end
+
       else
         result = _context.send( options[:match], options[:syntax], selector )
+
         if options[:match] == :all
           @_hash[meth] = []
           options[:limit] ||= result.length
           result[0, options[:limit]].each do |node|
             @_hash[meth] << (node[options[:attr]] || node.try(:text))
           end        
-        else
+        elsif result
           @_hash[meth] = (result[options[:attr]] || result.try(:text))
+        else
+          @_hash[meth] = options[:default]
         end
       end
     end

data/lib/klepto/version.rb

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

data/spec/lib/klepto/bot_spec.rb

@@ -201,6 +201,19 @@ describe Klepto::Bot do
       end
     end
 
+    describe 'a page missing a selector' do
+      before(:each) do
+        @bot = Klepto::Bot.new("https://twitter.com/justinbieber"){
+          name      'h1.fullname'
+          username  "span.screen-NOPE", default: "CHICKENS"
+        }
+        @structure = @bot.resources
+      end
+
+      it 'should have a sensible default for the structure' do
+        @structure.first[:username].should eq('CHICKENS')
+      end
+    end
 
     describe 'creating a bot with a node limit' do
       before(:each) do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: klepto
 version: !ruby/object:Gem::Version
-  version: 0.2.8
+  version: 0.2.9
   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: &70119515079920 !ruby/object:Gem::Requirement
+  requirement: &70208580722140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -21,10 +21,10 @@ dependencies:
         version: 1.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *70119515079920
+  version_requirements: *70208580722140
 - !ruby/object:Gem::Dependency
   name: capybara
-  requirement: &70119515077020 !ruby/object:Gem::Requirement
+  requirement: &70208580720340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -32,10 +32,10 @@ dependencies:
         version: 2.0.2
   type: :runtime
   prerelease: false
-  version_requirements: *70119515077020
+  version_requirements: *70208580720340
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &70119515074920 !ruby/object:Gem::Requirement
+  requirement: &70208580719740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 1.5.6
   type: :runtime
   prerelease: false
-  version_requirements: *70119515074920
+  version_requirements: *70208580719740
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70119515073060 !ruby/object:Gem::Requirement
+  requirement: &70208580719040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70119515073060
+  version_requirements: *70208580719040
 - !ruby/object:Gem::Dependency
   name: multi_json
-  requirement: &70119515069000 !ruby/object:Gem::Requirement
+  requirement: &70208580716800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,7 +65,7 @@ dependencies:
         version: '1.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70119515069000
+  version_requirements: *70208580716800
 description: Tearing up web pages into ActiveRecord resources
 email:
 - github@coryodaniel.com