plezi 0.7.4 → 0.7.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e7b74f28a320e2558c0478929989d9904ed191aa
-  data.tar.gz: 3231b1fca07d1ac55bfd14f1eff40be0cb0a7154
+  metadata.gz: 09b7229f402afa705079f518c81040b58b0bcdb9
+  data.tar.gz: 051c27c22d072d67a071f131db12ff81f118b743
 SHA512:
-  metadata.gz: bd7d3987c60cad451d7860296ece6fc2e19b24922c318a344fde248832d7bd7b91f956db0c6f600ccca185d7bb43401973036a79b4a8f8c405b08ce9a2a524f7
-  data.tar.gz: 5ca2c5850793f1c23ddec678499989e2166062c9b4c67ae1deb2232eaa9db0069235bfaaad7482aff4728dc2ffaba59012f4ab8e0c22d278f5d7bdb44e807c1a
+  metadata.gz: 808a747010627be737fac767f277b650de4ae57ebd28cf3b3098a2b5c44790ddf0f69ffd1bec58ae4018fdb5e67f9953ad768890528627c450436416a0935e74
+  data.tar.gz: 35f5e69c499cb04f1e1e23b3f647ad209f960dae41248ce059a70ad958dca3357dfc79319130854a34c4d5a6735d149933281b0757005395ceed4f424b0e4289

data/CHANGELOG.md

@@ -2,6 +2,12 @@
 
 ***
 
+Change log v.0.7.5
+
+**fix**: fixed an issue where form data might not be decoded correctly, resulting in remainin '+' signs that weren't properly converted to spaces.
+
+***
+
 Change log v.0.7.4
 
 **change/fix**: it seems that behavior is more predictable when routes macgic parameters are non-persistent between routes. The old behavior (persistent parameters) is now limited to re-write routes.

data/lib/plezi/handlers/route.rb

@@ -90,6 +90,18 @@ module Plezi
 				param_num = 0
 				section_search = "([\\/][^\\/]*)"
 				optional_section_search = "([\\/][^\\/]*)?"
+
+				# to check for routes formatted: /:paramater - required parameters
+				regexp_required_params = /^\:([^\(\)\{\}\:]*)$/
+				# to check for routes formatted: /(:paramater) - optional parameters
+				regexp_optional_params = /^\(\:([^\(\)\{\}\:]*)\)$/
+				# to check for routes formatted: /(:paramater){regexp} - optional formatted parameters
+				regexp_formatted_optional_params = /^\(\:([^\(\)\{\}\:]*)\)\{(.*)\}$/
+				# check for routes formatted: /:paramater{regexp} - required parameters
+				regexp_formatted_required_params = /^\:([^\(\)\{\}\:\/]*)\{(.*)\}$/
+				# check for routes formatted: /{regexp} - required path
+				regexp_formatted_path = /^\{(.*)\}$/
+
 				@path = '^'
 
 				# prep path string
@@ -124,34 +136,41 @@ module Plezi
 						return
 
 					# check for routes formatted: /:paramater - required parameters
-					elsif section.match /^\:([^\(\)\{\}\:]*)$/
+					elsif section.match regexp_required_params
 						#create a simple section catcher
 					 	@path << section_search
 					 	# add paramater recognition value
-					 	@fill_parameters[param_num += 1] = section.match(/^\:([^\(\)\{\}\:]*)$/)[1]
-
-					# check for routes formatted: /:paramater{regexp} - required parameters
-					elsif section.match /^\:([^\(\)\{\}\:\/]*)\{(.*)\}$/
-						#create a simple section catcher
-					 	@path << (  "(\/(" +  section.match(/^\:([^\(\)\{\}\:\/]*)\{(.*)\}$/)[2] + "))"  )
-					 	# add paramater recognition value
-					 	@fill_parameters[param_num += 1] = section.match(/^\:([^\(\)\{\}\:\/]*)\{(.*)\}$/)[1]
-					 	param_num += 1 # we are using two spaces
+					 	@fill_parameters[param_num += 1] = section.match(regexp_required_params)[1]
 
 					# check for routes formatted: /(:paramater) - optional parameters
-					elsif section.match /^\(\:([^\(\)\{\}\:]*)\)$/
+					elsif section.match regexp_optional_params
 						#create a optional section catcher
 					 	@path << optional_section_search
 					 	# add paramater recognition value
-					 	@fill_parameters[param_num += 1] = section.match(/^\(\:([^\(\)\{\}\:]*)\)$/)[1]
+					 	@fill_parameters[param_num += 1] = section.match(regexp_optional_params)[1]
 
 					# check for routes formatted: /(:paramater){regexp} - optional parameters
-					elsif section.match /^\(\:([^\(\)\{\}\:]*)\)\{(.*)\}$/
+					elsif section.match regexp_formatted_optional_params
 						#create a optional section catcher
-					 	@path << (  "(\/(" +  section.match(/^\(\:([^\(\)\{\}\:]*)\)\{(.*)\}$/)[2] + "))?"  )
+					 	@path << (  "(\/(" +  section.match(regexp_formatted_optional_params)[2] + "))?"  )
+					 	# add paramater recognition value
+					 	@fill_parameters[param_num += 1] = section.match(regexp_formatted_optional_params)[1]
+					 	param_num += 1 # we are using two spaces - param_num += should look for () in regex ? /[^\\](/
+
+					# check for routes formatted: /:paramater{regexp} - required parameters
+					elsif section.match regexp_formatted_required_params
+						#create a simple section catcher
+					 	@path << (  "(\/(" +  section.match(regexp_formatted_required_params)[2] + "))"  )
+					 	# add paramater recognition value
+					 	@fill_parameters[param_num += 1] = section.match(regexp_formatted_required_params)[1]
+					 	param_num += 1 # we are using two spaces - param_num += should look for () in regex ? /[^\\](/
+
+					# check for routes formatted: /{regexp} - formated path
+					elsif section.match regexp_formatted_path
+						#create a simple section catcher
+					 	@path << (  "\/(" +  section.match(regexp_formatted_path)[1] + ")"  )
 					 	# add paramater recognition value
-					 	@fill_parameters[param_num += 1] = section.match(/^\(\:([^\(\)\{\}\:]*)\)\{(.*)\}$/)[1]
-					 	param_num += 1 # we are using two spaces
+					 	param_num += 1 # we are using one space - param_num += should look for () in regex ? /[^\\](/
 
 					else
 						@path << "\/"

data/lib/plezi/server/protocols/http_protocol.rb

@@ -232,11 +232,11 @@ module Plezi
 			# parse content
 			case @parser_data["content-type"].to_s
 			when /x-www-form-urlencoded/
-				HTTP.extract_data @parser_body.split(/[&;]/), @parser_data[:params], :uri
+				HTTP.extract_data @parser_body.split(/[&;]/), @parser_data[:params], :form # :uri
 			when /multipart\/form-data/
 				read_multipart @parser_data, @parser_body
 			when /text\/xml/
-				# to-do support xml? support json?
+				# to-do support xml?
 				@parser_data[:body] = @parser_body.dup
 			when /application\/json/
 				@parser_data[:body] = @parser_body.dup

data/lib/plezi/version.rb

@@ -1,3 +1,3 @@
 module Plezi
-    VERSION = "0.7.4"
+    VERSION = "0.7.5"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: plezi
 version: !ruby/object:Gem::Version
-  version: 0.7.4
+  version: 0.7.5
 platform: ruby
 authors:
 - Boaz Segev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-22 00:00:00.000000000 Z
+date: 2015-03-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -133,7 +133,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: The Ruby Framework for real time web-apps, with Websockets, REST and HTTP