crabfarm 0.7.1 → 0.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c550699098370495349bb242274fee302050ec25
-  data.tar.gz: e422e85f42e800ed20c692e2d68e985962de9ae4
+  metadata.gz: 2cd329fb207d26d0ce84b7d9a245c9555032f72d
+  data.tar.gz: a50a7c709070a8d1a1ff1528c28c03502b75ae9b
 SHA512:
-  metadata.gz: 72c0cfe98b46fec0d071b0d03ccec46307fc2698862aa11a11ed25d0bcd2b65c99502ab14c202b0d4da0c47757353ca4ff824262e36f0d57f84ce37177cb09ac
-  data.tar.gz: d519fa4e7b65275ffac76922654a10199f4e222a35a3789960e1d2baf1cc084260c10f966b7a3b3081aeea1b3e4a82f7aff66af71a19fae5a3a17a1e91df39ea
+  metadata.gz: 97697da5b22796d930e8db64269ad94e6205c729637f623bcd3d64331f7936200807b73873c93d5bbddc5c9c5b066dc5df85c8a191a0b4f82fa64c2cbb3ef19c
+  data.tar.gz: c9418e6a5ad1d64871bb88763c5980da97fc6a6d0ce91d99ec69ffed994c35d950240a52448c9be9b6ef4876980a4b65ea5bd9db9b24d2c12a5de780fda45e27

data/lib/crabfarm/errors.rb

@@ -23,37 +23,19 @@ module Crabfarm
 
   class ResourceNotFoundError < Crabfarm::Error; end
 
-  class ApiError < Error
-    def code; 500 end
-    def to_json; {} end
-  end
-
-  class StillWorkingError < ApiError
-    def code; 409 end
-  end
+  class StillWorkingError < Error; end
 
-  class TimeoutError < ApiError
-    def code; 408 end
-  end
+  class TimeoutError < Error; end
 
-  class CrawlerBaseError < ApiError
-    def initialize(_msg, _trace)
-      @exc = _msg
-      @trace = _trace
-    end
+  class CrawlerError < Error
 
-    def to_json
-      {
-        exception: @exc,
-        backtrace: @trace
-      }.to_json
-    end
-  end
+    attr_reader :original
 
-  class CrawlerError < CrawlerBaseError
     def initialize(_exc)
-      super _exc.to_s, _exc.backtrace
+      super
+      @original = _exc
     end
+
   end
 
   class LiveInterrupted < StandardError; end

data/lib/crabfarm/modes/server.rb

@@ -17,8 +17,25 @@ module Crabfarm
           rack_response({ errors: e }.to_json, 400)
         end
 
-        rescue_from Crabfarm::ApiError do |e|
-          rack_response(e.to_json, e.code)
+        rescue_from Crabfarm::TimeoutError do |e|
+          rack_response('{}', 408)
+        end
+
+        rescue_from Crabfarm::StillWorkingError do |e|
+          rack_response('{}', 409)
+        end
+
+        rescue_from Crabfarm::CrawlerError do |e|
+          message = "#{e.original.message} (#{e.original.class.to_s})"
+          backtrace = e.original.backtrace.take_while { |t| !t.include? '/lib/crabfarm/' }
+          backtrace = e.original.backtrace if backtrace.count == 0
+
+          body = {
+            exception: message,
+            backtrace: backtrace
+          }
+
+          rack_response(body.to_json, 500)
         end
 
         helpers do

data/lib/crabfarm/version.rb

@@ -1,3 +1,3 @@
 module Crabfarm
-  VERSION = "0.7.1"
+  VERSION = "0.7.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: crabfarm
 version: !ruby/object:Gem::Version
-  version: 0.7.1
+  version: 0.7.2
 platform: ruby
 authors:
 - Ignacio Baixas
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-25 00:00:00.000000000 Z
+date: 2015-09-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport