plezi 0.8.7 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c39d10feca5a72236133883875628f43ae714a86
-  data.tar.gz: a1accf79bbde62e52e63836158e2e16d32cff059
+  metadata.gz: c1b45fb775eeba5ab996d2581da537e38640f7d4
+  data.tar.gz: 1060b31518ce6e3ee36cfa315ce916f72e7ab1d2
 SHA512:
-  metadata.gz: b94655b0900f4c5c69ac17c81cd3ee83af7c19ce8e459bb523766210b92e9c16c2d56977f4537665c19985dd5a77638bc93505abb85af8a515162d167f378017
-  data.tar.gz: dcdff9a3dd5ec25ef4c6d6ffb43714b52552df92e49258744841902371ad094dd1232cf0bd951e2a69b0773557d50bd8e29125c9f36016804354878883780f80
+  metadata.gz: 030e93b8a30cc04c3ad35c3aae1303e335b5bd1558469e9673cc14e07417c17b43e0a271a4441bee64b53c6785804b2a9460cd391d3402c2cc12e0093fe0a626
+  data.tar.gz: d663be79b8da32121b279848fc2cad6b5b66562ccbeedac9de25a41965bfa40380085a1b43af806f4f5e763a5e86eee7314e1f88fda8d5c43a2ba23d01c7fbc3

data/CHANGELOG.md

@@ -2,6 +2,29 @@
 
 ***
 
+Change log v.0.9.0
+
+**changes** (might break code):
+
+- The error code file handling logic has been changed.
+
+   Plezi will no longer look the 404 and 505 files in the _public_ `:root` location. Instead the files should be placed at the **templates** folder if defined or at the app's root folder (_if templates folder isn't set_).
+
+   Also, error code files should now correctly specify that they are html templates - for example, the older '404.erb' should be renamed as '404.html.erb'
+
+   To update your application **please rename the error code files and move them to the app template's folder** (`appname/app/views`).
+
+- Updated the template's welcome page and database configuration support. Existing applications shouldn't be effected.
+
+
+**feature**: auto-pinging can now be customized for different hosting-server timeouts and it can also be disabled using the `Plezi.ping_interval` setter and getter.
+
+**feature**: The Plezi framework can now impose limits on Websocket message sizes (even messages split across a number of frames) by using the `Plezi.ws_message_size_limit=` method.
+
+**fix**: Outgoing Websocket messages would break for messages over 32KB (and sometimes over 16KB). This was caused by an issue in the frame splitting algorithm which is now resolved.
+
+***
+
 Change log v.0.8.7
 
 **minor performance**: streamlined the ping/pong Websocket process.

data/bin/plezi

@@ -46,10 +46,21 @@ class AppTemplate
 		app_tree["app"]["models"] ||= {}
 		app_tree["app"]["views"] ||= {}
 
+		# set up templates for status error codes
+		app_tree["app"]["views"]["404.html"] ||= IO.read(::File.expand_path(File.join("..", "..", "resources" ,"404.html"),  __FILE__))
+		app_tree["app"]["views"]["500.html"] ||= IO.read(::File.expand_path(File.join("..", "..", "resources" ,"500.html"),  __FILE__))
+		app_tree["app"]["views"]["404.html.erb"] ||= IO.read(::File.expand_path(File.join("..", "..", "resources" ,"404.erb"),  __FILE__))
+		app_tree["app"]["views"]["500.html.erb"] ||= IO.read(::File.expand_path(File.join("..", "..", "resources" ,"500.erb"),  __FILE__))
+		app_tree["app"]["views"]["404.html.slim"] ||= IO.read(::File.expand_path(File.join("..", "..", "resources" ,"404.slim"),  __FILE__))
+		app_tree["app"]["views"]["500.html.slim"] ||= IO.read(::File.expand_path(File.join("..", "..", "resources" ,"500.slim"),  __FILE__))
+		app_tree["app"]["views"]["404.html.haml"] ||= IO.read(::File.expand_path(File.join("..", "..", "resources" ,"404.haml"),  __FILE__))
+		app_tree["app"]["views"]["500.html.haml"] ||= IO.read(::File.expand_path(File.join("..", "..", "resources" ,"500.haml"),  __FILE__))
+
 		# set up the assets folder
 		app_tree["assets"] ||= {}
 		app_tree["assets"]["stylesheets"] ||= {}
 		app_tree["assets"]["javascripts"] ||= {}
+		app_tree["assets"]["javascripts"]["websocket.js"] ||= IO.read(::File.expand_path(File.join("..", "..", "resources" ,"websockets.js"),  __FILE__)).gsub('appname', ARGV[1])
 		app_tree["assets"]["welcome.html"] ||= IO.read(::File.expand_path(File.join("..", "..", "resources" ,"welcome_page.html"),  __FILE__)).gsub('appname', ARGV[1])
 
 		# app core files.
@@ -92,19 +103,10 @@ class AppTemplate
 
 		# set up a public folder for static file service
 		app_tree["public"] ||= {}		
-		app_tree["public"]["404.slim"] ||= IO.read(::File.expand_path(File.join("..", "..", "resources" ,"404.slim"),  __FILE__))
-		app_tree["public"]["500.slim"] ||= IO.read(::File.expand_path(File.join("..", "..", "resources" ,"500.slim"),  __FILE__))
-		app_tree["public"]["404.html"] ||= IO.read(::File.expand_path(File.join("..", "..", "resources" ,"404.html"),  __FILE__))
-		app_tree["public"]["500.html"] ||= IO.read(::File.expand_path(File.join("..", "..", "resources" ,"500.html"),  __FILE__))
-		app_tree["public"]["404.erb"] ||= IO.read(::File.expand_path(File.join("..", "..", "resources" ,"404.erb"),  __FILE__))
-		app_tree["public"]["500.erb"] ||= IO.read(::File.expand_path(File.join("..", "..", "resources" ,"500.erb"),  __FILE__))
-		app_tree["public"]["404.haml"] ||= IO.read(::File.expand_path(File.join("..", "..", "resources" ,"404.haml"),  __FILE__))
-		app_tree["public"]["500.haml"] ||= IO.read(::File.expand_path(File.join("..", "..", "resources" ,"500.haml"),  __FILE__))
 		app_tree["public"]["assets"] ||= {}		
 		app_tree["public"]["assets"]["stylesheets"] ||= {}		
 		app_tree["public"]["assets"]["javascripts"] ||= {}		
 		app_tree["public"]["images"] ||= {}		
-		app_tree["public"]["images"]['plezi_gray.png'] ||= IO.read(::File.expand_path(File.join("..", "..", "resources" ,"plezi_gray.png"),  __FILE__))	
 
 	end
 

data/lib/plezi/common/dsl.rb

@@ -113,7 +113,7 @@ Encoding.default_external = 'utf-8'
 # PL is a shortcut for the Plezi module, so that `PL == Plezi`.
 PL = Plezi
 
-# shortcut for Plezi.listen.
+# shortcut for Plezi::DSL.listen.
 #
 def listen(params = {})
 	Plezi::DSL.listen params

data/lib/plezi/eventmachine/connection.rb

@@ -74,6 +74,7 @@ module Plezi
 				rescue => e
 					EventMachine.queue( [@socket], REMOVE_CONNECTION_PROC)
 				end
+				true
 			end
 
 			# the non-blocking proc used for send_nonblock
@@ -106,10 +107,13 @@ module Plezi
 					@protocol = false
 				end
 			end
-			# closes the connection.
+
+			# the non-blocking proc used for send_nonblock
+			FLUSH_AND_CLOSE_PROC = Proc.new {|c| c.flush; EventMachine.remove_io c.socket}
+
+			# Closes the connection. This is always asynchronous and will return immidiately.
 			def close
-				flush
-				EventMachine.queue [@socket], REMOVE_CONNECTION_PROC
+				EventMachine.queue [self], FLUSH_AND_CLOSE_PROC
 			end
 			alias :disconnect :close
 

data/lib/plezi/eventmachine/io.rb

@@ -213,7 +213,7 @@ module Plezi
 				Plezi.run_every(3_600) {GC.start; Plezi.info "Refreshing worker threads."; EventMachine.stop; EventMachine.start Plezi.max_threads}
 				# run_every( 1 , Proc.new() { Plezi.info "#{IO_CONNECTION_DIC.length} active connections ( #{ IO_CONNECTION_DIC.select{|k,v| v.protocol.is_a?(WSProtocol)} .length } websockets)." })
 				# run_every 10 , -> {Plezi.info "Cache report: #{CACHE_STORE.length} objects cached." } 
-				puts "** Deprecation Warning:\n- The current code for default error pages will be changed in version 0.9.0.\n- Default error pages will follow a different naming and location conventions.\n- The updated design will be part of the updated `plezi` helper script.\nPlease review your code before upgrading to the 0.9.0 version.\n"
+				# puts "** Deprecation Warning:\n- The current code for default error pages will be changed in version 0.9.0.\n- Default error pages will follow a different naming and location conventions.\n- The updated design will be part of the updated `plezi` helper script.\nPlease review your code before upgrading to the 0.9.0 version.\n"
 				puts "Services running Plezi version #{Plezi::VERSION}. Press ^C to stop"
 				EventMachine.start Plezi.max_threads
 

data/lib/plezi/handlers/http_host.rb

@@ -95,18 +95,17 @@ module Plezi
 		# sends a response for an error code, rendering the relevent file (if exists).
 		def send_by_code request, code, headers = {}
 			begin
-				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, 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
-					elsif defined?(::ERB) && Plezi.file_exists?(File.join(params[:root], "#{code}.erb"))
-						return send_raw_data request, ERB.new( Plezi.load_file( File.join(params[:root], "#{code}.erb") ) ).result(binding), 'text/html', code, headers
-					elsif Plezi.file_exists?(File.join(params[:root], "#{code}.html"))
-						return send_file(request, File.join(params[:root], "#{code}.html"), code, headers)
-					end
+				@base_code_path ||= params[:templates] || File.expand_path('.')
+				if defined?(::Slim) && Plezi.file_exists?(fn = File.join(@base_code_path, "#{code}.html.slim"))
+					Plezi.cache_data fn, Slim::Template.new( fn ) unless Plezi.cached? fn
+					return send_raw_data request, Plezi.get_cached( fn ).render( self, request: request ), 'text/html', code, headers
+				elsif defined?(::Haml) && Plezi.file_exists?(fn = File.join(@base_code_path, "#{code}.html.haml"))
+					Plezi.cache_data fn, Haml::Engine.new( IO.read( fn ) ) unless Plezi.cached? fn
+					return send_raw_data request, Plezi.get_cached( File.join(@base_code_path, "#{code}.html.haml") ).render( self ), 'text/html', code, headers
+				elsif defined?(::ERB) && Plezi.file_exists?(fn = File.join(@base_code_path, "#{code}.html.erb"))
+					return send_raw_data request, ERB.new( Plezi.load_file( fn ) ).result(binding), 'text/html', code, headers
+				elsif Plezi.file_exists?(fn = File.join(@base_code_path, "#{code}.html"))
+					return send_file(request, fn, code, headers)
 				end
 				return true if send_raw_data(request, HTTPResponse::STATUS_CODES[code], 'text/plain', code, headers)
 			rescue Exception => e

data/lib/plezi/server/http_protocol.rb

@@ -31,11 +31,11 @@ module Plezi
 		def on_message
 			# parse the request
 			parse_message
-			if (@parser_stage == 1) && @parser_data[:version] >= 1.1
-				# send 100 continue message????? doesn't work! both Crome and Safari go crazy if this is sent after the request was sent (but before all the packets were recieved... msgs over 1 Mb).
-				# Plezi.push_event Proc.new { Plezi.info "sending continue signal."; connection.send_nonblock "100 Continue\r\n\r\n" }
-				# connection.send_unsafe_interrupt "100 Continue\r\n\r\n" # causes double lock on connection
-			end
+			# if (@parser_stage == 1) && @parser_data[:version] >= 1.1
+			# 	# send 100 continue message????? doesn't work! both Crome and Safari go crazy if this is sent after the request was sent (but before all the packets were recieved... msgs over 1 Mb).
+			# 	# Plezi.push_event Proc.new { Plezi.info "sending continue signal."; connection.send_nonblock "100 Continue\r\n\r\n" }
+			# 	# connection.send_unsafe_interrupt "100 Continue\r\n\r\n" # causes double lock on connection
+			# end
 			true
 		end
 

data/lib/plezi/server/websocket.rb

@@ -124,6 +124,7 @@ module Plezi
 					end
 					@parser_data[:step] = 0
 					@parser_stage += 1
+					review_message_size
 				end
 				if @parser_stage == 2 && @parser_data[:mask] == 1
 					@parser_data[:mask_key] = data.slice!(0,4)
@@ -187,6 +188,48 @@ module Plezi
 			@parser_data[:body].clear
 			@parser_data[:step] = 0
 		end
+		#reviews the message size and closes the connection if expected message size is over the allowed limit.
+		def review_message_size
+			if ( self.class.message_size_limit.to_i > 0 ) && ( ( @parser_data[:len] + @message.bytesize ) > self.class.message_size_limit.to_i )
+				Plezi.callback @connection, :disconnect
+				@message.clear
+				@parser_data[:step] = 0
+				@parser_data[:body].clear
+				@parser_stage = -1
+				return false
+			end
+			true
+		end
+
+		# Sets the message byte size limit for a Websocket message. Defaults to 0 (no limit)
+		#
+		# Although memory will be allocated for the latest TCP/IP frame,
+		# this allows the websocket to disconnect if the incoming expected message size exceeds the allowed maximum size.
+		#
+		# If the sessage size limit is exceeded, the disconnection will be immidiate as an attack will be assumed. The protocol's normal disconnect sequesnce will be discarded.
+		def self.message_size_limit=val
+			@message_size_limit = val
+		end
+		# Gets the message byte size limit for a Websocket message. Defaults to 0 (no limit)
+		def self.message_size_limit
+			@message_size_limit
+		end
+		message_size_limit = 0
+
+	end
+
+	# Sets the message byte size limit for a Websocket message. Defaults to 0 (no limit)
+	#
+	# Although memory will be allocated for the latest TCP/IP frame,
+	# this allows the websocket to disconnect if the incoming expected message size exceeds the allowed maximum size.
+	#
+	# If the sessage size limit is exceeded, the disconnection will be immidiate as an attack will be assumed. The protocol's normal disconnect sequesnce will be discarded.
+	def self.ws_message_size_limit=val
+		WSProtocol.message_size_limit = val
+	end
+	# Gets the message byte size limit for a Websocket message. Defaults to 0 (no limit)
+	def self.ws_message_size_limit
+		WSProtocol.message_size_limit
 	end
 end
 

data/lib/plezi/server/websocket_client.rb

@@ -52,9 +52,14 @@ module Plezi
 		end
 		alias :close :disconnect
 
-		# sends data through the socket. a shortcut for ws_client.response <<
+		# Asynchronously sends data through the socket. a shortcut for ws_client.response <<
 		def << data
-			@response << data			
+			@response << data
+		end
+
+		# Synchronously sends data through the socket. a shortcut for ws_client.response <<
+		def send data
+			@response.send data
 		end
 
 		# Create a simple Websocket Client(!)

data/lib/plezi/server/ws_response.rb

@@ -17,7 +17,22 @@ module Plezi
 		#the request.
 		attr_accessor :request
 
-		PING_PROC = Proc.new {|res| EventMachine.timed_job 45, 1, [res.ping], PING_PROC unless res.service.disconnected? }
+		# Sets the defalt Websockt auto-ping interval.
+		#
+		# The default ping interval is 45 seconds.
+		#
+		# It's possible to set the ping interval to false, thereby disabling auto-pinging.
+		def self.ping_interval=(val)
+			@ping_interval = val
+		end
+		# Returns the defalt Websockt auto-ping interval.
+		#
+		# Plezi will automatically send a ping frame to keep websocket connections open.
+		# This auto-pinging can be disabled by setting the `ping_interval` to false.
+		def self.ping_interval
+			@ping_interval ||= 45
+		end
+		PING_PROC = Proc.new {|res| EventMachine.timed_job ping_interval, 1, [res.ping], PING_PROC unless res.service.disconnected? || !ping_interval }
 
 		def initialize request
 			@request, @service = request,request.service
@@ -81,20 +96,20 @@ module Plezi
 			service.locker.locked? ? (EventMachine.queue [service], CLOSE_PROC) : (CLOSE_PROC.call(service)) 
 		end
 
-		FRAME_SIZE_LIMIT = 131_072
+		FRAME_SIZE_LIMIT = 131_072 # javascript to test: str = '0123456789'; bigstr = ""; for(i = 0; i<=1033200; i+=1) {bigstr += str}; ws = new WebSocket('ws://localhost:3000/ws/size') ; ws.onmessage = function(e) {console.log(e.data.length)};ws. onopen = function(e) {ws.send(bigstr)}
 
-		# Dangerzone! ()alters the string, use `send` instead: formats the data as one or more WebSocket frames.
+		# Dangerzone! use `send` instead: formats the data as one or more WebSocket frames.
 		def self.frame_data data, op_code = nil, fin = true
 			# set up variables
 			frame = ''.force_encoding('binary')
 			op_code ||= (data.encoding.name == 'UTF-8' ? 1 : 2)
 
 
-			if data[FRAME_SIZE_LIMIT]
+			if data[FRAME_SIZE_LIMIT] && fin
 				# fragment big data chuncks into smaller frames - op-code reset for 0 for all future frames.
 				data = data.dup
 				data.force_encoding('binary')
-				[frame << frame_data(data.slice!(0..FRAME_SIZE_LIMIT), op_code, false), op_code = 0] while data.length > FRAME_SIZE_LIMIT # 1048576
+				[frame << frame_data(data.slice!(0...FRAME_SIZE_LIMIT), op_code, false), op_code = 0] while data.length > FRAME_SIZE_LIMIT # 1048576
 				# frame << frame_data(data.slice!(0..1048576), op_code, false)
 				# data = 
 				# op_code = 0
@@ -110,7 +125,7 @@ module Plezi
 
 			if data.length < 125
 				frame << data.length.chr
-			elsif data.length.bit_length < 16					
+			elsif data.length.bit_length <= 16					
 				frame << 126.chr
 				frame << [data.length].pack('S>')
 			else
@@ -123,4 +138,24 @@ module Plezi
 			frame
 		end
 	end
+
+	module_function
+	# Sets the defalt Websockt auto-ping interval.
+	#
+	# This method accepts one value, which should be either a number in seconds or `false`.
+	#
+	# The default ping interval is 45 seconds.
+	#
+	# It's possible to set the ping interval to false, thereby disabling auto-pinging.
+	def ping_interval=(val)
+		WSResponse.ping_interval = val
+	end
+	# Returns the defalt Websockt auto-ping interval.
+	#
+	# Plezi will automatically send a ping frame to keep websocket connections open.
+	# This auto-pinging can be disabled by setting the `ping_interval` to false.
+	def ping_interval
+		WSResponse.ping_interval
+	end
+
 end

data/lib/plezi/version.rb

@@ -1,3 +1,3 @@
 module Plezi
-    VERSION = "0.8.7"
+    VERSION = "0.9.0"
 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{Plezi is the native Ruby Framework for real time web-apps, with Websockets, RESTful routing and HTTP streaming support.}
-  spec.description   = %q{Plezi is the native Ruby Framework for real time web-apps, with Websockets, RESTful routing and HTTP streaming support.}
+  spec.summary       = %q{Plezi is the native Ruby Framework for real time web-apps. An easy way to write Websockets, RESTful routing and HTTP streaming apps.}
+  spec.description   = %q{Plezi is the native Ruby Framework for real time web-apps. An easy way to write Websockets, RESTful routing and HTTP streaming apps.}
   spec.homepage      = "http://boazsegev.github.io/plezi/"
   spec.license       = "MIT"
 
@@ -21,7 +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 = "** Deprecation Warning:\n- The current code for default error pages will be changed in version 0.9.0.\n- Default error pages will follow a different naming and location conventions.\n- The updated design will be part of the updated `plezi` helper script.\nPlease review your code before upgrading to the 0.9.0 version.\n\nThank you for installing Plezi, the native Ruby Framework for real time web-apps."
-  spec.post_install_message ||= "Thank you for installing Plezi, the native Ruby Framework for real time web-apps."
+  spec.post_install_message = "Thank you for installing Plezi, the native Ruby Framework for real time web-apps."
+  # spec.post_install_message = "** Deprecation Warning:\n- The current code for default error pages will be changed in version 0.9.0.\n- Default error pages will follow a different naming and location conventions.\n- The updated design will be part of the updated `plezi` helper script.\nPlease review your code before upgrading to the 0.9.0 version.\n\nThank you for installing Plezi, the native Ruby Framework for real time web-apps."
 
 end

data/resources/db_sequel_config.rb

@@ -11,21 +11,12 @@
 # http://sequel.jeremyevans.net
 if defined? Sequel
   
-  if defined? SQLite3
-    # An in-memory Sqlite3 connection:
-    # DB = Sequel.sqlite
-
-    # A Sqlite3 connection to a persistent database
-    DB = Sequel.sqlite(Root.join('db', 'db.sqlite3').to_s)
-
-  elsif defined? PG
-    if ENV['DYNO']
-      # A Postgres connection for Heroku:
-      DB = Sequel.connect(ENV['HEROKU_POSTGRESQL_RED_URL'])
-    else
-      # app name is the same as the root app folder: Root.to_s.split(/\/\\/).last
-      DB = Sequel.connect("postgres://localhost/#{Root.to_s.split(/[\/\\]/).last}")
-    end
+  if defined? PG && ENV['DYNO']
+    # A default Postgres connection for Heroku:
+    DB = Sequel.connect(ENV['HEROKU_POSTGRESQL_RED_URL'])
+  else
+    # use db/config.yaml to connect to database
+    DB = Sequel.connect( YAML::load(  File.open( Root.join('db', 'config.yml').to_s )  )[ ENV["ENV"].to_s ] )
   end
   if defined? Rake
 ##########

data/resources/websockets.js

@@ -1,28 +1,29 @@
-
-// remember to set your websocket uri as an absolute path!
-var ws_uri = "ws://echo.websocket.org/";
+// Your websocket URI should be an absolute path. The following sets the base URI.
+var ws_uri = 'ws://' + window.location.hostname + (window.location.port == '' ? '' : (':' + window.location.port) );
+// remember to add the specific controller's path to your websocket URI.
+ws_uri += "/";
+// websocket variable.
 var websocket = NaN
 
 function init_websocket()
 {
 	websocket = new WebSocket(ws_uri);
-	websocket.onopen = function(e) { on_open(e) };
-	websocket.onclose = function(e) { on_close(e) };
-	websocket.onmessage = function(e) { on_message(e) };
-	websocket.onerror = function(e) { on_error(e) }; }
-
-	function on_open(e) {
+	websocket.onopen = function(e) {
 		// what do you want to do now?
-	}
-	function on_close(e) {
+	};
+
+	websocket.onclose = function(e) {
 		// you probably want to reopen the websocket if it closes.
 		init_websocket()
-	}
-	function on_message(e) {
+	};
+	websocket.onerror = function(e) {
 		// what do you want to do now?
-	} 
-	function on_error(e) {
+	};
+	websocket.onmessage = function(e) {
 		// what do you want to do now?
-	}
+		console.log(e.data);
+		// to use JSON, use:
+		// msg = JSON.parse(e.data); // remember to use JSON also in your Plezi controller.
+	};
 }
-window.addEventListener("load", init, false); 
+window.addEventListener("load", init_websocket, false); 

data/resources/welcome_page.html

@@ -1,30 +1,64 @@
-<!DOCTYPE html><head><title>appname - Feed Me!</title><style type="text/css">body, html
+<!DOCTYPE html><head><title>appname - Feed Me!</title>
+<link href='http://fonts.googleapis.com/css?family=Shadows+Into+Light|Architects+Daughter' rel='stylesheet' type='text/css'>
+
+<link href="https://fonts.googleapis.com/css?family=Architects+Daughter" rel="stylesheet" type="text/css">
+<style type="text/css">
+/*
+med-blue: #44518E
+dark-gray: #424A70
+blue: #1B2864
+light-blue: #818ECE
+light-gray: #99A3CE
+*/
+body, html
 {
-    background-color: #eee;
+    background-color: #99A3CE;
     padding: 0; margin: 0;
     width: 100%;
     font-size: 1em;
 }
-body, html, h1, #wrapper, #wrapper h2
-{
-    background-image: url(/images/plezi_gray.png);
-    background-position: center top;
-    background-origin: inherit;
-    background-repeat: no-repeat;
-    background-size: 88% auto;
-    background-attachment: fixed;
-
-}
 
 h1
 {
-    background-color: #ddd;
-    color: #00a;
+    font-family: 'Indie Flower', cursive;
+    background-color: #1B2864;
+    color: #99A3CE;
     text-align: center;
-    border-bottom: 1px solid #000;
+    border-bottom: 1px solid #424A70;
     margin: 0 0 1em 0;
     padding: 0.5em 0;
     width: 100%;
+
+}
+h2, h3
+{
+    background-color: #44518E;
+    color: #99A3CE;
+    text-align: left;
+    margin: 0 0 1em 0;
+    padding: 0.5em 5%;
+    border-radius: 20px;
+    font-family: 'Shadows Into Light', cursive;
+}
+h2:before {
+  content: "|||";
+  color: #424A70;
+  padding-right: 0.3em;
+  margin-left: -1.5em;
+}
+h3:before {
+  content: "|||||";
+  color: #424A70;
+  padding-right: 0.3em;
+  margin-left: -2em;
+}
+h1 a, h2 a, h3 a
+{
+    color: #EBCD86;
+}
+h1 a:hover, h2 a:hover, h3 a:hover
+{
+    color: #EBD7A6;
 }
 p
 {
@@ -34,12 +68,12 @@ p
 }
 a
 {
-    color: #a04;
+    color: #D0AC54;
     text-decoration: none;
 }
 a:hover
 {
-    color: #70f;
+    color: #927121;
     text-decoration: underline;
 }
 #wrapper
@@ -51,15 +85,7 @@ a:hover
     min-height: 50%;
     color: #007;
 }
-#wrapper h2
-{
-    background-color: #ddd;
-    color: #008;
-    text-align: left;
-    margin: 0 0 1em 0;
-    padding: 0.5em 5%;
-    border-radius: 20px;
-}
+
 #wrapper p{ padding: 0 2%;}
 .bold { font-weight: bold; }
 #wrapper ol li{ padding: 0 2%;}
@@ -69,4 +95,35 @@ pre
     padding: 0.5em 0;
     background-color: #444;
     color: #ddd;
-}</style></head><body><h1>Welcome to  <a href="https://github.com/boazsegev/plezi">Plezi</a></h1><div id="wrapper"><h2>Congratulations, appname is running - What's next?</h2><p><span class="bold">Congratulations</span>, you're now running appname and it has so much potential!</p><p>appname started out <a href="https://github.com/boazsegev/plezi">Plezi</a> and it's your quest to feed it your code and make sure appname grows strong and happy.</p><p>You're the master of this quest, and your next steps might include:</p><ol><li><p class="bold">Deciding which gems to use:</p><ul><li>edit Gemfile in the appname folder.</li></ul></li><li><p class="bold">Reviewing the sample code and feeding <a href="https://github.com/boazsegev/plezi">Plezi</a> your code:</p><ul><li>Review the 'sample_controller.rb' file in the appname/app/controllers folder.</li><li>Delete the 'sample_controller.rb' file and this file (appname/assets/welcome.html).</li><li>Write your own controller and code.</li><li>Edit the 'routes.rb' file to set up your routes.</li></ul></li><li><p><span class="bold">Having fun</span> and submitting any issues you discover to the <a href="https://github.com/boazsegev/plezi">Plezi Github Project.</a></p></li></ol><p class="bold">Good Luck!</p></div></body>
+}
+
+</style>
+</head>
+<body>
+    <h1>Welcome to  <a href="https://github.com/boazsegev/plezi">Plezi</a></h1>
+    <div id="wrapper">
+        <h2>Congratulations, <a href='/'>appname</a> is running - What's next?</h2>
+        <p><span class="bold">Congratulations</span>, you're now running appname and it has so much potential!</p>
+        <p>appname started out <a href="https://github.com/boazsegev/plezi">Plezi</a> and it's your quest to feed it your code and make sure appname grows strong and happy.</p>
+        <p>You're the master of this quest, and your next steps might include:</p>
+        <ol><li><p class="bold">Deciding which gems to use:</p>
+            <ul>
+                <li>edit Gemfile in the appname folder.</li>
+            </ul>
+        </li>
+        <li>
+            <p class="bold">Reviewing the sample code and feeding <a href="https://github.com/boazsegev/plezi">Plezi</a> your code:</p>
+            <ul>
+                <li>Review the 'sample_controller.rb' file in the appname/app/controllers folder.</li>
+                <li>Delete the 'sample_controller.rb' file and this file (appname/assets/welcome.html).</li>
+                <li>Write your own controller and code.</li>
+                <li>Edit the 'routes.rb' file to set up your routes.</li>
+            </ul>
+        </li>
+        <li>
+            <p><span class="bold">Having fun</span> and submitting any issues you discover to the <a href="https://github.com/boazsegev/plezi">Plezi Github Project.</a></p>
+        </li>
+    </ol>
+    <p class="bold">Good Luck!</p>
+</div>
+</body>

data/test/plezi_tests.rb

@@ -135,6 +135,15 @@ class TestCtrl
 	end
 end
 
+class WSsizeTestCtrl
+	# called when new Websocket data is recieved
+	#
+	# data is a string that contains binary or UTF8 (message dependent) data.
+	def on_message data
+		response << data
+	end
+end
+
 module PleziTestTasks
 	module_function
 
@@ -251,7 +260,7 @@ module PleziTestTasks
 					go_test = false
 				end
 			end
-			ws3 = Plezi::WebsocketClient.connect_to("wss://localhost:3030") do |msg|
+			ws3 = Plezi::WebsocketClient.connect_to("ws://localhost:3000") do |msg|
 				if msg.match /uuid: ([^s]*)/
 					ws2 << "to: #{msg.match(/^uuid: ([^s]*)/)[1]}"
 					puts "    * Websocket UUID for unicast testing: #{msg.match(/^uuid: ([^s]*)/)[1]}"
@@ -290,6 +299,27 @@ module PleziTestTasks
 		PL.on_shutdown {puts "    * Websocket broadcast message test: #{RESULTS[broadcast_test]}" unless broadcast_test}
 		PL.on_shutdown {puts "    * Websocket unicast message test: #{RESULTS[unicast_test]}"}
 	end
+	def test_websocket_sizes
+			should_disconnect = false
+			ws = Plezi::WebsocketClient.connect_to("ws://localhost:3000/ws/size") do |msg|
+				if should_disconnect
+					puts "    * Websocket size disconnection test: #{RESULTS[false]}"
+				else
+					puts "    * Websocket message size test: got #{msg.bytesize} bytes"
+				end
+
+			end
+			ws.on_disconnect do
+				puts "    * Websocket size disconnection test: #{RESULTS[should_disconnect]}"
+			end
+			str = 'a'
+			time_now = Time.now
+			6.times {|i| str = str * 2**i;puts "    * Websocket message size test: sending #{str.bytesize} bytes"; ws.send str; sleep 0.2 }
+			sleep (Time.now - time_now + 1)
+			should_disconnect = true
+			Plezi.ws_message_size_limit = 1024
+			ws << str
+	end
 	def test_404
 		puts "    * 404 not found and router continuity tests: #{RESULTS[ Net::HTTP.get_response(URI.parse "http://localhost:3000/get404" ).code == '404' ]}"
 
@@ -323,6 +353,8 @@ route("/ssl") {|req, res| res << "false" }
 listen port: 3030, ssl: true
 route("/ssl") {|req, res| res << "true" }
 
+shared_route 'ws/size', WSsizeTestCtrl
+
 shared_route '/some/:multi{path|another_path}/(:option){route|test}/(:id)/(:optional)', TestCtrl
 shared_route '/', TestCtrl
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: plezi
 version: !ruby/object:Gem::Version
-  version: 0.8.7
+  version: 0.9.0
 platform: ruby
 authors:
 - Boaz Segev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-25 00:00:00.000000000 Z
+date: 2015-07-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -38,8 +38,8 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
-description: Plezi is the native Ruby Framework for real time web-apps, with Websockets,
-  RESTful routing and HTTP streaming support.
+description: Plezi is the native Ruby Framework for real time web-apps. An easy way
+  to write Websockets, RESTful routing and HTTP streaming apps.
 email:
 - boaz@2be.co.il
 executables:
@@ -106,7 +106,6 @@ files:
 - resources/haml_config.rb
 - resources/i18n_config.rb
 - resources/oauth_config.rb
-- resources/plezi_gray.png
 - resources/plezi_websockets.html
 - resources/rakefile
 - resources/redis_config.rb
@@ -119,14 +118,8 @@ homepage: http://boazsegev.github.io/plezi/
 licenses:
 - MIT
 metadata: {}
-post_install_message: |-
-  ** Deprecation Warning:
-  - The current code for default error pages will be changed in version 0.9.0.
-  - Default error pages will follow a different naming and location conventions.
-  - The updated design will be part of the updated `plezi` helper script.
-  Please review your code before upgrading to the 0.9.0 version.
-
-  Thank you for installing Plezi, the native Ruby Framework for real time web-apps.
+post_install_message: Thank you for installing Plezi, the native Ruby Framework for
+  real time web-apps.
 rdoc_options: []
 require_paths:
 - lib
@@ -145,7 +138,7 @@ rubyforge_project:
 rubygems_version: 2.4.7
 signing_key: 
 specification_version: 4
-summary: Plezi is the native Ruby Framework for real time web-apps, with Websockets,
-  RESTful routing and HTTP streaming support.
+summary: Plezi is the native Ruby Framework for real time web-apps. An easy way to
+  write Websockets, RESTful routing and HTTP streaming apps.
 test_files:
 - test/plezi_tests.rb