pakyow-core 0.7.2 → 0.8rc1

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

@@ -5,7 +5,7 @@ module Pakyow
         attr_accessor :dev_mode, :log, :public_dir, :root, :log_dir, 
         :presenter, :default_action, :ignore_routes, :error_level, 
         :default_environment, :application_path, :log_name, :src_dir,
-        :auto_reload, :errors_in_browser, :static
+        :auto_reload, :errors_in_browser, :static, :all_views_visible
         
         # Displays development-specific warnings.
         #
@@ -46,7 +46,7 @@ module Pakyow
         end
 
         def src_dir
-          @src_dir || "#{root}/app/lib"
+          @src_dir || "#{root}/lib"
         end
         
         # Default action
@@ -58,6 +58,10 @@ module Pakyow
         def ignore_routes
           @ignore_routes.nil? ? false : @ignore_routes
         end
+
+        def all_views_visible
+          @all_views_visible.nil? ? true : @all_views_visible
+        end
         
         def default_environment
           @default_environment || :development

data/pakyow-core/lib/core/configuration/server.rb

@@ -2,7 +2,7 @@ module Pakyow
   module Configuration
     class Server
       class << self
-        attr_accessor :port, :host
+        attr_accessor :port, :host, :handler
         
         # On what port does the application run?
         def port
@@ -13,6 +13,11 @@ module Pakyow
         def host
           @host || '0.0.0.0'
         end
+        
+        # If set, adds a handler to try (e.g. puma)
+        def handler
+          @handler || nil
+        end
       end
     end
   end

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

@@ -0,0 +1,5 @@
+module Pakyow
+  class FnContext
+    include Helpers
+  end
+end

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

@@ -9,6 +9,22 @@ module Pakyow
     def response
       Pakyow.app.response
     end
+    
+    def router
+      RouteLookup.new
+    end
+
+    def params
+      request.params
+    end
+
+    def session
+      request.session
+    end
+
+    def cookies
+      request.cookies
+    end
   end
 
   # Helper methods specific to delegates and controllers.

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

@@ -1,11 +1,10 @@
 module Pakyow
-  
   # Handles the loading and reloading of a Pakyow application. If in development
   # mode, files are automatically reloaded if modified.
   class Loader
 
     # Loads files in the provided path, decending into child directories.
-    def load!(path)
+    def load_from_path(path)
       require_recursively(path)
     end
     

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

@@ -2,20 +2,24 @@ module Pakyow
   
   # Provides an easy way to log text, warnings, etc.
   class Log
-    
+    # Opens stdout and the log file for writing.
+    def self.reopen
+      @@console = $stdout
+
+      d = Configuration::Base.app.log_dir
+      @@file = File.exists?(d) ? File.open("#{d}/#{Configuration::Base.app.log_name}", 'a') : nil
+    end
+
+    def self.close
+      @@file.close if @@file
+    end
+
     # Adds text to the log. 
     def self.puts(text = "")
       return if !Configuration::Base.app.log
       
-      @@console ||= $stdout
       @@console << "#{text}\r\n"
-      
-      dir = "#{Configuration::Base.app.log_dir}"
-      
-      if File.exists?(dir)
-        @@file ||= File.open("#{dir}/#{Configuration::Base.app.log_name}", 'a')
-        @@file.write "#{text}\r\n"
-      end
+      @@file.write "#{text}\r\n" if @@file
     end
 
     class << self

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

@@ -0,0 +1,37 @@
+module Pakyow
+  module Middleware
+    class Logger
+      def initialize(app)
+        @app = app
+      end
+      
+      def call(env)
+        result = nil
+        difference = time { |began_at|
+          Log.enter "Processing #{env['PATH_INFO']} (#{env['REMOTE_ADDR']} at #{began_at}) [#{env['REQUEST_METHOD']}]"
+          
+          if error = catch(:error) { 
+                      result = @app.call(env)
+                      nil 
+                    }
+            Log.enter "[500] #{error}\n"
+            Log.enter error.backtrace.join("\n") + "\n\n"
+            
+            result = Pakyow.app.response.finish
+          end
+        }
+        
+        Log.enter "Completed in #{difference}ms | #{Pakyow.app.response.status} | [#{Pakyow.app.request.url}]"
+        Log.enter
+
+        result
+      end
+
+      def time
+        s = Time.now
+        yield(s)
+        (Time.now.to_f - s.to_f) * 1000.0
+      end
+    end
+  end
+end

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

@@ -0,0 +1,40 @@
+module Pakyow
+  module Middleware
+    class NotFound
+      def initialize(app)
+        @app = app
+      end
+
+      def call(env)
+        @app.call(env)
+        
+        # 404 if no route matched and no views were found
+        unless found?
+          Log.enter "[404] Not Found"
+
+          Pakyow.app.response.body = [] 
+          Pakyow.app.presenter.reset if Pakyow.app.presenter
+
+          Pakyow.app.response.status = 404
+          Pakyow.app.router.handle!(404)
+
+          if Pakyow.app.presenter
+            # consider moving to presenter middleware
+            # Pakyow.app.presenter.prepare_for_request(Pakyow.app.request)
+            Pakyow.app.response.body = [Pakyow.app.presenter.content] if Pakyow.app.presenter.presented?
+          end
+        end
+      end
+
+      private
+
+      def found?
+        return true if Pakyow.app.router.routed?
+        return true if Pakyow.app.presenter && Pakyow.app.presenter.presented? && Configuration::App.all_views_visible
+
+        false
+      end
+    end
+  end
+end
+

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

@@ -0,0 +1,25 @@
+module Pakyow
+  module Middleware
+    class Presenter
+      def initialize(app)
+        @app = app
+      end
+
+      def call(env)
+        r = Pakyow.app.request
+
+        while(r) do
+          Pakyow.app.presenter.prepare_for_request(Pakyow.app.request)
+
+          r = catch(:rerouted) {
+                   @app.call(@env)
+                   nil
+                 }
+        end
+                                                                  #TODO the right thing to do?
+        Pakyow.app.response.body = [Pakyow.app.presenter.content] if Pakyow.app.presenter.presented?
+        Pakyow.app.response.finish
+      end
+    end
+  end
+end

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

@@ -0,0 +1,14 @@
+module Pakyow
+  module Middleware
+    class Reloader
+      def initialize(app)
+        @app = app
+      end
+      
+      def call(env)
+        Pakyow.app.reload
+        @app.call(env)
+      end
+    end
+  end
+end

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

@@ -0,0 +1,33 @@
+module Pakyow
+  module Middleware
+    class Router
+      def initialize(app)
+        @app = app
+      end
+
+      def call(env)
+        catch(:halt) {
+          Pakyow.app.router.route!(Pakyow.app.request)
+          @app.call(env)
+        }
+      rescue StandardError => error
+        Pakyow.app.request.error = error
+
+        Pakyow.app.response.status = 500
+        Pakyow.app.router.handle!(500)
+
+        if Configuration::Base.app.errors_in_browser
+          Pakyow.app.response.body = []
+          Pakyow.app.response.body << "<h4>#{CGI.escapeHTML(error.to_s)}</h4>"
+          Pakyow.app.response.body << error.backtrace.join("<br />")
+        end
+
+        begin
+          # caught by other middleware (e.g. logger)
+          throw :error, error
+        rescue ArgumentError
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,15 @@
+module Pakyow
+  module Middleware
+    class Setup
+      def initialize(app)
+        @app = app
+      end
+
+      def call(env)
+        #TODO don't track r/r on app; pass through middleware instead (or call in a context that has access to current r/r)
+        Pakyow.app.setup_rr(env)
+        @app.call(env)
+      end
+    end
+  end
+end

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

@@ -0,0 +1,27 @@
+module Pakyow
+  module Middleware
+    class Static
+      def initialize(app)
+        @app = app
+      end
+      
+      def call(env)
+        if is_static?(env)
+          response = Rack::Response.new
+          
+          catch(:halt) do
+            Pakyow.app.send(File.open(File.join(Configuration::Base.app.public_dir, env['PATH_INFO'])))
+          end
+        else
+          @app.call(env)
+        end
+      end
+      
+      private
+      
+      def is_static?(env)
+        env['PATH_INFO'] =~ /\.(.*)$/ && File.exists?(File.join(Configuration::Base.app.public_dir, env['PATH_INFO']))
+      end
+    end
+  end
+end

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

@@ -3,5 +3,9 @@ module Pakyow
     def self.inherited(subclass)
       Configuration::Base.app.presenter = subclass
     end
+
+    def self.instance
+      @@instance ||= self.new
+    end
   end
 end

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

@@ -2,7 +2,13 @@ module Pakyow
 
   # The Request object.
   class Request < Rack::Request
-    attr_accessor :restful, :route_spec, :controller, :action, :format, :error, :working_path, :working_method
+    attr_accessor :restful, :route_path, :controller, :action, :format, :error, :working_path, :working_method
+
+    def initialize(*args)
+      super
+
+      self.setup(self.path)
+    end
 
     # Easy access to path_info.
     def path
@@ -20,6 +26,10 @@ module Pakyow
       # Set response type
       Pakyow.app.response["Content-Type"] = Rack::Mime.mime_type(".#{@format}")
     end
+
+    def session
+      self.env['rack.session'] || {}
+    end
     
     def cookies
       @cookies ||= HashUtils.strhash(super)
@@ -31,25 +41,25 @@ module Pakyow
     end
     
     # Returns array of url components.
-    def url_parts
-      unless @url
-        @url = self.class.split_url(self.env['PATH_INFO'])
-      end
-    
-      return @url
+    def path_parts
+      @url ||= self.path ? self.class.split_url(self.path) : []
+    end
+
+    def referer
+      @referer ||= self.env['HTTP_REFERER']
     end
     
     # Returns array of referer components.
     def referer_parts
-      unless @referer
-        @referer = self.class.split_url(self.env['HTTP_REFERER'])
-      end
-    
-      return @referer
+      @referer_parts ||= self.referer ? self.class.split_url(self.referer) : []
     end
-    
-    private
-    
+
+    def setup(path, method = nil)
+      self.set_request_format_from_path(path)
+      self.set_working_path_from_path(path, method)
+    end
+
+    #TODO move to util class
     def self.split_url(url)
       arr = []
       url.split('/').each { |r|
@@ -58,5 +68,23 @@ module Pakyow
       
       return arr
     end
+    
+    protected
+
+    def set_working_path_from_path(path, method)
+      base_route, ignore_format = StringUtils.split_at_last_dot(path)
+
+      self.working_path = base_route
+      self.working_method = method || self.method
+    end
+
+    def set_request_format_from_path(path)
+      path, format = StringUtils.split_at_last_dot(path)
+
+      #TODO why it no work without this? was working fine in application
+      return unless format
+
+      self.format = ((format && (format[format.length - 1, 1] == '/')) ? format[0, format.length - 1] : format)
+    end
   end
 end

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

@@ -0,0 +1,6 @@
+module Pakyow
+
+  # The Response object.
+  class Response < Rack::Response
+  end
+end

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

@@ -0,0 +1,37 @@
+module Pakyow
+
+  # Handles looking up paths for named routes and populating
+  # the path with data.
+  #
+  class RouteLookup
+    include Helpers
+
+    def path(name, data = nil)
+      route = self.get_named_route(name)
+      data ? self.populate(route, data) : File.join('/', route[4])
+    end
+
+    def group(name)
+      @group = name
+      self
+    end
+
+    protected
+
+    def get_named_route(name)
+      Pakyow.app.router.route(name, @group) || []
+    end
+
+    def populate(route, data = {})
+      vars  = route[1]
+      
+      split_path = Request.split_url(route[4])
+      
+      vars.each {|v|
+        split_path[v[:position]] = data[v[:var]]
+      }
+
+      File.join('/', split_path.join('/'))
+    end
+  end
+end