iodine 0.1.12 → 0.1.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0cae62f19555de3237661fc0f47461290f31a47d
-  data.tar.gz: d4ee6c036d77d5ccc9cc243d2e5407609d39cc16
+  metadata.gz: 7fbbba2f03bc0eb7a52c6516a640eda4094230b7
+  data.tar.gz: bb2b8b42038b32af81a6fa63b8ee3627fc47ef69
 SHA512:
-  metadata.gz: 8ae4692ca663399664b005c9fd8983d151ca14a6ba543455e497d0884eabe760b0719c1bf520ad129584260ca3229f202afe3b80b16ede4c9055077415f77e02
-  data.tar.gz: 311d1785ec2ff505173d2eb2e34daafd997bcdd038710223d2f69b4348363df587dd4d3ebcedeca8c9fe65f93f86b8efcbbf19796fc4604b77b80c445cdf57cb
+  metadata.gz: c8f093d5101e34538a205a2f4aa996781c6bde02838cde091885ae37c6d8bcfd346590824d6ea15ec825194d713eb30cea0b9cf8d1c256dde8c30da372019cd8
+  data.tar.gz: e432d26f6af2a463737adff4ffbe8abf54486f61a4d9a475c544ee2c2316c2d8d72fe97fe486a2d701619e73a45afc041c2b2ad2b6bc800901f923192e1a9976

data/CHANGELOG.md

@@ -8,6 +8,18 @@ Please notice that this change log contains changes for upcoming releases as wel
 
 ***
 
+Change log v.0.1.13
+
+**Change**: Session cookie lifetime is now limited to the browser's session. The local data will still persist until the tmp-folder is cleared (when using session file storage).
+
+**Fix**: renamed the SSL session token so that the SSL session id isn't lost when a non-secure session is used.
+
+**Fix**: The `flash` cookie-jar will now actively prevent Symbol and String keys from overlapping.
+
+**Compatibility**: minor fixes and changes in preperation for Ruby 2.3.0.
+
+***
+
 Change log v.0.1.12
 
 **Update**: Passing a hash as the cookie value will allow to set cookie parameters using the {Response#set_cookie} options. i.e.: `cookies['key']= {value: "lock", max_age: 20}`. 

data/lib/iodine/core.rb

@@ -62,7 +62,7 @@ module Iodine
 		job = @queue && @queue.pop
 		if job && job[0]
 			begin
-				job[0].call *job[1]
+				job[0].call(*job[1])
 			rescue => e
 				error e
 			end

data/lib/iodine/core_init.rb

@@ -55,8 +55,8 @@ module Iodine
 			if @queue.empty?
 				#clear any closed IO objects.
 				@time = Time.now
-				@ios.keys.each &@status_loop
-				@ios.values.each &@timeout_proc
+				@ios.keys.each(&@status_loop)
+				@ios.values.each(&@timeout_proc)
 				until @io_in.empty?
 					n_io = @io_in.pop
 					@ios[n_io[0]] = n_io[1]
@@ -70,7 +70,7 @@ module Iodine
 				begin
 					r = IO.select(@ios.keys, nil, nil, 0.15)
 					r[0].each {|io| @queue << [@ios[io]] } if r
-				rescue => e
+				rescue 
 					
 				end
 				unless @stop && @queue.empty?

data/lib/iodine/http/hpack.rb

@@ -66,13 +66,13 @@ module Iodine
 					data = StringIO.new data
 					results = {}
 					while (field = decode_field(data))
-						name = (field[0].is_a?(String) && field[0][0] == ':') ? field[0][1..-1].to_sym : field[0]
+						name = (field[0].is_a?(String) && field[0][0] == ':'.freeze) ? field[0][1..-1].to_sym : field[0]
 						results[name] ? (results[name].is_a?(String) ? (results[name] = [results[name], field[1]]) : (results[name] << field[1]) ) : (results[name] = field[1]) if field[1]
 					end
 					results
 				end
 				def encode headers = {}
-					buffer = ''.force_encoding(::Encoding::ASCII_8BIT)
+					buffer = String.new.force_encoding(::Encoding::ASCII_8BIT)
 					headers.each {|k, v| buffer << encode_field( (k.is_a?(String) ? k : ":#{k.to_s}".freeze) ,v) if v}
 					buffer.force_encoding(::Encoding::ASCII_8BIT)
 				end
@@ -121,10 +121,10 @@ module Iodine
 					if value.is_a?(Array)
 						return (value.map {|v| encode_field name, v} .join)
 					end
-					raise "Http/2 headers must be LOWERCASE Strings!" if name[0] =~ /[A-Z]/n
+					raise "Http/2 headers must be LOWERCASE Strings!" if name[0] =~ /[A-Z]/n.freeze
 					value = value.to_s
-					if name == 'set-cookie'
-						buffer = ''.force_encoding ::Encoding::ASCII_8BIT
+					if name == 'set-cookie'.freeze
+						buffer = String.new.force_encoding ::Encoding::ASCII_8BIT
 						buffer << pack_number( 55, 1, 4)
 						buffer << pack_string(value)
 						return buffer
@@ -132,11 +132,11 @@ module Iodine
 					index = @encoding_list.find(name, value)
 					return pack_number( index, 1, 1) if index
 					index = @encoding_list.find_name name
-					buffer = ''.force_encoding(::Encoding::ASCII_8BIT)
+					buffer = String.new.force_encoding(::Encoding::ASCII_8BIT)
 					if index
 						buffer << pack_number( index, 1, 2)
 					else
-						raise "Http/2 headers whould be Strings! or allowed Psedo-Header Symbol Only!" if name[0] == ':'
+						raise "Http/2 headers whould be Strings! or allowed Psedo-Header Symbol Only!" if name[0] == ':'.freeze
 						buffer << pack_number( 0, 1, 2)
 						buffer << pack_string(name)
 					end
@@ -193,8 +193,8 @@ module Iodine
 				end
 				def inflate data
 					data = StringIO.new data
-					str = ''
-					buffer = ''
+					str = String.new
+					buffer = String.new
 					until data.eof?
 						byte = data.getbyte
 						8.times do |i|
@@ -209,8 +209,8 @@ module Iodine
 					str
 				end
 				def deflate data
-					str = ''.force_encoding ::Encoding::ASCII_8BIT
-					buffer = ''.force_encoding ::Encoding::ASCII_8BIT
+					str = String.new.force_encoding ::Encoding::ASCII_8BIT
+					buffer = String.new.force_encoding ::Encoding::ASCII_8BIT
 					data.bytes.each do |i|
 						buffer << HUFFMAN.key(i)
 						if (buffer.bytesize % 8) == 0
@@ -219,7 +219,7 @@ module Iodine
 						end
 					end
 					unless buffer.empty?
-						(8-(buffer.bytesize % 8)).times { buffer << '1'} if (buffer.bytesize % 8)
+						(8-(buffer.bytesize % 8)).times { buffer << '1'.freeze} if (buffer.bytesize % 8)
 						str << [buffer].pack('B*'.freeze)
 						buffer.clear
 					end

data/lib/iodine/http/http1.rb

@@ -22,22 +22,22 @@ module Iodine
 								return close
 							end
 							next if l.empty?
-							request[:method], request[:query], request[:version] = l.split(/[\s]+/, 3)
+							request[:method], request[:query], request[:version] = l.split(/[\s]+/.freeze, 3)
 							return (Iodine.warn('Htt1 Protocol Error, closing connection.') && close) unless request[:method] =~ HTTP_METHODS_REGEXP
-							request[:version] = (request[:version] || '1.1'.freeze).match(/[\d\.]+/)[0]
+							request[:version] = (request[:version] || '1.1'.freeze).match(/[\d\.]+/.freeze)[0]
 							request[:time_recieved] = Time.now
 						end
 						until request[:headers_complete] || (l = data.gets).nil?
-							if l.include? ':'
+							if l.include? ':'.freeze
 								# n = l.slice!(0, l.index(':')); l.slice! 0
 								# n.strip! ; n.downcase!; n.freeze
 								# request[n] ? (request[n].is_a?(Array) ? (request[n] << l) : request[n] = [request[n], l ]) : (request[n] = l)
 								request[:headers_size] ||= 0
 								request[:headers_size] += l.bytesize
-								l = l.strip.split(/:[\s]?/, 2)
+								l = l.strip.split(/:[\s]?/.freeze, 2)
 								l[0].strip! ; l[0].downcase!;
 								request[l[0]] ? (request[l[0]].is_a?(Array) ? (request[l[0]] << l[1]) : request[l[0]] = [request[l[0]], l[1] ]) : (request[l[0]] = l[1])
-							elsif l =~ /^[\r]?\n/
+							elsif l =~ /^[\r]?\n/.freeze
 								request[:headers_complete] = true
 							else
 								#protocol error
@@ -102,10 +102,10 @@ module Iodine
 				headers['content-length'.freeze] ||= body.size if body
 
 				keep_alive = response.keep_alive
-				if (request[:version].to_f > 1 && request['connection'.freeze].nil?) || request['connection'.freeze].to_s =~ /ke/i || (headers['connection'.freeze] && headers['connection'.freeze] =~ /^ke/i)
+				if (request[:version].to_f > 1 && request['connection'.freeze].nil?) || request['connection'.freeze].to_s =~ /ke/i.freeze || (headers['connection'.freeze] && headers['connection'.freeze] =~ /^ke/i.freeze)
 					keep_alive = true
 					headers['connection'.freeze] ||= 'keep-alive'.freeze
-					headers['keep-alive'.freeze] ||= "timeout=#{(@timeout ||= 3).to_s}"
+					headers['keep-alive'.freeze] ||= "timeout=#{(@timeout ||= 3).to_s}".freeze
 				else
 					headers['connection'.freeze] ||= 'close'.freeze
 				end
@@ -115,7 +115,7 @@ module Iodine
 				buffer = String.new
 				until body.eof?
 					written = write(body.read 65_536, buffer)
-					return Iodine.warn("Http/1 couldn't send response because connection was lost.") && body.close unless written
+					return Iodine.warn("Http/1 couldn't send response because connection was lost.".freeze) && body.close unless written
 					response.bytes_written += written
 				end
 				body.close
@@ -124,9 +124,9 @@ module Iodine
 				log_finished response
 			end
 			def stream_response response, finish = false
-				timeout = 15
+				set_timeout 15
 				unless response.headers.frozen?
-					response['transfer-encoding'.freeze] = 'chunked'
+					response['transfer-encoding'.freeze] = 'chunked'.freeze
 					response.headers['connection'.freeze] = 'close'.freeze
 					send_headers response
 					@refuse_requests = true
@@ -136,11 +136,11 @@ module Iodine
 				buffer = String.new
 				until body.eof?
 					written = stream_data(body.read 65_536, buffer)
-					return Iodine.warn("Http/1 couldn't send response because connection was lost.") && body.close unless written
+					return Iodine.warn("Http/1 couldn't send response because connection was lost.".freeze) && body.close unless written
 					response.bytes_written += written
 				end if body
 				if finish
-					response.bytes_written += stream_data('')
+					response.bytes_written += stream_data(''.freeze)
 					log_finished response
 					close unless response.keep_alive
 				end
@@ -166,7 +166,7 @@ module Iodine
 				when 'OPTIONS'.freeze
 					response = ::Iodine::Http::Response.new request
 					response[:Allow] = 'GET,HEAD,POST,PUT,DELETE,OPTIONS'.freeze
-					response['access-control-allow-origin'.freeze] = '*'
+					response['access-control-allow-origin'.freeze] = '*'.freeze
 					response['content-length'.freeze] = 0
 					send_response response
 					return false

data/lib/iodine/http/http2.rb

@@ -12,7 +12,7 @@ module Iodine
 				@hpack = ::Iodine::Http::Http2::HPACK.new
 
 				# the header-stream cache
-				@header_buffer = ''
+				@header_buffer = String.new
 				@header_end_stream = false
 				@header_sid = nil
 				@frame_locker = Mutex.new
@@ -74,7 +74,7 @@ module Iodine
 					body.close
 					buffer.clear
 				else
-					emit_payload('', request[:sid], 0, 1)
+					emit_payload(''.freeze, request[:sid], 0, 1)
 				end
 				log_finished response
 			end
@@ -92,7 +92,7 @@ module Iodine
 					buffer.clear
 					body.close
 				elsif finish
-					emit_payload('', request[:sid], 0, 1)
+					emit_payload(''.freeze, request[:sid], 0, 1)
 				end
 				log_finished response if finish
 			end
@@ -195,7 +195,7 @@ module Iodine
 					return (connection_error(PROTOCOL_ERROR) && Iodine.warn("Preface not given"))
 				end
 				@connected = true
-				emit_frame '', 0, 0x4
+				emit_frame ''.freeze, 0, 0x4
 				true
 			end
 
@@ -222,14 +222,14 @@ module Iodine
 					frame[:flags] = tmp.ord
 				end
 				unless frame[:sid]
-					tmp = (frame[:sid_bytes] ||= '')
+					tmp = (frame[:sid_bytes] ||= String.new)
 					tmp << data.read(4 - tmp.bytesize).to_s
 					return false if tmp.bytesize < 4
 					tmp = frame.delete(:sid_bytes).unpack('N')[0]
 					frame[:sid] = tmp & 2147483647
 					frame[:R] = tmp & 2147483648
 				end
-				tmp = (frame[:body] ||= '')
+				tmp = (frame[:body] ||= String.new)
 				tmp << data.read(frame[:length] - tmp.bytesize).to_s
 				return false if tmp.bytesize < frame[:length]
 				#TODO: something - Async?
@@ -257,7 +257,7 @@ module Iodine
 					process_ping frame
 				when 7 # GOAWAY
 					go_away NO_ERROR
-					Iodine.error "Http2 Disconnection with error (#{frame[:flags].to_s}): #{frame[:body].strip}" unless frame[:flags] == 0 && frame[:body] == ''
+					Iodine.error "Http2 Disconnection with error (#{frame[:flags].to_s}): #{frame[:body].strip}" unless frame[:flags] == 0 && frame[:body] == ''.freeze
 				when 8 # WINDOW_UPDATE
 				else # Error, frame not recognized
 				end
@@ -402,7 +402,7 @@ module Iodine
 						# Unsupported parameters MUST be ignored
 					end
 				end
-				emit_frame '', 0, 4, 1
+				emit_frame ''.freeze, 0, 4, 1
 			end
 
 			def process_request request

data/lib/iodine/http/rack_support.rb

@@ -8,7 +8,7 @@ module Iodine
 				@app = app
 				Iodine.threads ||= 18
 				Iodine.port = options[:Port]
-				RACK_DICTIONARY['rack.multiprocess'] = Iodine.processes.to_i > 1
+				RACK_DICTIONARY['rack.multiprocess'.freeze] = Iodine.processes.to_i > 1
 				Iodine.protocol ||= Iodine::Http::Http1
 				@pre_rack_handler = Iodine::Http.on_http unless Iodine::Http.on_http == Iodine::Http::NOT_IMPLEMENTED
 				Iodine::Http.on_http self
@@ -27,7 +27,7 @@ module Iodine
 				res[1].each {|k, v| response.headers[k.to_s.downcase] = v }
 				response.body = res[2]
 				response.raw_cookies.clear
-				response.headers['set-cookie'] = response.headers.delete('set-cookie').split("\n").join("\r\nset-cookie: ") if request[:io].is_a?(Iodine::Http::Http1) && response.headers['set-cookie']
+				response.headers['set-cookie'.freeze] = response.headers.delete('set-cookie'.freeze).split("\n".freeze).join("\r\nset-cookie: ".freeze) if request[:io].is_a?(Iodine::Http::Http1) && response.headers['set-cookie'.freeze]
 				response.request[:no_log] = true
 				true
 			end
@@ -41,12 +41,12 @@ module Iodine
 				# env.each {|k, v| env[k] = @request[v] if v.is_a?(Symbol)}
 				RACK_ADDON.each {|k, v| env[k] = (request[v].is_a?(String) ? ( request[v].frozen? ? request[v].dup.force_encoding('ASCII-8BIT') : request[v].force_encoding('ASCII-8BIT') ): request[v])}
 				request.each {|k, v| env["HTTP_#{k.upcase.tr('-', '_')}"] = v if k.is_a?(String) }
-				env['rack.input'.freeze] ||= request[:body] || StringIO.new(''.force_encoding('ASCII-8BIT'.freeze))
+				env['rack.input'.freeze] ||= request[:body] || StringIO.new(''.force_encoding('ASCII-8BIT'.freeze).freeze)
 				env['CONTENT_LENGTH'.freeze] = env.delete 'HTTP_CONTENT_LENGTH'.freeze if env['HTTP_CONTENT_LENGTH'.freeze]
 				env['CONTENT_TYPE'.freeze] = env.delete 'HTTP_CONTENT_TYPE'.freeze if env['HTTP_CONTENT_TYPE'.freeze]
-				env['HTTP_VERSION'.freeze] = "HTTP/#{request[:version].to_s}"
-				env['QUERY_STRING'.freeze] ||= ''
-				env['rack.errors'.freeze] = StringIO.new('')
+				env['HTTP_VERSION'.freeze] = "HTTP/#{request[:version].to_s}".freeze
+				env['QUERY_STRING'.freeze] ||= ''.freeze
+				env['rack.errors'.freeze] = StringIO.new(''.freeze)
 				# should unchain cookies from Array to String
 				env['HTTP_COOKIE'] = env['HTTP_COOKIE'].join '; ' if env['HTTP_COOKIE'].is_a?(Array)
 				env
@@ -68,9 +68,9 @@ module Iodine
 			}
 
 			RACK_DICTIONARY = {
-				"GATEWAY_INTERFACE"	=>"CGI/1.2",
-				'SERVER_SOFTWARE'	=> "Iodine v. #{Iodine::VERSION}",
-				'SCRIPT_NAME'		=> ''.force_encoding('ASCII-8BIT'),
+				"GATEWAY_INTERFACE"	=>"CGI/1.2".freeze,
+				'SERVER_SOFTWARE'	=> "Iodine v. #{Iodine::VERSION}".freeze,
+				'SCRIPT_NAME'		=> ''.force_encoding('ASCII-8BIT'.freeze).freeze,
 				'rack.logger'		=> Iodine,
 				'rack.multithread'	=> true,
 				'rack.multiprocess'	=> false,
@@ -78,19 +78,19 @@ module Iodine
 				# 'rack.hijack_io'	=> nil,
 				'rack.run_once'		=> false
 			}
-			RACK_DICTIONARY['rack.version'] = ::Rack.version.split('.') if defined?(::Rack)
-			HASH_SYM_PROC = Proc.new {|h,k| k = (Symbol === k ? k.to_s : k.to_s.to_sym); h.has_key?(k) ? h[k] : (h["gr.#{k.to_s}"] if h.has_key?("gr.#{k.to_s}") ) }
+			RACK_DICTIONARY['rack.version'.freeze] = ::Rack.version.split('.'.freeze) if defined?(::Rack)
+			HASH_SYM_PROC = Proc.new {|h,k| k = (Symbol === k ? k.to_s : k.to_s.to_sym); h.has_key?(k) ? h[k] : (h["iodine.#{k.to_s}"] if h.has_key?("iodine.#{k.to_s}") ) }
 		end
 	end
 end
 
-# ENV["RACK_HANDLER"] = 'grhttp'
+# ENV["RACK_HANDLER"] = 'iodine'
 
 # make Iodine the default fallback position for Rack.
 begin
 	require 'rack/handler'
 	Rack::Handler::WEBrick = Rack::Handler.get(:iodine)
-rescue Exception => e
+rescue Exception
 
 end
 ::Rack::Handler.register( 'iodine', 'Iodine::Http::Rack') if defined?(::Rack)

data/lib/iodine/http/request.rb

@@ -22,7 +22,7 @@ module Iodine
 				end
 				# overrides the []= method to set the cookie for the response (by encoding it and preparing it to be sent), as well as to save the cookie in the combined cookie jar (unencoded and available).
 				def []= key, val
-					return super unless @response
+					return super unless instance_variable_defined?(:@response) && @response
 					if key.is_a?(Symbol) && self.has_key?( key.to_s)
 						key = key.to_s
 					elsif self.has_key?( key.to_s.to_sym)
@@ -98,12 +98,12 @@ module Iodine
 
 			# the base url ([http/https]://host[:port])
 			def base_url switch_scheme = nil
-				"#{switch_scheme || self[:scheme]}://#{self[:host_name]}#{self[:port]? ":#{self[:port]}" : ''}"
+				"#{switch_scheme || self[:scheme]}://#{self[:host_name]}#{self[:port]? ":#{self[:port]}" : ''.freeze}".freeze
 			end
 
 			# the request's url, without any GET parameters ([http/https]://host[:port]/path)
 			def request_url switch_scheme = nil
-				"#{base_url switch_scheme}#{self[:original_path]}"
+				"#{base_url switch_scheme}#{self[:original_path]}".freeze
 			end
 
 			# the protocol's scheme (http/https/ws/wss) managing this request
@@ -213,12 +213,12 @@ module Iodine
 				request[:version] ||= '1'
 
 				request[:scheme] ||= request['x-forwarded-proto'.freeze] ? request['x-forwarded-proto'.freeze].downcase : ( request[:io].ssl? ? 'https'.freeze : 'http'.freeze)
-				tmp = (request['host'.freeze] || request[:authority] || ''.freeze).split(':')
+				tmp = (request['host'.freeze] || request[:authority] || ''.freeze).split(':'.freeze)
 				request[:host_name] = tmp[0]
 				request[:port] = tmp[1] || nil
 
-				tmp = (request[:query] ||= request[:path] ).split('?', 2)
-				request[:path] = tmp[0].chomp('/')
+				tmp = (request[:query] ||= request[:path] ).split('?'.freeze, 2)
+				request[:path] = tmp[0].chomp('/'.freeze)
 				request[:original_path] = tmp[0].freeze
 				request[:quary_params] = tmp[1]
 				extract_params tmp[1].split(/[&;]/.freeze), (request[:params] ||= {}) if tmp[1]
@@ -313,7 +313,7 @@ module Iodine
 			end
 			# decode form / uri data (including the '+' sign as a space (%20) replacement).
 			def self.uri_decode! s
-				s.gsub!('+'.freeze, '%20'.freeze); s.gsub!(/\%[0-9a-f]{2}/i) {|m| m[1..2].to_i(16).chr}; s.gsub!(/&#[0-9]{4};/i) {|m| [m[2..5].to_i].pack 'U'.freeze }; s
+				s.gsub!('+'.freeze, '%20'.freeze); s.gsub!(/\%[0-9a-f]{2}/i.freeze) {|m| m[1..2].to_i(16).chr}; s.gsub!(/&#[0-9]{4};/i.freeze) {|m| [m[2..5].to_i].pack 'U'.freeze }; s
 			end
 			# extracts parameters from header data 
 			def self.extract_header data, target_hash
@@ -325,7 +325,7 @@ module Iodine
 			end
 			# decode percent-encoded data (excluding the '+' sign for encoding).
 			def self.form_decode! s
-				s.gsub!(/\%[0-9a-f]{2}/i) {|m| m[1..2].to_i(16).chr}; s.gsub!(/&#[0-9]{4};/i) {|m| [m[2..5].to_i].pack 'U'.freeze }; s
+				s.gsub!(/\%[0-9a-f]{2}/i.freeze) {|m| m[1..2].to_i(16).chr}; s.gsub!(/&#[0-9]{4};/i.freeze) {|m| [m[2..5].to_i].pack 'U'.freeze }; s
 			end
 			# Changes String to a Ruby Object, if it's a special string...
 			def self.rubyfy!(string)
@@ -348,32 +348,32 @@ module Iodine
 				# parse content
 				request[:body].rewind
 				case request['content-type'.freeze].to_s
-				when /x-www-form-urlencoded/
+				when /x-www-form-urlencoded/.freeze
 					extract_params request[:body].read.split(/[&;]/), request[:params] #, :form # :uri
-				when /multipart\/form-data/
+				when /multipart\/form-data/.freeze
 					read_multipart request, request
-				when /text\/xml/
+				when /text\/xml/.freeze
 					# to-do support xml?
 					# request[:xml] = make_utf8! request[:body].read
 					nil
-				when /application\/json/
+				when /application\/json/.freeze
 					JSON.parse(make_utf8! request[:body].read).each {|k, v| add_param_to_hash k, v, request[:params]} rescue true
 				end
 				request[:body].rewind if request[:body]
 			end
 
 			# parse a mime/multipart body or part.
-			def self.read_multipart request, headers = {}, boundary = [], name_prefix = ''
+			def self.read_multipart request, headers = {}, boundary = [], name_prefix = String.new
 				body = request[:body]
-				return unless headers['content-type'].to_s =~ /multipart/i
+				return unless headers['content-type'.freeze].to_s =~ /multipart/i.freeze
 				part_headers = {}
-				extract_header headers['content-type'].split(/[;,][\s]?/), part_headers
+				extract_header headers['content-type'.freeze].split(/[;,][\s]?/.freeze), part_headers
 				boundary << part_headers[:boundary]
 				if part_headers[:name]
 					if name_prefix.empty?
 						name_prefix << part_headers[:name]
 					else
-						name_prefix << "[#{part_headers[:name]}]"
+						name_prefix << "[#{part_headers[:name]}]".freeze
 					end
 				end
 				part_headers.delete :name

data/lib/iodine/http/response.rb

@@ -4,6 +4,30 @@ module Iodine
 		#
 		# The response can be sent in stages but should complete within the scope of the connecton's message. Please notice that headers and status cannot be changed once the response started sending data.
 		class Response
+			# Makes sure that the `flash` cookie-jar doesn't have Symbols and Strings overlapping.
+			class Flash < ::Hash
+				# overrides the []= method to set the cookie for the response (by encoding it and preparing it to be sent), as well as to save the cookie in the combined cookie jar (unencoded and available).
+				def []= key, val
+					if key.is_a?(Symbol) && self.has_key?( key.to_s)
+						key = key.to_s
+					elsif self.has_key?( key.to_s.to_sym)
+						key = key.to_s.to_sym
+					end
+					super
+				end
+				# overrides th [] method to allow Symbols and Strings to mix and match
+				def [] key
+					if key.is_a?(Symbol) && self.has_key?( key.to_s)
+						key = key.to_s
+					elsif self.has_key?( key.to_s.to_sym)
+						key = key.to_s.to_sym
+					elsif self.has_key? "magic_flash_#{key.to_s}".freeze.to_sym
+						key = "magic_flash_#{key.to_s}".freeze.to_sym
+					end
+					super
+				end
+			end
+
 			# the response's status code
 			attr_accessor :status
 			# the response's headers
@@ -33,11 +57,9 @@ module Iodine
 				@bytes_written = 0
 				@keep_alive = @http_sblocks_count = false
 				# propegate flash object
-				@flash = Hash.new do |hs,k|
-					hs["magic_flash_#{k.to_s}".to_sym] if hs.has_key? "magic_flash_#{k.to_s}".to_sym
-				end
+				@flash = ::Iodine::Http::Response::Flash.new
 				request.cookies.each do |k,v|
-					@flash[k] = v if k.to_s.start_with? 'magic_flash_'
+					@flash[k] = v if k.to_s.start_with? 'magic_flash_'.freeze
 				end
 			end
 
@@ -83,7 +105,7 @@ module Iodine
 				Iodine.run block, &@stream_proc
 			end
 
-			# Creates nested streaming blocks for an Array or another Enumerable object. Once all streaming blocks are done, the response will automatically finish.
+			# Creates nested streaming blocks for an Array object (an object answering `#shift`). Once all streaming blocks are done, the response will automatically finish.
 			#
 			# Since streaming blocks might run in parallel, nesting the streaming blocks is important...
 			#
@@ -124,9 +146,15 @@ module Iodine
 			#
 			# @return [Hash like storage] creates and returns the session storage object with all the data from a previous connection.
 			def session
-				return @session if @session
-				id = request.cookies[::Iodine::Http.session_token.to_sym] || SecureRandom.uuid
-				set_cookie ::Iodine::Http.session_token, id, expires: (Time.now+86_400), secure: @request.ssl?, http_only: true
+				return @session if instance_variable_defined?(:@session) && @session
+				if @request.ssl?
+					@@sec_session_token ||= "#{::Iodine::Http.session_token}_enc".freeze
+					id = @request.cookies[@@sec_session_token.to_sym] || SecureRandom.uuid
+					set_cookie @@sec_session_token, id, expires: :session, secure: true, http_only: true
+				else
+				id = @request.cookies[::Iodine::Http.session_token.to_sym] || SecureRandom.uuid
+					set_cookie ::Iodine::Http.session_token, id, expires: :session, http_only: true
+				end
 				@request[:session] = @session = ::Iodine::Http::SessionManager.get(id)
 			end
 
@@ -177,7 +205,7 @@ module Iodine
 			end
 
 
-			COOKIE_NAME_REGEXP = /[\x00-\x20\(\)\<\>@,;:\\\"\/\[\]\?\=\{\}\s]/
+			COOKIE_NAME_REGEXP = /[\x00-\x20\(\)\<\>@,;:\\\"\/\[\]\?\=\{\}\s]/.freeze
 
 			# Sets/deletes cookies when headers are sent.
 			#
@@ -206,20 +234,20 @@ module Iodine
 				name = name.to_s
 				raise 'Illegal cookie name' if name =~ COOKIE_NAME_REGEXP
 				if value.nil?
-					params[:expires] = (Time.now - 315360000)
+					params[:expires] = (Iodine.time - 315360000)
 					value = 'deleted'.freeze					
 				else
-					params[:expires] ||= (Time.now + 315360000) unless params[:max_age]
+					params[:expires] ||= (Iodine.time + 315360000) unless params[:max_age]
 				end
 				params[:path] ||= '/'.freeze
 				value = Iodine::Http::Request.encode_url(value) # this dups the string
 				if params[:max_age]
-					value << ('; Max-Age=%s' % params[:max_age])
+					value << ('; Max-Age=%s'.freeze % params[:max_age])
 				else
-					value << ('; Expires=%s' % params[:expires].httpdate)
+					value << ('; Expires=%s'.freeze % params[:expires].httpdate) if params[:expires].is_a?(::Time)
 				end
-				value << "; Path=#{params[:path]}"
-				value << "; Domain=#{params[:domain]}" if params[:domain]
+				value << "; Path=#{params[:path]}".freeze
+				value << "; Domain=#{params[:domain]}".freeze if params[:domain]
 				value << '; Secure'.freeze if params[:secure]
 				value << '; HttpOnly'.freeze if params[:http_only]
 				@cookies[name.to_sym] = value
@@ -245,7 +273,7 @@ module Iodine
 				request.delete(:body).tap {|f| f.close unless f.respond_to?(:close) && f.closed? rescue false } if request[:body] && @http_sblocks_count.to_i == 0
 			end
 
-			# Returns the connection's UUID.
+			# Returns the connection's LOCAL UUID.
 			def uuid
 				request[:io].id
 			end
@@ -311,7 +339,7 @@ module Iodine
 				511=>"Network Authentication Required".freeze
 			}
 
-			# This will return the Body object as an IO like object, such as StringIO (or File)... And set the body to `nil` (seeing as it was extracted from the response).
+			# This will return the Body object as an IO like object, such as StringIO (or File) and set the body to `nil` (seeing as it was extracted from the response).
 			#
 			# This method will also attempts to set headers and update the response status in relation to the body, if applicable. Call this BEFORE getting any final data about the response or sending the headers.
 			def extract_body
@@ -327,7 +355,7 @@ module Iodine
 				elsif  @body.is_a?(File) || @body.is_a?(Tempfile) || @body.is_a?(StringIO)
 					@body
 				elsif @body.respond_to? :each
-					tmp = ''
+					tmp = String.new
 					@body.each {|s| tmp << s}
 					@body.close if @body.respond_to? :close
 					@body = nil
@@ -338,7 +366,7 @@ module Iodine
 				body_io.rewind
 
 				if !(@headers.frozen?) && @request['range'.freeze] && @request.get? && @status == 200 && @headers['content-length'.freeze].nil?
-					r = @request['range'.freeze].match(/^bytes=([\d]+)\-([\d]+)?$/i)
+					r = @request['range'.freeze].match(/^bytes=([\d]+)\-([\d]+)?$/i.freeze)
 					if r
 						old_size = body_io.size
 						start_pos = r[1].to_i
@@ -353,9 +381,9 @@ module Iodine
 							body_io.rewind
 						end
 						@headers['content-range'.freeze] = "bytes #{start_pos}-#{end_pos}/#{old_size}"
-						@headers['accept-ranges'.freeze] ||= 'bytes'
+						@headers['accept-ranges'.freeze] ||= 'bytes'.freeze
 					else
-						@headers['accept-ranges'.freeze] ||= 'none'
+						@headers['accept-ranges'.freeze] ||= 'none'.freeze
 					end
 				end
 
@@ -374,7 +402,7 @@ module Iodine
 					end
 					#set new flash cookies
 					@flash.each do |k,v|
-						set_cookie "magic_flash_#{k.to_s}", v
+						set_cookie "magic_flash_#{k.to_s}".freeze, v
 					end
 					@cookies.freeze
 					# response.cookies.set_response nil

data/lib/iodine/http/websocket_client.rb

@@ -133,10 +133,6 @@ module Iodine
 				@request.ssl?
 			end
 
-			# return the HTTP's handshake data, including any cookies sent by the server.
-			def request
-				@request
-			end
 			# return a Hash with the HTTP cookies recieved during the HTTP's handshake.
 			def cookies
 				@request.cookies
@@ -154,7 +150,7 @@ module Iodine
 				end
 				byte_size = data.bytesize
 				if byte_size > (::Iodine::Http::Websockets::FRAME_SIZE_LIMIT+2)
-					sections = byte_size/FRAME_SIZE_LIMIT + (byte_size % ::Iodine::Http::Websockets::FRAME_SIZE_LIMIT ? 1 : 0)
+					# sections = byte_size/FRAME_SIZE_LIMIT + (byte_size % ::Iodine::Http::Websockets::FRAME_SIZE_LIMIT ? 1 : 0)
 					ret = write( data.slice!( 0...::Iodine::Http::Websockets::FRAME_SIZE_LIMIT ), op_code, data.empty?, ext) && (ext = op_code = 0) until data.empty?
 					return ret # avoid sending an empty frame.
 				end
@@ -205,20 +201,19 @@ module Iodine
 					ssl.connect
 				end
 				# prep custom headers
-				custom_headers = ''
+				custom_headers = String.new
 				custom_headers = @options[:headers] if @options[:headers].is_a?(String)
 				@options[:headers].each {|k, v| custom_headers << "#{k.to_s}: #{v.to_s}\r\n"} if @options[:headers].is_a?(Hash)
-				@options[:cookies].each {|k, v| raise 'Illegal cookie name' if k.to_s.match(/[\x00-\x20\(\)<>@,;:\\\"\/\[\]\?\=\{\}\s]/); custom_headers << "Cookie: #{ k }=#{ Iodine::Http::Request.encode_url v }\r\n"} if @options[:cookies].is_a?(Hash)
+				@options[:cookies].each {|k, v| raise 'Illegal cookie name' if k.to_s.match(/[\x00-\x20\(\)<>@,;:\\\"\/\[\]\?\=\{\}\s]/.freeze); custom_headers << "Cookie: #{ k }=#{ Iodine::Http::Request.encode_url v }\r\n"} if @options[:cookies].is_a?(Hash)
 
 				# send protocol upgrade request
-				websocket_key = [(Array.new(16) {rand 255} .pack 'c*' )].pack('m0*')
-				(ssl || socket).write "GET #{url.path}#{url.query.to_s.empty? ? '' : ('?' + url.query)} HTTP/1.1\r\nHost: #{url.host}#{url.port ? (':'+url.port.to_s) : ''}\r\nUpgrade: websocket\r\nConnection: Upgrade\r\nOrigin: #{ssl ? 'https' : 'http'}://#{url.host}\r\nSec-WebSocket-Key: #{websocket_key}\r\nSec-WebSocket-Version: 13\r\n#{custom_headers}\r\n"
+				websocket_key = [(Array.new(16) {rand 255} .pack 'c*'.freeze )].pack('m0*'.freeze)
+				(ssl || socket).write "GET #{url.path}#{url.query.to_s.empty? ? ''.freeze : ("?#{url.query}")} HTTP/1.1\r\nHost: #{url.host}#{url.port ? (":#{url.port.to_s}") : ''.freeze}\r\nUpgrade: websocket\r\nConnection: Upgrade\r\nOrigin: #{ssl ? 'https'.freeze : 'http'.freeze}://#{url.host}\r\nSec-WebSocket-Key: #{websocket_key}\r\nSec-WebSocket-Version: 13\r\n#{custom_headers}\r\n"
 				# wait for answer - make sure we don't over-read
 				# (a websocket message might be sent immidiately after connection is established)
-				reply = ''
-				reply.force_encoding(::Encoding::ASCII_8BIT)
+				reply = String.new.force_encoding(::Encoding::ASCII_8BIT)
 				stop_time = Time.now + (@options[:timeout] || 5)
-				stop_reply = "\r\n\r\n"
+				stop_reply = "\r\n\r\n".freeze
 				until reply[-4..-1] == stop_reply
 					begin
 						reply << ( ssl ? ssl.read_nonblock(1) : socket.recv_nonblock(1) )
@@ -230,24 +225,24 @@ module Iodine
 					raise "Connection failed" if socket.closed?
 				end
 				# review reply
-				raise "Connection Refused. Reply was:\r\n #{reply}" unless reply.lines[0].match(/^HTTP\/[\d\.]+ 101/i)
-				raise 'Websocket Key Authentication failed.' unless reply.match(/^Sec-WebSocket-Accept:[\s]*([^\s]*)/i) && reply.match(/^Sec-WebSocket-Accept:[\s]*([^\s]*)/i)[1] == Digest::SHA1.base64digest(websocket_key + '258EAFA5-E914-47DA-95CA-C5AB0DC85B11')
+				raise "Connection Refused. Reply was:\r\n #{reply}" unless reply.lines[0].match(/^HTTP\/[\d\.]+ 101/i.freeze)
+				raise 'Websocket Key Authentication failed.' unless reply.match(/^Sec-WebSocket-Accept:[\s]*([^\s]*)/i.freeze) && reply.match(/^Sec-WebSocket-Accept:[\s]*([^\s]*)/i.freeze)[1] == Digest::SHA1.base64digest(websocket_key + '258EAFA5-E914-47DA-95CA-C5AB0DC85B11')
 				# read the body's data and parse any incoming data.
 				@request = Iodine::Http::Request.new
-				@request[:method] = 'GET'
-				@request['host'] = "#{url.host}:#{url.port}"
+				@request[:method] = 'GET'.freeze
+				@request['host'.freeze] = "#{url.host}:#{url.port}"
 				@request[:query] = url.path
-				@request[:version] = '1.1'
+				@request[:version] = '1.1'.freeze
 				reply = StringIO.new reply
 				reply.gets
 
 				until reply.eof?
 					until @request[:headers_complete] || (l = reply.gets).nil?
 						if l.include? ':'
-							l = l.strip.split(/:[\s]?/, 2)
+							l = l.strip.split(/:[\s]?/.freeze, 2)
 							l[0].strip! ; l[0].downcase!;
 							@request[l[0]] ? (@request[l[0]].is_a?(Array) ? (@request[l[0]] << l[1]) : @request[l[0]] = [@request[l[0]], l[1] ]) : (@request[l[0]] = l[1])
-						elsif l =~ /^[\r]?\n/
+						elsif l =~ /^[\r]?\n/.freeze
 							@request[:headers_complete] = true
 						else
 							#protocol error

data/lib/iodine/http/websockets.rb

@@ -6,8 +6,8 @@ module Iodine
 				@handler = @options[:handler]
 				@ws_extentions = @options[:ext]
 				@options[:request][:io] = self
-				@parser = {body: '', stage: 0, step: 0, mask_key: [], len_bytes: []}
-				set_timeout = self.class.default_timeout
+				@parser = {body: String.new, stage: 0, step: 0, mask_key: [], len_bytes: []}
+				set_timeout self.class.default_timeout
 				@handler.on_open if @handler.respond_to? :on_open
 			end
 			# parse and handle messages.
@@ -60,7 +60,7 @@ module Iodine
 				end
 				byte_size = data.bytesize
 				if byte_size > (FRAME_SIZE_LIMIT+2)
-					sections = byte_size/FRAME_SIZE_LIMIT + (byte_size%FRAME_SIZE_LIMIT ? 1 : 0)
+					# sections = byte_size/FRAME_SIZE_LIMIT + (byte_size%FRAME_SIZE_LIMIT ? 1 : 0)
 					send_data( data.slice!( 0...FRAME_SIZE_LIMIT ), op_code, data.empty?, ext) && (ext = op_code = 0) until data.empty?
 					return true # avoid sending an empty frame.
 				end
@@ -149,10 +149,10 @@ module Iodine
 				# and MUST NOT use them unless the server indicates that it wishes to use the extension.
 				ws_extentions = []
 				ext = []
-				request['sec-websocket-extensions'.freeze].to_s.split(/[\s]*[,][\s]*/).each {|ex| ex = ex.split(/[\s]*;[\s]*/); ( ( tmp = SUPPORTED_EXTENTIONS[ ex[0] ].call(ex[1..-1]) ) && (ws_extentions << tmp) && (ext << tmp.name) ) if SUPPORTED_EXTENTIONS[ ex[0] ] }
+				request['sec-websocket-extensions'.freeze].to_s.split(/[\s]*[,][\s]*/.freeze).each {|ex| ex = ex.split(/[\s]*;[\s]*/.freeze); ( ( tmp = SUPPORTED_EXTENTIONS[ ex[0] ].call(ex[1..-1]) ) && (ws_extentions << tmp) && (ext << tmp.name) ) if SUPPORTED_EXTENTIONS[ ex[0] ] }
 				ext.compact!
 				if ext.any?
-					response['sec-websocket-extensions'.freeze] = ext.join(', ')
+					response['sec-websocket-extensions'.freeze] = ext.join(', '.freeze)
 				else
 					ws_extentions = nil
 				end
@@ -200,7 +200,7 @@ module Iodine
 
 			def self.refuse response
 				response.status = 400
-				response['sec-websocket-extensions'.freeze] = SUPPORTED_EXTENTIONS.keys.join(', ')
+				response['sec-websocket-extensions'.freeze] = SUPPORTED_EXTENTIONS.keys.join(', '.freeze)
 				response['sec-websocket-version'.freeze] = '13'.freeze
 				false
 			end
@@ -298,7 +298,7 @@ module Iodine
 					close
 					parser[:p_op_code] = nil if parser[:p_op_code] == 8
 				else
-					parser[:message] ? ((parser[:message] << parser[:body]) && parser[:body].clear) : ((parser[:message] = parser[:body]) && parser[:body] = '')
+					parser[:message] ? ((parser[:message] << parser[:body]) && parser[:body].clear) : ((parser[:message] = parser[:body]) && parser[:body] = String.new)
 					# handle parser[:op_code] == 0 / fin == false (continue a frame that hasn't ended yet)
 					if parser[:fin]
 						@ws_extentions.each {|ex| ex.parse_message(parser) } if @ws_extentions

data/lib/iodine/protocol.rb

@@ -125,7 +125,7 @@ module Iodine
 					touch
 					r
 				end
-			rescue => e
+			rescue # => e
 				# Iodine.info e.message
 				close
 			end
@@ -214,7 +214,7 @@ module Iodine
 		# reads from the IO up to the specified number of bytes (defaults to ~1Mb).
 		def read_ssl size
 			@send_locker.synchronize do
-				data = ''
+				data = String.new
 				begin
 					 (data << @io.read_nonblock(size).to_s) until data.bytesize >= size
 				rescue OpenSSL::SSL::SSLErrorWaitReadable, IO::WaitReadable, IO::WaitWritable

data/lib/iodine/settings.rb

@@ -120,7 +120,7 @@ module Iodine
 	def create_cert bits=2048, cn=nil, comment='a self signed certificate for when we only need encryption and no more.'
 		unless cn
 			host_name = Socket::gethostbyname(Socket::gethostname)[0].split('.')
-			cn = ''
+			cn = String.new
 			host_name.each {|n| cn << "/DC=#{n}"}
 			cn << "/CN=Iodine.#{host_name.join('.')}"
 		end			

data/lib/iodine/ssl_connector.rb

@@ -10,7 +10,7 @@ module Iodine
 		end
 		TIMEOUT = 3 # hardcoded SSL/TLS handshake timeout
 		def on_open
-			timeout = TIMEOUT
+			set_timeout TIMEOUT
 			@ssl_socket = ::OpenSSL::SSL::SSLSocket.new(@io, ::Iodine.ssl_context)
 			@ssl_socket.sync_close = true
 		end

data/lib/iodine/timers.rb

@@ -42,7 +42,7 @@ module Iodine
 			return false unless @next <= @reactor.time
 			return true if @repeat_limit == 0
 			@repeat_limit -= 1 if @repeat_limit.to_i > 0
-			@reactor.run *@args, &@job
+			@reactor.run(*@args, &@job)
 			@next = @reactor.time + @interval
 			@repeat_limit == 0
 		end

data/lib/iodine/version.rb

@@ -1,3 +1,3 @@
 module Iodine
-  VERSION = "0.1.12"
+  VERSION = "0.1.13"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: iodine
 version: !ruby/object:Gem::Version
-  version: 0.1.12
+  version: 0.1.13
 platform: ruby
 authors:
 - Boaz Segev
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-11-12 00:00:00.000000000 Z
+date: 2015-11-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler