plezi 0.7.2 → 0.7.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c99bfcd9b6a94d36a2fa750a98c0c7316e24845c
-  data.tar.gz: 078b931cef17cedb26f6ff8e7de28da62601164d
+  metadata.gz: d2c1ce05a4f21add0356e4feb915c3f559ac29b7
+  data.tar.gz: 949097175113449016158060ae646d3b94124469
 SHA512:
-  metadata.gz: 82e261621440b280c9a50e95b96c3ea0621a2097a1780a5da76889fc374aa094449e7c1bd262266d64839238eafb982e05f2455aee16f264ff45caaa1fb230da
-  data.tar.gz: 2540f2e21dc643fd5395617841a6c3d3e5aa1da294461eab4db0c919355fe5c2771bfa346061e5556df9a646916cb9f39fae99a20a97c3a971198cc3a5a4bd93
+  metadata.gz: 60e319eb716785ff1363ded7fa6aa8a2d8e81da7239598c3ce17bab2bcb996ecda364b15ccac56b0bf1f66c260b1018a4cf04cd1249647220dd113b17868247d
+  data.tar.gz: 694bc16bb7c79cc83a90e77a6ef0880769e1a22d70d48656367592731a6aaa0f0ad4a5d1048691fba23c5ed66283403c18ade96639bfe96ce9fe11d2651cace8

data/CHANGELOG.md

@@ -2,6 +2,24 @@
 
 ***
 
+Change log v.0.7.3
+
+**major fix**: Fixed a conflict in the controller namespaces and caching system, which caused routing and Redis connection errors. The errors were resolved by moving the caching to the Framework's global caching system.
+
+**fix + feature**: It is now possible to dynamically add or remove routes from existing controllers. As you know, Plezi controllers behave like "smart folders" and their public methods are automatically published as routes. But - That routing tables is cached. Now the cache is automatically reset whenever a method is added or removed from the controller, or, you can reset the controller's routing cache by calling the controller class method #reset_routing_cache. This allows you to dynamically add or remove routes from existing controllers.
+
+**fix**: fixed as issue with utf-8 data in the cookie and flash data, where utf-8 data wasn't encoded properly as an ASCII string before being sent in the HTTP headers.
+
+**fix**: fixed an error with catch-all and re-write routes that caused some routes to fail or that rewrote routes that should not have been re-written. This bug was introduces when re-write routes conflicted with similar actual routes (such as '/en' conflicting with '/entance', the 'en' would be removed although that was not the intention).
+
+**fix**: fixed the raketasks... which do nothing just yet.
+
+**fix**: fixed the 404 error for the slim template. It now has access to the request object, so that it is possible to dynamically show the requested path or other parameters and cookies.
+
+**fix**: fixed the timing of the first service start up logging to log only once services actually start.
+
+***
+
 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).

data/bin/plezi

@@ -54,7 +54,7 @@ class AppTemplate
 		# app core files.
 		app_tree["environment.rb"] ||= IO.read ::File.expand_path(File.join("..", "..", "resources" ,"environment.rb"),  __FILE__)
 		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["rakefile"] ||= IO.read ::File.expand_path(File.join("..", "..", "resources" ,"rakefile"),  __FILE__)
 		app_tree["Procfile"] ||= ""
 		app_tree["Procfile"] << "\nweb: bundle exec ./#{ARGV[1]} -p $PORT\n"
 		app_tree["Gemfile"] ||= IO.read ::File.expand_path(File.join("..", "..", "resources" ,"Gemfile"),  __FILE__)

data/lib/plezi.rb

@@ -11,7 +11,7 @@ require 'digest/sha1'
 require 'securerandom'
 require 'time'
 require 'json'
-
+require 'uri'
 ### version
 
 require "plezi/version"

data/lib/plezi/base/cache.rb

@@ -49,16 +49,23 @@ module Plezi
 		end
 		data
 	end
+
 	# places data into the cache, under an identifier ( file name ).
 	def cache_data filename, data, mtime = Time.now
 		LOCK.synchronize { CACHE_STORE[filename] = CacheObject.new( data, mtime )  }
 		data
 	end
+
 	# Get data from the cache. will throw an exception if there is no data in the cache.
 	def get_cached filename
 		CACHE_STORE[filename].data # if CACHE_STORE[filename]
 	end
 
+	# Remove data from the cache, if it exists.
+	def clear_cached filename
+		LOCK.synchronize { CACHE_STORE.delete filename } # if CACHE_STORE[filename]
+	end
+
 	# returns true if the filename is cached.
 	def cached? filename
 		!CACHE_STORE[filename].nil?

data/lib/plezi/base/services.rb

@@ -44,7 +44,7 @@ module Plezi
 		service = nil
 		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}."
+		Plezi.callback Plezi, :info, "Started listening on port #{port}."
 		true
 	end
 

data/lib/plezi/handlers/controller_magic.rb

@@ -193,7 +193,7 @@ module Plezi
 				# set DELETE method if simulated
 				request.request_method = 'DELETE' if params[:_method].to_s.downcase == 'delete'
 				# respond to special :id routing
-				return params[:id].to_sym if params[:id] && available_public_methods.include?(params[:id].to_sym)
+				return params[:id].to_sym if params[:id] && self.class.available_public_methods.include?(params[:id].to_sym)
 				#review general cases
 				case request.request_method
 				when 'GET', 'HEAD'
@@ -207,18 +207,6 @@ module Plezi
 				false
 			end
 
-			# lists the available methods that will be exposed to HTTP requests
-			def available_public_methods
-				# set class global to improve performance while checking for supported methods
-				@@___available_public_methods___ ||= available_routing_methods - [:before, :after, :save, :show, :update, :delete, :initialize, :on_message, :pre_connect, :on_connect, :on_disconnect]
-			end
-
-			# lists the available methods that will be exposed to the HTTP router
-			def available_routing_methods
-				# set class global to improve performance while checking for supported methods
-				@@___available_routing_methods___ ||= (((self.class.public_instance_methods - Object.public_instance_methods) - Plezi::ControllerMagic::InstanceMethods.instance_methods).delete_if {|m| m.to_s[0] == '_'})
-			end
-
 			## WebSockets Magic
 
 			# WebSockets.
@@ -261,7 +249,6 @@ module Plezi
 			# the method will be called asynchrnously for each sibling instance of this Controller class.
 			def collect method_name, *args, &block
 				return Plezi.callback(self, :collect, *args, &block) if block
-
 				r = []
 				ObjectSpace.each_object(self.class) { |controller|  r << controller.method(method_name).call(*args) if controller.accepts_broadcast?  && (controller.object_id != self.object_id) }
 				return r
@@ -280,21 +267,75 @@ module Plezi
 		module ClassMethods
 			public
 
+			# lists the available methods that will be exposed to HTTP requests
+			def available_public_methods
+				# set class global to improve performance while checking for supported methods
+				Plezi.cached?(self.superclass.name + "_p&rt") ? Plezi.get_cached(self.superclass.name + "_p&rt") : Plezi.cache_data(self.superclass.name + "_p&rt", available_routing_methods - [:before, :after, :save, :show, :update, :delete, :initialize, :on_message, :pre_connect, :on_connect, :on_disconnect])
+			end
+
+			# lists the available methods that will be exposed to the HTTP router
+			def available_routing_methods
+				# set class global to improve performance while checking for supported methods
+				Plezi.cached?(self.superclass.name + "_r&rt") ? Plezi.get_cached(self.superclass.name + "_r&rt") : Plezi.cache_data(self.superclass.name + "_r&rt",  (((public_instance_methods - Object.public_instance_methods) - Plezi::ControllerMagic::InstanceMethods.instance_methods).delete_if {|m| m.to_s[0] == '_'})  )
+			end
+
+			# resets this controller's router, to allow for dynamic changes
+			def reset_routing_cache
+				Plezi.clear_cached(self.superclass.name + "_p&rt")
+				Plezi.clear_cached(self.superclass.name + "_r&rt")
+				available_routing_methods
+				available_public_methods
+			end
+
+			# a callback that resets the class router whenever a method (a potential route) is added
+			def method_added(id)
+				reset_routing_cache
+			end
+			# a callback that resets the class router whenever a method (a potential route) is removed
+			def method_removed(id)
+				reset_routing_cache
+			end
+			# a callback that resets the class router whenever a method (a potential route) is undefined (using #undef_method).
+			def method_undefined(id)
+				reset_routing_cache
+			end
+			
 			# reviews the Redis connection, sets it up if it's missing and returns the Redis connection.
 			#
 			# todo: review thread status? (incase an exception killed it)
 			def redis_connection
+				# return false unless defined?(Redis) && ENV['PL_REDIS_URL']
+				# return @@redis if defined?(@@redis_sub_thread) && @@redis
+				# @@redis_uri ||= URI.parse(ENV['PL_REDIS_URL'])
+				# @@redis ||= Redis.new(host: @@redis_uri.host, port: @@redis_uri.port, password: @@redis_uri.password)
+				# @@redis_sub_thread = Thread.new do
+				# 	begin
+				# 		Redis.new(host: @@redis_uri.host, port: @@redis_uri.port, password: @@redis_uri.password).subscribe(redis_channel_name) do |on|
+				# 			on.message do |channel, msg|
+				# 				args = JSON.parse(msg)
+				# 				params = args.shift
+				# 				__inner_process_broadcast params['_pl_ignore_object'], params['_pl_method_broadcasted'].to_sym, args
+				# 			end
+				# 		end						
+				# 	rescue Exception => e
+				# 		Plezi.error e
+				# 		retry
+				# 	end
+				# end
+				# raise "Redis connction failed for: #{ENV['PL_REDIS_URL']}" unless @@redis
+				# @@redis
 				return false unless defined?(Redis) && ENV['PL_REDIS_URL']
-				return @@redis if defined?(@@redis_sub_thread) && @@redis
+				return Plezi.get_cached(self.superclass.name + "_b") if Plezi.cached?(self.superclass.name + "_b")
 				@@redis_uri ||= URI.parse(ENV['PL_REDIS_URL'])
-				@@redis ||= Redis.new(host: @@redis_uri.host, port: @@redis_uri.port, password: @@redis_uri.password)
-				@@redis_sub_thread = Thread.new do
+				Plezi.cache_data self.superclass.name + "_b", Redis.new(host: @@redis_uri.host, port: @@redis_uri.port, password: @@redis_uri.password)
+				raise "Redis connction failed for: #{ENV['PL_REDIS_URL']}" unless Plezi.cached?(self.superclass.name + "_b")
+				t = Thread.new do
 					begin
 						Redis.new(host: @@redis_uri.host, port: @@redis_uri.port, password: @@redis_uri.password).subscribe(redis_channel_name) do |on|
 							on.message do |channel, msg|
 								args = JSON.parse(msg)
 								params = args.shift
-								__inner_process_broadcast params['_an_ignore_object'], params['_an_method_broadcasted'].to_sym, args
+								__inner_process_broadcast params['_pl_ignore_object'], params['_pl_method_broadcasted'].to_sym, args
 							end
 						end						
 					rescue Exception => e
@@ -302,13 +343,13 @@ module Plezi
 						retry
 					end
 				end
-				raise "Redis connction failed for: #{ENV['PL_REDIS_URL']}" unless @@redis
-				@@redis
+				Plezi.cache_data self.superclass.name + "_t", t
+				Plezi.get_cached(self.superclass.name + "_b")
 			end
 
 			# returns a Redis channel name for this controller.
 			def redis_channel_name
-				self.name.to_s
+				self.superclass.name.to_s
 			end
 
 			# broadcasts messages (methods) for this process
@@ -321,7 +362,7 @@ module Plezi
 				return false unless redis_connection
 				raise "Radis broadcasts cannot accept blocks (no inter-process callbacks of memory sharing)!" if block
 				# raise "Radis broadcasts accept only one paramater, which is an optional Hash (no inter-process memory sharing)" if args.length > 1 || (args[0] && !args[0].is_a?(Hash))
-				args.unshift ({_an_method_broadcasted: method_name, _an_ignore_object: ignore})
+				args.unshift ({_pl_method_broadcasted: method_name, _pl_ignore_object: ignore})
 				redis_connection.publish(redis_channel_name, args.to_json )
 				true
 			end

data/lib/plezi/handlers/http_host.rb

@@ -98,7 +98,7 @@ module Plezi
 				if params[:root]
 					if defined?(::Slim) && Plezi.file_exists?(File.join(params[:root], "#{code}.slim"))
 						Plezi.cache_data File.join(params[:root], "#{code}.slim"), Slim::Template.new( File.join( params[:root], "#{code}.slim" ) ) unless Plezi.cached? File.join(params[:root], "#{code}.slim")
-						return send_raw_data request, Plezi.get_cached( File.join(params[:root], "#{code}.slim") ).render( self ), 'text/html', code, headers
+						return send_raw_data request, Plezi.get_cached( File.join(params[:root], "#{code}.slim") ).render( self, request: request ), 'text/html', code, headers
 					elsif defined?(::Haml) && Plezi.file_exists?(File.join(params[:root], "#{code}.haml"))
 						Plezi.cache_data File.join(params[:root], "#{code}.haml"), Haml::Engine.new( IO.read( File.join( params[:root], "#{code}.haml" ) ) ) unless Plezi.cached? File.join(params[:root], "#{code}.haml")
 						return send_raw_data request, Plezi.get_cached( File.join(params[:root], "#{code}.haml") ).render( self ), 'text/html', code, headers

data/lib/plezi/handlers/route.rb

@@ -17,20 +17,23 @@ module Plezi
 			fill_parameters = match request.path
 			return false unless fill_parameters
 			fill_parameters.each {|k,v| HTTP.add_param_to_hash k, v, request.params }
+			ret = false
 			response = HTTPResponse.new request
 			if controller
 				ret = controller.new(request, response, params)._route_path_to_methods_and_set_the_response_
-				response.try_finish if ret
-				return ret
 			elsif proc
 				ret = proc.call(request, response)
 				# response << ret if ret.is_a?(String)
-				response.try_finish if ret
-				return ret
 			elsif controller == false
-				request.path = path.match(request.path).to_a.last
+				request.path = path.match(request.path).to_a.last.to_s
+				return false
 			end
-			return false
+			unless ret
+				request.params.delete :id if fill_parameters['id']
+				return false
+			end
+			response.try_finish
+			return ret
 		end
 
 		# handles Rack requests (dresses up as Rack).
@@ -111,10 +114,10 @@ module Plezi
 				# prep path string and split it where the '/' charected is unescaped.
 				path = path.gsub(/(^\/)|(\/$)/, '').gsub(/([^\\])\//, '\1 - /').split ' - /'
 				@path_sections = path.length
-				path.each do |section|
+				path.each.with_index do |section, section_index|
 					if section == '*'
 						# create catch all
-						@path << "(.*)"
+						section_index == 0 ? (@path << "(.*)") : (@path << "(\\/.*)?")
 						# finish
 						@path = /#{@path}$/
 						return
@@ -168,7 +171,7 @@ module Plezi
 		# this performs the match and assigns the parameters, if required.
 		def match path
 			hash = {}
-			m = nil
+			# m = nil
 			# unless @fill_parameters.values.include?("format")
 			# 	if (m = path.match /([^\.]*)\.([^\.\/]+)$/)
 			# 		HTTP.add_param_to_hash 'format', m[2], hash
@@ -201,6 +204,10 @@ module Plezi
 			controller.instance_eval { include Plezi::ControllerMagic }
 			ret = Class.new(controller) do
 
+				def name
+					new_class_name
+				end
+
 				def initialize request, response, host_params
 					@request, @params, @flash, @host_params = request, request.params, response.flash, host_params
 					@response = response
@@ -215,22 +222,6 @@ module Plezi
 					super()
 				end
 
-				def _route_path_to_methods_and_set_the_response_
-					#run :before filter
-					return false if available_routing_methods.include?(:before) && before == false 
-					#check request is valid and call requested method
-					ret = requested_method
-					return false unless available_routing_methods.include?(ret)
-					return false unless (ret = self.method(ret).call)
-					#run :after filter
-					return false if available_routing_methods.include?(:after) && after == false
-					# review returned type for adding String to response
-					if ret.is_a?(String)
-						response << ret
-						response['content-length'] = ret.bytesize if response.body.empty? && !response.headers_sent?
-					end
-					return true
-				end
 				# WebSockets.
 				#
 				# this method handles the protocol and handler transition between the HTTP connection
@@ -262,8 +253,108 @@ module Plezi
 					@_accepts_broadcast = false
 					super if defined? super
 				end
+
+				# Inner Routing
+				#
+				#
+				def _route_path_to_methods_and_set_the_response_
+					#run :before filter
+					return false if self.class.available_routing_methods.include?(:before) && self.before == false 
+					#check request is valid and call requested method
+					ret = requested_method
+					return false unless self.class.available_routing_methods.include?(ret)
+					return false unless (ret = self.method(ret).call)
+					#run :after filter
+					return false if self.class.available_routing_methods.include?(:after) && self.after == false
+					# review returned type for adding String to response
+					if ret.is_a?(String)
+						response << ret
+						response['content-length'] = ret.bytesize if response.body.empty? && !response.headers_sent?
+					end
+					return true
+				end
+				# a callback that resets the class router whenever a method (a potential route) is added
+				def self.method_added(id)
+					reset_routing_cache
+				end
+				# a callback that resets the class router whenever a method (a potential route) is removed
+				def self.method_removed(id)
+					reset_routing_cache
+				end
+				# a callback that resets the class router whenever a method (a potential route) is undefined (using #undef_method).
+				def self.method_undefined(id)
+					reset_routing_cache
+				end
+
+				# # lists the available methods that will be exposed to HTTP requests
+				# def self.available_public_methods
+				# 	# set class global to improve performance while checking for supported methods
+				# 	@@___available_public_methods___ ||= available_routing_methods - [:before, :after, :save, :show, :update, :delete, :initialize, :on_message, :pre_connect, :on_connect, :on_disconnect]
+				# end
+
+				# # lists the available methods that will be exposed to the HTTP router
+				# def self.available_routing_methods
+				# 	# set class global to improve performance while checking for supported methods
+				# 	@@___available_routing_methods___ ||= (((public_instance_methods - Object.public_instance_methods) - Plezi::ControllerMagic::InstanceMethods.instance_methods).delete_if {|m| m.to_s[0] == '_'})
+				# end
+
+				# # resets this controller's router, to allow for dynamic changes
+				# def self.reset_routing_cache
+				# 	@@___available_routing_methods___ = @@___available_public_methods___ = nil
+				# 	available_routing_methods
+				# 	available_public_methods
+				# end
+
+				
+				# # reviews the Redis connection, sets it up if it's missing and returns the Redis connection.
+				# #
+				# # todo: review thread status? (incase an exception killed it)
+				# def self.redis_connection
+				# 	return false unless defined?(Redis) && ENV['PL_REDIS_URL']
+				# 	return @@redis if defined?(@@redis_sub_thread) && @@redis
+				# 	@@redis_uri ||= URI.parse(ENV['PL_REDIS_URL'])
+				# 	@@redis ||= Redis.new(host: @@redis_uri.host, port: @@redis_uri.port, password: @@redis_uri.password)
+				# 	@@redis_sub_thread = Thread.new do
+				# 		begin
+				# 			Redis.new(host: @@redis_uri.host, port: @@redis_uri.port, password: @@redis_uri.password).subscribe(redis_channel_name) do |on|
+				# 				on.message do |channel, msg|
+				# 					args = JSON.parse(msg)
+				# 					params = args.shift
+				# 					__inner_process_broadcast params['_pl_ignore_object'], params['_pl_method_broadcasted'].to_sym, args
+				# 				end
+				# 			end						
+				# 		rescue Exception => e
+				# 			Plezi.error e
+				# 			retry
+				# 		end
+				# 	end
+				# 	raise "Redis connction failed for: #{ENV['PL_REDIS_URL']}" unless @@redis
+				# 	@@redis
+				# end
+
+				# # returns a Redis channel name for this controller.
+				# def self.redis_channel_name
+				# 	self.name.to_s
+				# end
+
+				# # broadcasts messages (methods) for this process
+				# def self.__inner_process_broadcast ignore, method_name, args, &block
+				# 	ObjectSpace.each_object(self) { |controller| Plezi.callback controller, method_name, *args, &block if controller.accepts_broadcast? && (!ignore || controller.uuid != ignore) }
+				# end
+
+				# # broadcasts messages (methods) between all processes (using Redis).
+				# def self.__inner_redis_broadcast ignore, method_name, args, &block
+				# 	return false unless redis_connection
+				# 	raise "Radis broadcasts cannot accept blocks (no inter-process callbacks of memory sharing)!" if block
+				# 	# raise "Radis broadcasts accept only one paramater, which is an optional Hash (no inter-process memory sharing)" if args.length > 1 || (args[0] && !args[0].is_a?(Hash))
+				# 	args.unshift ({_pl_method_broadcasted: method_name, _pl_ignore_object: ignore})
+				# 	redis_connection.publish(redis_channel_name, args.to_json )
+				# 	true
+				# end
+
 			end
 			Object.const_set(new_class_name, ret)
+			Module.const_get(new_class_name).reset_routing_cache
 			ret
 		end
 

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

@@ -126,6 +126,7 @@ module Plezi
 			elsif object.is_a?(String)
 				case decode_method
 				when :uri, :url, :form
+					object.force_encoding "binary"
 					object.gsub!(/[^a-zA-Z0-9\*\.\_\-]/) {|m| m.ord <= 16 ? "%0#{m.ord.to_s(16)}" : "%#{m.ord.to_s(16)}"}
 				when :html
 					object.gsub!('&', "&amp;")
@@ -134,8 +135,10 @@ module Plezi
 					object.gsub!("<", "&lt;")
 					object.gsub!(/[^\sa-zA-Z\d\&\;]/) {|m| "&#%04d;" % m.unpack('U')[0] }
 					# object.gsub!(/[^\s]/) {|m| "&#%04d;" % m.unpack('U')[0] }
+					object.force_encoding "binary"
 				when :utf8
 					object.gsub!(/[^\sa-zA-Z\d]/) {|m| "&#%04d;" % m.unpack('U')[0] }
+					object.force_encoding "binary"
 				else
 
 				end

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

@@ -40,7 +40,7 @@ module Plezi
 			@cookies = {}
 			# propegate flash object
 			@flash = Hash.new do |hs,k|
-				hs["plezi_flash_#{k.to_s}"] if hs.has_key? "plezi_flash_#{k.to_s}"
+				hs["plezi_flash_#{k.to_s}".to_sym] if hs.has_key? "plezi_flash_#{k.to_s}".to_sym
 			end
 			request.cookies.each do |k,v|
 				@flash[k] = v if k.to_s.start_with? "plezi_flash_"

data/lib/plezi/version.rb

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

data/plezi.gemspec

@@ -8,8 +8,8 @@ Gem::Specification.new do |spec|
   spec.version       = Plezi::VERSION
   spec.authors       = ["Boaz Segev"]
   spec.email         = ['boaz@2be.co.il']
-  spec.summary       = %q{The Ruby Web-App Framework with Websockets, REST and HTTP streaming support.}
-  spec.description   = %q{Plezi is a Rack free Ruby Web-App Framework with native Websocket, HTTP streaming, and REST routing support. Advance to next step in Ruby evolution - a framework with an integrated server, ready for seamless WebSockets and RESTful applications.}
+  spec.summary       = %q{The Ruby Framework for real time web-apps, with Websockets, REST and HTTP streaming support.}
+  spec.description   = %q{Plezi is a Rack free Ruby Framework for real time web-apps, with native Websocket, HTTP streaming, and REST routing support.}
   spec.homepage      = "http://boazsegev.github.io/plezi/"
   spec.license       = "MIT"
 
@@ -21,6 +21,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler", "~> 1.7"
   spec.add_development_dependency "rake", "~> 10.0"
 
-  spec.post_install_message = "This update might break existing code - please review ChangeLog.md before upgrading any apps.\n\r\n\rFor example\n\r-Please make sure to change any `params[:list]['0'.to_sym][:key]` to `params[:list][0][:key]` (Fixnum rather then String).\n\r- Pleasemake sure to update `params[:check] == 'true'` to `params[:check] == true` (not aString)."
+  # spec.post_install_message = "This update might break existing code - please review ChangeLog.md before upgrading any apps."
+  spec.post_install_message = "Thank you for installing Plezi, the Ruby Framework for real time web-apps."
 
 end

data/resources/Gemfile

@@ -9,23 +9,25 @@ gem 'plezi'
 ####################
 # development gems
 
-# use pry gem for basic debug ( put `binding.pry` at breake point )?
+## use pry gem for basic debug ( put `binding.pry` at breake point )?
 # gem 'pry'
 
+## use rake tasks with bundle exec?
+# gem 'rake'
 
-# active support can run without rails and extends the Ruby language.
-# it might be heavy, be warned.
-# see: http://guides.rubyonrails.org/active_support_core_extensions.html
+## active support can run without rails and extends the Ruby language.
+## it might be heavy, be warned.
+## see: http://guides.rubyonrails.org/active_support_core_extensions.html
 # 
 # gem 'activesupport', :require => ['active_support', 'active_support/core_ext'] 
-# or:
+## or:
 # gem 'activesupport', :require => ['active_support', active_support/all'] 
 
 
 ####################
 # gems for easy markup
 
-## Slim is very recommended for HTML markup, it's both easy and fast.
+## Slim is very recommended for HTML markup, it's both easy and fast. We LOVE it.
 # gem 'slim'
 
 ## Sass makes CSS easy
@@ -50,9 +52,10 @@ gem 'plezi'
 # WebSocket Scaling
 
 ## redis servers are used to allow websocket scaling.
-## the :broadcast and :collect methods will work only for the current process.
+## the Controller#collect method will work only for the current process.
+## the Controller#broadcast can be configured to automatically use Redis, but some inter-process limitation apply.
 ## using Redis, we can publish messages and subscribe to 'chunnels' across processes
-# (limited support for :broadcast and NO support for :collect while Redis is running).
+## (limited support for :broadcast and NO support for :collect while Redis is running).
 
 # gem 'redis'
 

data/resources/rakefile

@@ -0,0 +1,12 @@
+# load all framework and gems
+load ::File.expand_path(File.join("..", "environment.rb"),  __FILE__)
+
+# Make sure the server doesn't start
+NO_PLEZI_AUTO_START = true
+
+# create a default task
+desc "The default task does nothing... it's waiting for you to tell it what to do."
+task :default do
+	puts "I don't know what to do."
+	puts `rake -T`
+end

data/resources/routes.rb

@@ -11,7 +11,7 @@
 
 # This is an optional re-write route for I18n.
 # i.e.: `/en/home` will be rewriten as `/home`, while setting params[:locale] to "en"
-route "/(:locale){#{I18n.available_locales.join "|"}}/*" , false if defined? I18n
+route "/:locale{#{I18n.available_locales.join "|"}}/*" , false if defined? I18n
 
 ###
 # add your routes here:

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: plezi
 version: !ruby/object:Gem::Version
-  version: 0.7.2
+  version: 0.7.3
 platform: ruby
 authors:
 - Boaz Segev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-08 00:00:00.000000000 Z
+date: 2015-03-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -38,9 +38,8 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
-description: Plezi is a Rack free Ruby Web-App Framework with native Websocket, HTTP
-  streaming, and REST routing support. Advance to next step in Ruby evolution - a
-  framework with an integrated server, ready for seamless WebSockets and RESTful applications.
+description: Plezi is a Rack free Ruby Framework for real time web-apps, with native
+  Websocket, HTTP streaming, and REST routing support.
 email:
 - boaz@2be.co.il
 executables:
@@ -108,7 +107,7 @@ files:
 - resources/i18n_config.rb
 - resources/plezi_gray.png
 - resources/plezi_websockets.html
-- resources/rakefile.rb
+- resources/rakefile
 - resources/redis_config.rb
 - resources/routes.rb
 - resources/welcome_page.html
@@ -117,11 +116,8 @@ homepage: http://boazsegev.github.io/plezi/
 licenses:
 - MIT
 metadata: {}
-post_install_message: "This update might break existing code - please review ChangeLog.md
-  before upgrading any apps.\n\r\n\rFor example\n\r-Please make sure to change any
-  `params[:list]['0'.to_sym][:key]` to `params[:list][0][:key]` (Fixnum rather then
-  String).\n\r- Pleasemake sure to update `params[:check] == 'true'` to `params[:check]
-  == true` (not aString)."
+post_install_message: Thank you for installing Plezi, the Ruby Framework for real
+  time web-apps.
 rdoc_options: []
 require_paths:
 - lib
@@ -140,5 +136,6 @@ rubyforge_project:
 rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
-summary: The Ruby Web-App Framework with Websockets, REST and HTTP streaming support.
+summary: The Ruby Framework for real time web-apps, with Websockets, REST and HTTP
+  streaming support.
 test_files: []

data/resources/rakefile.rb

@@ -1,22 +0,0 @@
-# encoding: UTF-8
-BUILDING_PLEZI_TEMPLATE = true
-NO_PLEZI_AUTO_START = true
-
-require 'rubygems'
-require 'rake'
-
-app_name = ::File.expand_path(::Dir["."][0]).split(/[\\\/]/).last
-require ::File.expand_path(::Dir["."][0], ( app_name + ".rb") )
-
-namespace :app do
-
-	desc "adds and framework files that might be missing (use after adding plezi gems).\nnotice: this will not update rakefile.rb or Gemfile(!)."
-	task :rebuild do
-		Dir.chdir '..'
-		puts `plezi force #{app_name}`
-	end
-end
-
-task :default do
-	puts `rake -T`
-end