plezi 0.10.15 → 0.10.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ac2ec66d7213346b5414d5e6dda9bfee10d135c5
-  data.tar.gz: 0631b6f21c1f5576ccd6cbc88fafcdb8d47a1638
+  metadata.gz: 9ba53dc3edc704550c8afdc060088aed2cd9db01
+  data.tar.gz: 7aa792d205aabce90e999f1c5637a882c40de10a
 SHA512:
-  metadata.gz: eea85e77d2bdf4fe1aaa6877e4945d35834c3c98d42f3b1a10381a7601765e6795273a45ef5eef971f5e6541f8e7ce0a985f4ae298e1cfd3b498f3b162480eae
-  data.tar.gz: 60750c0fea68213ebdc91c1930032e8c7317b5bd4757946139af3d7ffe59f1dee35c3b57917aabd42d909fd0f1c598f1242282115c6b874626847839a4ea99c6
+  metadata.gz: 667725a7647a0c49e81991e0d164c3729c639ecbd37e56de37cb0131ed91cf059039e2b9eba121bef365b23e89e8b0dcca57b7bcdc0b75fa547bb3949fd29161
+  data.tar.gz: 44a1bb1546727e1e96fecfbe3e65607dcd0f9093ac4f1fb8a9161d33a119f23c739f93f9ea761abfe1536f4763a96518117b912c19de9382f6e7a6d4bbd598e9

data/CHANGELOG.md

@@ -1,8 +1,20 @@
 #Change Log
 
+***
+
+Change log v.0.10.16
+
+**Fix**: Requires a newer version of the GRHttp server, which fixs an issue with Firefox's websocket implementation. 
+
+**New Feature**: Persistent and synchronized Session data(!) using Redis (if supplied) with a fallback to temporary memory storage. Session lifetime is 5 days.
+
+***
+
 Change log v.0.10.15
 
-**Fix**: Fixed the autostart feature that was diabled to to changed in the GRHttp server.
+**Fix**: Fixed the autostart feature that was diabled due to a changed in the GRHttp server's code for Rack support.
+
+***
 
 Change log v.0.10.14
 

data/README.md

@@ -1,4 +1,4 @@
-# Plezi, The Ruby framework for realtime web-apps
+# [Plezi](https://github.com/boazsegev/plezi), The Ruby framework for realtime web-apps
 [![Gem Version](https://badge.fury.io/rb/plezi.svg)](http://badge.fury.io/rb/plezi)
 [![Inline docs](http://inch-ci.org/github/boazsegev/plezi.svg?branch=master)](http://www.rubydoc.info/github/boazsegev/plezi/master)
 

data/bin/plezi

@@ -4,198 +4,10 @@ $0="Plezi Builder"
 
 require 'irb'
 require 'securerandom'
+require 'plezi/builders/builder'
+require 'plezi/builders/app_builder'
 
 
-##########
-# this is the template writer
-#
-# you can update it by aliasing the old initialize and writing adding to it:
-#
-#		if defined? BUILDING_PLEZI_TEMPLATE
-#			class AppTemplate
-#				alias :my_new_gem_old_init :initialize
-#				def initialize
-#					# start with the old initialize, to set the template up
-#					my_new_gem_old_init appname
-#					# add your gem to the gemfile
-#					app_tree["Gemfile"] << "\n# feed GEMNAME to plezi"
-#					app_tree["Gemfile"] << "\ngem 'GEMNAME'"
-#					# make sure your folder exists, but don't overwrite!!!
-#					# if you overwrite!!! you might destroy other gems additions.
-#					app_tree["lib"] ||= {}
-#					app_tree["MY_SPECIAL_GEM"] ||= {}
-#					# once your folder exists, create your file
-#					app_tree["lib]["MY_SPECIAL_GEM"]["filename.rb"] = "# code goes here..."
-#					app_tree["file_without_folder.rb"] ||= "# more code goes here..."
-#				end
-#			end
-#		end
-#
-class AppTemplate
-
-	def initialize
-		@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"
-		app_tree["templates"] ||= {}
-		app_tree["templates"]["404.html.erb"] ||= IO.read(::File.expand_path(File.join("..", "..", "resources" ,"404.erb"),  __FILE__))
-		app_tree["templates"]["500.html.erb"] ||= IO.read(::File.expand_path(File.join("..", "..", "resources" ,"500.erb"),  __FILE__))
-		app_tree["templates"]["welcome.html.erb"] ||= IO.read(::File.expand_path(File.join("..", "..", "resources" ,"mini_welcome_page.html"),  __FILE__)).gsub('appname', ARGV[1])
-		app_tree["assets"] ||= {}
-		app_tree["assets"]["websocket.js"] ||= IO.read(::File.expand_path(File.join("..", "..", "resources" ,"websockets.js"),  __FILE__)).gsub('appname', ARGV[1])
-		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"] ||= {}
-		app_tree["app"]["controllers"] ||= {}
-		app_tree["app"]["controllers"]["sample_controller.rb"] ||= IO.read(::File.expand_path(File.join("..", "..", "resources" ,"controller.rb"),  __FILE__))
-		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.
-		app_tree["environment.rb"] ||= IO.read ::File.expand_path(File.join("..", "..", "resources" ,"environment.rb"),  __FILE__)
-		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 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"] ||= {}
-		app_tree["config"]["oauth.rb"] ||= IO.read(::File.expand_path(File.join("..", "..", "resources" ,"oauth_config.rb"),  __FILE__))
-		app_tree["config"]["active_record.rb"] ||= IO.read(::File.expand_path(File.join("..", "..", "resources" ,"db_ac_config.rb"),  __FILE__))
-		app_tree["config"]["sequel.rb"] ||= IO.read(::File.expand_path(File.join("..", "..", "resources" ,"db_sequel_config.rb"),  __FILE__))
-		app_tree["config"]["datamapper.rb"] ||= IO.read(::File.expand_path(File.join("..", "..", "resources" ,"db_dm_config.rb"),  __FILE__))
-		app_tree["config"]["haml.rb"] ||= IO.read(::File.expand_path(File.join("..", "..", "resources" ,"haml_config.rb"),  __FILE__))
-		app_tree["config"]["slim.rb"] ||= IO.read(::File.expand_path(File.join("..", "..", "resources" ,"slim_config.rb"),  __FILE__))
-		app_tree["config"]["i18n.rb"] ||= IO.read(::File.expand_path(File.join("..", "..", "resources" ,"i18n_config.rb"),  __FILE__))
-		app_tree["config"]["redis.rb"] ||= (IO.read(::File.expand_path(File.join("..", "..", "resources" ,"redis_config.rb"),  __FILE__))).gsub('appsecret', "#{ARGV[1]}_#{SecureRandom.hex}")
-
-		#set up database stub folders
-		app_tree["db"] ||= {}
-		app_tree["db"]["migrate"] ||= {}
-		app_tree["db"]["fixtures"] ||= {}
-		app_tree["db"]["config.yml"] ||= IO.read(::File.expand_path(File.join("..", "..", "resources" ,"database.yml"),  __FILE__))
-
-		#set up the extras folder, to be filled with future goodies.
-		# app_tree["extras"] ||= {}
-		# app_tree["extras"]["config.ru"] ||= IO.read ::File.expand_path(File.join("..", "..", "resources" ,"config.ru"),  __FILE__)
-
-		#set up I18n stub
-		app_tree["locales"] ||= {}
-		app_tree["locales"]["en.yml"] ||= IO.read ::File.expand_path(File.join("..", "..", "resources" ,"en.yml"),  __FILE__)
-
-		# create library, log and tmp folders
-		app_tree["logs"] ||= {}
-		app_tree["lib"] ||= {}
-		app_tree["tmp"] ||= {}
-
-
-		# set up a public folder for static file service
-		app_tree["public"] ||= {}		
-		app_tree["public"]["assets"] ||= {}		
-		app_tree["public"]["assets"]["stylesheets"] ||= {}		
-		app_tree["public"]["assets"]["javascripts"] ||= {}		
-		app_tree["public"]["images"] ||= {}
-		finalize
-	end
-	def finalize
-		begin
-			Dir.mkdir ARGV[1]
-			puts "created the #{ARGV[1]} application directory.".green
-		rescue Exception => e
-			puts "the #{ARGV[1]} application directory exists - trying to rebuild (no overwrite).".pink
-		end
-		Dir.chdir ARGV[1]
-		puts "starting to write template data...".red
-		puts ""
-		write_files app_tree
-		File.chmod 0775, "#{ARGV[1]}"
-		puts "tried to update execution permissions. this is system dependent and might have failed.".pink
-		puts "use: chmod +x ./#{ARGV[1]} to set execution permissions on Unix machines."
-		puts ""
-		puts "done."
-		puts "\n#{@end_comments.join("\n")}" unless @end_comments.empty?
-		puts ""
-		puts "please change directory into the app directory: cd #{ARGV[1]}"
-		puts ""
-		puts "run the #{ARGV[1]} app using: ./#{ARGV[1]} or using: plezi s"
-		puts ""
-	end
-
-	def write_files files, parent = "."
-		if files.is_a? Hash
-			files.each do |k, v|
-				if v.is_a? Hash
-					begin
-						Dir.mkdir k
-						puts "    created #{parent}/#{k}".green
-					rescue Exception => e
-						puts "    exists #{parent}/#{k}".red
-					end
-					Dir.chdir k
-					write_files v, (parent + "/" + k)
-					Dir.chdir ".."
-				elsif v.is_a? String
-					if ::File.exists? k
-						if false #%w{Gemfile rakefile.rb}.include? k
-							# old = IO.read k
-							# old = (old.lines.map {|l| "\##{l}"}).join
-							# IO.write k, "#####################\n#\n# OLD DATA COMMENTED OUT - PLEASE REVIEW\n#\n##{old}\n#{v}"
-							# puts "    #{parent}/#{k} WAS OVERWRITTEN, old data was preserved by comenting it out.".pink
-							# puts "    #{parent}/#{k} PLEASE REVIEW.".pink
-							# @end_comments << "#{parent}/#{k} WAS OVERWRITTEN, old data was preserved by comenting it out. PLEASE REVIEW."
-						else
-							puts "    EXISTS(!) #{parent}/#{k}".red
-						end
-					else
-						IO.write k, v
-						puts "    wrote #{parent}/#{k}".yellow
-					end
-				end
-			end
-		end
-	end
-end
-
 
 ######################################################################
 # tweek the string class for termial coloring options
@@ -252,7 +64,7 @@ if ARGV[0] == 'new' || ARGV[0] == 'n' || ARGV[0] == "force" || ARGV[0] == 'mini'
 	end
 
 	# building
-	template = AppTemplate.new
+	template = Plezi::AppBuilder.new
 	(ARGV[0] == 'mini' || ARGV[0] == 'm' ) ? template.build_mini : template.build
 elsif ARGV[0] == 'server' || ARGV[0] == 'start' || ARGV[0] == 's'
 	ARGV.shift

data/lib/plezi.rb

@@ -50,6 +50,7 @@ require 'plezi/handlers/controller_magic.rb'
 require 'plezi/handlers/controller_core.rb'
 require 'plezi/handlers/placebo.rb'
 require 'plezi/handlers/stubs.rb'
+require 'plezi/handlers/session.rb'
 
 
 ##############################################################################

data/lib/plezi/builders/app_builder.rb

@@ -0,0 +1,135 @@
+require 'plezi/builders/builder'
+module Plezi
+
+
+	class AppBuilder
+		def initialize
+			@end_comments = []
+			@app_tree ||= {}
+			@root = ::Plezi::Builder::GEM_ROOT
+		end
+		def app_tree
+			@app_tree ||= {}
+		end
+		def build_mini
+			require 'plezi/version'
+			@app_tree["#{ARGV[1]}"] ||= IO.read( File.join(@root, "resources" ,"mini_exec.rb")).gsub('appname', ARGV[1])
+			@app_tree["#{ARGV[1]}.rb"] ||= IO.read( File.join(@root, "resources" ,"mini_app.rb")).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"
+			app_tree["templates"] ||= {}
+			app_tree["templates"]["404.html.erb"] ||= IO.read(File.join(@root, "resources" ,"404.erb"))
+			app_tree["templates"]["500.html.erb"] ||= IO.read(File.join(@root, "resources" ,"500.erb"))
+			app_tree["templates"]["welcome.html.erb"] ||= IO.read(File.join(@root, "resources" ,"mini_welcome_page.html")).gsub('appname', ARGV[1])
+			app_tree["assets"] ||= {}
+			app_tree["assets"]["websocket.js"] ||= IO.read(File.join(@root, "resources" ,"websockets.js")).gsub('appname', ARGV[1])
+			finalize
+		end
+
+		def build
+			require 'plezi/version'
+			# plezi run script
+			@app_tree["#{ARGV[1]}"] ||= IO.read File.join(@root,"resources" ,"code.rb")
+
+			# set up application files
+			app_tree["app"] ||= {}
+			app_tree["app"]["controllers"] ||= {}
+			app_tree["app"]["controllers"]["sample_controller.rb"] ||= IO.read(File.join(@root,"resources" ,"controller.rb"))
+			app_tree["app"]["models"] ||= {}
+			app_tree["app"]["views"] ||= {}
+
+			# set up templates for status error codes
+			app_tree["app"]["views"]["404.html"] ||= IO.read(File.join(@root,"resources" ,"404.html"))
+			app_tree["app"]["views"]["500.html"] ||= IO.read(File.join(@root,"resources" ,"500.html"))
+			app_tree["app"]["views"]["404.html.erb"] ||= IO.read(File.join(@root,"resources" ,"404.erb"))
+			app_tree["app"]["views"]["500.html.erb"] ||= IO.read(File.join(@root,"resources" ,"500.erb"))
+			app_tree["app"]["views"]["404.html.slim"] ||= IO.read(File.join(@root,"resources" ,"404.slim"))
+			app_tree["app"]["views"]["500.html.slim"] ||= IO.read(File.join(@root,"resources" ,"500.slim"))
+			app_tree["app"]["views"]["404.html.haml"] ||= IO.read(File.join(@root,"resources" ,"404.haml"))
+			app_tree["app"]["views"]["500.html.haml"] ||= IO.read(File.join(@root,"resources" ,"500.haml"))
+
+			# 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.join(@root,"resources" ,"websockets.js")).gsub('appname', ARGV[1])
+			app_tree["assets"]["welcome.html"] ||= IO.read(File.join(@root,"resources" ,"welcome_page.html")).gsub('appname', ARGV[1])
+
+			# app core files.
+			app_tree["environment.rb"] ||= IO.read File.join(@root,"resources" ,"environment.rb")
+			app_tree["routes.rb"] ||= IO.read File.join(@root,"resources" ,"routes.rb")
+			app_tree["rakefile"] ||= IO.read File.join(@root,"resources" ,"rakefile")
+			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"] << IO.read( File.join(@root,"resources" ,"Gemfile"))
+			app_tree["Gemfile"] << "\n\n\nruby '#{RUBY_VERSION}'\n"
+
+			# set up config files
+			app_tree["config"] ||= {}
+			app_tree["config"]["oauth.rb"] ||= IO.read(File.join(@root,"resources" ,"oauth_config.rb"))
+			app_tree["config"]["active_record.rb"] ||= IO.read(File.join(@root,"resources" ,"db_ac_config.rb"))
+			app_tree["config"]["sequel.rb"] ||= IO.read(File.join(@root,"resources" ,"db_sequel_config.rb"))
+			app_tree["config"]["datamapper.rb"] ||= IO.read(File.join(@root,"resources" ,"db_dm_config.rb"))
+			app_tree["config"]["haml.rb"] ||= IO.read(File.join(@root,"resources" ,"haml_config.rb"))
+			app_tree["config"]["slim.rb"] ||= IO.read(File.join(@root,"resources" ,"slim_config.rb"))
+			app_tree["config"]["i18n.rb"] ||= IO.read(File.join(@root,"resources" ,"i18n_config.rb"))
+			app_tree["config"]["redis.rb"] ||= (IO.read(File.join(@root,"resources" ,"redis_config.rb"))).gsub('appsecret', "#{ARGV[1]}_#{SecureRandom.hex}")
+
+			#set up database stub folders
+			app_tree["db"] ||= {}
+			app_tree["db"]["migrate"] ||= {}
+			app_tree["db"]["fixtures"] ||= {}
+			app_tree["db"]["config.yml"] ||= IO.read(File.join(@root,"resources" ,"database.yml"))
+
+			#set up the extras folder, to be filled with future goodies.
+			# app_tree["extras"] ||= {}
+			# app_tree["extras"]["config.ru"] ||= IO.read File.join(@root,"resources" ,"config.ru")
+
+			#set up I18n stub
+			app_tree["locales"] ||= {}
+			app_tree["locales"]["en.yml"] ||= IO.read File.join(@root,"resources" ,"en.yml")
+
+			# create library, log and tmp folders
+			app_tree["logs"] ||= {}
+			app_tree["lib"] ||= {}
+			app_tree["tmp"] ||= {}
+
+
+			# set up a public folder for static file service
+			app_tree["public"] ||= {}		
+			app_tree["public"]["assets"] ||= {}		
+			app_tree["public"]["assets"]["stylesheets"] ||= {}		
+			app_tree["public"]["assets"]["javascripts"] ||= {}		
+			app_tree["public"]["images"] ||= {}
+			finalize
+		end
+		def finalize
+			begin
+				Dir.mkdir ARGV[1]
+				puts "created the #{ARGV[1]} application directory.".green
+			rescue Exception => e
+				puts "the #{ARGV[1]} application directory exists - trying to rebuild (no overwrite).".pink
+			end
+			Dir.chdir ARGV[1]
+			puts "starting to write template data...".red
+			puts ""
+			Builder.write_files app_tree
+			File.chmod 0775, "#{ARGV[1]}"
+			puts "tried to update execution permissions. this is system dependent and might have failed.".pink
+			puts "use: chmod +x ./#{ARGV[1]} to set execution permissions on Unix machines."
+			puts ""
+			puts "done."
+			puts "\n#{@end_comments.join("\n")}" unless @end_comments.empty?
+			puts ""
+			puts "please change directory into the app directory: cd #{ARGV[1]}"
+			puts ""
+			puts "run the #{ARGV[1]} app using: ./#{ARGV[1]} or using: plezi s"
+			puts ""
+		end
+	end
+end

data/lib/plezi/builders/builder.rb

@@ -0,0 +1,41 @@
+module Plezi
+	module Builder
+
+		GEM_ROOT = ::File.expand_path(File.join(File.dirname(__FILE__), '..', '..', '..'))
+
+		def self.write_files files, parent = "."
+			if files.is_a? Hash
+				files.each do |k, v|
+					if v.is_a? Hash
+						begin
+							Dir.mkdir k
+							puts "    created #{parent}/#{k}".green
+						rescue Exception => e
+							puts "    exists #{parent}/#{k}".red
+						end
+						Dir.chdir k
+						write_files v, (parent + "/" + k)
+						Dir.chdir ".."
+					elsif v.is_a? String
+						if ::File.exists? k
+							if false #%w{Gemfile rakefile.rb}.include? k
+								# old = IO.read k
+								# old = (old.lines.map {|l| "\##{l}"}).join
+								# IO.write k, "#####################\n#\n# OLD DATA COMMENTED OUT - PLEASE REVIEW\n#\n##{old}\n#{v}"
+								# puts "    #{parent}/#{k} WAS OVERWRITTEN, old data was preserved by comenting it out.".pink
+								# puts "    #{parent}/#{k} PLEASE REVIEW.".pink
+								# @end_comments << "#{parent}/#{k} WAS OVERWRITTEN, old data was preserved by comenting it out. PLEASE REVIEW."
+							else
+								puts "    EXISTS(!) #{parent}/#{k}".red
+							end
+						else
+							IO.write k, v
+							puts "    wrote #{parent}/#{k}".yellow
+						end
+					end
+				end
+			end
+		end
+	end
+
+end

data/lib/plezi/builders/form_builder.rb

@@ -0,0 +1,24 @@
+require 'plezi/builders/builder'
+
+module Plezi
+
+	module FormBuilder
+
+		FORM_BUILDERS = %w{ Slim ERB }
+		MODEL_BUILDERS = %w{ Squel }
+
+		DB_TYPES = %w{primary_key string text integer float decimal datetime time date binary boolean}
+
+		@gem_root = ::Plezi::Builder::GEM_ROOT
+		def self.parse_args
+			return unless ARGS[0][0] == 'g'
+			struct = {}
+			ARGS[1..-1].each do |s|
+				s = s.split /[\:\.]/
+				raise "Cannot parse parameters - need to be defined as name.type or name:type." if s.count !=2
+				struct[s[0]] = DB_TYPES[s[1].downcase] || (raise "Unrecognized type #{s[1]}.")
+			end
+			struct
+		end
+	end
+end

data/lib/plezi/common/api.rb

@@ -119,7 +119,7 @@ module Plezi
 	# to broadcast Plezi messages to other Plezi processes - allowing for scalable intigration of Plezi into other frameworks.
 	def start_placebo
 		GReactor.clear_listeners
-		redis_connection # make sure the redis connection is activated
+		redis # make sure the redis connection is activated
 		puts "* Plezi #{Plezi::VERSION} Services will start with no Server...\n"
 		start_async
 	end

data/lib/plezi/common/dsl.rb

@@ -93,6 +93,9 @@ unless defined? PLEZI_NON_DSL
 	# sets information to be used when restarting
 	$PL_SCRIPT = $0
 	$PL_ARGV = $*.dup
+
+	# sets up a generic session-token name based on the script name
+	GRHttp.session_token = "#{($0).split(/[\\\/]/).last.split(/[\s]+/).first}_uuid"
 	# restarts the Plezi app with the same arguments as when it was started.
 	#
 	# EXPERIMENTAL

data/lib/plezi/common/redis.rb

@@ -10,7 +10,7 @@ module Plezi
 	#      ENV['PL_REDIS_URL'] = ENV['REDISCLOUD_URL']`
 	# or
 	#      ENV['PL_REDIS_URL'] = "redis://username:password@my.host:6379"
-	def redis_connection
+	def redis
 		return @redis if (@redis_sub_thread && @redis_sub_thread.alive?) && @redis
 		return false unless defined?(Redis) && ENV['PL_REDIS_URL']
 		@redis_locker ||= Mutex.new
@@ -47,5 +47,6 @@ module Plezi
 		Reactor.error e
 		false
 	end
+	alias :redis_connection :redis
 end
 

data/lib/plezi/handlers/controller_core.rb

@@ -19,6 +19,7 @@ module Plezi
 					@host_params = request.io[:params]
 					@response = response
 					@cookies = request.cookies
+					@session = response.session
 					# # \@response["content-type"] ||= ::Plezi.default_content_type
 					super()
 				end
@@ -46,7 +47,7 @@ module Plezi
 					@response = ws
 					ws.autoping Plezi::Settings.autoping if Plezi::Settings.autoping
 					# create the redis connection (in case this in the first instance of this class)
-					Plezi.redis_connection
+					Plezi.redis
 					super() if defined?(super)
 				end
 				# handles websocket messages.

data/lib/plezi/handlers/controller_magic.rb

@@ -29,11 +29,14 @@ module Plezi
 			# the :params variable contains all the parameters set by the request (/path?locale=he  => params ["locale"] == "he").
 			attr_reader :params
 
-			# a cookie-jar to get and set cookies (set: `cookie [:name] = data` or get: `cookie [ :name ]`).
+			# A cookie-jar to get and set cookies (set: `cookie [:name] = data` or get: `cookie [ :name ]`).
 			#
 			# Cookies and some other data must be set BEFORE the response's headers are sent.
 			attr_reader :cookies
 
+			# Session data can be stored here (for now, session data doesn't scale - coming soon).
+			attr_reader :session
+
 			# the HTTPResponse **OR** the WSResponse object that formats the response and sends it. use `response << data`. This object can be used to send partial data (such as headers, or partial html content) in blocking mode as well as sending data in the default non-blocking mode.
 			attr_reader :response
 

data/lib/plezi/handlers/session.rb

@@ -0,0 +1,84 @@
+module Plezi
+	module Base
+		module SessionStorage
+			module_function
+			# returns a session object
+			def fetch id
+				@session_cache[id] || (@session_cache[id] = Plezi::Session.new(id))
+			end
+			@session_cache = {}
+		end
+	end
+	# A hash like interface for storing request session data.
+	# The store must implement: store(key, value) (aliased as []=);
+	# fetch(key, default = nil) (aliased as []);
+	# delete(key); clear;
+	class Session
+
+		# The session's lifetime in seconds = 5 days. This is only true when using the built in support for the Redis persistent storage.
+		SESSION_LIFETIME = 432_000
+		# called by the Plezi framework to initiate a session with the id requested
+		def initialize id
+			@id = id
+			if (conn=Plezi.redis)
+				@data=conn.hgetall(id)
+			end
+			@data ||= {}
+		end
+		# Get a key from the session data store. If a Redis server is supplied, it will be used to synchronize session data.
+		#
+		# Due to scaling considirations, all keys will be converted to strings, so that `"name" == :name` and `1234 == "1234"`.
+		# If you store two keys that evaluate as the same string, they WILL override each other.
+		def [] key
+			key = key.to_s
+			if conn=Plezi.redis
+				conn.expire @id, SESSION_LIFETIME
+				@data[key] = conn.hget @id, key
+			end
+			@data[key]
+		end
+		alias :fetch :[]
+
+		# Stores a key in the session's data store. If a Redis server is supplied, it will be used to synchronize session data.
+		#
+		# Due to scaling considirations, all keys will be converted to strings, so that `"name" == :name` and `1234 == "1234"`.
+		# If you store two keys that evaluate as the same string, they WILL override each other.
+		def []= key, value
+			key = key.to_s
+			if (conn=Plezi.redis)
+				conn.hset @id, key, value
+				conn.expire @id, SESSION_LIFETIME
+			end
+			@data[key] = value
+		end
+		alias :store :[]=
+
+		# @return [Hash] returns a shallow copy of the current session data as a Hash.
+		def to_h
+			if (conn=Plezi.redis) 
+				conn.expire @id, SESSION_LIFETIME
+				return (@data=conn.hgetall(@id)).dup
+			end
+			@data.dup
+		end
+
+		# Removes a key from the session's data store.
+		def delete key
+			key = key.to_s
+			if (conn=Plezi.redis)
+				conn.expire @id, SESSION_LIFETIME
+				conn.hdel @id, key
+			end				
+			@data.delete key	
+		end
+
+		# Clears the session's data.
+		def clear
+			if (conn=Plezi.redis)
+				conn.del @id
+			end
+			@data.clear
+		end
+	end
+	GRHttp::SessionManager.storage = Plezi::Base::SessionStorage
+end

data/lib/plezi/handlers/ws_object.rb

@@ -192,7 +192,7 @@ module Plezi
 				end
 
 				def __inner_redis_broadcast data
-					return unless conn = Plezi.redis_connection
+					return unless conn = Plezi.redis
 					data[:server] = Plezi::Settings.uuid
 					return conn.publish( ( data[:to_server] ? data[:to_server] : Plezi::Settings.redis_channel_name ), data.to_yaml ) if conn
 					false

data/lib/plezi/version.rb

@@ -1,3 +1,3 @@
 module Plezi
-    VERSION = "0.10.15"
+    VERSION = "0.10.16"
 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.19"
+  spec.add_dependency "grhttp", "~> 0.0.21"
   spec.add_development_dependency "bundler", "~> 1.7"
   spec.add_development_dependency "rake", "~> 10.0"
 

data/resources/environment.rb

@@ -26,6 +26,9 @@ require 'tilt/sass' if defined?(::Slim) && defined?(::Sass)
 # set up Plezi's logs - Heroku logs to STDOUT, this machine logs to log file
 GReactor.create_logger File.expand_path(File.join 'logs','server.log'), ENV["RACK_ENV"]=="development" unless ENV['DYNO']
 
+# set the session token name
+GRHttp.session_token = 'appname_uui'
+
 ## Allow forking? ONLY if your code is fully scalable across processes.
 # GReactor::Settings.set_forking 4
 

data/resources/mini_app.rb

@@ -5,6 +5,8 @@
 	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
+	## Set a persistant session token id name
+	GRHttp.session_token = 'appname_uui'
 	## 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'

data/test/plezi_tests.rb

@@ -208,7 +208,7 @@ module PleziTestTasks
 
 		rescue => e
 		puts "    **** Update RESTful path test FAILED TO RUN!!!"
-		puts e
+		puts e.message
 	end
 	def test_delete
 		puts "    * Delete RESTful path test: #{RESULTS[Net::HTTP.post_form( URI.parse("http://localhost:3000/"), id: 3, _method: :delete).body == 'delete 3']}"
@@ -475,7 +475,7 @@ Plezi.start_async
 PleziTestTasks.run_tests
 
 # 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
+# GReactor::Settings.set_forking 4
 # GR.run_async { PleziTestTasks.run_tests }
 # start_services
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: plezi
 version: !ruby/object:Gem::Version
-  version: 0.10.15
+  version: 0.10.16
 platform: ruby
 authors:
 - Boaz Segev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-28 00:00:00.000000000 Z
+date: 2015-07-31 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.19
+        version: 0.0.21
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.19
+        version: 0.0.21
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -69,6 +69,9 @@ files:
 - Rakefile
 - bin/plezi
 - lib/plezi.rb
+- lib/plezi/builders/app_builder.rb
+- lib/plezi/builders/builder.rb
+- lib/plezi/builders/form_builder.rb
 - lib/plezi/common/api.rb
 - lib/plezi/common/cache.rb
 - lib/plezi/common/defer.rb
@@ -80,6 +83,7 @@ files:
 - lib/plezi/handlers/http_router.rb
 - lib/plezi/handlers/placebo.rb
 - lib/plezi/handlers/route.rb
+- lib/plezi/handlers/session.rb
 - lib/plezi/handlers/stubs.rb
 - lib/plezi/handlers/ws_object.rb
 - lib/plezi/helpers/http_sender.rb