rasti-web 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 50a62a6c007c11424a97fd9eb207ca0cb1641bb0
-  data.tar.gz: 04bf7b2fe637a40625b401227d8c1ffe61088b6c
+  metadata.gz: 8be22c6b9730ecebfc6deb7449fc33fc580eedfa
+  data.tar.gz: 260d7b82a6a975f7872c0e6d5a2cff49f526272f
 SHA512:
-  metadata.gz: 22684f3a9e873bdf5e3a30e468013ebe310d33c555e7b37068f016e765eecfbd0d89e9109d2434305ba2b90afd21e6b4fc972fd1e00e5a0967848b9da90bdb95
-  data.tar.gz: f8ec4a69517f0c2c8eec1d130b0b70bb3ae34ac7752cdff43da466fa49b439dd072df5ed243ff303adcce1090a9b5fa28ceefa53f6c3dd12b6f223cd3ec0fda1
+  metadata.gz: 2255e469c1232c3f66a83e17aea842e34f55d51e7c23656be60f30b90785c864e08aed79dd6f6a6f7ebc72256ab95bfc218c6a077418ec0c09c3821e16fdc119
+  data.tar.gz: ee292a32f9ec7142d1bb0ab386d635fb128bcc277e44bda50430761b183d361d699bdce02e531766bf5513a4ae08011081ddda445c1258146387e95af144a4c8

data/lib/rasti/web.rb

@@ -7,6 +7,7 @@ require 'class_config'
 require 'forwardable'
 require 'logger'
 require 'hash_ext'
+require 'class_ancestry_sort'
 
 require_relative 'web/route'
 require_relative 'web/router'

data/lib/rasti/web/controller.rb

@@ -24,8 +24,9 @@ module Rasti
             begin
               controller.public_send action_name
             rescue => ex
-              if controller.respond_to? ex.class.name
-                controller.public_send ex.class.name, ex
+              exception_class = handled_exceptions.detect { |klass| ex.is_a? klass }
+              if exception_class
+                controller.instance_exec ex, &exception_handlers[exception_class]
               else
                 raise ex
               end
@@ -35,10 +36,16 @@ module Rasti
 
         alias_method :>>, :action
 
+        def exception_handlers
+          @exception_handlers ||= superclass.respond_to?(:exception_handlers) ? superclass.exception_handlers : {}
+        end
+
+        def handled_exceptions
+          @handled_exceptions ||= ClassAncestrySort.desc exception_handlers.keys
+        end
+
         def rescue_from(exception_class, &block)
-          define_method exception_class.name do |ex|
-            instance_exec ex, &block
-          end
+          exception_handlers[exception_class] = block
         end
       end
 

data/lib/rasti/web/version.rb

@@ -1,5 +1,5 @@
 module Rasti
   module Web
-    VERSION = '1.0.0'
+    VERSION = '1.1.0'
   end
 end

data/rasti-web.gemspec

@@ -24,6 +24,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'class_config', '~> 0.0.2'
   spec.add_dependency 'hash_ext', '~> 0.1'
   spec.add_dependency 'content-type', '~> 0.0'
+  spec.add_dependency 'class_ancestry_sort', '~> 0.1'
 
   spec.add_development_dependency 'bundler', '~> 1.12'
   spec.add_development_dependency 'rake', '~> 11.0'
@@ -39,5 +40,6 @@ Gem::Specification.new do |spec|
     spec.add_development_dependency 'term-ansicolor', '~> 1.3.0'
     spec.add_development_dependency 'tins', '~> 1.6.0'
     spec.add_development_dependency 'json', '~> 1.8'
+    spec.add_development_dependency 'parslet', '~> 1.7.0'
   end
 end

data/spec/controller_spec.rb

@@ -11,13 +11,22 @@ class TestController < Rasti::Web::Controller
     raise 'Unexpected error'
   end
 
-  def fail
-    raise CustomError, 'Expected error'
+  def explicit_fail
+    raise CustomError, 'Explicit error'
+  end
+
+  def implicit_fail
+    raise EOFError, 'Implicit error'
   end
 
   rescue_from CustomError do |ex|
     render.status 500, ex.message
   end
+
+  rescue_from IOError do |ex|
+    render.status 500, ex.message
+  end
+
 end
 
 describe Rasti::Web::Controller do
@@ -38,13 +47,22 @@ describe Rasti::Web::Controller do
     error.message.must_equal "Undefined action 'invalid' in TestController"
   end
 
-  it 'Rescue exception' do
-    action = TestController.action :fail
-    env = Rack::MockRequest.env_for '/fail'
+  it 'Rescue explicit exception' do
+    action = TestController.action :explicit_fail
+    env = Rack::MockRequest.env_for '/explicit_fail'
+    status, headers, response = action.call env
+
+    status.must_equal 500
+    response.body.must_equal ['Explicit error']
+  end
+
+  it 'Rescue implicit exception' do
+    action = TestController.action :implicit_fail
+    env = Rack::MockRequest.env_for '/implicit_fail'
     status, headers, response = action.call env
 
     status.must_equal 500
-    response.body.must_equal ['Expected error']
+    response.body.must_equal ['Implicit error']
   end
 
   it 'Unexpected exception' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rasti-web
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Gabriel Naiman
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-13 00:00:00.000000000 Z
+date: 2017-08-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -94,6 +94,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.0'
+- !ruby/object:Gem::Dependency
+  name: class_ancestry_sort
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement