jeanine 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8d88a21a82401395ddca515402a07e3155939eb0
-  data.tar.gz: e6edce8a4097864466149cf6769765332a868c76
+  metadata.gz: a9120ffa8994858a7560330fa0afbe1bf18e2f94
+  data.tar.gz: fd326e260cc8c90a5b70b8b8ad4a1cd5b0b9869a
 SHA512:
-  metadata.gz: 17f7d684adeefc7ec56e7244c6c53fddeafb9d037e4a1ee9aab94d8925193a39a95d0a079ba2aad85ae3f5a64b972315a7893f6ced6d07ba7e693923be9cc67e
-  data.tar.gz: 82082d64a1620c947e51aa84d9ada5701825c0525061cd930022b8ef68611338570fc64f20038a4605e48bf1d27578c668ff2923a0ef7d88bc3b55435792877d
+  metadata.gz: 8b11b5b73abed4a7df44caf5a7b53ad6d2d52616fc23658e8c0d864239c0dc7b3fdfb6837c6d611f593944ad2518d92cc9af945ec3185a7bdfd783f913c3309c
+  data.tar.gz: 2ca9b7d2196c08e57bda6f983cfb0a1da71c06772bb6b42b76deb0aa941d5cb454eef4041d9834f8b3eeea9644d5a86b22e48de5f6b951a32e39481d9ac631a4

data/lib/jeanine/app.rb

@@ -1,18 +1,22 @@
 require 'jeanine/callbacks'
 require 'jeanine/mimes'
 require 'jeanine/request'
+require 'jeanine/rescuing'
 require 'jeanine/response'
 require 'jeanine/renderer'
 require 'jeanine/routing'
+require 'jeanine/session'
 
 module Jeanine
   class App
+    include Session
     include Routing::Evaluation
     attr_reader :request, :response
+
     class << self
-      include Routing::DSL
       include Callbacks
-
+      include Routing::DSL
+      include Rescuing
       alias :_new :new
       def new(*args, &block)
         initialize!
@@ -37,11 +41,24 @@ module Jeanine
       end
     end
 
+    include Rescuing
+
     def call(env)
-      @env = env
-      @request = Jeanine::Request.new(env)
-      @response = Jeanine::Response.new
-      catch(:halt) { route_eval }
+      begin
+        @env = env
+        @request = Jeanine::Request.new(env)
+        @response = Jeanine::Response.new
+        catch(:halt) { route_eval }
+      rescue => error
+        handler = self.class.rescue_handlers[error.class]
+        raise error unless handler
+        if handler.is_a?(Symbol)
+          @response.write(send(handler, error))
+        else
+          @response.write(instance_exec(error, &handler))
+        end
+        @response.complete!
+      end
     end
 
     private

data/lib/jeanine/rescuing.rb

@@ -0,0 +1,17 @@
+module Jeanine
+  module Rescuing
+    def rescue_from(*exceptions, with: nil, &block)
+      exceptions.each do |exception|
+        if with
+          rescue_handlers[exception] = with
+        else
+          rescue_handlers[exception] = block
+        end
+      end
+    end
+
+    def rescue_handlers
+      @rescue_handlers ||= {}
+    end
+  end
+end

data/lib/jeanine/session.rb

@@ -0,0 +1,7 @@
+module Jeanine
+  module Session
+    def session
+      env['rack.session']
+    end
+  end
+end

data/lib/jeanine/version.rb

@@ -1,3 +1,3 @@
 module Jeanine
-  VERSION = "0.1.0"
+  VERSION = "0.2.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jeanine
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Josh Brody
@@ -87,11 +87,13 @@ files:
 - lib/jeanine/path_proxy.rb
 - lib/jeanine/renderer.rb
 - lib/jeanine/request.rb
+- lib/jeanine/rescuing.rb
 - lib/jeanine/response.rb
 - lib/jeanine/router.rb
 - lib/jeanine/routing.rb
 - lib/jeanine/routing/dsl.rb
 - lib/jeanine/routing/evaluation.rb
+- lib/jeanine/session.rb
 - lib/jeanine/version.rb
 - lib/jeanine/view.rb
 homepage: https://github.com/joshmn/jeanine