iodine 0.0.1 → 0.0.2

data/lib/iodine/timers.rb

@@ -24,7 +24,7 @@ module Iodine
 		end
 
 		# stops a timed event.
-		# @return [GReactor::TimedEvent] returns the TimedEvent object.
+		# @return [Iodine::TimedEvent] returns the TimedEvent object.
 		def stop!
 			@repeat_limit = 0
 			self
@@ -38,7 +38,7 @@ module Iodine
 			return false unless @next <= Iodine.time
 			return true if @repeat_limit == 0
 			@repeat_limit -= 1 if @repeat_limit.to_i > 0
-			Iodine.queue @job, @args
+			Iodine.run *@args, &@job
 			@next = Iodine.time + @interval
 			@repeat_limit == 0
 		end
@@ -59,28 +59,11 @@ module Iodine
 	#
 	# Timed event's time of execution is dependant on the workload and continuous uptime of the process (timed events AREN'T persistent).
 	#
-	# @return [GReactor::TimedEvent] returns the new TimedEvent object.
+	# @return [Iodine::TimedEvent] returns the new TimedEvent object.
 	def run_after seconds, *args, &block
 		timed_job seconds, 1, args, block
 	end
 
-	# pushes a timed event to the timers's stack
-	#
-	# accepts:
-	# time:: the time at which the job should be executed.
-	# *arg:: any arguments that will be passed to the handler's `call` method.
-	# &block:: the block to execute.
-	#
-	# A block is required.
-	#
-	# On top of the arguments passed to the `run_after` method, the timer object will be passed as the last agrument to the receiving block.
-	#
-	# Timed event's time of execution is dependant on the workload and continuous uptime of the process (timed events AREN'T persistent).
-	#
-	# @return [GReactor::TimedEvent] returns the new TimedEvent object.
-	def run_at run_time, *args, &block
-		timed_job( (@time - run_time), 1, args, block)
-	end
 	# pushes a repeated timed event to the timers's stack
 	#
 	# accepts:
@@ -95,7 +78,7 @@ module Iodine
 	#
 	# Timed event's time of execution is dependant on the workload and continuous uptime of the process (timed events AREN'T persistent unless you save and reload them yourself).
 	#
-	# @return [GReactor::TimedEvent] returns the new TimedEvent object.
+	# @return [Iodine::TimedEvent] returns the new TimedEvent object.
 	def run_every seconds, limit = -1, *args, &block
 		timed_job seconds, limit, args, block
 	end
@@ -112,5 +95,6 @@ module Iodine
 	@check_timers = Proc.new do
 		@timer_locker.synchronize { @timers.delete_if {|t| t.done? } }
 	end
+	@check_timers = [@check_timers]
 
 end

data/lib/iodine/version.rb

@@ -1,3 +1,3 @@
 module Iodine
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/lib/rack/handler/iodine.rb

@@ -0,0 +1,3 @@
+require 'iodine/http'
+
+::Rack::Handler.register( 'iodine', 'Iodine::Base::Rack') if defined?(::Rack)

data/{bin/http_test → manual tests/core_http_test }

@@ -14,7 +14,7 @@ require 'stringio'
 
 
 
-class MiniServer < Iodine::SSLProtocol
+class MiniServer < Iodine::Protocol
 	def on_open
 		@headers = {}
 		set_timeout 1
@@ -46,4 +46,8 @@ class MiniServer < Iodine::SSLProtocol
 
 end
 
-Iodine.protocol = MiniServer
+Iodine.threads = 1
+# Iodine.ssl = 1
+Iodine.protocol = MiniServer
+
+

data/manual tests/hello_world

@@ -0,0 +1,56 @@
+#!/usr/bin/env ruby
+
+require 'pathname'
+Root ||= Pathname.new(File.dirname(__FILE__)).expand_path
+Dir.chdir Root.join('..').to_s
+
+require "bundler/setup"
+require "iodine/http"
+
+# Iodine.ssl = true
+# Iodine.treads = 8
+# Iodine.protocol.on_http do |req, res|
+# 	res.session[:count] ||= 0
+# 	res.session[:count] += 1
+# 	res << "Visits: #{res.session[:count]}\n\nRequest object:\n\n#{req.to_s}"
+# end
+
+# Iodine.processes = 4
+
+Iodine.protocol.on_http { "Hello World!" }
+
+
+class WSChatServer
+	def initialize nickname
+		@nickname = nickname || "unknown"
+	end
+	def on_open protocol
+		@io = protocol
+		@io.broadcast "#{@nickname} has joined the chat!"
+		@io << "Welcome #{@nickname}, you have joined the chat!"
+	end
+	def on_message data
+		@io.broadcast "#{@nickname} >> #{data}"
+		@io << ">> #{data}"
+	end
+	def on_broadcast data
+		@io << data
+	end
+	def on_close
+		@io.broadcast "#{@nickname} has left the chat!"
+	end
+end
+
+Iodine::Http.on_websocket { |request, response| WSChatServer.new request.params[:name]}
+
+Process.fork do
+
+	Iodine.ssl = true
+	Iodine.port = 3030
+	Iodine.protocol.on_http do |req, res|
+		res.session[:count] ||= 0
+		res.session[:count] += 1
+		res << "Visits: #{res.session[:count]}\n\nRequest object:\n\n#{req.to_s}"
+	end
+
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: iodine
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Boaz Segev
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-10-17 00:00:00.000000000 Z
+date: 2015-10-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -66,20 +66,33 @@ files:
 - README.md
 - Rakefile
 - bin/console
-- bin/echo
-- bin/em playground
-- bin/http_test
 - bin/setup
 - iodine.gemspec
 - lib/iodine.rb
 - lib/iodine/core.rb
+- lib/iodine/http.rb
+- lib/iodine/http/hpack.rb
+- lib/iodine/http/http1.rb
+- lib/iodine/http/http2.rb
+- lib/iodine/http/rack_support.rb
+- lib/iodine/http/request.rb
+- lib/iodine/http/response.rb
+- lib/iodine/http/session.rb
+- lib/iodine/http/websocket_client.rb
+- lib/iodine/http/websocket_handler.rb
+- lib/iodine/http/websockets.rb
 - lib/iodine/io.rb
 - lib/iodine/logging.rb
 - lib/iodine/protocol.rb
 - lib/iodine/settings.rb
-- lib/iodine/ssl_protocol.rb
+- lib/iodine/ssl_connector.rb
 - lib/iodine/timers.rb
 - lib/iodine/version.rb
+- lib/rack/handler/iodine.rb
+- manual tests/core_http_test
+- manual tests/echo
+- manual tests/em playground
+- manual tests/hello_world
 homepage: https://github.com/boazsegev/iodine
 licenses:
 - MIT
@@ -106,3 +119,4 @@ signing_key:
 specification_version: 4
 summary: IOdine makes writing evented server applications easy to write.
 test_files: []
+has_rdoc: 

data/lib/iodine/ssl_protocol.rb

@@ -1,108 +0,0 @@
-module Iodine
-
-	# This class inherits from Protocol, but it includes some adjustments related to SSL connection handling.
-	class SSLProtocol < Protocol
-
-		# This is a mini-protocol used only to implement the SSL Handshake in a non-blocking manner,
-		# allowing for a hardcoded timeout (which you can monkey patch) of 3 seconds.
-		class SSLWait < Protocol
-			TIMEOUT = 3 # hardcoded SSL/TLS handshake timeout
-			def on_open
-				timeout = TIMEOUT
-				@ssl_socket = OpenSSL::SSL::SSLSocket.new(@io, Iodine.ssl_context)
-				@ssl_socket.sync_close = true
-			end
-
-			# atempt an SSL Handshale
-			def call
-				return if @locker.locked?
-				return unless @locker.try_lock
-				begin
-					@ssl_socket.accept_nonblock
-					@locker.unlock
-				rescue IO::WaitReadable, IO::WaitWritable
-					@locker.unlock
-					return
-				rescue OpenSSL::SSL::SSLError
-					@e = Exception.new "Self-signed Certificate?".freeze
-					@locker.unlock
-					return
-				rescue => e
-					Iodine.warn "SSL Handshake failed with: #{e.message}".freeze
-					@e = e
-					close
-					@locker.unlock
-					return
-				end
-				Iodine.protocol.new @ssl_socket
-			end
-			def on_close
-				# inform
-				Iodine.warn "SSL Handshake #{@e ? "failed with: #{@e.message} (#{@e.class.name})" : 'timed-out.'}".freeze
-				# the core @io is already closed, but let's make sure the SSL object is closed as well.
-				@ssl_socket.close unless @ssl_socket.closed?
-			end
-		end
-
-
-		attr_reader :ssl_socket
-
-
-
-		# reads from the IO up to the specified number of bytes (defaults to ~1Mb).
-		def read size = 1048576
-			@send_locker.synchronize do
-				data = ''
-				begin
-					 (data << @ssl_socket.read_nonblock(size).to_s) until data.bytesize >= size
-				rescue OpenSSL::SSL::SSLErrorWaitReadable, IO::WaitReadable, IO::WaitWritable
-
-				rescue IOError
-					close
-				rescue => e
-					Iodine.warn "SSL Protocol read error: #{e.class.name} #{e.message} (closing connection)"
-					close
-				end
-				return false if data.to_s.empty?
-				touch
-				data
-			end
-		end
-
-		def write data
-			begin
-				@send_locker.synchronize do
-					r = @ssl_socket.write data
-					touch
-					r
-				end				
-			rescue => e
-				close
-				false
-			end
-		end
-		alias :send :write
-		alias :<< :write
-
-		def on_close
-			@ssl_socket.close unless @ssl_socket.closed?
-			super
-		end
-
-
-
-
-
-		# This method initializes the SSL Protocol
-		def initialize ssl_socket
-			@ssl_socket = ssl_socket
-			super(ssl_socket.io)
-		end
-
-		def self.accept io
-			SSLWait.new(io)
-		end
-
-
-	end
-end