helmet 0.0.6 → 0.1.0

data/lib/helmet/api.rb

@@ -1,37 +1,30 @@
 require 'goliath/api'
 
-require 'helmet/templates'
+require 'helmet/handler'
 
 module Helmet
   class API < Goliath::API
-
-    # Handle application routes
-    @@routes          = {}
-    
-    # Handle before filters
-    @@before_filters  = []
     
     class << self
-      include Templates
-
-      def public_folder=(folder)
-        @@public_folder = folder
+      
+      def set(key, value)
+        @config[key.to_sym] = value
       end
 
-      def public_folder
-        @@public_folder
+      def config(key)
+        @config[key.to_sym]
       end
-
-      def views_folder=(folder)
-        @@views_folder = folder
+      
+      def before(route, &block)
+        @before_filters << [route, block]
       end
-
-      def views_folder
-        @@views_folder
+      
+      def routes
+        @routes
       end
       
-      def before(route, &block)
-        @@before_filters << [route, block]
+      def before_filters
+        @before_filters
       end
       
       def get(route, &block) 
@@ -45,27 +38,39 @@ module Helmet
 
       def register_route(method, route, &block)
         sig = API.signature(method, route)
-        @@routes[sig] = block
+        @routes[sig] = block
       end
-
+      
       def signature(method, route)
         "#{method}#{route}"
       end
 
       def inherited(klass)
+        klass.init
+        
         # setup basic middlewares
         setup_middlewares klass
 
         # compute public/ views folder
-        base = File.dirname(caller.first[/^[^:]*/])
-        self.public_folder = File.join(base, 'public')
-        self.views_folder = File.join(base, 'views')
+        base = File.expand_path(File.dirname(caller.first[/^[^:]*/]))
+        klass.set :public_folder, File.join(base, 'public')
+        klass.set :views_folder, File.join(base, 'views')
 
         super # update Goliath::Application.app_class
       end
 
-      private
+      def init
+        # Handle application routes
+        @routes          = {}
+
+        # Handle before filters
+        @before_filters  = []
 
+        @config          = {}
+      end
+
+      private
+            
       def setup_middlewares(klass)
         # support for session
         klass.use Rack::Session::Cookie
@@ -75,29 +80,35 @@ module Helmet
     end
 
     def response(env)
-      path = env['REQUEST_PATH']
+      # request path
+      path    = env['REQUEST_PATH']
+      
+      # request handler
+      handler = Handler.new(env)
 
-      # evaluate filters
-      resp = catch(:halt) do
-        @@before_filters.each do |route|
+      catch(:halt) do
+        # evaluate filters
+        self.class.before_filters.each do |route|
           case route.first
           when String
-            route[1].call(env) if route.first == path
+            handler.handle! &route[1] if route.first == path
           when Regexp
-            route[1].call(env) if route.first =~ path
+            handler.handle! &route[1] if route.first =~ path
+          end
+        end
+        
+        sig = API.signature(env['REQUEST_METHOD'], path)
+        block = self.class.routes[sig]
+        if block
+          handler.handle!(&block)
+        else
+          handler.handle! do
+            status 404
+            'not found!'
           end
         end
-        nil
-      end
-      return resp if resp
-      
-      sig = API.signature(env['REQUEST_METHOD'], path)
-      block = @@routes[sig]
-      if block
-        block.call env
-      else
-        [404, {}, 'not found!']
       end
+      handler.response.format_response
     end
   end
 end

data/lib/helmet/handler.rb

@@ -0,0 +1,68 @@
+require 'helmet/templates'
+require 'helmet/response'
+
+module Helmet
+
+  # Handle each request and provide usefull methods for request handling
+  class Handler
+    include Templates
+    
+    # Request environment
+    attr_reader :env
+    
+    attr_reader :response
+    
+    def initialize(env)
+      @env      = env
+      @response = Response.new(env)
+    end
+    
+    # @return (Response) request response
+    def handle!(&block)
+      @response.body = instance_exec(&block)
+      @response.format_response
+    end
+    
+    # @return (Rack::Session) the current session data
+    def session
+      @env['rack.session']
+    end
+    
+    # Creates a redirect HTTP response
+    def redirect(uri)
+      @response.status = 302
+      @response.header['Location'] = uri
+      @response.body = ''
+      halt
+    end
+    
+    # halt the execution
+    def halt(body=nil)
+      @response.body = body if body
+      throw :halt
+    end
+    
+    # @return (Integer) response status code
+    def status
+      @response.status
+    end
+
+    # set response status code
+    def status(code)
+      @response.status = code
+    end
+    
+    # @return (Hash) response header
+    def header
+      @response.header
+    end
+    
+    # @return (String) response body
+    def body
+      @response.body
+    end
+    
+    def content_type(type)
+    end
+  end
+end

data/lib/helmet/response.rb

@@ -0,0 +1,28 @@
+module Helmet
+  
+  class Response
+    # Request environment
+    attr_reader :env
+    
+    # HTTP response status
+    attr_accessor :status
+    
+    # HTTP response header
+    attr_accessor :header
+    
+    # HTTP response body
+    attr_accessor :body
+    
+    def initialize(env)
+      @env      = env
+      @status   = 200 # Default OK!
+      @header   = {}
+      @body     = ''
+    end
+    
+    # @return (Array) HTTP response tuple [status, header, body]
+    def format_response
+      [@status, @header, @body]
+    end
+  end
+end

data/lib/helmet/templates.rb

@@ -6,7 +6,7 @@ module Helmet
     @@template_cache = Tilt::Cache.new
         
     def erb(template, options = {}, locals = {})
-     render :erb, template, options, locals
+     render(:erb, template, options, locals) 
     end
 
     def render(engine, data, options = {}, locals = {}, &block)
@@ -15,8 +15,8 @@ module Helmet
       @@template_cache.clear unless Goliath.env == :production
       compiled_template = @@template_cache.fetch(data, options) do
         template = Tilt.new(find_template(engine, data), nil, options)
-      end      
-      output = compiled_template.render nil, locals, &block
+      end
+      output = compiled_template.render(self, locals, &block)
       if layout
         return render(engine, layout, options, locals) {output}
       end
@@ -27,7 +27,7 @@ module Helmet
     
     def find_template(engine, template)
       filename = "#{template.to_s}.#{engine.to_s}"
-      File.join(views_folder, filename)
+      File.join(@klass.config(:views_folder), filename)
     end
   end
 end

metadata

@@ -2,7 +2,7 @@
 name: helmet
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.6
+  version: 0.1.0
 platform: ruby
 authors: 
 - Thiago Lewin
@@ -44,6 +44,8 @@ extra_rdoc_files: []
 
 files: 
 - lib/helmet/api.rb
+- lib/helmet/handler.rb
+- lib/helmet/response.rb
 - lib/helmet/templates.rb
 - lib/helmet.rb
 homepage: https://github.com/tlewin/helmet