plezi 0.8.6 → 0.8.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c7c44156e8d07feee948374172192f5bbaafa806
-  data.tar.gz: a8a7badafd82d78e01a20d3ccf55e8bcc1dbd20a
+  metadata.gz: c39d10feca5a72236133883875628f43ae714a86
+  data.tar.gz: a1accf79bbde62e52e63836158e2e16d32cff059
 SHA512:
-  metadata.gz: 54db5b96460193896c8feacf4db749ea68132b0659007b93b54633bc4e99e45689906bc666df1517aa644e2f5f573d63d4b0364a4723ddc621c13ec7eae6dd53
-  data.tar.gz: 1e2426a2844334deb000f49381f6dad3ee1c89feaff3feb32944ba5ec7ad03a37c44985de8a4d50bf7ab7c88479893d180ca871ee782c2e22a425359876cac3f
+  metadata.gz: b94655b0900f4c5c69ac17c81cd3ee83af7c19ce8e459bb523766210b92e9c16c2d56977f4537665c19985dd5a77638bc93505abb85af8a515162d167f378017
+  data.tar.gz: dcdff9a3dd5ec25ef4c6d6ffb43714b52552df92e49258744841902371ad094dd1232cf0bd951e2a69b0773557d50bd8e29125c9f36016804354878883780f80

data/CHANGELOG.md

@@ -2,6 +2,16 @@
 
 ***
 
+Change log v.0.8.7
+
+**minor performance**: streamlined the ping/pong Websocket process.
+
+**fix**: fixed an issue with the auto-utilization of the I18n gem, where one request could set the locale for all subsequent requests that are processed by the same thread.
+
+**deprecation warning**: The current code for default error pages will be changed in version 0.9.0, so that default error pages will follow a different naming convention and would be searched for in a different location. The updated design will be part of the updated `plezi` helper script. Please review your code before upgrading to the 0.9.0 version.
+
+***
+
 Change log v.0.8.6
 
 **fix**: fixed an issue with the plezi helper script that prevented the script from starting the Plezi app or Plezi console.

data/README.md

@@ -33,7 +33,7 @@ to create a new barebones app using the Plezi framework, run from terminal:
 
     $ plezi new appname
 
-That's it, now you have a ready to use basic web server (with some demo code), just run it:
+That's it, now you have a ready to use basic web server (with some demo code). If you're on MacOS or linux you can simply double click the `appname` script file in the `appname` folder. Or, from the terminal, you can type:
 
     $ cd appname
     $ ./appname # ( or: plezi s )

data/lib/plezi/eventmachine/io.rb

@@ -213,6 +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 "Services running Plezi version #{Plezi::VERSION}. Press ^C to stop"
 				EventMachine.start Plezi.max_threads
 

data/lib/plezi/handlers/controller_magic.rb

@@ -203,7 +203,7 @@ module Plezi
 				options[:type] ||= 'html'
 				options[:locale] ||= params[:locale].to_sym if params[:locale]
 				# options[:locals] ||= {}
-				I18n.locale = options[:locale] if defined?(I18n) && options[:locale]
+				I18n.locale = options[:locale] || I18n.default_locale if defined?(I18n) # sets the locale to nil for default behavior even if the locale was set by a previous action - removed: # && options[:locale]
 				# find template and create template object
 				filename = template.is_a?(String) ? File.join( host_params[:templates].to_s, template) : (File.join( host_params[:templates].to_s, *template.to_s.split('_')) + (options[:type].empty? ? '': ".#{options[:type]}") + '.slim')
 				return ( Plezi.cache_needs_update?(filename) ? Plezi.cache_data( filename, ( Slim::Template.new() { IO.read filename } ) )  : (Plezi.get_cached filename) ).render(self, &block) if defined?(::Slim) && Plezi.file_exists?(filename)
@@ -453,7 +453,7 @@ module Plezi
 				true
 			end
 
-			# WebSockets.
+			# WebSockets: fires an event on all of this controller's active websocket connections.
 			#
 			# Class method.
 			#
@@ -471,9 +471,7 @@ module Plezi
 				__inner_redis_broadcast(nil, nil, method_name, args, &block) || __inner_process_broadcast(nil, nil, method_name.to_sym, args, &block)
 			end
 
-			# WebSockets.
-			#
-			# Class method.
+			# WebSockets: fires an event on a specific websocket connection using it's UUID.
 			#
 			# Use this to unidcast an event to specific websocket connection using it's UUID.
 			#

data/lib/plezi/server/websocket.rb

@@ -162,13 +162,16 @@ module Plezi
 			@extentions.each {|ex| SUPPORTED_EXTENTIONS[ex[0]][1].call(@parser_data[:body], ex[1..-1]) if SUPPORTED_EXTENTIONS[ex[0]]}
 
 			case @parser_data[:op_code]
-			when 9, 10
-				# handle @parser_data[:op_code] == 9 (ping) / @parser_data[:op_code] == 10 (pong)
-				Plezi.callback @connection, :send_nonblock, WSResponse.frame_data(@parser_data[:body].pack('C*'), 10) # unless @parser_data[:op_code] == 10
-				@parser_op_code = nil if @parser_op_code == 9 || @parser_op_code == 10
+			when 9 # ping
+				# handle @parser_data[:op_code] == 9 (ping)
+				Plezi.callback @connection, :send_nonblock, WSResponse.frame_data(@parser_data[:body].pack('C*'), 10) # "\x8A\x00" can't be used, because body should be returned. # sends pong op_code == 10
+				@parser_op_code = nil if @parser_op_code == 9
+			when 10 #pong
+				# handle @parser_data[:op_code] == 10 (pong)
+				@parser_op_code = nil if @parser_op_code == 10
 			when 8
 				# handle @parser_data[:op_code] == 8 (close)
-				Plezi.callback( @connection, :send_nonblock, WSResponse.frame_data('', 8) ) { @connection.disconnect }
+				Plezi.callback( @connection, :send_nonblock, "\x88\x00" ) { @connection.disconnect }
 				@parser_op_code = nil if @parser_op_code == 8
 			else
 				@message << @parser_data[:body].pack('C*')

data/lib/plezi/server/ws_response.rb

@@ -64,12 +64,12 @@ module Plezi
 
 		# pings the connection
 		def ping
-			service.send_nonblock self.class.frame_data('', 9)
+			service.send_nonblock "\x89\x00" # op_code 9
 			self
 		end
 		# pings the connection
 		def pong
-			service.send_nonblock self.class.frame_data('', 10)
+			service.send_nonblock "\x8A\x00" # op_code 10
 			self
 		end
 

data/lib/plezi/version.rb

@@ -1,3 +1,3 @@
 module Plezi
-    VERSION = "0.8.6"
+    VERSION = "0.8.7"
 end

data/plezi.gemspec

@@ -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 = "This update might break existing code - please review ChangeLog.md before upgrading any 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."
+  spec.post_install_message ||= "Thank you for installing Plezi, the native Ruby Framework for real time web-apps."
 
 end

data/resources/websockets.js

@@ -0,0 +1,28 @@
+
+// remember to set your websocket uri as an absolute path!
+var ws_uri = "ws://echo.websocket.org/";
+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) {
+		// what do you want to do now?
+	}
+	function on_close(e) {
+		// you probably want to reopen the websocket if it closes.
+		init_websocket()
+	}
+	function on_message(e) {
+		// what do you want to do now?
+	} 
+	function on_error(e) {
+		// what do you want to do now?
+	}
+}
+window.addEventListener("load", init, false); 

data/test/plezi_tests.rb

@@ -299,7 +299,7 @@ module PleziTestTasks
 	end
 	def test_500
 		workers = Plezi::EventMachine.count_living_workers
-		putc "    * 500 internal error test: #{RESULTS[ Net::HTTP.get_response(URI.parse "http://localhost:3000/fail" ).code == '500' ]}"
+		print "    * 500 internal error test: #{RESULTS[ Net::HTTP.get_response(URI.parse "http://localhost:3000/fail" ).code == '500' ]}"
 		# cause 10 more exceptions to be raised... testing thread survival.
 		10.times { putc "."; Net::HTTP.get_response(URI.parse "http://localhost:3000/fail" ).code }
 		putc "\n"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: plezi
 version: !ruby/object:Gem::Version
-  version: 0.8.6
+  version: 0.8.7
 platform: ruby
 authors:
 - Boaz Segev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-18 00:00:00.000000000 Z
+date: 2015-06-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -111,6 +111,7 @@ files:
 - resources/rakefile
 - resources/redis_config.rb
 - resources/routes.rb
+- resources/websockets.js
 - resources/welcome_page.html
 - test/plezi_tests.rb
 - websocket chatroom.md
@@ -118,8 +119,14 @@ homepage: http://boazsegev.github.io/plezi/
 licenses:
 - MIT
 metadata: {}
-post_install_message: Thank you for installing Plezi, the native Ruby Framework for
-  real time web-apps.
+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.
 rdoc_options: []
 require_paths:
 - lib