plezi 0.10.12 → 0.10.13

data/resources/mini_app.rb

@@ -7,11 +7,15 @@
 	Root ||= Pathname.new(File.dirname(__FILE__)).expand_path
 	## make sure all file access and file loading is relative to the application's root folder
 	# Dir.chdir Root.to_s
+	## load code from a subfolder called 'code'
+	# Dir[File.join "{code}", "**" , "*.rb"].each {|file| load File.expand_path(file)}
 
-	## Commet the following in order to use use your original app's Gemfile.
 	## If this app is independant, use bundler to load gems (including the plezi gem).
-	require 'bundler'
-	Bundler.require(:default, ENV['ENV'].to_s.to_sym)
+	## Else, use the original app's Gemfile and start Plezi's Rack mode.
+		require 'bundler'
+		Bundler.require(:default, ENV['ENV'].to_s.to_sym)
+		## OR:
+		# Plesi.start_rack # remember 
 
 	## Uncomment to create a log file
 	# GReactor.create_logger File.expand_path(Root.join('server.log').to_s)
@@ -58,8 +62,7 @@ end
 listen 	host: :default,
 		# root: Root.join('public').to_s,
 		# assets: Root.join('assets').to_s,
-		# assets_public: '/assets',
-		# templates: Root.join('app','views').to_s,
+		# templates: Root.join('templates').to_s,
 		ssl: false
 
 ## Optional stuff:

data/resources/welcome_page.html

@@ -175,13 +175,13 @@ input[type=submit]:active
 </style>
 <script type="text/javascript">
 // Your websocket URI should be an absolute path. The following sets the base URI.
-var ws_uri = (window.location.protocol.match(/https/) ? 'wss' : 'ws') + '://' + window.location.hostname + (window.location.port == '' ? '' : (':' + window.location.port) ) + window.location.pathname;
-// remember to add the specific controller's path to your websocket URI.
-ws_uri += "/";
+// remember to update to the specific controller's path to your websocket URI.
+var ws_controller_path = '/' // window.location.pathname; // change to '/controller/path'
+var ws_uri = (window.location.protocol.match(/https/) ? 'wss' : 'ws') + '://' + window.location.hostname + (window.location.port == '' ? '' : (':' + window.location.port) ) + ws_controller_path
 // websocket variable.
 var websocket = NaN
 // count failed attempts
-var websocket_fail = 0
+var websocket_fail_count = 0
 
 function init_websocket()
 {

data/test/plezi_tests.rb

@@ -312,28 +312,32 @@ module PleziTestTasks
 		PL.on_shutdown {puts "    * Websocket unicast message test: #{RESULTS[unicast_test]}"}
 	end
 	def test_websocket_sizes
-			should_disconnect = false
-			ws = GRHttp::WSClient.connect_to("ws://localhost:3000/ws/size") do |ws|
-				if should_disconnect
-					puts "    * Websocket size disconnection test: #{RESULTS[false]}"
-				else
-					puts "    * Websocket message size test: got #{ws.data.bytesize} bytes"
-				end
-
-			end
-			ws.on_close do
-				puts "    * Websocket size disconnection test: #{RESULTS[should_disconnect]}"
-			end
-			str = 'a'
-			time_now = Time.now
-			8.times {|i| str = str * 2**i;puts "    * Websocket message size test: sending #{str.bytesize} bytes"; ws << str; }
-			str.clear
-			to_sleep = (Time.now - time_now)*2 + 1
-			puts "will now sleep for #{to_sleep} seconds, waiting allowing the server to respond"
-			sleep to_sleep rescue true
-			should_disconnect = true
-			Plezi::Settings.ws_message_size_limit = 1024
-			ws << ('0123'*258)
+			# should_disconnect = false
+			# ws = GRHttp::WSClient.connect_to("ws://localhost:3000/ws/size") do |ws|
+			# 	if should_disconnect
+			# 		puts "    * Websocket size disconnection test: #{RESULTS[false]}"
+			# 	else
+			# 		puts "    * Websocket message size test: got #{ws.data.bytesize} bytes"
+			# 	end
+
+			# end
+			# ws.on_close do
+			# 	puts "    * Websocket size disconnection test: #{RESULTS[should_disconnect]}"
+			# end
+			# str = 'a'
+			# time_now = Time.now
+			# 8.times {|i| str = str * 2**i;puts "    * Websocket message size test: sending #{str.bytesize} bytes"; ws << str; }
+			# str.clear
+			# to_sleep = (Time.now - time_now)*2 + 1
+			# puts "will now sleep for #{to_sleep} seconds, waiting allowing the server to respond"
+			# sleep to_sleep rescue true
+			# should_disconnect = true
+			# Plezi::Settings.ws_message_size_limit = 1024
+			# ws << ('0123'*258)
+	end
+	def test_broadcast_stress
+		PlaceboStressTestCtrl.create_listeners
+		PlaceboStressTestCtrl.run_test
 	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' ]}"
@@ -343,17 +347,17 @@ module PleziTestTasks
 		puts e
 	end
 	def test_500
-		# workers = GReactor.instance_exec {@threads.select {|t| t.alive?} .count}
-		# 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"
-		# workers_after_test = GReactor.instance_exec {@threads.select {|t| t.alive?} .count}
-		# puts "    * Worker survival test: #{RESULTS[workers_after_test == workers]} (#{workers_after_test} out of #{workers})"
-
-		# rescue => e
-		# puts "    **** 500 internal error test FAILED TO RUN!!!"
-		# puts e
+		workers = GReactor.instance_exec {@threads.select {|t| t.alive?} .count}
+		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"
+		workers_after_test = GReactor.instance_exec {@threads.select {|t| t.alive?} .count}
+		puts "    * Worker survival test: #{RESULTS[workers_after_test == workers]} (#{workers_after_test} out of #{workers})"
+
+		rescue => e
+		puts "    **** 500 internal error test FAILED TO RUN!!!"
+		puts e
 	end
 end
 
@@ -388,6 +392,40 @@ class PlaceboCtrl
 	end
 end
 
+
+class PlaceboStressTestCtrl
+	def review start_time, fin = false, uni = false
+		if fin
+			time_now = Time.now
+			average = (((time_now - start_time)*1.0/(LISTENERS*REPEATS))*1000.0).round(4)
+			total = (time_now - start_time).round(3)
+			puts "    * Placebo stress test - Total of #{LISTENERS*REPEATS} events) finished in #{total} seconds"
+			puts "    * Placebo stress test - average: (#{average} seconds per event."
+			PlaceboStressTestCtrl.run_unicast_test unless uni
+		end
+	end
+	def self.run_test
+		puts "\n    * Placebo Broadcast stress test starting - (#{LISTENERS} listening objects with #{REPEATS} messages."
+		start_time = Time.now
+		(REPEATS - 1).times {|i| PlaceboStressTestCtrl.broadcast :review, start_time}
+		PlaceboStressTestCtrl.unicast @uuid, :review, start_time, true
+		puts "    * Placebo stress test - sending messages required: (#{Time.now - start_time} seconds."
+	end
+	def self.run_unicast_test
+		puts "\n    * Placebo Unicast stress test starting - (#{LISTENERS} listening objects with #{REPEATS} messages."
+		start_time = Time.now
+		(REPEATS - 1).times {|i| PlaceboStressTestCtrl.unicast @uuid, :review, start_time, false, true}
+		PlaceboStressTestCtrl.unicast @uuid, :review, start_time, true, true
+		puts "    * Placebo stress test - sending messages required: (#{Time.now - start_time} seconds."
+	end
+	def self.create_listeners
+		@uuid = nil
+		LISTENERS.times {@uuid = Plezi::Placebo.new(PlaceboStressTestCtrl).uuid}
+	end
+	REPEATS = 1000
+	LISTENERS = 600
+end
+
 PL.create_logger nil
 # PL::Settings.max_threads = 4
 
@@ -401,6 +439,9 @@ shared_route 'ws/no', Nothing
 shared_route 'ws/placebo', PlaceboTestCtrl
 shared_route 'ws/size', WSsizeTestCtrl
 
+
+# puts Nothing.ancestors.join "\n"
+
 shared_route '/some/:multi{path|another_path}/(:option){route|test}/(:id)/(:optional)', TestCtrl
 shared_route '/', TestCtrl
 
@@ -418,23 +459,26 @@ end
 
 
 
-r = Plezi::Placebo.new PlaceboCtrl
-puts "    * Create Placebo test: #{PleziTestTasks::RESULTS[r && true]}"
 
-Plezi.start_async
 puts "    --- Plezi will ran async, performing some tests that than hang"
 
 puts "    --- Starting tests"
 puts "    --- Failed tests should read: #{PleziTestTasks::RESULTS[false]}"
+Plezi.start_async
 PleziTestTasks.run_tests
-puts "\n    --- Press ^C to complete tests."
 
+r = Plezi::Placebo.new PlaceboCtrl
+puts "    * Create Placebo test: #{PleziTestTasks::RESULTS[r && true]}"
+
+# ENV['PL_REDIS_URL'] ||= ENV['REDIS_URL'] || ENV['REDISCLOUD_URL'] || ENV['REDISTOGO_URL'] || "redis://test:1234@pub-redis-11008.us-east-1-4.5.ec2.garantiadata.com:11008"
+# # GReactor::Settings.set_forking 4
+# GR.run_async { PleziTestTasks.run_tests }
 # start_services
 
 shoutdown_test = false
-# GReactor::Settings.set_forking 4
 Plezi.on_shutdown { shoutdown_test = true }
 
+puts "\n    --- Press ^C to complete tests."
 Plezi.start
 # Plezi::EventMachine.clear_timers
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: plezi
 version: !ruby/object:Gem::Version
-  version: 0.10.12
+  version: 0.10.13
 platform: ruby
 authors:
 - Boaz Segev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-24 00:00:00.000000000 Z
+date: 2015-07-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: grhttp
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.15
+        version: 0.0.16
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.15
+        version: 0.0.16
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -52,8 +52,8 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
-description: Plezi is the native Ruby Framework for real time web-apps. An easy way
-  to write Websockets, RESTful routing and HTTP streaming apps.
+description: Plezi - the easy way to add Websockets, RESTful routing and HTTP streaming
+  serviced to Ruby Web-Apps.
 email:
 - boaz@2be.co.il
 executables:
@@ -78,9 +78,11 @@ files:
 - lib/plezi/handlers/controller_core.rb
 - lib/plezi/handlers/controller_magic.rb
 - lib/plezi/handlers/http_router.rb
+- lib/plezi/handlers/placebo old.rb
 - lib/plezi/handlers/placebo.rb
 - lib/plezi/handlers/route.rb
 - lib/plezi/handlers/stubs.rb
+- lib/plezi/handlers/ws_object.rb
 - lib/plezi/helpers/http_sender.rb
 - lib/plezi/helpers/magic_helpers.rb
 - lib/plezi/helpers/mime_types.rb
@@ -145,8 +147,8 @@ rubyforge_project:
 rubygems_version: 2.4.7
 signing_key: 
 specification_version: 4
-summary: Plezi is the native Ruby Framework for real time web-apps. An easy way to
-  write Websockets, RESTful routing and HTTP streaming apps.
+summary: Plezi - the easy way to add Websockets, RESTful routing and HTTP streaming
+  serviced to Ruby Web-Apps.
 test_files:
 - test/console
 - test/plezi_tests.rb