plezi 0.7.1 → 0.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 030d9117d441e83606c9ad6c5e27fbc19a6db318
-  data.tar.gz: ad87f43274ae4c0186f5357dcde773968fb17f0e
+  metadata.gz: c99bfcd9b6a94d36a2fa750a98c0c7316e24845c
+  data.tar.gz: 078b931cef17cedb26f6ff8e7de28da62601164d
 SHA512:
-  metadata.gz: 8267042b38ee5f2db6a21d32c2f0d533a32aae06c66627bd74b100f06850126ede7ceaf758cb79d8d963050d645cd4292730e57f1025d3fa273f2848cb8f3f2b
-  data.tar.gz: fa8952d9489c4282c517889c73f32644a3bc16247e9c31ab6aef57e9131ebc645e81387bd2fa16c12d3cbf227d2c971cd6b70fcfe2139f596a0bb663370ada0a
+  metadata.gz: 82e261621440b280c9a50e95b96c3ea0621a2097a1780a5da76889fc374aa094449e7c1bd262266d64839238eafb982e05f2455aee16f264ff45caaa1fb230da
+  data.tar.gz: 2540f2e21dc643fd5395617841a6c3d3e5aa1da294461eab4db0c919355fe5c2771bfa346061e5556df9a646916cb9f39fae99a20a97c3a971198cc3a5a4bd93

data/CHANGELOG.md

@@ -2,6 +2,14 @@
 
 ***
 
+Change log v.0.7.2
+
+**fix**: fixed the template's Proc file for Heroku integration. There was a issue due to the main app file name convention change (the app file no longer has the .rb extention, and now the Proc file correctly reflects that change).
+
+**fix**: recognition of floats caused conversion errors for stings that are nomeric with multiple dots (i.e. 1.1.2015). Also, float recognition was discovered to be non-reversable (i.e `"1.10".to_f.to_s #==> "1.1"`). For this reason, float recognition has been removed. Fixnum recognition is still active.
+
+***
+
 Change log v.0.7.1 - OLDER CODE MIGHT BREAK!
 
 **feature**: ruby objects (Integers, Floats, true & false) are now automatically converted from strings to Ruby objects (notice that 'true' and 'false' ARE case sensative, to preserve the value in case of a #to_s method call)
@@ -276,7 +284,7 @@ Change log v.0.5.1
 
 Change log v.0.5.0
 
-**feature:** Multiple (virtual) hosts on the same port are now available `listen port, host: 'foo', file_root: 'public/'`, each host holds it's own route stack, file_root and special paramaters (i.e. `:debug` etc'). greate for different namespaces (admin.foo.com, www.foo.com, etc').
+**feature:** Multiple (virtual) hosts on the same port are now available `listen port, host: 'foo', file_root: 'public/'`, each host holds it's own route stack, file_root and special parameters (i.e. `:debug` etc'). greate for different namespaces (admin.foo.com, www.foo.com, etc').
 
 **fix**: Magic params have full featured Regex capabilities for the optional routes (`(:optional){(regex)|([7]{3})}`).
 
@@ -325,15 +333,15 @@ the following features are added
 
 - magic routes:
 
-it is now possible to set required paramaters inside the route:
+it is now possible to set required parameters inside the route:
 ```ruby
 route "/version/:number/", Controller
 # => accepts only paths styled "/version/foo".
-# => if no version paramater exists, path will not be called and paramaters will not be set.
+# => if no version paramater exists, path will not be called and parameters will not be set.
 # => (this: "/version" fails).
 ```
 
-it is now possible to set optional paramaters inside the route:
+it is now possible to set optional parameters inside the route:
 ```ruby
 route "/user/(:id)/(:visitor_id)", Controller
 # => accepts any of the following paths:
@@ -353,7 +361,7 @@ route "/user/(:id)/*", Controller
 
 - re-write routes:
 
-re-write routes allow us to extract paramaters from the route without any controller, rewriting the request's path.
+re-write routes allow us to extract parameters from the route without any controller, rewriting the request's path.
 
 they can be extreamly powerful in fairly rare but interesting circumstances.
 

data/bin/plezi

@@ -56,7 +56,7 @@ class AppTemplate
 		app_tree["routes.rb"] ||= IO.read ::File.expand_path(File.join("..", "..", "resources" ,"routes.rb"),  __FILE__)
 		app_tree["rakefile.rb"] ||= IO.read ::File.expand_path(File.join("..", "..", "resources" ,"rakefile.rb"),  __FILE__)
 		app_tree["Procfile"] ||= ""
-		app_tree["Procfile"] << "\nweb: bundle exec ./#{ARGV[1]}.rb -p $PORT\n"
+		app_tree["Procfile"] << "\nweb: bundle exec ./#{ARGV[1]} -p $PORT\n"
 		app_tree["Gemfile"] ||= IO.read ::File.expand_path(File.join("..", "..", "resources" ,"Gemfile"),  __FILE__)
 
 		# set up config files
@@ -123,7 +123,7 @@ class AppTemplate
 		@app_tree["#{ARGV[1]}"] ||= IO.read ::File.expand_path(File.join("..", "..", "resources" ,"code.rb"),  __FILE__)
 		write_files app_tree
 		File.chmod 0775, "#{ARGV[1]}"
-		puts "tried to update execution permissions. this probably failed.".pink
+		puts "tried to update execution permissions. this is system dependent and might have failed.".pink
 		puts "use: chmod +x ./#{ARGV[1]} to set execution permissions on Unix machines."
 		puts ""
 		puts "done."
@@ -277,10 +277,10 @@ else
 	puts "n                       alias for new."
 	puts "new app with gem        'new' accepts the 'with' paramater (or w for short)."
 	puts "starting up an app:".pink
-	puts "start                   runs the app. accepts any paramaters the app supports."
+	puts "start                   runs the app. accepts any parameters the app supports."
 	puts "s                       alias for start/server."
 	puts "start console innsead of services:".pink
-	puts "console                 runs the app. accepts any paramaters the app supports."
+	puts "console                 runs the app. accepts any parameters the app supports."
 	puts "c                       alias for start/server."
 	puts "==============================".green
 	puts "create an app with specific plugins:".pink
@@ -291,9 +291,9 @@ else
 	puts "plezi n app w all"
 	puts "loads the all available gem(s) and allows them to update the template before building the app.".green
 	puts ""
-	puts "start the application with any paramaters it supports:".pink
+	puts "start the application with any parameters it supports:".pink
 	puts "plezi s -p 80"
-	puts "loads the app with paramaters -p 80".green
+	puts "loads the app with parameters -p 80".green
 	puts ""
 end
 

data/lib/plezi.rb

@@ -105,7 +105,7 @@ end
 #    # client requests: /1
 #    #  =>  Plezi::StubRESTCtrl.new.show() # where params[:id] == 1
 #
-# it is possible to use "magic" routes (i.e. `/resource/:type/(:id)/(:date){/[0-9]{8}}/:foo`) and it is also possible to set the appropriate paramaters within the `before` method of the Conltroller.
+# it is possible to use "magic" routes (i.e. `/resource/:type/(:id)/(:date){/[0-9]{8}}/:foo`) and it is also possible to set the appropriate parameters within the `before` method of the Conltroller.
 #
 # Routes are handled in the order they are created. If overlapping routes exist, the first will execute first:
 #

data/lib/plezi/base/dsl.rb

@@ -80,7 +80,7 @@ PL = Plezi
 # creates a server object and waits for routes to be set.
 # 
 # port:: the port to listen to. the first port defaults to 3000 and increments by 1 with every `listen` call. it's possible to set the first port number by running the app with the -p paramater.
-# params:: a Hash of serever paramaters, as listed in the Plezi#add_service documentation.
+# params:: a Hash of serever parameters, as listed in the Plezi#add_service documentation.
 #
 # The different keys in the params hash control the server's behaviour, as follows:
 #
@@ -114,7 +114,7 @@ end
 # path:: the path for the route
 # controller:: The controller class which will accept the route.
 #
-# `path` paramaters has a few options:
+# `path` parameters has a few options:
 #
 # * `path` can be a Regexp object, forcing the all the logic into controller (typically using the before method).
 #
@@ -140,7 +140,7 @@ end
 #
 # magic routes make for difficult debugging - the smarter the routes, the more difficult the debugging.
 # use with care and avoid complex routes when possible. RESTful routes are recommended when possible.
-# json serving apps are advised to use required paramaters, empty sections indicating missing required paramaters (i.e. /path///foo/bar///).
+# json serving apps are advised to use required parameters, empty sections indicating missing required parameters (i.e. /path///foo/bar///).
 #
 def route(path, controller = nil, &block)
 	Plezi::DSL.route(path, controller, &block)

data/lib/plezi/base/events.rb

@@ -38,7 +38,7 @@ module Plezi
 	# `callback( Kernel, :sleep, 1 ) { puts "this is a demo" }`
 	# callback sets an asynchronous method call with a callback.
 	#
-	# paramaters:
+	# parameters:
 	# object:: the object holding the method to be called (use `Kernel` for global methods).
 	# method:: the method's name (Symbol). this is the method that will be called.
 	# *arguments:: any additional arguments that should be sent to the method (the main method, not the callback).

data/lib/plezi/base/services.rb

@@ -14,7 +14,7 @@ module Plezi
 	# public API to add a service to the framework.
 	# accepts:
 	# port:: port number
-	# parameters:: a hash of paramaters that are passed on to the service for handling (and from there, service dependent, to the protocol and/or handler).
+	# parameters:: a hash of parameters that are passed on to the service for handling (and from there, service dependent, to the protocol and/or handler).
 	#
 	# parameters are any of the following:
 	# host:: the host name. defaults to any host not explicitly defined (a catch-all).
@@ -38,12 +38,12 @@ module Plezi
 	#
 	# templates can be either an ERB file on a Haml file.
 	#
-	def add_service port, paramaters = {}
-		paramaters[:port] ||= port
-		paramaters[:service_type] ||= ( paramaters[:ssl] ? SSLService : BasicService)
+	def add_service port, parameters = {}
+		parameters[:port] ||= port
+		parameters[:service_type] ||= ( parameters[:ssl] ? SSLService : BasicService)
 		service = nil
-		service = paramaters[:service_type].create_service(port, paramaters) unless ( defined?(BUILDING_PLEZI_TEMPLATE) || defined?(PLEZI_ON_RACK) )
-		S_LOCKER.synchronize {SERVICES[service] = paramaters}
+		service = parameters[:service_type].create_service(port, parameters) unless ( defined?(BUILDING_PLEZI_TEMPLATE) || defined?(PLEZI_ON_RACK) )
+		S_LOCKER.synchronize {SERVICES[service] = parameters}
 		info "Started listening on port #{port}."
 		true
 	end

data/lib/plezi/handlers/controller_magic.rb

@@ -26,7 +26,7 @@ module Plezi
 			# the request object, class: HTTPRequest.
 			attr_reader :request
 
-			# the ::params variable contains all the paramaters set by the request (/path?locale=he  => params["locale"] == "he").
+			# the ::params variable contains all the parameters set by the request (/path?locale=he  => params["locale"] == "he").
 			attr_reader :params
 
 			# a cookie-jar to get and set cookies (set: `cookie\[:name] = data` or get: `cookie\[:name]`).

data/lib/plezi/handlers/route.rb

@@ -14,9 +14,9 @@ module Plezi
 
 		# lets the route answer the request. returns false if no response has been sent.
 		def on_request request
-			fill_paramaters = match request.path
-			return false unless fill_paramaters
-			fill_paramaters.each {|k,v| HTTP.add_param_to_hash k, v, request.params }
+			fill_parameters = match request.path
+			return false unless fill_parameters
+			fill_parameters.each {|k,v| HTTP.add_param_to_hash k, v, request.params }
 			response = HTTPResponse.new request
 			if controller
 				ret = controller.new(request, response, params)._route_path_to_methods_and_set_the_response_
@@ -35,9 +35,9 @@ module Plezi
 
 		# handles Rack requests (dresses up as Rack).
 		def call request
-			fill_paramaters = match request.path_info
-			return false unless fill_paramaters
-			fill_paramaters.each {|k,v| HTTP.add_param_to_hash k, v, request.params }
+			fill_parameters = match request.path_info
+			return false unless fill_parameters
+			fill_parameters.each {|k,v| HTTP.add_param_to_hash k, v, request.params }
 			response = HTTPResponse.new request
 			if controller
 				ret = controller.new(request, response, params)._route_path_to_methods_and_set_the_response_
@@ -55,7 +55,7 @@ module Plezi
 		#
 		# Regexp paths will be left unchanged
 		#
-		# a string can be either a simple string `"/users"` or a string with paramaters:
+		# a string can be either a simple string `"/users"` or a string with parameters:
 		# `"/static/:required/(:optional)/(:optional_with_format){[\d]*}/:optional_2"`
 		def initialize path, controller, params={}, &block
 			@path_sections , @params = false, params
@@ -78,7 +78,7 @@ module Plezi
 		# initializes the path by converting the string into a Regexp
 		# and noting any parameters that might need to be extracted for RESTful routes.
 		def initialize_path path
-			@fill_paramaters = {}
+			@fill_parameters = {}
 			if path.is_a? Regexp
 				@path = path
 			elsif path.is_a? String
@@ -119,34 +119,34 @@ module Plezi
 						@path = /#{@path}$/
 						return
 
-					# check for routes formatted: /:paramater - required paramaters
+					# check for routes formatted: /:paramater - required parameters
 					elsif section.match /^\:([^\(\)\{\}\:]*)$/
 						#create a simple section catcher
 					 	@path << section_search
 					 	# add paramater recognition value
-					 	@fill_paramaters[param_num += 1] = section.match(/^\:([^\(\)\{\}\:]*)$/)[1]
+					 	@fill_parameters[param_num += 1] = section.match(/^\:([^\(\)\{\}\:]*)$/)[1]
 
-					# check for routes formatted: /:paramater{regexp} - required paramaters
+					# 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_paramaters[param_num += 1] = section.match(/^\:([^\(\)\{\}\:\/]*)\{(.*)\}$/)[1]
+					 	@fill_parameters[param_num += 1] = section.match(/^\:([^\(\)\{\}\:\/]*)\{(.*)\}$/)[1]
 					 	param_num += 1 # we are using two spaces
 
-					# check for routes formatted: /(:paramater) - optional paramaters
+					# check for routes formatted: /(:paramater) - optional parameters
 					elsif section.match /^\(\:([^\(\)\{\}\:]*)\)$/
 						#create a optional section catcher
 					 	@path << optional_section_search
 					 	# add paramater recognition value
-					 	@fill_paramaters[param_num += 1] = section.match(/^\(\:([^\(\)\{\}\:]*)\)$/)[1]
+					 	@fill_parameters[param_num += 1] = section.match(/^\(\:([^\(\)\{\}\:]*)\)$/)[1]
 
-					# check for routes formatted: /(:paramater){regexp} - optional paramaters
+					# check for routes formatted: /(:paramater){regexp} - optional parameters
 					elsif section.match /^\(\:([^\(\)\{\}\:]*)\)\{(.*)\}$/
 						#create a optional section catcher
 					 	@path << (  "(\/(" +  section.match(/^\(\:([^\(\)\{\}\:]*)\)\{(.*)\}$/)[2] + "))?"  )
 					 	# add paramater recognition value
-					 	@fill_paramaters[param_num += 1] = section.match(/^\(\:([^\(\)\{\}\:]*)\)\{(.*)\}$/)[1]
+					 	@fill_parameters[param_num += 1] = section.match(/^\(\:([^\(\)\{\}\:]*)\)\{(.*)\}$/)[1]
 					 	param_num += 1 # we are using two spaces
 
 					else
@@ -154,9 +154,9 @@ module Plezi
 						@path << section
 					end
 				end
-				unless @fill_paramaters.values.include?("id")
+				unless @fill_parameters.values.include?("id")
 					@path << optional_section_search
-					@fill_paramaters[param_num += 1] = "id"
+					@fill_parameters[param_num += 1] = "id"
 				end
 				@path = /#{@path}$/
 			else
@@ -165,11 +165,11 @@ module Plezi
 			return
 		end
 
-		# this performs the match and assigns the paramaters, if required.
+		# this performs the match and assigns the parameters, if required.
 		def match path
 			hash = {}
 			m = nil
-			# unless @fill_paramaters.values.include?("format")
+			# unless @fill_parameters.values.include?("format")
 			# 	if (m = path.match /([^\.]*)\.([^\.\/]+)$/)
 			# 		HTTP.add_param_to_hash 'format', m[2], hash
 			# 		path = m[1]
@@ -177,7 +177,7 @@ module Plezi
 			# end
 			m = @path.match path
 			return false unless m
-			@fill_paramaters.each { |k, v| hash[v] = m[k][1..-1] if m[k] && m[k] != '/' }
+			@fill_parameters.each { |k, v| hash[v] = m[k][1..-1] if m[k] && m[k] != '/' }
 			hash
 		end
 
@@ -190,7 +190,7 @@ module Plezi
 		#
 		# adds the `redirect_to` and `send_data` methods to the controller class, as well as the properties:
 		# env:: the env recieved by the Rack server.
-		# params:: the request's paramaters.
+		# params:: the request's parameters.
 		# cookies:: the request's cookies.
 		# flash:: an amazing Hash object that sets temporary cookies for one request only - greate for saving data between redirect calls.
 		#

data/lib/plezi/server/helpers/http.rb

@@ -79,7 +79,7 @@ module Plezi
 				p.each_index { |i| p[i].strip! ; n = p[i].match(/^[0-9]+$/) ? p[i].to_i : p[i].to_sym ; p[i+1] ? [ ( a[n] ||= ( p[i+1] == ' ' ? [] : {} ) ), ( a = a[n]) ] : ( a.is_a?(Hash) ? (a[n] ? (a[n].is_a?(Array) ? (a << val) : a[n] = [a[n], val] ) : (a[n] = val) ) : (a << val) ) }
 			rescue Exception => e
 				Plezi.error e
-				Plezi.error "(Silent): paramaters parse error for #{param_name} ... maybe conflicts with a different set?"
+				Plezi.error "(Silent): parameters parse error for #{param_name} ... maybe conflicts with a different set?"
 				target_hash[param_name] = rubyfy! param_value
 			end
 		end
@@ -174,8 +174,6 @@ module Plezi
 				string = false
 			elsif string.match(/[0-9]/) && !string.match(/[^0-9]/)
 				string = string.to_i
-			elsif string.match(/[0-9]/) && !string.match(/[^0-9\.]/)
-				string = string.to_f
 			end
 			string
 		end

data/lib/plezi/version.rb

@@ -1,3 +1,3 @@
 module Plezi
-    VERSION = "0.7.1"
+    VERSION = "0.7.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: plezi
 version: !ruby/object:Gem::Version
-  version: 0.7.1
+  version: 0.7.2
 platform: ruby
 authors:
 - Boaz Segev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-07 00:00:00.000000000 Z
+date: 2015-03-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler