picombo 0.2.5 → 0.3.0

data/lib/classes/router.rb

@@ -86,7 +86,7 @@ module Picombo
 			# Try and load the controller class
 			begin
 				controller = Picombo::Controllers::const_get(uri[:controller].capitalize!).new
-			rescue LoadError
+			rescue LoadError, NameError
 				return Picombo::Controllers::Error_404.new.run_error(@@req.path)
 			end
 

data/lib/core/core.rb

@@ -13,7 +13,6 @@ module Picombo
 	#
 	# 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
@@ -21,15 +20,6 @@ module Picombo
 			@@cli
 		end
 
-		# Gets the extension of the request
-		def self.extension
-			@@extension
-		end
-		# Assigns the extension of the request
-		def self.extension=(extension)
-			@@extension = extension
-		end
-
 		# Standard call function that gets invoked by Rack
 		def call(env)
 			# start system benchmark
@@ -41,11 +31,7 @@ module Picombo
 			@@env = env
 			@@req = Rack::Request.new(env)
 
-			@@extension = File.extname(@@req.path)[1..-1]
-			@@extension = 'html' if @@extension.nil?
-
 			@@response = Rack::Response.new
-			#@@response['Content-Type'] = Picombo::Config.load('mimes.'+@@extension)[0]
 			@@response['Content-Type'] = 'text/html'
 			@@response.status = 200
 			@@redirect = []
@@ -60,7 +46,7 @@ module Picombo
 			# Load hooks
 			Picombo::Config.get('config.hooks').each do |hook|
 				Picombo::Core.find_file('hooks', hook).each do |file|
-					require file
+					load file
 				end
 			end
 

data/lib/hooks/profiler.rb

@@ -1,3 +1,3 @@
 Picombo::Event.add('system.display') do
-	Picombo::View::Core.new('bench/footer').render()
+	Picombo::Stache::Bench_Footer.new.output
 end

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 2
-  - 5
-  version: 0.2.5
+  - 3
+  - 0
+  version: 0.3.0
 platform: ruby
 authors: 
 - Jeremy Bush
@@ -14,10 +14,37 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-08 00:00:00 -05:00
+date: 2010-06-15 00:00:00 -05:00
 default_executable: 
-dependencies: []
-
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: rack
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 0
+        - 0
+        version: 1.0.0
+  type: :runtime
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: mustache
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 10
+        - 0
+        version: 0.10.0
+  type: :runtime
+  version_requirements: *id002
 description: Picombo is a lightweight MVC web framework that enables you to create websites quickly.
 email: contractfrombelow@gmail.com
 executables: []
@@ -38,12 +65,8 @@ files:
 - ./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
@@ -55,10 +78,8 @@ files:
 - ./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: []

data/lib/classes/security.rb

@@ -1,46 +0,0 @@
-module Picombo
-	# Helper class for security things like xss
-	class Security
-		# Returns the base URL for use with any internal links.
-		def self.xss_clean(str, driver = nil)
-			driver = 'default' if driver.nil? or driver == true
-
-			Security.send(driver, str)
-		end
-
-		#This is a blacklist method, so ensure this is what you really want
-		def self.bitkeeper(str)
-			# clean any control characters
-			str.gsub!(/[\x00-\x20]*/, '')
-			# clean null byte
-			str.gsub!(/[\0]/, '')
-
-			# Remove javascript: and vbscript: protocols
-			str.gsub!(/([a-z]*)=([`"]*)javascript:/iu, '\1=\2nojavascript....')
-			str.gsub!(/([a-z]*)=([`"]*)vbscript:/iu, '\1=\2novbscript....')
-			str.gsub!(/#([a-z]*)=(["]*)-moz-binding:/u, '\1=\2nomozbinding...')
-
-			# Only works in IE: <span style="width: expression(alert('Ping!'));"></span>
-			str.gsub!(/(<[^>]+?)style=[`"]*.*?expression\([^>]*>/i, '\1>')
-			str.gsub!(/(<[^>]+?)style=[`"]*.*?behaviour\([^>]*>/i, '\1>')
-			str.gsub!(/(<[^>]+?)style=[`"]*.*?script:*[^>]*>/iu, '\1>')
-
-			# Remove namespaced elements (we do not need them)
-			data = str.gsub(/<\/*\w+:\w[^>]*>/i, '')
-
-			begin
-				old_data = data
-				data.gsub!(/<\/*(?:applet|b(?:ase|gsound|link)|embed|frame(?:set)?|i(?:frame|layer)|l(?:ayer|ink)|meta|object|s(?:cript|tyle)|title|xml)[^>]*>/i, '')
-			end until old_data == data
-
-			data
-		end
-
-		#default cleaner. encodes the strign to prevent xss
-		def self.default(str)
-			require 'htmlentities'
-
-			HTMLEntities.new.encode(str)
-		end
-	end
-end

data/lib/classes/view/stache.rb

@@ -1,18 +0,0 @@
-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

@@ -1,18 +0,0 @@
-module Picombo
-	module View
-		# == XML View
-		#
-		# The core view renders XML to the browser
-		#
-		# See the View documentation for usage specifics
-		class XML < Picombo::View::Core
-			# 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.rb

@@ -1,83 +0,0 @@
-module Picombo
-	# == View Class
-	#
-	# The Picombo::View class allows for template files to be rendered and displayed in the browser.
-	#
-	# By default, only ERB templating is currently supported.
-	# === Examples
-	#
-	# 	foobar = Picombo::View::Core.new('template')
-	# 	# Sets a view variable
-	# 	foobar.set('bar', 'baz')
-	# 	# Renders the view to the output buffer
-	# 	foobar.render
-	#
-	# You can also nest views like so:
-	# 
-	# 	body = Picombo::View::Core.new('page/body')
-	# 	body.set('content', 'Hello World!')
-	# 	template = Picombo::View::Core.new('template')
-	# 	template.set('body', body.render(true))
-	# 	template.render
-	#
-	# This will render a body subview inside of your template view file
-	module View
-		# == Core View
-		#
-		# The core view renders HTML to the browser using ERB
-		#
-		# See the View documentation for usage specifics
-		class Core
-			require 'erb'
-
-			@view_file = ''
-			@view_data = []
-
-			# Creates a new view object and sets the filename. Raises an IOError exception if the view file is not found
-			def initialize(filename)
-				@view_data = {}
-				view_location = Picombo::Core.find_file('views', filename, false, 'rhtml').shift
-
-				if view_location.nil?
-					raise IOError
-				end
-
-				@view_file = view_location
-			end
-
-			# Support templating of member data.
-			def get_binding
-				binding
-			end
-
-			# Sets a view variable
-			def set(key, val)
-				instance_variable_set "@#{key}", val
-			end
-
-			# Renders the view to the output buffer, or optionally simply returns it if echo is true
-			def render(return_output = false)
-				view = ERB::new(File.read(@view_file))
-
-				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
-
-			require 'classes/view/'+filename.downcase
-
-			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

data/lib/views/bench/footer.rhtml

@@ -1,22 +0,0 @@
-<table style="width: 100%">
-	<tr>
-		<th align="left">System Benchmarks</th>
-		<th align="right">Time</th>
-	</tr>
-	<tr>
-		<td>Picombo Setup</td>
-		<td align="right"><%= Picombo::Bench.instance.get('loading') %></td>
-	</tr>
-	<tr>
-		<td>Environment Setup</td>
-		<td align="right"><%= Picombo::Bench.instance.get('setup') %></td>
-	</tr>
-	<tr>
-		<td>Controller Execution</td>
-		<td align="right"><%= Picombo::Bench.instance.get('controller_execution') %></td>
-	</tr>
-	<tr>
-		<td>Total Execution</td>
-		<td align="right"><%= Picombo::Bench.instance.get('application') %></td>
-	</tr>
-</table>

data/lib/views/tests/test.rhtml

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