kazoo 0.0.5 → 0.0.6

data/Manifest

@@ -3,8 +3,14 @@ Manifest
 Rakefile
 lib/kazoo.rb
 lib/kazoo/accessors.rb
+lib/kazoo/app.rb
+lib/kazoo/bouncer.rb
+lib/kazoo/bouncer/authenticator.rb
 lib/kazoo/router.rb
+lib/kazoo/router/app.rb
+lib/kazoo/router/common.rb
 lib/kazoo/router/context.rb
+lib/kazoo/router/dispatch.rb
 lib/kazoo/router/route.rb
 lib/kazoo/sinatra.rb
 lib/kazoo/support.rb

data/Rakefile

@@ -5,7 +5,9 @@ require 'echoe'
 require 'rspec'
 require 'rspec/core/rake_task'
 
-Echoe.new('kazoo', '0.0.5') do |p|
+$LOAD_PATH.push( File.join(File.dirname(__FILE__), 'lib') )
+
+Echoe.new('kazoo', '0.0.6') do |p|
   p.description    = "A moduler framework to facilitate the development of content management systems"
   p.url            = "http://rubykazoo.com"
   p.author         = "Jeremy Nicoll"

data/kazoo.gemspec

@@ -2,16 +2,16 @@
 
 Gem::Specification.new do |s|
   s.name = %q{kazoo}
-  s.version = "0.0.5"
+  s.version = "0.0.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jeremy Nicoll"]
   s.cert_chain = ["/Users/eltiare/keys/gem-public_cert.pem"]
-  s.date = %q{2011-02-16}
+  s.date = %q{2011-03-10}
   s.description = %q{A moduler framework to facilitate the development of content management systems}
   s.email = %q{jnicoll @nspam@ accentuate.me}
-  s.extra_rdoc_files = ["lib/kazoo.rb", "lib/kazoo/accessors.rb", "lib/kazoo/router.rb", "lib/kazoo/router/context.rb", "lib/kazoo/router/route.rb", "lib/kazoo/sinatra.rb", "lib/kazoo/support.rb"]
-  s.files = ["MIT-License", "Manifest", "Rakefile", "lib/kazoo.rb", "lib/kazoo/accessors.rb", "lib/kazoo/router.rb", "lib/kazoo/router/context.rb", "lib/kazoo/router/route.rb", "lib/kazoo/sinatra.rb", "lib/kazoo/support.rb", "readme.markdown", "spec/router/context_spec.rb", "spec/router/route_spec.rb", "spec/router_spec.rb", "spec/spec.opts", "spec/spec_helper.rb", "kazoo.gemspec"]
+  s.extra_rdoc_files = ["lib/kazoo.rb", "lib/kazoo/accessors.rb", "lib/kazoo/app.rb", "lib/kazoo/bouncer.rb", "lib/kazoo/bouncer/authenticator.rb", "lib/kazoo/router.rb", "lib/kazoo/router/app.rb", "lib/kazoo/router/common.rb", "lib/kazoo/router/context.rb", "lib/kazoo/router/dispatch.rb", "lib/kazoo/router/route.rb", "lib/kazoo/sinatra.rb", "lib/kazoo/support.rb"]
+  s.files = ["MIT-License", "Manifest", "Rakefile", "lib/kazoo.rb", "lib/kazoo/accessors.rb", "lib/kazoo/app.rb", "lib/kazoo/bouncer.rb", "lib/kazoo/bouncer/authenticator.rb", "lib/kazoo/router.rb", "lib/kazoo/router/app.rb", "lib/kazoo/router/common.rb", "lib/kazoo/router/context.rb", "lib/kazoo/router/dispatch.rb", "lib/kazoo/router/route.rb", "lib/kazoo/sinatra.rb", "lib/kazoo/support.rb", "readme.markdown", "spec/router/context_spec.rb", "spec/router/route_spec.rb", "spec/router_spec.rb", "spec/spec.opts", "spec/spec_helper.rb", "kazoo.gemspec"]
   s.homepage = %q{http://rubykazoo.com}
   s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Kazoo", "--main", "readme.markdown"]
   s.require_paths = ["lib"]

data/lib/kazoo.rb

@@ -1,12 +1,19 @@
-$LOAD_PATH.push(File.dirname(__FILE__))
-
 require 'cgi'
 
-module Kazoo;   end
+module Kazoo;  end
 
 require "kazoo/support"
 require "kazoo/accessors"
 
+require 'kazoo/router/common'
+require 'kazoo/router/app'
+require 'kazoo/router/dispatch'
 require 'kazoo/router/route'
 require 'kazoo/router/context'
-require "kazoo/router"
+require "kazoo/router"
+
+require 'kazoo/app'
+
+
+require 'kazoo/bouncer'
+require 'kazoo/bouncer/authenticator'

data/lib/kazoo/accessors.rb

@@ -7,3 +7,5 @@ module Kazoo
   end
 
 end
+
+module KMod; end

data/lib/kazoo/app.rb

@@ -0,0 +1,89 @@
+module Kazoo::App
+  
+  def self.included(klass)
+    klass.send(:extend, ClassMethods)
+    klass.send(:include, Kazoo::Support)
+  end
+  
+  module ClassMethods
+    
+    def krouter
+      @_krouter ||= Kazoo::Router::App.new
+    end
+  
+    def path_options=(val)
+      if val.is_a?(Hash)
+        @_route_options = val
+      else
+        raise ArgumentError, "route_options must be a hash"
+      end
+    end
+    
+    def path_options
+      @_route_options || {}
+    end
+    
+    def set_paths(opts)
+      opts.each { |k,v| path(k,v) }
+    end
+  
+    def path(name, path = nil, opts = {})
+      opts = path_options.merge(opts)
+      
+      path_prefix = opts.delete(:path_prefix)
+      name_prefix = opts.delete(:name_prefix)
+      
+      name = "#{name_prefix}_#{name}" if name_prefix
+      
+      if path
+        raise ArgumentError, "Path must be a string" unless path.is_a?(String)
+        path = File.join(path_prefix, path) if path_prefix
+        route = Kazoo::Router::Route.new(path, opts.merge(:app_mode => true))
+        krouter.add_route(route, name.to_sym)
+        path
+      else
+        raise ArgumentError, "#The route `{name}` does not exist" unless krouter.named_routes[name]
+        krouter.named_routes[name].to_s
+      end
+    end
+    
+  end
+  
+  def path(name,path,opts)
+    self.class.path(name,path,opts)
+  end
+  
+  def krouter
+    self.class.krouter
+  end
+  
+  def url(name = '', opts = {})
+    
+    if name.is_a?(Symbol)
+      raise ArgumentError, "Invalid url name: #{name}" unless krouter.named_routes[name]
+    
+      url_path = krouter.named_routes[name].to_s.split('/').map { |part|
+        next unless part.is_a?(String)
+        if matches = part.match(/^:([a-z_]+)$/i)
+          matched = matches[1].downcase
+          opts[matched] || opts[matched.to_sym] || params[matched] || raise("You need to pass '#{matched}' to generate URL")
+        else
+          part
+        end
+      }.join('/')
+      
+      # Check for prefix
+      full_path = kenv['path_prefix'] ? File.join(kenv['path_prefix'], url_path) : url_path
+      
+      format = opts[:format] || opts['format']
+      full_path << ".#{format}" if format
+      
+      full_path
+    else
+      kenv['HTTP_PREFIX'] ? File.join(kenv['HTTP_PREFIX'], name) : name
+    end
+    
+  end
+
+
+end

data/lib/kazoo/bouncer.rb

@@ -0,0 +1,61 @@
+class Kazoo::Bouncer
+  
+  def self.authenticators
+    @_authenticators ||= []
+  end
+  
+  def self.add_authenticator(klass)
+    authenticators << klass
+  end
+  
+  def initialize(env)
+    @env = env
+    @request = Rack::Request.new(env)
+  end
+  
+  def request
+    @request
+  end
+  
+  def session
+    @request.session
+  end
+  
+  def current_user
+    @_current_user ||= if session['kazoo.user'] && session['kazoo.user'][0]
+      Kernel.const_get(session['kazoo.user'][0]).find(session['kazoo.user'][1]) rescue nil
+    end
+  end
+  
+  def current_user=(user)
+    if user.nil?
+      forget
+    else
+      session['kazoo.user'] = [user.class.name, user.id]
+      user
+    end
+  end
+  
+  def authenticated?
+    session['kazoo.authenticated'] ? true : false
+  end
+  
+  def forget
+    session.delete('kazoo.authenticated')
+    session.delete('kazoo.user')
+  end
+  
+  def authenticate!
+    self.class.authenticators.each { |auth|
+      user = auth.new.call(request)
+      if user
+        session['kazoo.authenticated'] = '1'
+        self.current_user = user if user.class.respond_to?(:find)
+        puts 'Session: ', session.inspect
+        return user
+      end
+    }
+    nil
+  end
+  
+end

data/lib/kazoo/bouncer/authenticator.rb

@@ -0,0 +1,30 @@
+class Kazoo::Bouncer
+  
+  class Authenticator
+    
+    def self.inherited(klass)
+      Kazoo::Bouncer.add_authenticator klass
+    end
+    
+    def call(req)
+      @_params = req.params
+      @_request = req
+      run
+    end
+    
+    def params
+      @_params
+    end
+    
+    def request
+      @_request
+    end
+    
+    def run
+      raise NotImplementedError, "You must override the `run` method in #{self.class.name}. Please don't punch any ducks"
+    end
+    
+  end
+  
+  
+end

data/lib/kazoo/router.rb

@@ -1,67 +1,5 @@
 class Kazoo::Router
   
-  def self.map(&blk)
-    new.map(&blk)
-  end
-  
-  def map(&blk)
-    @context ||= Context.new(self)
-    @context.instance_eval(&blk)
-    self
-  end
-  
-  def routes
-    @routes ||= []
-  end
-  
-  def named_routes
-    @named_routes ||= {}
-  end
-  
-  def error_handler(app)
-    @error_handler = app
-  end
-  
-  def general_handler(app)
-    @general_handler = app
-  end
-  
-  def kenv
-    @env['kazoo'] ||= {}
-  end
-  
-  def call(env)
-    @env = env
-    @routes.each do |route|
-      env['PATH_INFO'] = "#{env["PATH_INFO"]}/" unless %r'/$'.match(env['PATH_INFO'])
-      params = route.extract_params(env['PATH_INFO'])
-      
-      if params && route.app
-        kenv['params'] ||= {}
-        kenv['params'].merge!(params)
-        
-        match = route.to_regexp.match(env['PATH_INFO'])[0]
-        kenv['path_prefix'] = kenv['path_prefix'] ? File.join(kenv['path_prefix'], match) : match
-        
-        env['PATH_INFO'] = env['PATH_INFO'].sub(match, '')
-        env['PATH_INFO'] = "/#{env['PATH_INFO']}" unless env['PATH_INFO'].match(%r'^/')
-        
-        response = route.app.call(env)
-        return response unless response[1]['X-Cascade'] == 'pass'
-      end
-      
-    end
-    
-    # If no routes found
-    default_response = [404, {'Content-Type' => 'text/plain', "X-Cascade" => "pass"}, 'The requested URI is not found']
-    if @error_handler
-      env['error'] = 'not_found'
-      env['default_response'] = default_response
-      @error_handler.call(env)
-    else
-      default_response
-    end
-  end
-  
+  include Dispatch
   
 end

data/lib/kazoo/router/app.rb

@@ -0,0 +1,44 @@
+class Kazoo::Router
+  
+  class App
+    
+    include Common
+    
+    set :type, :app
+      
+    def self.map(opts = {}, &blk)
+      @_context_options = opts
+      @_context ||= Context.new(self, opts)
+      @_context.instance_eval(&blk)
+      self
+    end#def map
+    
+    def self.context_options
+      @_context_opts
+    end
+    
+    def self.add_route(route, name=nil)
+      routes << route
+      named_routes[name.to_sym] = route if name
+    end
+    
+    def self.routes
+      @_routes ||= []
+    end
+    
+    def self.named_routes
+      @_named_routes ||= {}
+    end
+    
+    def routes
+      @_routes ||= self.class.routes.dup
+    end
+    
+    def named_routes
+      @_named_routes ||= self.class.named_routes.dup
+    end
+    
+    
+  end#module App
+
+end#class Kazoo::Router

data/lib/kazoo/router/common.rb

@@ -0,0 +1,104 @@
+class Kazoo::Router
+  
+  module Common
+    
+    def self.included(klass)
+      klass.send(:extend, ClassMethods)
+    end
+    
+    module ClassMethods
+      
+      def set(var, val)
+        @_settings ||= {}
+        @_settings[var.to_sym] = val
+      end
+      
+      def get(var)
+        @_settings ||= {}
+        @_settings[var.to_sym]
+      end
+      
+      def context_options
+        nil
+      end
+      
+    end#ClassMethods
+    
+    def set(var,val)
+      @_settings ||= {}
+      @_settings[var.to_sym] = val
+    end
+    
+    def get(var)
+      @_settings ||= {}
+      @_settings[var.to_sym] || self.class.get(var)
+    end
+    
+    def map(opts = {}, &blk)
+      opts = self.class.context_options.merge(opts) if self.class.context_options
+      @context ||= Context.new(self, opts)
+      @context.instance_eval(&blk)
+      self
+    end
+    
+    def add_route(route, name=nil)
+      routes << route
+      named_routes[name.to_sym] = route if name
+    end
+    
+    def routes
+      @routes ||= []
+    end
+    
+    def named_routes
+      @named_routes ||= {}
+    end
+    
+    def kenv
+      @env['kazoo'] ||= {}
+    end
+    
+    def call(env)
+      @env = env
+      kenv['params'] ||= {}
+      
+      #TODO: This hack is causing problems. Figure out regexp to match paths better. 
+      env['PATH_INFO'] = "#{env["PATH_INFO"]}/" unless %r'/$'.match(env['PATH_INFO'])
+      
+      @routes.each do |route|
+        
+        params = route.extract_params(env['PATH_INFO'])
+        
+        if params && route.app
+          kenv['params'].merge!(params)
+          
+          match = route.to_regexp.match(env['PATH_INFO'])[0]
+          kenv['path_prefix'] = kenv['path_prefix'] ? File.join(kenv['path_prefix'], match) : match
+          
+          env['PATH_INFO'] = env['PATH_INFO'].sub(match, '')
+          env['PATH_INFO'] = "/#{env['PATH_INFO']}" unless env['PATH_INFO'].match(%r'^/')
+          
+          response = route.app.call(env)
+          
+          if response[1]['X-Cascade'] == 'pass'
+            next 
+          elsif @error_handler && response[0] > 399
+            return @error_handler.call(env, *response)
+          else
+            return response
+          end
+          
+        elsif get(:mode) == :app && params
+          return params
+        end
+        
+      end
+      
+      # If no routes found
+      default_response = [404, {'Content-Type' => 'text/plain', "X-Cascade" => "pass"}, 'The requested URI is not found']
+      @error_handler ?  @error_handler.call(env, *default_response) :  default_response
+    end
+    
+  end
+  
+end

data/lib/kazoo/router/context.rb

@@ -10,12 +10,33 @@ class Kazoo::Router
     def match(path, opts)
       opts = @opts.merge(opts)
       name = extract_name(opts)
+      
+      if get(:mode) == :app 
+        opts[:app_mode] =  true
+      else
+        opts[:default_app] = @default_app
+      end
+      
       route = Route.new(path, opts)
       @router.named_routes[name] = route if name
       @router.routes << route
       route
     end
     
+    def set(var,val)
+      @router.set(var,val)
+    end
+    
+    def get(var)
+      @router.get(var)
+    end
+    
+    def default_app(app)
+      raise ArgumentError, "default_app must be a rack application (#{app} doesn't respond to call)" unless app.respond_to?(:call)
+      raise NameError, "NameError: undefined local variable or method `default_app' for #{self}" if get(:mode) == :app
+      @default_app = app
+    end
+    
     def context(opts = {})
       opts = opts.dup
       
@@ -34,7 +55,13 @@ class Kazoo::Router
     end
     
     def extract_name(opts)
-      
+      if @opts[:name_prefix]  && opts[:name]
+        "#{@opts[:name_prefix]}_#{opts[:name]}"
+      elsif opts[:name]
+        opts[:name]
+      else
+        nil
+      end
     end
     
     def error_handler(app)

data/lib/kazoo/router/dispatch.rb

@@ -0,0 +1,30 @@
+class Kazoo::Router
+  
+  module Dispatch
+    
+    def self.included(klass)
+      klass.send(:include, Common)
+      klass.set :type, :dispatch
+      klass.send(:extend, ClassMethods)
+    end
+    
+    module ClassMethods
+      
+      def map(&blk)
+        new.map(&blk)
+      end
+      
+    end
+    
+    def error_handler(app)
+      @error_handler = app
+    end
+    
+    def general_handler(app)
+      @general_handler = app
+    end
+    
+  end
+  
+  
+end

data/lib/kazoo/router/route.rb

@@ -5,14 +5,26 @@ class Kazoo::Router
     def initialize(path, opts = {})
       
       @named_params = []
-      @opts = opts
+      @opts = opts.dup
       
       # Extract & delete the special options
-      @app = opts.delete(:to)
+      app_mode = @opts.delete(:app_mode)
       
-      @path_prefix = opts.delete(:path_prefix)
-      @regex_prefix = opts.delete(:regex_prefix)
-      opts.delete(:name_prefix)
+      to = @opts.delete(:to)
+      default_app = @opts.delete(:default_app)
+      @app =  to || default_app
+      
+      raise ArgumentError, 'You must supply an application/block' if !@app && !app_mode
+      
+      @path_prefix = @opts.delete(:path_prefix)
+      @regex_prefix = @opts.delete(:regex_prefix)
+      @opts.delete(:name_prefix)
+      
+      @opts.each { |k,v|
+        next if k.is_a?(String)
+        @opts.delete(k)
+        @opts[k.to_s] = v
+      }
       
       # Parse the path
       if path.is_a?(String)
@@ -46,7 +58,7 @@ class Kazoo::Router
       
       final_path = "/#{final_path}" unless final_path.match(%r"^\/")
       final_path = "#{final_path}/" unless final_path.match(%r"\/$")
-      @matcher = Regexp.new("^#{final_path}")
+      @matcher = Regexp.new(app_mode ? "^#{final_path}$" : "^#{final_path}" )
     end
     
     def to_s

data/lib/kazoo/sinatra.rb

@@ -2,12 +2,17 @@ require 'sinatra/base'
 
 class Kazoo::Sinatra < Sinatra::Base
   
-  enable  :sessions
+  include Kazoo::App
   
   before do
     params.merge!(kenv['params']) if kenv['params']
   end
   
+  def call!(env)
+    @_bouncer ||= Kazoo::Bouncer.new(env)
+    super
+  end
+  
   def ksession
     session['kazoo'] ||= {}
   end
@@ -17,17 +22,22 @@ class Kazoo::Sinatra < Sinatra::Base
   end
   
   def current_user=(user)
-    if user
-      ksession['user_id'] = user.id
-      ksession['user_class'] = user.class.name
-    else
-      ksession['user_class'] = ksession['user_id'] = nil
-    end
+    @_bouncer.current_user = user
     user
   end
   
   def current_user
-    @_kcu ||= Kernal.const_get(k).find(ksession['user_id']) if ksession['user_id']
+    @_bouncer.current_user
+  end
+  
+  def authenticate!
+    unless @_bouncer.authenticated?
+      if @_bouncer.authenticate!
+        halt 302, {'Location' => request.env['rack.url_scheme'] + '://' +request.env['HTTP_HOST']  + request.env['REQUEST_PATH']}, ''
+      else
+        throw(:halt, [401, "Not authorized\n"])
+      end
+    end
   end
   
   def render(engine, data, options = {}, *args)
@@ -44,68 +54,6 @@ class Kazoo::Sinatra < Sinatra::Base
     super(engine, data, options, *args)
     
   end
-  
-  
-  def self.set_paths(opts)
-    opts.each { |k,v| path(k,v) }
-  end
-  
-  
-  def self.path(name, path = nil)
-    if path
-      raise ArgumentError, "Path must be a string" unless path.is_a?(String)
-      paths[name.to_sym] = path
-      path
-    else
-      paths[name.to_sym]
-    end
-  end
-  
-  def self.paths
-    @paths ||= {}
-  end
-  
-  def path(name,path)
-    self.class.path(name,path)
-  end
-  
-  def paths
-    self.class.paths
-  end
-  
-  def url(name = '', opts = {})
-    if name.is_a?(Symbol)
-      raise ArgumentError, "Invalid url name: #{name}" unless paths[name]
-    
-      url_path = paths[name].split('/').map { |part|
-        next unless part.is_a?(String)
-        if matches = part.match(/^:([a-z_]+)$/i)
-          matched = matches[1].downcase
-          opts[matched] || opts[matched.to_sym] || params[matched] || raise("You need to pass '#{matched}' to generate URL")
-        else
-          part
-        end
-      }.join('/')
-      
-      # Check for prefix
-      full_path = kenv['HTTP_PREFIX'] ? File.join(kenv['HTTP_PREFIX'], url_path) : url_path
-      
-      format = opts[:format] || opts['format']
-      full_path << ".#{format}" if format
-      
-      full_path
-    else
-      kenv['HTTP_PREFIX'] ? File.join(kenv['HTTP_PREFIX'], name) : name
-    end
-  end
-
-private
 
-  def decamelize(class_name)
-    parts = class_name.split('::')
-    parts.map { |part|
-      part.gsub(/([A-Z])/, '_\1').gsub(/(^\_)|(\_$)/, '').downcase
-    }.join('/')
-  end
   
 end

data/lib/kazoo/support.rb

@@ -1,5 +1,28 @@
 module Kazoo::Support
   
+  HTTP_CODES = {
+    400 => :bad_request,
+    401 => :unauthorized,
+    402 => :payment_required,
+    403 => :forbidden,
+    404 => :not_found,
+    405 => :method_not_allowed,
+    406 => :not_acceptable,
+    500 => :internal_server_error,
+    501 => :not_implemented,
+    502 => :bad_gateway,
+    503 => :service_unavailable,
+    504 => :gateway_timeout,
+    505 => :http_version_not_supported
+  }
+  
+  
+  def decamelize(class_name)
+    parts = class_name.split('::')
+    parts.map { |part|
+      part.gsub(/([A-Z])/, '_\1').gsub(/(^\_)|(\_$)/, '').downcase
+    }.join('/')
+  end
   
   def load_files(files)
     excepted_inits = []

data/readme.markdown

@@ -1,7 +1,7 @@
 Kazoo
 =====
 
-Kazoo is a Ruby framework to faciliate modular content management applications. So far, it's a router and some methods added to Sinatra to make it easier to have multiple Sinatra apps act more cohesively. Please note the current version on this: 0.0.4, so please be aware that it is not production ready yet. Kazoo is on rubygems.org so that you can install it by running:
+Kazoo is a Ruby framework to faciliate modular content management applications. So far, it's a router and some methods added to Sinatra to make it easier to have multiple Sinatra apps act more cohesively. Please be aware that it is not production ready yet. Kazoo is on rubygems.org so that you can install it by running:
 
     gem install kazoo
 

data/spec/router/route_spec.rb

@@ -3,14 +3,20 @@ require File.join(File.dirname(__FILE__), '../spec_helper')
 describe Kazoo::Router::Route do
   
   before(:each) do
-    @route = Kazoo::Router::Route.new('/your/:relative/is/:adjective')
-    @route2 = Kazoo::Router::Route.new('/testing')
+    blk = lambda { [200, { 'Content-Type' => 'text/plan' }, 'Success!'] }
+    @route = Kazoo::Router::Route.new('/your/:relative/is/:adjective', :to => blk)
+    @route2 = Kazoo::Router::Route.new('/testing', :to => blk, :test => 3)
+    @app_route = Kazoo::Router::Route.new('/testing', :app_mode => true)
   end
   
   it "extracts the variables from a path" do
     @route.named_params.should eq(['relative', 'adjective'])
   end
   
+  it "converts param keys to a string" do
+    @route2.extract_params('/testing/').keys.should eq(['test'])
+  end
+  
   it "generates a path with variables" do
     @route.path(:relative => 'mom', :adjective => 'huge').should eq(
       '/your/mom/is/huge'
@@ -36,4 +42,8 @@ describe Kazoo::Router::Route do
     @route2.extract_params('/testing_and_stuff').should eq(nil)
   end
   
+  it "matches exactly when acting as an app route" do
+    @app_route.to_regexp.inspect.should eq('/^\/testing\/$/')
+  end
+  
 end

data/spec/router_spec.rb

@@ -1,38 +1,72 @@
 require File.join(File.dirname(__FILE__), 'spec_helper')
 
+def path(p)
+  { 'PATH_INFO' => p }
+end
 
 describe Kazoo::Router do
 
-  before :each do
-    @proper_response = [200, {'Content-Type' => 'text/plain'}, 'Yay!']
-    @proper_response2 = [200, {'Content-Type' => 'text/plain'}, 'Response2']
-    @not_found_response = [404, {"X-Cascade"=>"pass", "Content-Type"=>"text/plain"}, "The requested URI is not found"]
-    
-    handler = lambda { @proper_response }
-    handler2 = lambda { @proper_response2 }
-    
-    @router = Kazoo::Router.map do
-      match '/something/:id', :to => handler
-      match '/something', :to => handler
-      match '/something_else', :to => handler2
+  
+  describe "dispatch mode" do
+    
+    before :each do
+      
+      @proper_response = [200, {'Content-Type' => 'text/plain'}, 'Yay!']
+      @proper_response2 = [200, {'Content-Type' => 'text/plain'}, 'Response2']
+      @not_found_response = [404, {"X-Cascade"=>"pass", "Content-Type"=>"text/plain"}, "The requested URI is not found"]
+    
+      handler = lambda { @proper_response }
+      handler2 = lambda { @proper_response2 }
+    
+      @router = Kazoo::Router.map do
+        match '/something/:id', :to => handler
+        match '/something', :to => handler
+        match '/something_else', :to => handler2
+      end
+    end
+    
+    it "routes to the proper handler" do
+      @router.call(path '/something').should eq(@proper_response)
+      @router.call(path '/something/else').should eq(@proper_response)
+    end
+    
+    it "sets the kazoo params" do
+      env = path '/something/123'
+      @router.call(env)
+      env['kazoo']['params'].should eq({'id' => '123'})
+    end
+    
+    it "matches later routes properly" do
+      @router.call(path '/something_else/testing_blah').should eq(@proper_response2)
+    end
+    
+    it "allows for a default app" do
+      router = Kazoo::Router.map do
+        default_app lambda { |hash|
+          raise "hell" unless hash
+          [200, {'Content-Type' => 'text/plain'}, "Hey!"]
+        }
+      end
     end
     
   end
   
-  it "routes to the proper handler" do
-    @router.call({ 'PATH_INFO' => '/something' }).should eq(@proper_response)
-    @router.call({ 'PATH_INFO' => '/something/else'}).should eq(@proper_response)
-  end
   
-  it "sets the kazoo params" do
-    env = { 'PATH_INFO' => '/something/123' }
-    @router.call(env)
-    env['kazoo']['params'].should eq({'id' => '123'})
+  describe "app mode" do
+    
+    before :each do
+      @router = Kazoo::Router.map do
+        set :mode, :app
+        match '/testing', :view => 'good'
+      end
+    end
+    
+    it "returns a hash" do
+      @router.call(path '/testing').should eq({'view' => 'good'})
+    end
+    
+    
   end
   
-  it "matches later routes properly" do
-    env = { 'PATH_INFO' => '/something_else/testing_blah' }
-    @router.call(env).should eq(@proper_response2)
-  end
   
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: kazoo
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 19
   prerelease: 
   segments: 
   - 0
   - 0
-  - 5
-  version: 0.0.5
+  - 6
+  version: 0.0.6
 platform: ruby
 authors: 
 - Jeremy Nicoll
@@ -36,7 +36,7 @@ cert_chain:
   ZVeyFF4suKZEIEKi
   -----END CERTIFICATE-----
 
-date: 2011-02-16 00:00:00 -07:00
+date: 2011-03-10 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
@@ -49,8 +49,14 @@ extensions: []
 extra_rdoc_files: 
 - lib/kazoo.rb
 - lib/kazoo/accessors.rb
+- lib/kazoo/app.rb
+- lib/kazoo/bouncer.rb
+- lib/kazoo/bouncer/authenticator.rb
 - lib/kazoo/router.rb
+- lib/kazoo/router/app.rb
+- lib/kazoo/router/common.rb
 - lib/kazoo/router/context.rb
+- lib/kazoo/router/dispatch.rb
 - lib/kazoo/router/route.rb
 - lib/kazoo/sinatra.rb
 - lib/kazoo/support.rb
@@ -60,8 +66,14 @@ files:
 - Rakefile
 - lib/kazoo.rb
 - lib/kazoo/accessors.rb
+- lib/kazoo/app.rb
+- lib/kazoo/bouncer.rb
+- lib/kazoo/bouncer/authenticator.rb
 - lib/kazoo/router.rb
+- lib/kazoo/router/app.rb
+- lib/kazoo/router/common.rb
 - lib/kazoo/router/context.rb
+- lib/kazoo/router/dispatch.rb
 - lib/kazoo/router/route.rb
 - lib/kazoo/sinatra.rb
 - lib/kazoo/support.rb