angus 0.0.4 → 0.0.5

data/lib/angus/exceptions.rb

@@ -0,0 +1,3 @@
+class MiddlewareNotFound < StandardError
+
+end

data/lib/angus/request_handler.rb

@@ -3,6 +3,8 @@ require 'angus-router'
 require_relative 'response'
 require_relative 'responses'
 require_relative 'middleware/exception_handler'
+require_relative 'exceptions'
+MiddlewareNotFound
 
 module Angus
   class RequestHandler
@@ -11,6 +13,8 @@ module Angus
 
     DEFAULT_RENDER = :json
 
+    attr_reader :middleware
+
     def initialize
       @router = Angus::Router.new
       @middleware = []
@@ -28,7 +32,11 @@ module Angus
 
     def to_app
       inner_app = lambda { |env| self.dup.call!(env) }
-      @middleware.reverse.inject(inner_app) { |app, middleware| middleware.call(app) }
+      @middleware.reverse.inject(inner_app) do |app, middleware|
+        klass, args, block = middleware
+
+        klass.new(app, *args, &block)
+      end
     end
 
     def call!(env)
@@ -63,7 +71,23 @@ module Angus
     end
 
     def use(middleware, *args, &block)
-      @middleware << lambda { |app| middleware.new(app, *args, &block) }
+      return if @middleware.map(&:first).include?(middleware)
+
+      @middleware << [middleware, args, block]
+    end
+
+    def use_before(klass, middleware, *args, &block)
+      return if @middleware.map(&:first).include?(middleware)
+      index = @middleware.map(&:first).index(klass) or raise MiddlewareNotFound.new(middleware)
+
+      @middleware.insert(index, [middleware, args, block])
+    end
+
+    def use_after(klass, middleware, *args, &block)
+      return if @middleware.map(&:first).include?(middleware)
+      index = @middleware.map(&:first).index(klass) or raise MiddlewareNotFound.new(middleware)
+
+      @middleware.insert(index + 1, [middleware, args, block])
     end
 
   end

data/lib/angus/version.rb

@@ -1,3 +1,3 @@
 module Angus
-  VERSION = '0.0.4'
+  VERSION = '0.0.5'
 end

data/spec/angus/middleware/exception_handler_spec.rb

@@ -1,8 +1,3 @@
-#require_relative '../definition_reader'
-#require_relative '../responses'
-#require_relative '../status_codes'
-
-
 require 'spec_helper'
 
 require 'angus/middleware/exception_handler'

data/spec/angus/request_handler_spec.rb

@@ -0,0 +1,100 @@
+require 'spec_helper'
+
+require 'angus/request_handler'
+
+work_dir =  File.join(File.dirname(__FILE__), '..', 'functional', 'basic')
+describe Angus::RequestHandler, { :work_dir => work_dir } do
+
+  subject(:handler) { Angus::RequestHandler.new }
+
+  let(:app) { double(:app) }
+
+  describe '.new' do
+    it 'has a a exception handler middleware' do
+      handler.middleware.map(&:first).should include(Angus::Middleware::ExceptionHandler)
+    end
+  end
+
+  describe '#use' do
+
+    let(:other_middleware) { Struct.new(:app) }
+
+    it 'adds the given middleware after the rest' do
+      handler.use(other_middleware)
+
+      handler.middleware.last.first.should eq(other_middleware)
+    end
+
+    context 'when the given middleware is already present' do
+      before { handler.use(other_middleware) }
+
+      it 'does not modify the middleware' do
+        expect {
+          handler.use(other_middleware)
+        }.to_not change { handler.middleware }
+      end
+    end
+
+  end
+
+  describe '#use_after' do
+
+    let(:other_middleware) { Struct.new(:app) }
+
+    it 'adds the given middleware after the given class' do
+      handler.use_after(Angus::Middleware::ExceptionHandler, other_middleware)
+
+      handler.middleware.last.first.should eq(other_middleware)
+    end
+
+    context 'when the given class is not present in the middleware' do
+      it 'raises an MiddlewareNotFound error' do
+        expect {
+          handler.use_after(Angus::Middleware, other_middleware)
+        }.to raise_error(MiddlewareNotFound)
+      end
+    end
+
+    context 'when the given middleware is already present' do
+      before { handler.use_after(Angus::Middleware::ExceptionHandler, other_middleware) }
+
+      it 'does not modify the middleware' do
+        expect {
+          handler.use_after(Angus::Middleware::ExceptionHandler, other_middleware)
+        }.to_not change { handler.middleware }
+      end
+    end
+
+  end
+
+  describe '#use_before' do
+
+    let(:other_middleware) { Struct.new(:app) }
+
+    it 'adds the given middleware before the given class' do
+      handler.use_before(Angus::Middleware::ExceptionHandler, other_middleware)
+
+      handler.middleware.first.first.should eq(other_middleware)
+    end
+
+    context 'when the given class is not present in the middleware' do
+      it 'raises an MiddlewareNotFound error' do
+        expect {
+          handler.use_before(Angus::Middleware, other_middleware)
+        }.to raise_error(MiddlewareNotFound)
+      end
+    end
+
+    context 'when the given middleware is already present' do
+     before { handler.use_before(Angus::Middleware::ExceptionHandler, other_middleware) }
+
+      it 'does not modify the middleware' do
+        expect {
+          handler.use_before(Angus::Middleware::ExceptionHandler, other_middleware)
+        }.to_not change { handler.middleware }
+      end
+    end
+
+  end
+
+end

data/spec/functional/basic/definitions/users/operations.yml

@@ -1,7 +1,7 @@
 get_user:
-  name: Obtener Información de un Usuario
+  name: Obtener Informacion de un Usuario
   description: >
-    Devuelve información del usuario, como por ejemplo e-mail y fecha de nacimiento.
+    Devuelve informacion del usuario, como por ejemplo e-mail y fecha de nacimiento.
 
   path: /users/:user_id
   method: get

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: angus
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
   prerelease: 
 platform: ruby
 authors:
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-26 00:00:00.000000000 Z
+date: 2013-11-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -233,6 +233,7 @@ files:
 - lib/angus/base_resource.rb
 - lib/angus/command.rb
 - lib/angus/response.rb
+- lib/angus/exceptions.rb
 - lib/angus/middleware/exception_handler.rb
 - lib/angus/rspec/support/examples/describe_errors.rb
 - lib/angus/rspec/support/matchers/operation_response_matchers.rb
@@ -247,6 +248,7 @@ files:
 - lib/angus/base.rb
 - lib/angus.rb
 - spec/spec_helper.rb
+- spec/angus/request_handler_spec.rb
 - spec/angus/middleware/exception_handler_spec.rb
 - spec/angus/rspec/examples/describe_errors_spec.rb
 - spec/functional/no_resources_spec.rb
@@ -297,6 +299,7 @@ specification_version: 3
 summary: angus
 test_files:
 - spec/spec_helper.rb
+- spec/angus/request_handler_spec.rb
 - spec/angus/middleware/exception_handler_spec.rb
 - spec/angus/rspec/examples/describe_errors_spec.rb
 - spec/functional/no_resources_spec.rb