plezi 0.10.10 → 0.10.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 51cbaa19856511e83dc4eec44e82573be9e4a539
-  data.tar.gz: 45a11c946dd7f1c2a86a999bc1586cedf3cc00b6
+  metadata.gz: 3ae320b0b94bf0515e804c8f578919e46147d349
+  data.tar.gz: b82256beacdbd56c48b66755d4b086d0293452fb
 SHA512:
-  metadata.gz: 88a265ccda32792f53ab5d517d4ad1c245b3672e99e1e94ea588536d8b090783ad563d742d3da6974ab81ece05f18142e57d6bffd615ccab7d4a4de7bb608686
-  data.tar.gz: 7b41e62df43c66263c4f771df4f209d8d8545f647006191b2d547b262ea4f4bcf8897b64ac3be5f8881b62ea784ab2de498f8779d1009ddca307a6cb6e596a36
+  metadata.gz: ebeaa5a013faf936e694f5d54fd212d1c299f015631f63667c0e0419958321f86086f8087d94111c194656247101d3d65f621fe15177a2931a83199d0ed3be76
+  data.tar.gz: 8df8144823d9be37ecd9d8d89e01b116c5aed875188781ea5953961b022b5c8765ca84b4c312b20fb2c98ca132f819aa8f296140ea718346d3af914227b3a5c2

data/CHANGELOG.md

@@ -2,6 +2,18 @@
 
 ***
 
+Change log v.0.10.11
+
+**Feature**: added the mini-app template, for quick websocket oriented apps that are meant to be attached to other frameworks (use `$ plezi mini appname` or `$ plezi m appname`).
+
+**Feature**: allow Regexp hosts in the `listen` and `host` methods.
+
+**Fix**: An error in the chache system was introduced when performing slight performance enhancements (two variable names were switched). The issue is now fixed.
+
+**Fix**: Correctly handle multiple `listen` calls with the same port number.
+
+***
+
 Change log v.0.10.10
 
 **Fix**: Autopinging wasn't senf doe to a typo (`unless` instead of `if`).. this is now fixed. Autopinging will keep your Websocket connections alive.

data/bin/plezi

@@ -34,10 +34,28 @@ require 'securerandom'
 class AppTemplate
 
 	def initialize
-		require 'rubygems'
-		# set end comments
 		@end_comments = []
 		@app_tree ||= {}
+	end
+	def app_tree
+		@app_tree ||= {}
+	end
+	def build_mini
+		require 'plezi/version'
+		@app_tree["#{ARGV[1]}"] ||= IO.read( ::File.expand_path(File.join("..", "..", "resources" ,"mini_exec.rb"),  __FILE__)).gsub('appname', ARGV[1])
+		@app_tree["#{ARGV[1]}.rb"] ||= IO.read( ::File.expand_path(File.join("..", "..", "resources" ,"mini_app.rb"),  __FILE__)).gsub('appname', ARGV[1]).gsub('appsecret', "#{ARGV[1]}_#{SecureRandom.hex}")
+		app_tree["Procfile"] ||= ""
+		app_tree["Procfile"] << "\nweb: bundle exec ruby ./#{ARGV[1]} -p $PORT\n"		
+		app_tree["Gemfile"] ||= ''
+		app_tree["Gemfile"] << "source 'https://rubygems.org'\n\n####################\n# core gems\n\n# include the basic plezi framework and server\ngem 'plezi', '~> #{Plezi::VERSION}'\n"
+		app_tree["Gemfile"] << "\n\n\nruby '#{RUBY_VERSION}'\n"
+		finalize
+	end
+
+	def build
+		require 'plezi/version'
+		# plezi run script
+		@app_tree["#{ARGV[1]}"] ||= IO.read ::File.expand_path(File.join("..", "..", "resources" ,"code.rb"),  __FILE__)
 
 		# set up application files
 		app_tree["app"] ||= {}
@@ -68,10 +86,11 @@ class AppTemplate
 		app_tree["routes.rb"] ||= IO.read ::File.expand_path(File.join("..", "..", "resources" ,"routes.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["Procfile"] << "\nweb: bundle exec ruby ./#{ARGV[1]} -p $PORT\n"
 		app_tree["Gemfile"] ||= ''
 		app_tree["Gemfile"] << "source 'https://rubygems.org'\n\n####################\n# core gems\n\n# include the basic plezi framework and server\ngem 'plezi', '~> #{Plezi::VERSION}'\n"
 		app_tree["Gemfile"] << IO.read( ::File.expand_path(File.join("..", "..", "resources" ,"Gemfile"),  __FILE__))
+		app_tree["Gemfile"] << "\n\n\nruby '#{RUBY_VERSION}'\n"
 
 		# set up config files
 		app_tree["config"] ||= {}
@@ -108,17 +127,10 @@ class AppTemplate
 		app_tree["public"]["assets"] ||= {}		
 		app_tree["public"]["assets"]["stylesheets"] ||= {}		
 		app_tree["public"]["assets"]["javascripts"] ||= {}		
-		app_tree["public"]["images"] ||= {}		
-
-	end
-
-	def app_tree
-		@app_tree ||= {}
+		app_tree["public"]["images"] ||= {}
+		finalize
 	end
-	def build
-		# require 'pry'
-		# binding.pry
-		app_tree["Gemfile"] << "\n\n\nruby '#{RUBY_VERSION}'\n"
+	def finalize
 		begin
 			Dir.mkdir ARGV[1]
 			puts "created the #{ARGV[1]} application directory.".green
@@ -128,7 +140,6 @@ class AppTemplate
 		Dir.chdir ARGV[1]
 		puts "starting to write template data...".red
 		puts ""
-		@app_tree["#{ARGV[1]}"] ||= IO.read ::File.expand_path(File.join("..", "..", "resources" ,"code.rb"),  __FILE__)
 		write_files app_tree
 		File.chmod 0775, "#{ARGV[1]}"
 		puts "tried to update execution permissions. this is system dependent and might have failed.".pink
@@ -216,10 +227,9 @@ end
 
 # require 'optparser'
 
-if ARGV[0] == 'new' || ARGV[0] == 'n' || ARGV[0] == "force"
+if ARGV[0] == 'new' || ARGV[0] == 'n' || ARGV[0] == "force" || ARGV[0] == 'mini' || ARGV[0] == 'm' 
 	#########
 	## set up building environment
-	require 'plezi/version'
 	NO_PLEZI_AUTO_START = true
 	ARGV[1] = ARGV[1].gsub /[^a-zA-Z0-9]/, '_'
 	if Dir.exists?(ARGV[1]) && ARGV[0] != "force"
@@ -234,39 +244,9 @@ if ARGV[0] == 'new' || ARGV[0] == 'n' || ARGV[0] == "force"
 		Dir.chdir '..'
 	end
 
-	if ARGV.count > 3 && (ARGV[2] == 'with' || ARGV[2] == 'w')
-
-		# gem loading
-		local_gems = Gem::Specification.map {|g| g.name}
-		# this will load all requested gems and allow them to update the AppTemplate
-		if ARGV[3] == "all"
-			puts "loading gems and giving each gem a chance to update the app template:".yellow
-			local_gems.each do |g|
-				begin
-					puts "loaded the #{g} gem."	if require g				
-				rescue Exception => e
-					puts "couldn't load the #{g} gem... moving on.".red
-				end
-			end
-		else
-			require 'pathname'
-			ARGV[3..-1].each do |g|
-				if local_gems.include? g
-					require g
-					puts "loaded the #{g} gem, and gave it a change to update the template."
-				else
-					puts "Error, the gem: #{g} could not be found!".red
-					puts "try first running: gem install #{g}".green
-					exit
-				end
-			end
-		end
-		true
-	end
-
 	# building
 	template = AppTemplate.new
-	template.build
+	(ARGV[0] == 'mini' || ARGV[0] == 'm' ) ? template.build_mini : template.build
 elsif ARGV[0] == 'server' || ARGV[0] == 'start' || ARGV[0] == 's'
 	ARGV.shift
 	load File.expand_path(Dir["."][0], (File.expand_path(Dir["."][0]).split(/[\\\/]/).last) ) rescue load( File.expand_path(Dir["."][0], (File.expand_path(Dir["."][0]).split(/[\\\/]/).last ) ) )
@@ -288,25 +268,19 @@ else
 	puts "option                  description".yellow
 	puts "new <appname>           creates a new application called <appname>."
 	puts "n                       alias for new."
-	puts "new app with gem        'new' accepts the 'with' paramater (or w for short)."
+	puts "mini <appname>          creates a new mini-application called <appname>."
+	puts "m                       alias for mini."
 	puts "starting up an app:".pink
-	puts "start                   runs the app. accepts any parameters the app supports."
+	puts "start                   attempts to run the app. accepts any parameters the app supports."
 	puts "s                       alias for start/server."
 	puts "start console innsead of services:".pink
 	puts "console                 runs the app. accepts any parameters the app supports."
 	puts "c                       alias for start/server."
 	puts "==============================".green
-	puts "create an app with specific plugins:".pink
-	puts "plezi new app with gem1 gem2"
-	puts "loads the specific gem(s) and allows them to update the template before building the app.".green
-	puts ""
-	puts "create an app with ALL plugins:".pink
-	puts "plezi n app w all"
-	puts "loads the all available gem(s) and allows them to update the template before building the app.".green
 	puts ""
-	puts "start the application with any parameters it supports:".pink
-	puts "plezi s -p 80"
-	puts "loads the app with parameters -p 80".green
+	puts "Run the app using the app's script with an optional: -p {port number}. i.e."
+	puts "    cd ./appname".pink
+	puts "    ./appname -p 8080".pink
 	puts ""
 end
 

data/lib/plezi/common/cache.rb

@@ -21,8 +21,8 @@ module Plezi
 
 			# initialize a Cached object
 			def initialize d = nil, t = Time.now
-				@data = t
-				@mtime = d
+				@data = d
+				@mtime = t
 			end
 		end
 

data/lib/plezi/common/dsl.rb

@@ -32,12 +32,6 @@ module Plezi
 			# ssl_key:: the public key for the SSL service.
 			# ssl_cert:: the certificate for the SSL service.
 			#
-			# some further options, which are unstable and might be removed in future versions, are:
-			# protocol:: the protocol objects (usually a class, but any object answering `#call` will do).
-			# handler:: an optional handling object, to be called upon by the protocol (i.e. #on_message, #on_connect, etc'). this option is used to allow easy protocol switching, such as from HTTP to Websockets. 
-			#
-			# Duringn normal Plezi behavior, the optional `handler` object will be returned if `listen` is called more than once for the same port.
-			#
 			# assets:
 			#
 			# assets support will render `.sass`, `.scss` and `.coffee` and save them as local files (`.css`, `.css`, and `.js` respectively)
@@ -55,6 +49,18 @@ module Plezi
 				parameters[:assets_public] ||= '/assets'
 				parameters[:assets_public].chomp! '/'
 
+				if !parameters[:port] && defined? ARGV
+					if ARGV.find_index('-p')
+						port_index = ARGV.find_index('-p') + 1
+						parameters[:port] ||= ARGV[port_index].to_i
+						ARGV[port_index] = (parameters[:port] + 1).to_s
+					else
+						ARGV << '-p'
+						ARGV << '3001'
+						parameters[:port] ||= 3000
+					end
+				end
+
 				#keeps information of past ports.
 				@listeners ||= {}
 				@listeners_locker = Mutex.new
@@ -63,7 +69,7 @@ module Plezi
 				@listeners_locker.synchronize do
 					if @listeners[parameters[:port]]
 						puts "WARNING: port aleady in use! returning existing service and attemptin to add host (maybe multiple hosts? use `host` instead)."
-						@active_router = @listeners[parameters[:port]].params[:http_handler]
+						@active_router = @listeners[parameters[:port]][:http_handler]
 						@active_router.add_host parameters[:host], parameters if @active_router.is_a?(HTTPRouter)
 						return @active_router
 					end

data/lib/plezi/handlers/http_router.rb

@@ -40,7 +40,7 @@ module Plezi
 
 			# adds a host to the router (or activates an existing host to add new routes). accepts a host name and any parameters not related to the actual connection (ssl etc') (see {Plezi.listen})
 			def add_host host_name, params = {}
-				host_name = (host_name ? host_name.to_s.downcase : :default)
+				host_name = (host_name ? (host_name.is_a?(String) ? host_name.to_s.downcase : host_name) : :default)
 				@active_host = get_host(host_name) || ( @hosts[host_name] = Host.new(params) )
 				add_alias host_name, *params[:alias] if params[:alias]
 				@active_host

data/lib/plezi/version.rb

@@ -1,3 +1,3 @@
 module Plezi
-    VERSION = "0.10.10"
+    VERSION = "0.10.11"
 end

data/plezi.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "grhttp", "~> 0.0.12"
+  spec.add_dependency "grhttp", "~> 0.0.14"
   spec.add_development_dependency "bundler", "~> 1.7"
   spec.add_development_dependency "rake", "~> 10.0"
 

data/resources/mini_app.rb

@@ -0,0 +1,77 @@
+# encoding: UTF-8
+
+## Set working directory, load gems and create logs
+	# Using pathname extentions for setting public folder
+	require 'pathname'
+	#set up root object, it might be used by the environment and\or the plezi extension gems.
+	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
+	# using bundler to load gems (including the plezi gem)
+	require 'bundler'
+	Bundler.require(:default, ENV['ENV'].to_s.to_sym)
+	## uncomment to create a log file
+	# GReactor.create_logger File.expand_path(Root.join('server.log').to_s)
+
+## Options for Scaling the app (across processes or machines):
+	## uncomment to set up forking.
+	# GReactor::Settings.set_forking 4
+	## Redis scaling
+	# Plezi::Settings.redis_channel_name = 'appsecret'
+	# ENV['PL_REDIS_URL'] ||= ENV['REDIS_URL'] || ENV['REDISCLOUD_URL'] || ENV['REDISTOGO_URL'] || "redis://username:password@my.host:6389"
+
+
+# The basic appname controller, to get you started
+class MyController
+	# HTTP
+	def index
+		"Hello World!\r\n\r\nThis appname mini-app is an example hello world and websocket chatroom.\r\n
+		\r\nplease visit http://www.websocket.org/echo.html and connect to: ws://localhost:3000/nickname"
+	end
+	def websockets
+		redirect_to "http://www.websocket.org/echo.html"
+	end
+	# Websockets
+	def on_message data
+		data = "#{params[:id]}: #{data}" if params[:id]
+		_print data
+		broadcast :_print, data		
+	end
+	def on_open
+		_print 'Welcome!'
+		broadcast :_print, "Somebody joind us :-)"
+	end
+	def on_close
+		broadcast :_print, "Somebody left us :-("
+	end
+	def _print data
+		response << data
+	end
+end
+
+
+# start a web service to listen on the first default port (3000 or the port set by the command-line).
+# you can change some of the default settings here.
+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,
+		ssl: false
+
+## Optional stuff:
+	## I18n re-write, 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
+	#
+	## OAuth2 - Facebook / Google authentication
+	# require 'plezi/oauth'
+	# ENV["FB_APP_ID"] ||= "app id"; ENV["FB_APP_SECRET"] ||= "secret"; ENV['GOOGLE_APP_ID'] = "app id"; ENV['GOOGLE_APP_SECRET'] = "secret"
+	# create_auth_shared_route do |service_name, auth_token, remote_user_id, remote_user_email, remote_response|
+	#         # ...callback for authentication.
+	#         # This callback should return the app user object or false
+	#         # This callback has access to the controller's methods (request, cookies, response, etc')
+	# end
+
+# Add your routes and controllers by order of priority.
+route '/(:id)', MyController
+

data/resources/mini_exec.rb

@@ -0,0 +1,5 @@
+#!/usr/bin/env ruby
+# encoding: UTF-8
+
+# load the appname-app
+load ::File.expand_path(File.join("..", "appname.rb"),  __FILE__)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: plezi
 version: !ruby/object:Gem::Version
-  version: 0.10.10
+  version: 0.10.11
 platform: ruby
 authors:
 - Boaz Segev
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.12
+        version: 0.0.14
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.12
+        version: 0.0.14
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -107,6 +107,8 @@ files:
 - resources/environment.rb
 - resources/haml_config.rb
 - resources/i18n_config.rb
+- resources/mini_app.rb
+- resources/mini_exec.rb
 - resources/oauth_config.rb
 - resources/plezi_websockets.html
 - resources/rakefile