plezi 0.10.2 → 0.10.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5f99a6c5363bfd4c55ae83bccdd950960f70e09b
-  data.tar.gz: 1efec6a2d073e2c10ecae857ffd762125dd5c5d5
+  metadata.gz: c4c8828c427f149b793363c7fee35cc22b23a02d
+  data.tar.gz: 00cec3276546ec102eddb67e62de3b90a4a4a595
 SHA512:
-  metadata.gz: ad3c84e4434609d30e7770f2fc2d4b6b698054439b52a9484ca8fd38cd8decb93fc8f5e8f3b51bcf79378ca752fb60369957994d966ee3b3abbd33cbe72f967c
-  data.tar.gz: 6c19c160e6791996b23bc09dcca988f44a462c6ede451f35be1b2946ef65f7b1be611bf1ec1abefa40bb113a5ce44934ac80bb5f915dde452f0f63cd6755fcdc
+  metadata.gz: 8c747627876d08a48dbe328418aebf0edee57f8a7d484298e17ca65b76f1f55a50e72483fb4ce8044973ba6c01a0fb31f63e4500b0701dfc4228dacf11e374a7
+  data.tar.gz: 1e636b886ec198c3874848eb471123d341edffa1700a44ea2032bb12213eb3b844d3ba3d734c6b28ac5b9a7a484bc4ff37514fad270c44549f60467dfca358a6

data/CHANGELOG.md

@@ -2,6 +2,14 @@
 
 ***
 
+Change log v.0.10.3
+
+**Update**: updated the starting process, so that Plezi's engine (based on GReactor) could be started and restarted if needed.
+
+**Fix**: the startup process ignored the `max_thread` settings. This is now fixed.
+
+***
+
 Change log v.0.10.2
 
 **Fix**: fixed an issue where the Redis connection couldn't broadcast due to limited acess to the controller's methods.

data/bin/plezi

@@ -220,7 +220,7 @@ if ARGV[0] == 'new' || ARGV[0] == 'n' || ARGV[0] == "force"
 	#########
 	## set up building environment
 	require 'plezi/version'
-	BUILDING_PLEZI_TEMPLATE = true
+	NO_PLEZI_AUTO_START = true
 	ARGV[1] = ARGV[1].gsub /[^a-zA-Z0-9]/, '_'
 	if Dir.exists?(ARGV[1]) && ARGV[0] != "force"
 		puts ""

data/lib/plezi/common/dsl.rb

@@ -125,6 +125,16 @@ module Plezi
 			end
 		end
 	end
+
+	def self.start
+		return GReactor.start if GReactor.running?
+		Object.const_set("NO_PLEZI_AUTO_START", true) unless defined?(NO_PLEZI_AUTO_START)
+		puts "Starting Plezi #{Plezi::VERSION} Services using the GRHttp #{GRHttp::VERSION} server."
+		puts "Press ^C to exit."
+		GReactor.on_shutdown { puts "Plezi shutdown. It was fun to serve you."  }
+		GReactor.start Plezi::Settings.max_threads
+		GReactor.join { puts "\r\nStarting shutdown sequesnce. Press ^C to force quit."}
+	end
 end
 
 Encoding.default_internal = 'utf-8'
@@ -212,18 +222,12 @@ end
 # it is recommended that you DO NOT CALL this method.
 # if any post shut-down actions need to be performed, use Plezi.on_shutdown instead.
 def start_services
-	return 0 if ( defined?(NO_PLEZI_AUTO_START) || defined?(BUILDING_PLEZI_TEMPLATE) || defined?(PLEZI_ON_RACK) )
-	Object.const_set "NO_PLEZI_AUTO_START", true
+	return 0 if defined?(NO_PLEZI_AUTO_START)
 	undef listen
 	undef host
 	undef route
 	undef shared_route
-	undef start_services
-	puts "Starting Plezi #{Plezi::VERSION} Services using the GRHttp #{GRHttp::VERSION} server."
-	puts "Press ^C to exit."
-	GReactor.on_shutdown { puts "Plezi shutdown. It was fun to serve you."  }
-	GReactor.start unless GReactor.running?
-	GReactor.join { puts "\r\nStarting shutdown sequesnce. Press ^C to force quit."}
+	Plezi.start
 end
 
 # restarts the Plezi app with the same arguments as when it was started.
@@ -234,7 +238,7 @@ def restart_plezi_app
 end
 
 # sets to start the services once dsl script is finished loading.
-at_exit { start_services } unless ( defined?(NO_PLEZI_AUTO_START) || defined?(BUILDING_PLEZI_TEMPLATE) || defined?(PLEZI_ON_RACK) )
+at_exit { start_services }
 
 # sets information to be used when restarting
 $PL_SCRIPT = $0

data/lib/plezi/helpers/magic_helpers.rb

@@ -1,6 +1,10 @@
 module Plezi
 
+	# use GRHttp's helpers for escaping data etc'.
+	HTTP = GRHttp::HTTP
+
 	module Base
+		# some helper methods used internally.
 		module Helpers
 			# a proc that allows Hashes to search for key-value pairs while also converting keys from objects to symbols and from symbols to strings.
 			#

data/lib/plezi/version.rb

@@ -1,3 +1,3 @@
 module Plezi
-    VERSION = "0.10.2"
+    VERSION = "0.10.3"
 end

data/resources/config.ru

@@ -22,7 +22,7 @@
 # 2. you have better control over Middleware then you could have with Plezi.
 # ("wait", you might say, "there is no Middleware in Plezi!"... "Ahhh", I will answer, "so much to discover...")
 
-PLEZI_ON_RACK = true
+NO_PLEZI_AUTO_START = true
 
 # load all framework and gems
 load ::File.expand_path(File.join("..", "environment.rb"),  __FILE__)
@@ -31,7 +31,7 @@ load ::File.expand_path(File.join("..", "environment.rb"),  __FILE__)
 load ::File.expand_path(File.join("..", "routes.rb"),  __FILE__)
 
 # start the plezi EM, to make sure that the plezi async code doesn't break.
-Plezi::EventMachine.start Plezi.max_threads
+GReactor.start Plezi::Settings.max_threads
 
 # run the Rack app
-run Plezi::DSL
+run Plezi::Base::DSL

data/resources/controller.rb

@@ -119,6 +119,7 @@ class SampleController
 	# the demo content simply broadcasts the message.
 	def on_message data
 		# broadcast sends an asynchronous message to all sibling instances, but not to self.
+		data = Plezi::HTTP.escape data
 		broadcast :_print_out, data
 		response << "You said: #{data}"
 	end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: plezi
 version: !ruby/object:Gem::Version
-  version: 0.10.2
+  version: 0.10.3
 platform: ruby
 authors:
 - Boaz Segev