pakyow-core 0.8.rc4 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6603c6f6c576749182546ee51b5f99a237ba2ab2
-  data.tar.gz: a986e3adf2e4c33a16e8565b48984947bc1e00e5
+  metadata.gz: a272d5c2f6d429275df4e3eac0561c8df6c285e3
+  data.tar.gz: 8b21f4193337cd9c7298ccbe0e004bd9c814beb0
 SHA512:
-  metadata.gz: 13942daed315f9bf380e9ff718d07458c89d630918d781377117e11aec1dfcab916c5692c769e6148ea37ec74e931c402ae303be62db75f2a77005b293b95d5c
-  data.tar.gz: 81cddf4aadc79a683129e3420cdf95e42f1e863cbfc123dbe93b92685ac830e533f3f76ca0cae149cc02b4300c5c9a5cb08419023763c7192f5b234ed07da3cf
+  metadata.gz: dbb4242d0cbbb4dcce94608b6773026e68c4168c450dd4e7587def70a3db921d5e6d53a7b9cd45b3f718451ec70c8b7cf7878ea998eacf95aed655dc084cea56
+  data.tar.gz: b965ed0dd836899da344beb011cd777eb09080fa3013c381d7a4e1194108147f90c58f9be3dfcb0dedce8d6c06519a66d78ea85188a10c992280cb1506173f07

data/pakyow-core/CHANGES

@@ -1,3 +1,7 @@
+= 0.8.0 / 2014-03-02
+
+  * Major rewrite, including changes to app definition and routing
+
 = 0.7.2 / 2012-02-29
 
   * Application server shuts down gracefully

data/pakyow-core/lib/core/app.rb

@@ -4,6 +4,7 @@ module Pakyow
       def reset
         @@routes = {}
         @@config = {}
+        @@middleware = []
 
         @@stacks = {:before => {}, :after => {}}
         %w(init load process route match error).each {|name|
@@ -16,7 +17,7 @@ module Pakyow
       #
       def define(&block)
         # sets the path to the app file so it can be reloaded later
-        config.app.path = StringUtils.parse_path_from_caller(caller[0])
+        config.app.path = Utils::String.parse_path_from_caller(caller[0])
 
         self.instance_eval(&block)
       end
@@ -32,15 +33,10 @@ module Pakyow
         end
       end
 
-      # Defines middleware to be loaded.
+      # Accepts block to be added to middleware stack.
       #
       def middleware(&block)
-        # prevents middleware from being loaded on each
-        # request when auto_reload is enabled
-        return if prepared?
-
-        # tell builder about the middleware
-        builder.instance_eval(&block)
+        @@middleware << block
       end
 
       # Creates an environment.
@@ -144,7 +140,11 @@ module Pakyow
         envs = envs.empty? || envs.first.nil? ? [config.app.default_environment] : envs
         load_config(envs)
 
-        # load middleware
+        # load each block from middleware stack
+        @@middleware.each {|mw|
+          self.instance_exec(builder, &mw)
+        }
+
         builder.use(Rack::MethodOverride)
         builder.use(Middleware::Static)   if config.app.static
         builder.use(Middleware::Logger)   if config.app.log
@@ -185,7 +185,7 @@ module Pakyow
     include Helpers
     include AppHelpers
 
-    attr_accessor :request, :response
+    attr_writer :context
 
     def initialize
       Pakyow.app = self
@@ -217,42 +217,43 @@ module Pakyow
     def process(env)
       call_stack(:before, :process)
 
-      @response = Response.new
-      @request  = Request.new(env)
-      @request.app = self
-      @request.setup
+      req = Request.new(env)
+      res = Response.new
+
+      # set response format based on request
+      res.format = req.format
+
+      @context = AppContext.new(req, res)
 
       set_initial_cookies
 
       @found = false
       catch(:halt) {
-        unless config.app.ignore_routes
-          call_stack(:before, :route)
+        call_stack(:before, :route)
 
-          @found = @router.perform(@request, self) {
-            call_stack(:after, :match)
-          }
+        @found = @router.perform(context, self) {
+          call_stack(:after, :match)
+        }
 
-          call_stack(:after, :route)
-        end
+        call_stack(:after, :route)
 
         unless found?
-          handle(404, false) 
+          handle(404, false)
 
           if config.app.errors_in_browser
-            @response["Content-Type"] = 'text/html'
+            response["Content-Type"] = 'text/html'
 
             view_file = File.join(File.expand_path('../../', __FILE__), 'views', 'errors', '404.html')
             content = File.open(view_file).read
 
-            path = StringUtils.normalize_path(request.path)
+            path = Utils::String.normalize_path(request.path)
             path = '/' if path.empty?
 
             content.gsub!('{view_path}', path == '/' ? 'index.html' : "#{path}.html")
             content.gsub!('{route_path}', path)
 
-            @response.body = []
-            @response.body << content
+            response.body = []
+            response.body << content
           end
         end
       }
@@ -261,38 +262,38 @@ module Pakyow
 
       call_stack(:after, :process)
 
-      @response.finish
+      response.finish
     rescue StandardError => error
       call_stack(:before, :error)
 
-      @request.error = error
+      request.error = error
 
       handle(500, false) unless found?
 
       if config.app.errors_in_browser
-        @response["Content-Type"] = 'text/html'
-        
+        response["Content-Type"] = 'text/html'
+
         view_file = File.join(File.expand_path('../../', __FILE__), 'views', 'errors', '500.html')
         content = File.open(view_file).read
 
-        path = StringUtils.normalize_path(request.path)
+        path = Utils::String.normalize_path(request.path)
         path = '/' if path.empty?
 
         nice_source = error.backtrace[0].match(/^(.+?):(\d+)(|:in `(.+)')$/)
 
         content.gsub!('{file}', nice_source[1].gsub(File.expand_path(Config::App.root) + '/', ''))
         content.gsub!('{line}', nice_source[2])
-        
-        content.gsub!('{msg}', error.to_s)
-        content.gsub!('{trace}', error.backtrace.join('<br>'))
 
-        @response.body = []
-        @response.body << content
+        content.gsub!('{msg}', CGI.escapeHTML(error.to_s))
+        content.gsub!('{trace}', error.backtrace.map { |bt| CGI.escapeHTML(bt) }.join('<br>'))
+
+        response.body = []
+        response.body << content
       end
 
       call_stack(:after, :error)
 
-      @response.finish
+      response.finish
     end
 
     def found?
@@ -319,17 +320,17 @@ module Pakyow
     # Interrupts the application and returns response immediately.
     #
     def halt
-      throw :halt, @response
+      throw :halt, response
     end
 
     # Routes the request to different logic.
     #
     def reroute(path, method = nil)
-      @request.setup(path, method)
+      request.setup(path, method)
 
       call_stack(:before, :route)
       call_stack(:after, :match)
-      @router.reroute(@request)
+      @router.reroute(request)
       call_stack(:after, :route)
     end
 
@@ -344,7 +345,7 @@ module Pakyow
         data = file_or_data.read
 
         # auto set type based on file type
-        type = Rack::Mime.mime_type("." + StringUtils.split_at_last_dot(file_or_data.path)[1])
+        type = Rack::Mime.mime_type("." + Utils::String.split_at_last_dot(file_or_data.path)[1])
       else
         data = file_or_data
       end
@@ -353,7 +354,7 @@ module Pakyow
       headers["Content-Type"]         = type if type
       headers["Content-disposition"]  = "attachment; filename=#{send_as}" if send_as
 
-      @response = Response.new(data, @response.status, @response.header.merge(headers))
+      self.context = AppContext.new(request, Response.new(data, response.status, response.header.merge(headers)))
       halt
     end
 
@@ -361,11 +362,11 @@ module Pakyow
     #
     def redirect(location, status_code = 302)
       location = router.path(location) if location.is_a?(Symbol)
-      
+
       headers = response ? response.header : {}
       headers = headers.merge({'Location' => location})
 
-      app.response = Response.new('', status_code, headers)
+      self.context = AppContext.new(request, Response.new('', status_code, headers))
       halt
     end
 
@@ -409,18 +410,18 @@ module Pakyow
       @router = Router.instance.reset
       self.class.routes.each_pair {|set_name, block|
         @router.set(set_name, &block)
-      }
+      } unless config.app.ignore_routes
     end
 
     def set_cookies
-      @request.cookies.each_pair {|k, v|
-        @response.unset_cookie(k) if v.nil?
+      request.cookies.each_pair {|k, v|
+        response.unset_cookie(k) if v.nil?
 
         # cookie is already set with value, ignore
         next if @initial_cookies.include?(k.to_s) && @initial_cookies[k.to_s] == v
 
         # set cookie with defaults
-        @response.set_cookie(k, {
+        response.set_cookie(k, {
           :path => config.cookies.path,
           :expires => config.cookies.expiration,
           :value => v
@@ -429,7 +430,7 @@ module Pakyow
 
       # delete cookies that are no longer present
       @initial_cookies.each {|k|
-        @response.delete_cookie(k) unless @request.cookies.key?(k.to_s)
+        response.delete_cookie(k) unless request.cookies.key?(k.to_s)
       }
     end
 
@@ -437,7 +438,7 @@ module Pakyow
     # for comparison at the end of the cycle
     def set_initial_cookies
       @initial_cookies = {}
-      @request.cookies.each {|k,v|
+      request.cookies.each {|k,v|
         @initial_cookies[k] = v
       }
     end

data/pakyow-core/lib/core/app_context.rb

@@ -0,0 +1,10 @@
+module Pakyow
+	class AppContext
+		attr_reader :request, :response
+
+		def initialize(request = nil, response = nil)
+			@request = request
+			@response = response
+		end
+	end
+end

data/pakyow-core/lib/core/base.rb

@@ -5,16 +5,19 @@ require 'core/config/cookies'
 require 'core/config/logger'
 require 'core/helpers'
 require 'core/multilog'
+require 'core/app_context'
 require 'core/request'
 require 'core/response'
 require 'core/loader'
 require 'core/router'
+require 'core/route_merger'
+require 'core/route_module'
 require 'core/route_set'
 require 'core/route_eval'
 require 'core/route_template_defaults'
 require 'core/route_lookup'
 require 'core/app'
-require 'core/exceptions'
+require 'core/errors'
 
 # middlewares
 require 'core/middleware/logger'

data/pakyow-core/lib/core/errors.rb

@@ -0,0 +1,13 @@
+module Pakyow
+  # Raised when no app context is available
+  class NoContextError < StandardError; end
+
+  # Raised when route is looked up that doesn't exist
+  class MissingRoute < StandardError; end
+
+  # Raised when template part doesn't exist
+  class UnknownTemplatePart < StandardError; end
+
+  class Error < StandardError; end
+end
+

data/pakyow-core/lib/core/helpers.rb

@@ -1,7 +1,10 @@
 module Pakyow
-
   # For methods that should be accessible anywhere
   module Helpers
+    def context
+      @context or raise NoContextError
+    end
+
     def logger
       request.logger
     end
@@ -11,12 +14,12 @@ module Pakyow
     end
 
     def request
-      @request
+      context.request
     end
     alias_method :req, :request
 
     def response
-      @response
+      context.response
     end
     alias_method :res, :response
 

data/pakyow-core/lib/core/loader.rb

@@ -7,21 +7,21 @@ module Pakyow
     def load_from_path(path)
       require_recursively(path)
     end
-    
+
     protected
-    
+
     def require_recursively(dir)
       @times ||= {}
       if File.exists?(dir)
-        DirUtils.walk_dir(dir) do |path|
+        Utils::Dir.walk_dir(dir) do |path|
           next if FileTest.directory?(path)
           next if path.split('.')[-1] != 'rb'
-          
+
           if Config::Base.app.auto_reload
             if !@times[path] || (@times[path] && File.mtime(path) - @times[path] > 0)
               load(path)
               @times[path] = File.mtime(path)
-            end              
+            end
           else
             require path
           end

data/pakyow-core/lib/core/middleware/static.rb

@@ -11,8 +11,9 @@ module Pakyow
         if static
           catch(:halt) do
             app = Pakyow.app.dup
-            app.response = Response.new
-            app.request = Request.new(env)
+            res = Response.new
+            req = Request.new(env)
+            app.context = AppContext.new(req, res)
             app.send(File.open(resource_path))
           end
         else

data/pakyow-core/lib/core/request.rb

@@ -2,8 +2,8 @@ module Pakyow
 
   # The Request object.
   class Request < Rack::Request
-    attr_accessor :restful, :route_path, :controller, :action, :format, 
-    :error, :app, :path, :method, :paths, :methods, :formats
+    attr_accessor :restful, :route_path, :controller, :action, :format,
+    :error, :path, :method, :paths, :methods, :formats
 
     def initialize(*args)
       super
@@ -14,6 +14,8 @@ module Pakyow
 
       @path = path_info
       @method = request_method.downcase.to_sym
+
+      setup
     end
 
     def path=(path)
@@ -30,9 +32,6 @@ module Pakyow
       format = format ? format.to_sym : :html
       @formats << format
       @format = format
-
-      # Set response type
-      @app.response["Content-Type"] = Rack::Mime.mime_type(".#{@format}")
     end
 
     def first_path
@@ -52,12 +51,12 @@ module Pakyow
     end
 
     def cookies
-      @cookies ||= HashUtils.strhash(super)
+      @cookies ||= Utils::Hash.strhash(super)
     end
 
     # Returns indifferent params (see {HashUtils.strhash} for more info on indifferent hashes).
     def params
-      @params ||= HashUtils.strhash(super)
+      @params ||= Utils::Hash.strhash(super)
     end
 
     # Returns array of url components.
@@ -98,14 +97,14 @@ module Pakyow
     protected
 
     def set_working_path_from_path(path, method)
-      base_route, ignore_format = StringUtils.split_at_last_dot(path)
+      base_route, ignore_format = Utils::String.split_at_last_dot(path)
 
       self.path = base_route
       self.method = method || self.method
     end
 
     def set_request_format_from_path(path)
-      path, format = StringUtils.split_at_last_dot(path)
+      path, format = Utils::String.split_at_last_dot(path)
       self.format = ((format && (format[format.length - 1, 1] == '/')) ? format[0, format.length - 1] : format)
     end
   end