picombo 0.3.0 → 0.3.1

data/lib/classes/input.rb

@@ -7,13 +7,6 @@ module Picombo
 	#
 	# * To return the entire input hash, omit the key
 	# * If the key is not found, the default parameter is returned, by default nil
-	#
-	# === XSS Filtering
-	#
-	# in the main config file, there is an xss_clean option. If you set this to true,
-	# all GET and POST variables will be scanned and cleaned of script data. You can manually
-	# filter strings by using:
-	# 	Picombo::Input.instance.xss_clean(str)
 	class Input
 		include Singleton
 
@@ -21,16 +14,6 @@ module Picombo
 		def set_request(req)
 			@req = req
 
-			if Picombo::Config.get('config.xss_clean')
-				@req.GET().each do |key, value|
-					Picombo::Log.write(:debug, 'Cleaning GET key: '+key)
-					@req.GET()[key] = Picombo::Security.xss_clean(value, Picombo::Config.get('config.xss_clean'))
-				end
-				@req.POST().each do |key, value|
-					Picombo::Log.write(:debug, 'Cleaning POST key: '+key)
-					@req.POST()[key] = Picombo::Security.xss_clean(value, Picombo::Config.get('config.xss_clean'))
-				end
-			end
 			Picombo::Log.write(:debug, 'Input Library initialized')
 		end
 
@@ -45,6 +28,16 @@ module Picombo
 			default
 		end
 
+		def query_string(hash)
+			temp = []
+
+			hash.each do |key, value|
+				temp << key+'='+value
+			end
+
+			temp.join('&')
+		end
+
 		# Retrieves a POST item by key. If the key doesn't exist, return default
 		# Optionaly returns the entire POST hash if key is nil
 		def post(key = nil, default = nil)

data/lib/classes/router.rb

@@ -152,6 +152,7 @@ module Picombo
 
 			router_parts = path == '/' ? ('/'+@@routes['_default'][:val]).split('/') : path.split('/')
 			@@current_uri = path.split('?').at(0)
+			@@current_uri.slice!(0)
 			@@segments = @@current_uri.split('/')[1..-1]
 			@@rsegments = router_parts[1..-1]
 			routed_uri = @@current_uri
@@ -168,8 +169,8 @@ module Picombo
 					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]
+							routed_uri.gsub!(route, destination[:val])
+							@@rsegments = routed_uri.split('/')
 						end
 					end
 				end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 3
-  - 0
-  version: 0.3.0
+  - 1
+  version: 0.3.1
 platform: ruby
 authors: 
 - Jeremy Bush
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-15 00:00:00 -05:00
+date: 2010-06-17 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency