rasti-web 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8be22c6b9730ecebfc6deb7449fc33fc580eedfa
-  data.tar.gz: 260d7b82a6a975f7872c0e6d5a2cff49f526272f
+  metadata.gz: f5b7da3fc4edfaad86b1d790a3c003196931296d
+  data.tar.gz: c5609146785dc24b28067ed485becd91f46b613d
 SHA512:
-  metadata.gz: 2255e469c1232c3f66a83e17aea842e34f55d51e7c23656be60f30b90785c864e08aed79dd6f6a6f7ebc72256ab95bfc218c6a077418ec0c09c3821e16fdc119
-  data.tar.gz: ee292a32f9ec7142d1bb0ab386d635fb128bcc277e44bda50430761b183d361d699bdce02e531766bf5513a4ae08011081ddda445c1258146387e95af144a4c8
+  metadata.gz: df8e6c78eca2b2dcfd8ff4cddcb80dbb3263fe3c3282e93fb8e1a091b6c3315bac8ced0777357d55067c839749e9b220b11f295efe8d0474202e258afff1e4bd
+  data.tar.gz: 5146ccb76aadf74162fc60e270dd21aed3d8bff3c10cccc23cffacf8dac3f2ab8764562dea8c7927bba5bb536c38ef94506097c8b818a995eb924dd3b1fc70b2

data/.ruby-version

@@ -1 +1 @@
-ruby-2.3.0
+ruby-2.4.0

data/.travis.yml

@@ -1,4 +1,5 @@
 language: ruby
+
 rvm:
   - 1.9.3
   - 2.0
@@ -6,6 +7,16 @@ rvm:
   - 2.2
   - 2.3.0
   - 2.4.0
-  - jruby
+  - jruby-1.7.25
+  - jruby-9.1.7.0
+  - ruby-head
+  - jruby-head
+
+matrix:
+  fast_finish: true
+  allow_failures:
+    - rvm: ruby-head
+    - rvm: jruby-head
+
 before_install:
   - gem install bundler

data/README.md

@@ -62,6 +62,38 @@ class UsersController < Rasti::Web::Controller
 end
 ```
 
+### Hooks
+
+```ruby
+class UsersController < Rasti::Web::Controller
+
+  before_action do |action_name|
+  end
+
+  before_action :action_name do
+  end
+
+  after_action do |action_name|
+  end
+
+  after_action :action_name do
+  end
+
+end
+```
+
+### Error handling
+
+```ruby
+class UsersController < Rasti::Web::Controller
+
+  rescue_from StandardError do |ex|
+    render.status 500, 'Unexpected error'
+  end
+
+end
+```
+
 ## Contributing
 
 1. Fork it ( https://github.com/gabynaiman/rasti-web/fork )

data/Rakefile

@@ -3,7 +3,8 @@ require 'rake/testtask'
 
 Rake::TestTask.new(:spec) do |t|
   t.libs << 'spec'
-  t.pattern = 'spec/**/*_spec.rb'
+  t.libs << 'lib'
+  t.pattern = ENV['DIR'] ? File.join(ENV['DIR'], '**', '*_spec.rb') : 'spec/**/*_spec.rb'
   t.verbose = false
   t.warning = false
   t.loader = nil if ENV['TEST']

data/lib/rasti/web/controller.rb

@@ -16,26 +16,65 @@ module Rasti
       end
 
       class << self
+
         def action(action_name)
           raise "Undefined action '#{action_name}' in #{name}" unless instance_methods.include? action_name.to_sym
           
           Endpoint.new do |req, res, render|
             controller = new req, res, render
             begin
+              call_before_action controller, action_name
               controller.public_send action_name
             rescue => 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
+              call_exception_handler controller, ex
+            ensure
+              call_after_action controller, action_name
             end
           end
         end
 
         alias_method :>>, :action
 
+        def before_action(action_name=nil, &block)
+          before_action_hooks[action_name] = block
+        end
+
+        def after_action(action_name=nil, &block)
+          after_action_hooks[action_name] = block
+        end
+
+        def rescue_from(exception_class, &block)
+          exception_handlers[exception_class] = block
+        end
+
+        def call_before_action(controller, action_name)
+          hook = before_action_hooks[action_name] || before_action_hooks[nil]
+          controller.instance_exec action_name, &hook if hook
+        end
+
+        def call_after_action(controller, action_name)
+          hook = after_action_hooks[action_name] || after_action_hooks[nil]
+          controller.instance_exec action_name, &hook if hook
+        end
+
+        def call_exception_handler(controller, exception)
+          exception_class = handled_exceptions.detect { |klass| exception.is_a? klass }
+          exception_handler = exception_handlers[exception_class]
+          if exception_handler
+            controller.instance_exec exception, &exception_handler
+          else
+            raise exception
+          end
+        end
+
+        def before_action_hooks
+          @before_action_hooks ||= superclass.respond_to?(:before_action_hooks) ? superclass.before_action_hooks : {}
+        end
+
+        def after_action_hooks
+          @after_action_hooks ||= superclass.respond_to?(:after_action_hooks) ? superclass.after_action_hooks : {}
+        end
+
         def exception_handlers
           @exception_handlers ||= superclass.respond_to?(:exception_handlers) ? superclass.exception_handlers : {}
         end
@@ -44,9 +83,6 @@ module Rasti
           @handled_exceptions ||= ClassAncestrySort.desc exception_handlers.keys
         end
 
-        def rescue_from(exception_class, &block)
-          exception_handlers[exception_class] = block
-        end
       end
 
     end

data/lib/rasti/web/render.rb

@@ -81,7 +81,7 @@ module Rasti
       end
 
       def extract_status(args)
-        args.detect { |a| a.is_a? Fixnum }
+        args.detect { |a| a.is_a? Integer }
       end
 
       def extract_headers(args)

data/lib/rasti/web/version.rb

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

data/spec/controller_spec.rb

@@ -1,7 +1,28 @@
 require 'minitest_helper'
 
 class TestController < Rasti::Web::Controller
+  
   CustomError = Class.new StandardError
+
+  def self.hooks_log
+    @hooks_log ||= []
+  end
+
+  before_action do |action_name|
+    self.class.hooks_log << "Before all: #{action_name}"
+  end
+
+  after_action do |action_name|
+    self.class.hooks_log << "After all: #{action_name}"
+  end
+
+  before_action :test do 
+    self.class.hooks_log << 'Before single: test'
+  end
+
+  after_action :test do 
+    self.class.hooks_log << 'After single: test'
+  end
   
   def test
     render.html 'Test HTML'
@@ -30,6 +51,10 @@ class TestController < Rasti::Web::Controller
 end
 
 describe Rasti::Web::Controller do
+
+  before do
+    TestController.hooks_log.clear
+  end
   
   it 'Action endpoint' do
     action = TestController.action :test
@@ -40,11 +65,17 @@ describe Rasti::Web::Controller do
     status.must_equal 200
     headers['Content-Type'].must_equal 'text/html; charset=utf-8'
     response.body.must_equal ['Test HTML']
+    
+    TestController.hooks_log.must_equal [
+      'Before single: test',
+      'After single: test'
+    ]
   end
 
   it 'Invalid action' do
     error = proc { TestController.action :invalid }.must_raise RuntimeError
     error.message.must_equal "Undefined action 'invalid' in TestController"
+    TestController.hooks_log.must_be_empty
   end
 
   it 'Rescue explicit exception' do
@@ -54,6 +85,11 @@ describe Rasti::Web::Controller do
 
     status.must_equal 500
     response.body.must_equal ['Explicit error']
+
+    TestController.hooks_log.must_equal [
+      'Before all: explicit_fail',
+      'After all: explicit_fail'
+    ]
   end
 
   it 'Rescue implicit exception' do
@@ -63,6 +99,11 @@ describe Rasti::Web::Controller do
 
     status.must_equal 500
     response.body.must_equal ['Implicit error']
+
+    TestController.hooks_log.must_equal [
+      'Before all: implicit_fail',
+      'After all: implicit_fail'
+    ]
   end
 
   it 'Unexpected exception' do
@@ -71,6 +112,11 @@ describe Rasti::Web::Controller do
     
     error = proc { action.call env }.must_raise RuntimeError
     error.message.must_equal 'Unexpected error'
+
+    TestController.hooks_log.must_equal [
+      'Before all: exception',
+      'After all: exception'
+    ]
   end
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rasti-web
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Gabriel Naiman
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-18 00:00:00.000000000 Z
+date: 2017-09-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -300,7 +300,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: Web blocks to build robust applications