micro_spider 0.1.18 → 0.1.19

data/lib/micro_spider.rb

@@ -1,13 +1,23 @@
 require 'capybara'
-require 'capybara-webkit'
 require 'capybara/dsl'
+require 'capybara/mechanize'
 
-Capybara.current_driver = :webkit
+Capybara.default_driver = :mechanize
+Capybara.current_driver = :mechanize
+Capybara.app = proc { |env| [200, {'Content-Type' => 'text/html'}, 'You need to use MicroSpider#site method to set app host.'] }
 Capybara.configure do |config|
   config.ignore_hidden_elements = false
   config.run_server = false
 end
 
+# If has capybara-webkit, first priority
+begin
+  require 'capybara-webkit'
+  Capybara.current_driver = :webkit
+rescue Exception => e
+  # Nothing to do.
+end
+
 require 'logger'
 require 'set'
 require 'timeout'
@@ -52,6 +62,7 @@ class MicroSpider
   #   spider.visit('http://google.com')
   #
   def visit(path)
+    raise ArgumentError, "Path can't be nil or empty" if path.nil? || path.empty?
     sleep_or_not
     logger.info "Begin to visit #{path}."
     super(path)
@@ -64,7 +75,8 @@ class MicroSpider
   #
   def click(locator, opts = {}, &block)
     actions << lambda {
-      path = find_link(locator, opts)[:href]
+      path = find_link(locator, opts)[:href] rescue nil
+      raise SpiderCore::ClickPathNotFound, "#{locator} not found" if path.nil?
       if block_given?
         spider = self.spawn
         spider.entrance(path)
@@ -223,6 +235,10 @@ class MicroSpider
         logger.fatal(err.message)
         logger.fatal(err.backtrace.inspect)
         break
+      rescue SpiderCore::ClickPathNotFound => err
+        logger.fatal(err.message)
+        logger.fatal(err.backtrace.inspect)
+        break
       end
     }
   end

data/lib/spider_core/exceptions.rb

@@ -0,0 +1,3 @@
+module SpiderCore
+  class ClickPathNotFound < RuntimeError; end
+end

data/lib/spider_core/version.rb

@@ -1,3 +1,3 @@
 module SpiderCore
-  VERSION = "0.1.18"
+  VERSION = "0.1.19"
 end

data/lib/spider_core.rb

@@ -2,3 +2,4 @@ require 'spider_core/behavior'
 require 'spider_core/follow_dsl'
 require 'spider_core/field_dsl'
 require 'spider_core/pagination_dsl'
+require 'spider_core/exceptions'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: micro_spider
 version: !ruby/object:Gem::Version
-  version: 0.1.18
+  version: 0.1.19
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-07 00:00:00.000000000 Z
+date: 2013-09-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capybara
@@ -28,7 +28,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: capybara-webkit
+  name: capybara-mechanize
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -148,6 +148,7 @@ extra_rdoc_files: []
 files:
 - lib/micro_spider.rb
 - lib/spider_core/behavior.rb
+- lib/spider_core/exceptions.rb
 - lib/spider_core/field_dsl.rb
 - lib/spider_core/follow_dsl.rb
 - lib/spider_core/pagination_dsl.rb