pakyow-core 0.8rc1 → 0.8.rc4

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

@@ -1,27 +1,33 @@
 module Pakyow
   class RouteTemplateDefaults
-    def self.register
-      Pakyow::Router.instance.set(:default) {
+    def self.defaults
+      lambda {
         template(:restful) {
-          get '/', :index, fn(:index)
+          unnested_path = path.dup
+          nested_path { |group, path|
+            File.join(path, ":#{group}_id")
+          }
 
+          default fn(:default) if fn(:default)
+
+          get '/new', :new, fn(:new) if fn(:new)
+          
           # special case for show (view path is overridden)
           if show_fns = fn(:show)
-            show_fns = [show_fns] unless show_fns.is_a?(Array)
-            get '/:id', :show, show_fns.unshift(
+            get '/:id', :show, Array(show_fns).unshift(
               lambda {
-                presenter.view_path = File.join(self.path, 'show') if Configuration::Base.app.presenter
+                #TODO would like to move this reference out of core
+                presenter.view_path = File.join(unnested_path, 'show') if @presenter
               }
             )
           end
+          
+          post '/', :create, fn(:create) if fn(:create)
 
-          get '/new', :new, fn(:new)
-          post '/', :create, fn(:create)
-
-          get '/:id/edit', :edit, fn(:edit)
-          put '/:id', :update, fn(:update)
+          get '/:id/edit', :edit, fn(:edit) if fn(:edit)
+          put '/:id', :update, fn(:update) if fn(:update)
 
-          delete '/:id', :delete, fn(:delete)
+          delete '/:id', :delete, fn(:delete) if fn(:delete)
         }
       }
     end

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

@@ -6,20 +6,23 @@ module Pakyow
   class Router
     include Singleton
 
+    attr_reader :sets
+
     def initialize
+      @sets = {}
     end
 
+    #TODO want to do this for all sets?
     def reset
       @sets = {}
-      RouteTemplateDefaults.register
       self
     end
 
-    # Creates a new set (or appends to a set if it exists).
+    # Creates a new set.
     #
     def set(name, &block)
-      @sets[name] ||= RouteSet.new
-      @sets[name].instance_exec(&block)
+      @sets[name] = RouteSet.new
+      @sets[name].eval(&block)
     end
 
     # Iterates through route sets and returns the first matching route.
@@ -36,32 +39,33 @@ module Pakyow
 
     # Performs the initial routing for a request.
     #
-    def route!(request)
-      self.trampoline(self.match(request))
+    def perform(request, ctx = Pakyow.app, &after_match)
+      fns = match(request)
+      after_match.call if block_given?
+
+      trampoline(fns, ctx)
     end
 
     # Reroutes a request.
     #
-    def reroute!(request)
+    def reroute(request)
       throw :fns, self.match(request)
     end
 
     # Finds and invokes a handler by name or by status code.
     #
-    def handle!(name_or_code, from_logic = false)
+    def handle(name_or_code, app = Pakyow.app, from_logic = false)
+      app.response.status = name_or_code if name_or_code.is_a?(Integer)
+
       @sets.each { |set|
         if h = set[1].handle(name_or_code)
-          Pakyow.app.response.status = h[0]
-          from_logic ? throw(:fns, h[2]) : self.trampoline(h[2])
+          app.response.status = h[1]
+          from_logic ? throw(:fns, h[2]) : self.trampoline(h[2], app)
           break
         end
       }
     end
 
-    def routed?
-      @routed
-    end
-
     # Looks up and populates a path with data
     #
     def path(name, data = nil)
@@ -74,28 +78,31 @@ module Pakyow
       RouteLookup.new.group(name)
     end
 
-    protected
-
-    # Calls a list of route functions in order (each in a separate context).
+    # Calls a defined fn
     #
-    def call_fns(fns)
-      fns.each {|fn| self.context.instance_exec(&fn)}
+    def fn(name)
+      @sets.each { |set|
+        if fn = set[1].fn(name)
+          fn.call
+          break
+        end
+      }
     end
 
-    # Creates a context in which to evaluate a route function.
+    protected
+
+    # Calls a list of route functions in order (in a shared context).
     #
-    def context
-      FnContext.new
+    def call_fns(fns, app)
+      fns.each {|fn| app.instance_exec(&fn)}
     end
 
     # Finds the first matching route for the request path/method and
     # returns the list of route functions for that route.
     #
     def match(request)
-      path   = StringUtils.normalize_path(request.working_path)
-      method = request.working_method
-
-      @routed = false
+      path   = StringUtils.normalize_path(request.path)
+      method = request.method
 
       match, data = nil
       @sets.each { |set|
@@ -121,10 +128,11 @@ module Pakyow
     # Calls route functions and catches new functions as
     # they're thrown (e.g. by reroute).
     #
-    def trampoline(fns)
+    def trampoline(fns, ctx)
+      routed = false
       until fns.empty?
         fns = catch(:fns) {
-          self.call_fns(fns)
+          self.call_fns(fns, ctx)
 
           # Getting here means that call() returned normally (not via a throw)
           :fall_through
@@ -133,11 +141,13 @@ module Pakyow
         # If reroute! or invoke_handler! was called in the block, block will have a new value (nil or block).
         # If neither was called, block will be :fall_through
 
-        @routed = case fns
+        routed = case fns
           when []             then false
           when :fall_through  then fns = [] and true
         end
       end
+
+      return routed
     end
 
     # Extracts the data from a path.
@@ -146,8 +156,8 @@ module Pakyow
       data = {}
       return data unless matches
 
-      vars.each {|v|
-        data[v[:var]] = matches[v[:position]]
+      matches.names.each {|var|
+        data[var.to_sym] = matches[var]
       }
 
       data

data/pakyow-core/lib/utils/dir.rb

@@ -14,5 +14,24 @@ module Pakyow
         dirs.each{|d| walk_dir("#{dir}/#{d}", &block) unless d.start_with?(".")}
       end
 
+      def self.print_dir(dir)
+        puts "/#{dir}"
+        DirUtils.walk_dir(dir) {|full_path|
+          path = full_path.gsub(Regexp.new("#{dir}\/?"), '')
+          next if path.empty?
+
+          prefix = "|"
+          path.scan(/\//).size.times do
+            prefix += "  |"
+          end
+
+          path.gsub!(/^.*\//, '')
+          puts "#{prefix}-- #{path}"
+        }
+      end
+
+      def self.dir_within_dir?(dir1, dir2)
+        (dir1.split('/') - dir2.split('/')).empty?
+      end
   end
 end

data/pakyow-core/lib/utils/hash.rb

@@ -11,18 +11,28 @@ module Pakyow
     def self.strhash(hash)
       indifferentize(hash)
     end
-    
+
+    # Converts keys to symbols.
+    def self.symbolize_keys(hash)
+      Hash[hash.map{|(k,v)| [k.to_sym,v]}]
+    end
+
+    # Converts keys/values to symbols.
+    def self.symbolize(hash)
+      Hash[hash.map{|(k,v)| [k.to_sym,v.to_sym]}]
+    end
+
     protected
-    
+
     # (see {strhash})
     def self.indifferentize(hash)
       hash.each_pair do |key, value|
         hash[key] = indifferentize(value) if value.is_a? Hash
       end
-      
+
       indifferent_hash.merge(hash)
     end
-    
+
     # (see {strhash})
     def self.indifferent_hash
       Hash.new { |hash,key| hash[key.to_s] if Symbol === key }

data/pakyow-core/lib/views/errors/404.html

@@ -0,0 +1,77 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <title>
+    Pakyow: 404
+  </title>
+
+  <style>
+    body {
+      font:13px Helvetica Neue, Helvetica, sans-serif;
+      line-height:1.35em;
+      color:#333;
+    }
+
+    h1 {
+      font-size:20px;
+      color:#333;
+    }
+
+    h2 {
+      font-weight:normal;
+      font-size:13px;
+      color:#FF0000;
+    }
+
+    code {
+      font-size:13px;
+      display:block;
+      margin:20px;
+      color:#333;
+    }
+
+    hr {
+      height:1px;
+      background:#ccc;
+      border:0;
+    }
+
+    .wrapper {
+      width:700px;
+      margin:60px auto 0;
+    }
+
+    .instruct {
+      font-size:15px;
+      margin:30px 0;
+      color:#777;
+    }
+  </style>
+</head>
+<body>
+  <div class="wrapper">
+    <h1>
+      Pakyow couldn't find a route or view for this request path.
+    </h1>
+
+    <p class="instruct">
+      For Pakyow to fulfill this request, create a view at '{view_path}'.
+    </p>
+
+    <hr>
+
+    <p class="instruct">
+      If you want back-end code to execute for this path, create 
+      a route; maybe something like this:
+
+      <code>
+        get '{route_path}' do
+        <br>
+        &nbsp;&nbsp;# your code goes here
+        <br>
+        end
+      </code>
+    </p>
+  </div>
+</body>
+</html>

data/pakyow-core/lib/views/errors/500.html

@@ -0,0 +1,56 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <title>
+    Pakyow: 500
+  </title>
+
+  <style>
+    body {
+      font:13px Helvetica Neue, Helvetica, sans-serif;
+      line-height:1.35em;
+      color:#333;
+    }
+
+    h1 {
+      font-size:20px;
+      color:#333;
+    }
+
+    h2 {
+      font-weight:normal;
+      font-size:13px;
+      color:#FF0000;
+    }
+
+    .wrapper {
+      width:900px;
+      margin:60px auto 0;
+    }
+
+    .instruct {
+      font-size:15px;
+      margin:30px 0;
+      color:#777;
+    }
+  </style>
+</head>
+<body>
+  <div class="wrapper">
+    <h1>
+      Pakyow found something wrong.
+    </h1>
+
+    <p class="instruct">
+      The error originated on line {line} of '{file}'
+      and generated the following stack trace:
+    </p>
+
+    <h2>
+      {msg}
+    </h2>
+
+    {trace}
+  </div>
+</body>
+</html>

metadata

@@ -1,125 +1,102 @@
 --- !ruby/object:Gem::Specification
 name: pakyow-core
 version: !ruby/object:Gem::Version
-  version: 0.8rc1
-  prerelease: 3
+  version: 0.8.rc4
 platform: ruby
 authors:
 - Bryan Powell
 - Bret Young
 autorequire: 
-bindir: pakyow-core/bin
+bindir: bin
 cert_chain: []
-date: 2013-02-11 00:00:00.000000000 Z
+date: 2013-10-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '1.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '1.5'
 - !ruby/object:Gem::Dependency
-  name: turn
+  name: minitest
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: '5.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.9'
-description: pakyow-core
+        version: '5.0'
+description: Core functionality for Pakyow applications, including routing and middleware.
 email: bryan@metabahn.com
-executables:
-- pakyow
+executables: []
 extensions: []
 extra_rdoc_files: []
 files:
 - pakyow-core/CHANGES
 - pakyow-core/README
 - pakyow-core/MIT-LICENSE
-- pakyow-core/lib/commands/console.rb
-- pakyow-core/lib/commands/server.rb
-- pakyow-core/lib/commands/USAGE
-- pakyow-core/lib/commands/USAGE-CONSOLE
-- pakyow-core/lib/commands/USAGE-NEW
-- pakyow-core/lib/commands/USAGE-SERVER
-- pakyow-core/lib/core/application.rb
+- pakyow-core/lib/core/app.rb
 - pakyow-core/lib/core/base.rb
-- pakyow-core/lib/core/cache.rb
-- pakyow-core/lib/core/configuration/app.rb
-- pakyow-core/lib/core/configuration/base.rb
-- pakyow-core/lib/core/configuration/server.rb
-- pakyow-core/lib/core/fn_context.rb
+- pakyow-core/lib/core/config/app.rb
+- pakyow-core/lib/core/config/base.rb
+- pakyow-core/lib/core/config/cookies.rb
+- pakyow-core/lib/core/config/logger.rb
+- pakyow-core/lib/core/config/server.rb
+- pakyow-core/lib/core/exceptions.rb
 - pakyow-core/lib/core/helpers.rb
 - pakyow-core/lib/core/loader.rb
-- pakyow-core/lib/core/log.rb
 - pakyow-core/lib/core/middleware/logger.rb
-- pakyow-core/lib/core/middleware/not_found.rb
-- pakyow-core/lib/core/middleware/presenter.rb
 - pakyow-core/lib/core/middleware/reloader.rb
-- pakyow-core/lib/core/middleware/router.rb
-- pakyow-core/lib/core/middleware/setup.rb
 - pakyow-core/lib/core/middleware/static.rb
-- pakyow-core/lib/core/presenter_base.rb
+- pakyow-core/lib/core/multilog.rb
 - pakyow-core/lib/core/request.rb
 - pakyow-core/lib/core/response.rb
+- pakyow-core/lib/core/route_eval.rb
 - pakyow-core/lib/core/route_lookup.rb
 - pakyow-core/lib/core/route_set.rb
-- pakyow-core/lib/core/route_template.rb
 - pakyow-core/lib/core/route_template_defaults.rb
 - pakyow-core/lib/core/router.rb
-- pakyow-core/lib/generators/pakyow/app/app_generator.rb
-- pakyow-core/lib/generators/pakyow/app/templates/app.rb
-- pakyow-core/lib/generators/pakyow/app/templates/config.ru
-- pakyow-core/lib/generators/pakyow/app/templates/public/favicon.ico
-- pakyow-core/lib/generators/pakyow/app/templates/rakefile
-- pakyow-core/lib/generators/pakyow/app/templates/README
-- pakyow-core/lib/generators/pakyow/app/templates/views/main.html
-- pakyow-core/lib/generators/pakyow/app/templates/views/pakyow.html
 - pakyow-core/lib/pakyow-core.rb
 - pakyow-core/lib/utils/dir.rb
 - pakyow-core/lib/utils/hash.rb
 - pakyow-core/lib/utils/string.rb
-- pakyow-core/bin/pakyow
+- pakyow-core/lib/views/errors/404.html
+- pakyow-core/lib/views/errors/500.html
 homepage: http://pakyow.com
-licenses: []
+licenses:
+- MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - pakyow-core/lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
-      version: 1.8.7
+      version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>'
+  - - '>'
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
 rubyforge_project: pakyow-core
-rubygems_version: 1.8.23
+rubygems_version: 2.0.0
 signing_key: 
-specification_version: 3
-summary: pakyow-core
+specification_version: 4
+summary: Core functionality for Pakyow applications.
 test_files: []

data/pakyow-core/bin/pakyow

@@ -1,18 +0,0 @@
-#!/usr/bin/env ruby
-
-CORE_PATH = File.expand_path('../../lib', __FILE__)
-
-case ARGV.first
-when 'new'
-  ARGV.shift
-  require 'generators/pakyow/app/app_generator'
-  Pakyow::Generators::AppGenerator.start
-when 'server', 's'
-  ARGV.shift
-  require File.join(CORE_PATH, 'commands/server')
-when 'console', 'c'
-  ARGV.shift
-  require File.join(CORE_PATH, 'commands/console')
-when '--help', '-h', nil
-  puts File.open(File.join(CORE_PATH, 'commands/USAGE')).read
-end

data/pakyow-core/lib/commands/USAGE

@@ -1,9 +0,0 @@
-Usage:
-  pakyow command
-
-There are three commands:
-  new       Create a new Pakyow application
-  server    Start the application server
-  console   Start the application console
-
-Run a command with -h for more information.

data/pakyow-core/lib/commands/USAGE-CONSOLE

@@ -1,12 +0,0 @@
-Usage:
-  pakyow console [environment]
-  
-Description:
-    The 'pakyow console' command stages the application and starts an interactive
-    session. If environment is not specified, the default_environment defined by 
-    your application will be used.
-
-Example:
-    pakyow console development
-
-    This starts the console with the 'development' configuration.

data/pakyow-core/lib/commands/USAGE-NEW

@@ -1,11 +0,0 @@
-Usage:
-  pakyow new application
-
-Description:
-    The 'pakyow new' command creates a new Pakyow application at the path
-    specified.
-
-Example:
-    pakyow new path/to/application
-
-    This generates a new Pakyow application in path/to/application.

data/pakyow-core/lib/commands/USAGE-SERVER

@@ -1,12 +0,0 @@
-Usage:
-  pakyow server [environment]
-  
-Description:
-    The 'pakyow server' command starts the application server. If environment
-    is not specified, the default_environment defined by your application
-    will be used.
-
-Example:
-    pakyow server development
-
-    This starts the application server with the 'development' configuration.

data/pakyow-core/lib/commands/console.rb

@@ -1,18 +0,0 @@
-if ARGV.first == '--help' || ARGV.first == '-h'
-  puts File.open(File.join(CORE_PATH, 'commands/USAGE-CONSOLE')).read
-else
-  $:.unshift(Dir.pwd)
-
-  require 'app'
-  PakyowApplication::Application.stage(ARGV.first)
-  
-  def reload
-    puts "Reloading..."
-    Pakyow.app.reload
-  end
-  
-  require 'irb'
-  ARGV.clear
-  IRB.start
-end
-

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

@@ -1,8 +0,0 @@
-if ARGV.first == '--help' || ARGV.first == '-h'
-  puts File.open(File.join(CORE_PATH, 'commands/USAGE-SERVER')).read
-else
-  $:.unshift(Dir.pwd)
-
-  require 'app'
-  PakyowApplication::Application.run(ARGV.first)
-end