picombo 0.1.0 → 0.2.0

data/lib/classes/{cache_file.rb → cache/file.rb}

@@ -1,13 +1,20 @@
 module Picombo
+	# == Cache_File Class
+	#
+	# Handles driver level logic for file based caching.
+	#
+	# Not used by end users. Should only be called from main cache class
 	class Cache_File
 		@@config = nil
 
+		# Constructor.
 		def initialize(config)
 			@@config = config
 			raise "Cache directory does not exist: "+APPPATH+'cache' unless File.directory?(APPPATH+'cache/')
 			raise "Cache directory not writable: "+APPPATH+'cache' unless File.writable?(APPPATH+'cache/')
 		end
 
+		# Finds an array of files that exist for a specified key
 		def exists(keys)
 			return Dir.glob(APPPATH+'cache/*~*') if keys == true
 
@@ -21,6 +28,7 @@ module Picombo
 			paths.uniq
 		end
 
+		# Writes a config value to a file
 		def set(items, lifetime)
 			lifetime+=Time.now.to_i
 
@@ -35,6 +43,7 @@ module Picombo
 			return true
 		end
 
+		# Retreives a cached item or items
 		def get(keys, single = false)
 			items = []
 
@@ -60,18 +69,21 @@ module Picombo
 			end
 		end
 
+		# Deletes a cache entry
 		def delete(keys)
 			exists(keys).each do |file|
 				File.unlink(file)
 			end
 		end
 
+		# Deletes all cache entries
 		def delete_all
 			exists(true).each do |file|
 				File.unlink(file)
 			end
 		end
 
+		# Determines if a cache entry is expired or not
 		def expired(file)
 			expires = file[file.index('~') + 1, file.length]
 			return (expires != 0 and expires.to_i <= Time.now.to_i);

data/lib/classes/config.rb

@@ -1,4 +1,40 @@
+require 'yaml'
+
 module Picombo
+	# == Config Class
+	#
+	# Handles retreiving of key value storage items
+	#
+	# Picombo uses config items internally to keep track of common or long term configuration values. These settings are stored in yaml files.
+	#
+	# === Overview
+	# There are several built in config file types:
+	#  * config.yaml
+	#  * datamapper.yaml
+	#  * cache.yaml
+	#  * log.yaml
+	#  * mimes.yaml
+	#
+	# The only file required to be in your application directory is config.yaml. The rest of the files are defined in the system location.
+	# You can change/overwrite the system values by creating the file in your application directory and specifying your application values there.
+	# Please refer to the source system files for examples.
+	#
+	# === Usage
+	# To call config values, use the Picombo::Config.get method. The first parameter is the path of your config value, using dot notation. With dot notation, the first part is the filename, and everything after that is the path inside the file.
+	#
+	# ==== Example
+	# For the following file (datamapper.yaml):
+	#
+	# 	default:
+	# 	 driver: mysql
+	# 	 host: localhost
+	# 	 database: picom_db
+	# 	 username: picom_u
+	# 	 password: picom_p
+	#
+	# You can get the database config value like:
+	#
+	# Picombo::Config.get('datamapper.default.database')
 	class Config
 		include Enumerable
 

data/lib/classes/cookie.rb

@@ -1,4 +1,17 @@
 module Picombo
+	# == Cookie handling class
+	#
+	# In essense, a proxy to the rack cookie handling methods.
+	#
+	# == Example usage
+	# Writing cookie values
+	# 	Picombo::Cookie.set(:sample, 'this is the content of the cookie')
+	#
+	# Getting cookie values
+	# 	Picombo::Cookie.get(:sample)
+	#
+	# Deleting a cookie
+	# 	Picombo::Cookie.delete(:sample)
 	class Cookie
 		include Singleton
 

data/lib/classes/e404.rb

@@ -1,4 +1,5 @@
 module Picombo
+	# == Main 404 exception class. Used to detect 404 errors in the app
 	class E404 < Exception
 		
 	end

data/lib/classes/event.rb

@@ -76,8 +76,8 @@ module Picombo
 		#
 		# Remove one or all of the callbacks from a given event.
 		#
-		def self.clear!(name, callback = nil)
-			return false unless @@events.include?(name)
+		def self.clear!(name = nil, callback = nil)
+			@@events = {} if name.nil?
 
 			if callback.nil?
 				@@events[name] = []

data/lib/classes/html.rb

@@ -1,7 +1,6 @@
 module Picombo
 
 	# Helper class to generate HTML
-
 	class Html
 		include Singleton
 
@@ -16,6 +15,7 @@ module Picombo
 			safe.join
 		end
 
+		# Returns a html link tag for +css+
 		def self.style(css)
 			unless css.is_a? Array
 				return '<link type="text/css" href="'+Picombo::Url.base()+css+'" rel="stylesheet" />'
@@ -29,6 +29,7 @@ module Picombo
 			to_return
 		end
 
+		# Returns a html script tag for +js+
 		def self.script(js)
 			unless js.is_a? Array
 				return '<script type="text/javascript" src="'+Url.base()+js+'"></script>'

data/lib/classes/log.rb

@@ -16,7 +16,7 @@ module Picombo
 	class Log
 		include Singleton
 
-		# Writes log entry with level +type+:: with +message+::
+		# Writes log entry with level +type+ with +message+
 		def self.write(type, message)
 			types = {:none => 0, :info => 1, :warning => 2, :notice => 3, :debug => 4}
 

data/lib/classes/router.rb

@@ -3,52 +3,68 @@ module Picombo
 	# Processes the URI to route requests to proper controller
 	#
 	# == Using Routes
-	# Routes are defined in the +config/routes.yaml+:: config file.
+	# Routes are defined in the +config/routes.rb+ config file.
 	#
-	# There should always be a 'default' route, which is the route that applies when there are no uri segments. ex: +default: controller/method+::
+	# There should always be a '_default' route, which is the route that applies when there are no uri segments. ex: +Picombo::Router.add('_default', 'controller/method')+
 	#
-	# The first kind of route is an exact match route. This will look for a URI match in the keys of the routes file. ex: +foobar/baz: controller/method+::
+	# The first kind of route is an exact match route. This will look for a URI match in the keys of the routes file. ex: +Picombo::Router.add('foobar/baz', 'controller/method')+
 	#
 	# You can also use regex routes for more powerful routing:
-	# * A catch-all route: .+: controller/method
-	# * Routing all second URI segments to the index method: foobar/(.+): foobar/index
-	# * ([a-z]{2}): chamber/video/\1
+	# * A catch-all route: Picombo::Router.add(Regexp.new(/(.+)/), 'controller/method')
+	# * Routing all second URI segments to the index method: Picombo::Router.add(Regexp.new(/foobar\/(.+)/), 'foobar/index')
+	# * Picombo::Router.add(Regexp.new(/([a-z]{2})/), 'chamber/video/\1')
+	#
+	# === Using lambdas for routes
+	# You can use lamba methods for complex routing schemes that rely on extra logic. The first parameter to the lambda method is the source uri as a string
+	#
+	# 	Picombo::Route.add('my complex route', lambda{ |path|
+	# 			if Regexp.new('(complex|foobar)/([a-z]{2})/(.+)').match(path)
+	# 				{:controller => 'city', :method => 'index', :params => Regexp.last_match[2,3]}
+	# 		end
+	#  })
 
 	class Router
 		@@req = nil
+		@@routes = {}
 
-		# Data writer.
-		def self.routes=(routes)
-			@@routes = routes
-		end
+		# Assigns the current uri of the request
 		def self.current_uri=(current_uri)
 			@@current_uri = current_uri
 		end
+		# Reads the current uri of the request
 		def self.current_uri
 			@@current_uri
 		end
+		# Assigns the current segments of the request
 		def self.segments=(segments)
 			@@segments = segments
 		end
+		# Reads the current segments of the request
 		def self.segments
 			@@segments
 		end
+		# Assigns the current rsegments of the request
 		def self.rsegments=(rsegments)
 			@@rsegments = rsegments
 		end
+		# Assigns the current controller of the request
 		def self.controller=(controller)
 			@@controller = controller
 		end
+		# Reads the current controller of the request
 		def self.controller
 			@@controller
 		end
+		# Assigns the current method of the request
 		def self.method=(method)
 			@@method = method
 		end
+		# Reads the current method of the request
 		def self.method
 			@@method
 		end
 
+		# Initializes the request
 		def initialize(req)
 			@@req = req
 		end
@@ -60,8 +76,7 @@ module Picombo
 			Picombo::Event.run('system.pre_router')
 			# Find the controller and method
 			uri = @@req.path
-			path = uri[0..-(File.extname(uri).length+1)]
-			uri = Picombo::Router.process_uri(path)
+			uri = Picombo::Router.process_uri(uri)
 
 			# Let events have the ability to modify the uri array
 			Picombo::Event.run('system.post_router', uri)
@@ -94,7 +109,7 @@ module Picombo
 					return Picombo::Controllers::Error_404.new.run_error(@@req.path)
 				end
 			else
-				return Picombo::Controllers::Error_404.new.run_error(uri.inspect)
+				return Picombo::Controllers::Error_404.new.run_error(@@req.path)
 			end
 			Picombo::Event.run('system.post_controller')
 
@@ -104,27 +119,56 @@ module Picombo
 			Picombo::Core.render
 		end
 
+		# Adds a route to the router
+		# 
+		# * key - the name of the route (optionally the source URI for simple routes)
+		# * val - the destination of the route (optionally a lambda for complex routes)
+		def self.add(key, val, style = nil)
+			@@routes[key] = {:val => val, :generate => style}
+		end
+
+		# Generates a routed URI based on paramaters
+		def self.generate(key, params = [])
+			raise ArgumentError.new('The route: "'+key+'" doesn\'t exist!') if ! @@routes.key?(key)
+			route = @@routes[key]
+
+			routing_string  = route[:generate]
+
+			params.each do |key, value|
+				routing_string.gsub!('{'+key.to_s+'}', value)
+			end
+
+			routing_string
+		end
+
 		# Takes a uri path string and determines the controller, method and any get parameters
 		# Uses the routes config file for translation
 		def self.process_uri(path)
-			router_parts = path == '/' ? ('/'+Picombo::Config.get('routes._default')).split('/') : path.split('/')
+
+			# Load routes
+			Picombo::Core.find_file('config', 'routes').each do |file|
+				require file
+			end
+
+			router_parts = path == '/' ? ('/'+@@routes['_default'][:val]).split('/') : path.split('/')
 			@@current_uri = path.split('?').at(0)
 			@@segments = @@current_uri.split('/')[1..-1]
 			@@rsegments = router_parts[1..-1]
 			routed_uri = @@current_uri
 
-			# Load routes
-			routes = Picombo::Config.load('routes')
-
 			# Try and find a direct match
-			if routes.key?(@@current_uri)
-				routed_uri = routes[@@current_uri]
+			if @@routes.key?(@@current_uri)
+				routed_uri = @@routes[@@current_uri][:val]
 				@@rsegments = routed_uri.split('/')
 			else
-				routes.each do |route, destination|
-					if route != '_default'
-						if Regexp.new(route).match(@@current_uri)
-							routed_uri.gsub!(Regexp.new(route), destination)
+				@@routes.each do |route, destination|
+					if destination[:val].is_a?(Proc)
+						route = destination[:val].call(@@current_uri)
+						return route if ! route.nil?
+					elsif route.is_a?(Regexp)
+						match = route.match(@@current_uri)
+						if ! match.nil? and match.length > 1
+							routed_uri.gsub!(Regexp.new(route), destination[:val])
 							@@rsegments = routed_uri.split('/')[1..-1]
 						end
 					end
@@ -145,11 +189,11 @@ module Picombo
 			if ! @@rsegments[1].nil?
 				@@rsegments[1] = @@rsegments[1].split('?').at(0)
 			else
-				@@rsegments[1] = ('/'+Picombo::Config.get('routes._default')).split('/').at(2)
+				@@rsegments[1] = ('/'+@@routes['_default'][:val]).split('/').at(2)
 			end
 
 			# make sure to remove the GET from any of the parameters
-			{:controller => @@rsegments[0].split('?').at(0), :method => @@rsegments[1], :params => params}
+			{:controller => @@rsegments[0].split('?').at(0).gsub('.', '').downcase, :method => @@rsegments[1], :params => params}
 		end
 	end
 end

data/lib/classes/session.rb

@@ -1,11 +1,24 @@
 module Picombo
+	# == Session handling class
+	#
+	# In essense, a proxy to the rack session handling methods.
+	#
+	# == Example usage
+	# Writing cookie values
+	# 	Picombo::Session.set(:sample, 'this is the content of the session var')
+	#
+	# Getting cookie values
+	# 	Picombo::Session.get(:sample)
 	class Session
 		include Singleton
 
+		# Initializes the request for cookies
 		def init(req)
 			@@req = req
 		end
 
+		# Retrieves a session item defined by key, returns default if item doesn't exist
+		# You can retreive the entire session by omiting the key paramter
 		def get(key = nil, default = nil)
 			return @@req.session if key.nil?
 
@@ -14,8 +27,14 @@ module Picombo
 			return result.nil? ? default : result
 		end
 
+		# Sets a session item defined by key to val
 		def set(key, val)
 			@@req.session[key] = val
 		end
+
+		# Unsets a session variable
+		def unset(key)
+			@@req.session.delete(key)
+		end
 	end
 end

data/lib/classes/view/stache.rb

@@ -0,0 +1,18 @@
+module Picombo
+	module View
+		# == XML View
+		#
+		# The core view renders XML to the browser
+		#
+		# See the View documentation for usage specifics
+		class Stache < Mustache
+			# Standard constructor
+			def initialize(filename)
+				super(filename)
+
+				# Changes the content type to xml for the application
+				Picombo::Core.raw_response()['Content-Type'] = 'text/xml'
+			end
+		end
+	end
+end

data/lib/classes/view/xml.rb

@@ -6,6 +6,7 @@ module Picombo
 		#
 		# See the View documentation for usage specifics
 		class XML < Picombo::View::Core
+			# Standard constructor
 			def initialize(filename)
 				super(filename)
 

data/lib/classes/view.rb

@@ -28,6 +28,8 @@ module Picombo
 		#
 		# See the View documentation for usage specifics
 		class Core
+			require 'erb'
+
 			@view_file = ''
 			@view_data = []
 
@@ -54,17 +56,18 @@ module Picombo
 			end
 
 			# Renders the view to the output buffer, or optionally simply returns it if echo is true
-			def render(echo = false)
+			def render(return_output = false)
 				view = ERB::new(File.read(@view_file))
 
-				if echo
-					view.result(get_binding())
+				if return_output
+					return view.result(get_binding())
 				else
 					Picombo::Core.response view.result(get_binding())
 				end
 			end
 		end
 
+		# Autoloader for missing view constants. Used to load non-standard view classes like XML.
 		def View.const_missing(name)
 			filename = name.to_s
 

data/lib/config/routes.rb

@@ -0,0 +1 @@
+Picombo::Router.add('_default', 'test/index')

data/lib/controllers/error/404.rb

@@ -0,0 +1,15 @@
+module Picombo
+	module Controllers
+		# == Controller class for handling 404 events
+		#
+		# To override, re-define this in your application's controller directory
+		class Error_404
+			# Displays a 404 message for the current uri
+			def run_error(uri)
+				body = Picombo::Stache::Error_404.new
+				body.uri = uri
+				return [404, {'Content-Type' => 'text/html'}, body.output]
+			end
+		end
+	end
+end

data/lib/controllers/template.rb

@@ -11,23 +11,29 @@ module Picombo
 		# 		super
 		# 	end
 		#
-		# The default template view is called 'template' which is located in views/template.rhtml. You can change this on a per controller basis by changing the @@template vartiable in the controller:
+		# The default template view is called 'layout' which is located in views/layout.rb. You can change this on a per controller basis by changing the @template vartiable in the controller's constructor:
 		#
-		# 	@@template = 'foobar_template'
+		# 	@template = 'foobar_template'
 		#
-		# Now, you can use @@template in your controller and it will always use the same template. The template will automatically render at the end of the controller execution, so there is no need to call @@template.render manually
+		# Now, you can use @template in your controller and it will always use the same template. The template will automatically render at the end of the controller execution, so there is no need to call @template.output manually
 		class Template
-			@@template = 'template'
-			@@auto_render = true
-
 			def initialize
-				@@template = Picombo::View::Core.new(@@template) if @@template.is_a?(String)
+				@template = 'layout' if @template.nil?
+				@auto_render = true
+
+				@template = Picombo::Stache::const_get(@template.capitalize).new if @template.is_a?(String)
 
-				Picombo::Event.add('system.post_controller', 'Picombo::Controllers::Template.render') if @@auto_render
+				Picombo::Event.add('system.post_controller', [self, 'render']) if @auto_render
 			end
 
-			def self.render
-				@@template.render if @@auto_render
+			def render
+				if @auto_render
+					if Picombo::Core.cli
+						return @template.render
+					end
+
+					@template.output
+				end
 			end
 		end
 	end

data/lib/core/core.rb

@@ -9,12 +9,23 @@
 # It's designed to be fast, lightweight and easy to use.
 
 module Picombo
+	# == Core
+	#
+	# The core class for Picombo. Handles system initialization and other core functionality.
 	class Core
 		@@extension = 'html'
+		@@cli = false
+
+		# Determines if the request was made on the CLI or not
+		def self.cli
+			@@cli
+		end
 
-		def self.extension()
+		# Gets the extension of the request
+		def self.extension
 			@@extension
 		end
+		# Assigns the extension of the request
 		def self.extension=(extension)
 			@@extension = extension
 		end
@@ -25,6 +36,8 @@ module Picombo
 			Picombo::Bench.instance.start('application')
 			Picombo::Bench.instance.start('loading')
 
+			Picombo::Event.clear!
+
 			@@env = env
 			@@req = Rack::Request.new(env)
 
@@ -110,7 +123,7 @@ module Picombo
 			files = []
 			$LOAD_PATH.each do |path|
 				if File.exist?(path+'/'+directory+'/'+file+ext)
-					files.unshift(path+'/'+directory+'/'+file+ext)
+					files.unshift(path.chomp('/')+'/'+directory+'/'+file+ext)
 				end
 			end
 
@@ -143,7 +156,7 @@ module Picombo
 	def Picombo.const_missing(name)
 		filename = name.to_s
 
-		require 'classes/'+filename
+		require 'classes/'+filename.gsub(/_/, '/')
 
 		raise filename+' not found!' if ! const_defined?(name)
 
@@ -173,7 +186,7 @@ module Picombo
 		def Models.const_missing(name)
 			filename = name.to_s
 
-			require 'models/'+filename.downcase
+			require 'models/'+filename.downcase.gsub(/_/, '/')
 
 			raise filename+' not found!' if ! const_defined?(name)
 
@@ -222,7 +235,7 @@ module Picombo
 		def Controllers.const_missing(name)
 			filename = name.to_s
 
-			require 'controllers/'+filename
+			require 'controllers/'+filename.gsub(/_/, '/')
 
 			raise LoadError if ! const_defined?(name)
 

data/lib/core/core_cli.rb

@@ -0,0 +1,88 @@
+require 'core/core'
+
+module Picombo
+	# == Core
+	#
+	# The core class for Picombo. Handles system initialization and other core functionality.
+	class Core
+
+		# Standard call function that gets invoked by Rack
+		def call
+			@@cli = true
+
+			# start system benchmark
+			Picombo::Bench.instance.start('application')
+			Picombo::Bench.instance.start('loading')
+
+			@@req = Picombo::CLI_Request.new(ARGV[0])
+
+			@@response = Picombo::CLI_Response.new
+			@@redirect = []
+
+			# Add directory extensions to the filesystem
+			Picombo::Config.get('config.extensions').each do |extension|
+				require extension
+			end
+			$LOAD_PATH.delete(APPPATH)
+			$LOAD_PATH.unshift(APPPATH)
+
+			# Load hooks
+			Picombo::Config.get('config.hooks').each do |hook|
+				Picombo::Core.find_file('hooks', hook).each do |file|
+					require file
+				end
+			end
+
+			Picombo::Bench.instance.stop('loading')
+
+			Picombo::Log.write(:debug, 'Picombo Setup Complete')
+			output = Picombo::Router.new(@@req).process()
+
+			Picombo::Event.run('system.shutdown')
+
+			output
+		end
+
+		# Adds content to the output buffer
+		def self.response(str)
+			@@response.write(str)
+		end
+
+		# Renders output. Returns empty string, because all output should be "puts"'d
+		def self.render
+			''
+		end
+	end
+
+	# Overloaded CLI Request object for compatibility
+	class CLI_Request
+		# Assigns the request path
+		def initialize(path)
+			@path = path
+		end
+
+		# Returns the request path
+		def path
+			@path
+		end
+	end
+
+	# Overloaded CLI Response object for compatibility
+	class CLI_Response
+		@writer = lambda { |x| @body << x }
+		@body = []
+
+		# Writes content to the buffer
+		def write(str)
+			s = str.to_s
+			@writer.call s
+
+			str
+		end
+
+		# returns the buffer
+		def finish
+			@body
+		end
+	end
+end

data/lib/hooks/datamapper.rb

@@ -1,3 +1,5 @@
+require 'dm-core'
+
 # Set up database
 DataMapper.setup(:default,
                  {:host => Picombo::Config.get('datamapper.default.host'),

data/lib/hooks/mustache.rb

@@ -0,0 +1,24 @@
+require 'mustache'
+
+module Picombo
+	module Stache
+		# Autoloader for missing mustache classes.
+		def Stache.const_missing(name)
+			filename = name.to_s
+
+			require 'views/'+filename.downcase.gsub(/_/, '/')
+
+			raise name.to_s+' not found!' if ! const_defined?(name)
+
+			klass = const_get(name)
+			return klass if klass
+			raise klass+" not found!"
+		end
+	end
+end
+
+class Mustache
+	def output
+		Picombo::Core.response(render)
+	end
+end

data/lib/{bootstrap.rb → picombo.rb}

@@ -1,16 +1,12 @@
-require 'thin'
-require 'erb'
-require 'yaml'
-require 'dm-core'
+# to customize this, place a copy of picombo.rb in your application folder
+
 require 'singleton'
 require 'core/core'
 require 'classes/config'
 
+# This is where the magic happens!
 def run_system()
 	app = Rack::Builder.new do
-		use Rack::ShowExceptions
-		#use Rack::Reloader
-		use Rack::Static, :urls => ['/css', '/images']
 		use Rack::Session::Cookie
 		run Picombo::Core.new
 	end

data/lib/views/error/404.mustache

@@ -0,0 +1,2 @@
+<h1>Page Not Found</h1>
+<p>The page you requested, <em>{{uri}}</em>, was not found.</p>

data/lib/views/error/404.rb

@@ -0,0 +1,17 @@
+module Picombo
+	module Stache
+		class Error_404 < Mustache
+			self.template = File.open(Picombo::Core.find_file('views', 'error/404', true, 'mustache').shift).read
+
+			@uri = nil
+
+			def uri=(uri)
+				@uri = uri
+			end
+
+			def uri
+				@uri
+			end
+		end
+	end
+end

data/lib/views/tests/test.rhtml

@@ -0,0 +1 @@
+Test <%= @test %>

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: picombo
 version: !ruby/object:Gem::Version 
-  version: 0.1.0
+  prerelease: false
+  segments: 
+  - 0
+  - 2
+  - 0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Jeremy Bush
@@ -9,11 +14,11 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-23 00:00:00 -05:00
+date: 2010-06-08 00:00:00 -05:00
 default_executable: 
 dependencies: []
 
-description: Picombo is a lightweight MVC framework inspired by the Kohana PHP MVC framework.
+description: Picombo is a lightweight MVC web framework that enables you to create websites quickly.
 email: contractfrombelow@gmail.com
 executables: []
 
@@ -22,38 +27,43 @@ extensions: []
 extra_rdoc_files: []
 
 files: 
-- lib/bootstrap.rb
-- lib/classes/bench.rb
-- lib/classes/cache.rb
-- lib/classes/cache_file.rb
-- lib/classes/config.rb
-- lib/classes/cookie.rb
-- lib/classes/e404.rb
-- lib/classes/event.rb
-- lib/classes/html.rb
-- lib/classes/input.rb
-- lib/classes/log.rb
-- lib/classes/router.rb
-- lib/classes/security.rb
-- lib/classes/session.rb
-- lib/classes/url.rb
-- lib/classes/view
-- lib/classes/view/xml.rb
-- lib/classes/view.rb
-- lib/config/cache.yaml
-- lib/config/log.yaml
-- lib/config/mimes.yaml
-- lib/config/routes.yaml
-- lib/controllers
-- lib/controllers/error_404.rb
-- lib/controllers/template.rb
-- lib/core/core.rb
-- lib/hooks/datamapper.rb
-- lib/hooks/profiler.rb
-- lib/views/404.rhtml
-- lib/views/bench/footer.rhtml
-has_rdoc: false
+- ./lib/classes/bench.rb
+- ./lib/classes/cache/file.rb
+- ./lib/classes/cache.rb
+- ./lib/classes/config.rb
+- ./lib/classes/cookie.rb
+- ./lib/classes/e404.rb
+- ./lib/classes/event.rb
+- ./lib/classes/html.rb
+- ./lib/classes/input.rb
+- ./lib/classes/log.rb
+- ./lib/classes/router.rb
+- ./lib/classes/security.rb
+- ./lib/classes/session.rb
+- ./lib/classes/url.rb
+- ./lib/classes/view/stache.rb
+- ./lib/classes/view/xml.rb
+- ./lib/classes/view.rb
+- ./lib/config/cache.yaml
+- ./lib/config/log.yaml
+- ./lib/config/mimes.yaml
+- ./lib/config/routes.rb
+- ./lib/controllers/error/404.rb
+- ./lib/controllers/template.rb
+- ./lib/core/core.rb
+- ./lib/core/core_cli.rb
+- ./lib/hooks/datamapper.rb
+- ./lib/hooks/mustache.rb
+- ./lib/hooks/profiler.rb
+- ./lib/picombo.rb
+- ./lib/views/bench/footer.rhtml
+- ./lib/views/error/404.mustache
+- ./lib/views/error/404.rb
+- ./lib/views/tests/test.rhtml
+has_rdoc: true
 homepage: http://www.picombo.net/
+licenses: []
+
 post_install_message: 
 rdoc_options: []
 
@@ -63,20 +73,22 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.1
+rubygems_version: 1.3.6
 signing_key: 
-specification_version: 2
+specification_version: 3
 summary: A lightweight MVC web framework
 test_files: []
 

data/lib/config/routes.yaml

@@ -1 +0,0 @@
-_default: test/index

data/lib/controllers/error_404.rb

@@ -1,11 +0,0 @@
-module Picombo
-	module Controllers
-		class Error_404
-			def run_error(uri)
-				body = Picombo::View::Core.new('404')
-				body.set('uri', uri)
-				return [404, {'Content-Type' => 'text/html'}, body.render(true)]
-			end
-		end
-	end
-end

data/lib/views/404.rhtml

@@ -1,2 +0,0 @@
-<h1>Page Not Found</h1>
-<p>The page you requested, <%= @uri %>, was not found.</p>