rack-app 0.12.1 → 0.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5759d181f7bd7eaddf70e9b1172c74dc22e50d2d
-  data.tar.gz: c59a6ef74c8663237bbe91501b8a32b09c55ab2c
+  metadata.gz: 58f26a39292b8d52e2bfeabf12e5bdeb865cd9e4
+  data.tar.gz: f1fa441f35fe56d10ede7e4731281210f8b5d352
 SHA512:
-  metadata.gz: 6b767a6f85cfa4e294e51fb6fb8b1c242675c7e2ff8555cf5e469f72cf40cfabab20123047be01b4e62636a24347b8d823bf6e0a4eaae8f14fd0fc775889e8b4
-  data.tar.gz: 478c39eadfa8cee23a268520a184a0e6bb1a809ed5edea3725b6c824e71ba85ee4d6aa58eb34444e3ffdad1ec83123b3a1a4b3cb5cf5c7db8809adcd16b05a9b
+  metadata.gz: 5fa94365b0a18d26dc3f666a38bafe6686227d68599dce43a1d941aaac736ec678831537ed5dd00f404c44f166c9eff17a43bb36633f79ea95ac70d39ee46980
+  data.tar.gz: 462d5fca3c4429ccdc942159666539500850801cc571e6ad75db1ff73790952d20e46f42b9e2f1e0beecef5f6bb96e41e332f47797da1f88390a01fa386a40e9

data/VERSION

@@ -1 +1 @@
-0.12.1
+0.13.0

data/lib/rack/app.rb

@@ -7,12 +7,14 @@ class Rack::App
   require 'rack/app/constants'
 
   require 'rack/app/params'
-  require 'rack/app/utils'
   require 'rack/app/router'
   require 'rack/app/endpoint'
+  require 'rack/app/serializer'
+  require 'rack/app/error_handler'
   require 'rack/app/endpoint/not_found'
   require 'rack/app/request_configurator'
 
+  require 'rack/app/utils'
   require 'rack/app/file'
 
   class << self
@@ -70,6 +72,15 @@ class Rack::App
       end
     end
 
+    def error(*exception_classes,&block)
+      @error_handler ||= Rack::App::ErrorHandler.new
+      unless block.nil?
+        @error_handler.register_handler(exception_classes,block)
+      end
+
+      return @error_handler
+    end
+
     def router
       @router ||= Rack::App::Router.new
     end
@@ -81,7 +92,8 @@ class Rack::App
           :request_method => request_method,
           :request_path => request_path,
           :description => @last_description,
-          :serializer => @serializer,
+          :serializer => serializer,
+          :error_handler => error,
           :app_class => self
       }
 
@@ -104,8 +116,14 @@ class Rack::App
       return nil
     end
 
-    def serializer(&code)
-      @serializer = code
+    def serializer(&definition_how_to_serialize)
+      @serializer ||= Rack::App::Serializer.new
+
+      unless definition_how_to_serialize.nil?
+        @serializer.set_serialization_logic(definition_how_to_serialize)
+      end
+
+      return @serializer
     end
 
   end

data/lib/rack/app/endpoint.rb

@@ -5,8 +5,9 @@ class Rack::App::Endpoint
   def initialize(properties)
     @properties = properties
     @logic_block = properties[:user_defined_logic]
-    @serializer = properties[:serializer] || default_serializer
+    @serializer = properties[:serializer]
     @api_class = properties[:app_class]
+    @error_handler = properties[:error_handler]
 
     @path_params_matcher = {}
   end
@@ -23,7 +24,7 @@ class Rack::App::Endpoint
     request_handler.response = response
     request.env['rack.app.path_params_matcher']= @path_params_matcher.dup
 
-    call_return = request_handler.instance_exec(&@logic_block)
+    call_return = @error_handler.execute_with_error_handling { request_handler.instance_exec(&@logic_block) }
 
     return call_return if is_a_rack_response_finish?(call_return)
     add_response_body_if_missing(call_return, response)
@@ -39,7 +40,7 @@ class Rack::App::Endpoint
   protected
 
   def add_response_body_if_missing(call_return, response)
-    response.write(String(@serializer.call(call_return))) if response.body.empty?
+    response.write(String(@serializer.serialize(call_return))) if response.body.empty?
   end
 
   def is_a_rack_response_finish?(call_return)
@@ -49,8 +50,4 @@ class Rack::App::Endpoint
         call_return[1].is_a?(Hash)
   end
 
-  def default_serializer
-    lambda { |o| o.to_s }
-  end
-
 end

data/lib/rack/app/endpoint/not_found.rb

@@ -8,7 +8,8 @@ not_found_properties = {
     :request_method => 'GET',
     :request_path => '\404',
     :description => 'page not found',
-    :serializer => lambda { |o| String(o) },
+    :serializer => Rack::App::Serializer.new,
+    :error_handler => Rack::App::ErrorHandler.new,
     :app_class => app_class
 }
 

data/lib/rack/app/error_handler.rb

@@ -0,0 +1,35 @@
+class Rack::App::ErrorHandler
+
+  def initialize
+    @handlers = {}
+  end
+
+  def register_handler(exception_classes, handler_block)
+    exception_classes.each do |exception_class|
+      @handlers[exception_class]= handler_block
+    end
+    nil
+  end
+
+  def execute_with_error_handling
+    yield
+  rescue *[Exception, @handlers.keys].flatten => ex
+    get_handler(ex).call(ex)
+  end
+
+  protected
+
+  def get_handler(ex)
+    explicit(ex) || parent(ex) || raise(ex)
+  end
+
+  def explicit(ex)
+    @handlers[ex.class]
+  end
+
+  def parent(ex)
+    handler = @handlers.find { |exception_class, handler| ex.class <= exception_class }
+    return handler.nil? ? nil : handler.last
+  end
+
+end

data/lib/rack/app/serializer.rb

@@ -0,0 +1,15 @@
+class Rack::App::Serializer
+
+  def initialize
+    @proc = lambda { |o| o.to_s }
+  end
+
+  def set_serialization_logic(proc)
+    @proc = proc
+  end
+
+  def serialize(object)
+    @proc.call(object)
+  end
+
+end

data/lib/rack/app/test.rb

@@ -2,23 +2,38 @@ require 'uri'
 require 'rack/app'
 module Rack::App::Test
 
-  # magic ;)
   def self.included(klass)
-    class << klass
+    klass.__send__(:extend,SpecHelpers)
+  end
 
-      define_method(:rack_app) do |*args, &constructor|
+  module SpecHelpers
 
-        rack_app_class = args.shift
-        subject_app = rack_app_class.is_a?(Class) ? rack_app_class : Class.new(Rack::App)
-        subject_app.class_eval(&constructor) unless constructor.nil?
+    def rack_app(*args,&constructor)
 
+      begin
+        let(:rack_app){ rack_app_by(*args,&constructor) }
+      rescue NoMethodError
         define_method(:rack_app) do
-          subject_app
+          rack_app_by(*args,&constructor)
         end
-
       end
 
     end
+
+  end
+
+  def rack_app_by(*args,&constructor)
+    subject_app = nil
+    rack_app_class = args.shift
+
+    if constructor.nil?
+      subject_app = rack_app_class
+    else
+      subject_app = Class.new(rack_app_class || Rack::App)
+      subject_app.class_eval(&constructor)
+    end
+
+    subject_app
   end
 
   [:get, :post, :put, :delete, :options, :patch].each do |request_method|

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rack-app
 version: !ruby/object:Gem::Version
-  version: 0.12.1
+  version: 0.13.0
 platform: ruby
 authors:
 - Adam Luzsi
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-02-02 00:00:00.000000000 Z
+date: 2016-02-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -91,6 +91,7 @@ files:
 - lib/rack/app/constants.rb
 - lib/rack/app/endpoint.rb
 - lib/rack/app/endpoint/not_found.rb
+- lib/rack/app/error_handler.rb
 - lib/rack/app/file.rb
 - lib/rack/app/file/server.rb
 - lib/rack/app/file/streamer.rb
@@ -100,6 +101,7 @@ files:
 - lib/rack/app/router.rb
 - lib/rack/app/router/dynamic.rb
 - lib/rack/app/router/static.rb
+- lib/rack/app/serializer.rb
 - lib/rack/app/test.rb
 - lib/rack/app/utils.rb
 - lib/rack/app/version.rb