iodine 0.1.21 → 0.2.0

data/lib/iodine/version.rb

@@ -1,3 +1,3 @@
 module Iodine
-  VERSION = "0.1.21"
+  VERSION = '0.2.0'.freeze
 end

data/lib/rack/handler/iodine.rb

@@ -1,3 +1,146 @@
-require 'iodine/http'
+require 'iodine' unless defined?(::Iodine::VERSION)
 
-::Rack::Handler.register( 'iodine', 'Iodine::Http::Rack') if defined?(::Rack)
+module Iodine
+  # {Iodine::Rack} is an Iodine HTTP and Websocket Rack server bundled with {Iodine} for your convinience.
+  module Rack
+    # get/set the Rack application.
+    def self.app=(val)
+      @app = val
+    end
+
+    # get/set the Rack application.
+    def self.app
+      @app
+    end
+
+    # get/set the HTTP connection timeout property. Defaults to 5. Limited to a maximum of 255. 0 values are silently ignored.
+    def self.timeout=(t)
+      @timeout = t
+    end
+
+    # get/set the HTTP connection timeout property. Defaults to 5.
+    def self.timeout
+      @timeout
+    end
+
+    # get/set the Websocket connection timeout property. Defaults to 40 seconds. Limited to a maximum of 255. 0 values are silently ignored.
+    def self.ws_timeout=(t)
+      @ws_timeout = t
+    end
+
+    # get/set the Websocket connection timeout property. Defaults to 40 seconds. Limited to a maximum of 255. 0 values are silently ignored.
+    def self.ws_timeout
+      @ws_timeout
+    end
+
+    # get/set the HTTP public folder property. Defaults to 5. Defaults to the incoming argumrnts or `nil`.
+    def self.public=(val)
+      @public = val
+    end
+    @public = ARGV[ARGV.index('-www') + 1] if ARGV.index('-www')
+
+    # get/set the HTTP public folder property. Defaults to 5.
+    def self.public
+      @public
+    end
+
+    # get/set the maximum HTTP body size for incoming data. Defaults to ~50Mb. 0 values are silently ignored.
+    def self.max_body_size=(val)
+      @max_body_size = val
+    end
+
+    # get/set the maximum HTTP body size for incoming data. Defaults to ~50Mb.
+    def self.max_body_size
+      @max_body_size
+    end
+
+    # get/set the maximum Websocket body size for incoming data. Defaults to defaults to ~250KB. 0 values are silently ignored.
+    def self.max_msg_size=(val)
+      @max_msg_size = val
+    end
+
+    # get/set the maximum Websocket body size for incoming data. Defaults to defaults to ~250KB. 0 values are silently ignored.
+    def self.max_msg_size
+      @max_msg_size
+    end
+
+    # get/set the HTTP logging value (true / false). Defaults to the incoming argumrnts or `false`.
+    def self.log=(val)
+      @log = val
+    end
+
+    # get/set the HTTP logging value (true / false). Defaults to the incoming argumrnts or `false`.
+    def self.log
+      @log
+    end
+    @log = true if ARGV.index('-v')
+    @log = false if ARGV.index('-q')
+
+    # get/set the HTTP listenning port. Defaults to 3000.
+    def self.port=(val)
+      @port = val
+    end
+
+    # get/set the HTTP listenning port. Defaults to 3000.
+    def self.port
+      @port
+    end
+    @port = ARGV[ARGV.index('-p') + 1] if ARGV.index('-p')
+    @port ||= 3000
+
+    # get/set the HTTP socket binding address. Defaults to `nil` (usually best).
+    def self.address=(val)
+      @address = val
+    end
+
+    # get/set the HTTP socket binding address. Defaults to `nil` (usually best).
+    def self.address
+      @address
+    end
+    @address = nil
+
+    # Runs a Rack app, as par the Rack handler requirements.
+    def self.run(app, options = {})
+      # nested applications... is that a thing?
+      if @app && @app != app
+        old_app = @app
+        @app = proc do |env|
+          ret = old_app.call(env)
+          ret = app.call(env) if !ret.is_a?(Array) || (ret.is_a?(Array) && ret[0].to_i == 404)
+          ret
+        end
+      else
+        @app = app
+      end
+      @port = options[:Port] if options[:Port]
+      @port = options[:Address] if options[:Address]
+      # provide Websocket features using Rack::Websocket
+      Rack.send :remove_const, :Websocket if defined?(Rack::Websocket)
+      Rack.const_set :Websocket, ::Iodine::Websocket
+      # start Iodine
+      Iodine.start
+      # remove the Websocket features from Rack::Websocket
+      Rack.send :remove_const, :Websocket
+      true
+    end
+    IODINE_RACK_LOADED = true
+  end
+end
+
+# Iodine::Rack.app = proc { |env| p env; puts env['rack.input'].read(1024).tap { |s| puts "Got data #{s.length} long, #{s[0].ord}, #{s[1].ord} ... #{s[s.length - 2].ord}, #{s[s.length - 1].ord}:" if s }; env['rack.input'].rewind; [404, {}, []] }
+
+ENV['RACK_HANDLER'] = 'iodine'
+
+# make Iodine the default fallback position for Rack.
+begin
+  require 'rack/handler' unless defined?(Rack::Handler)
+  Rack::Handler::WEBrick = ::Iodine::Rack # Rack::Handler.get(:iodine)
+rescue Exception
+
+end
+
+begin
+  ::Rack::Handler.register('iodine', 'Iodine::Rack') if defined?(::Rack::Handler)
+rescue Exception
+
+end

metadata

@@ -1,15 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: iodine
 version: !ruby/object:Gem::Version
-  version: 0.1.21
+  version: 0.2.0
 platform: ruby
 authors:
 - Boaz Segev
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-01-19 00:00:00.000000000 Z
+date: 2016-08-18 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: rack
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rake-compiler
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -52,12 +80,13 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: " The Iodine v.0.1.X line and API is deprecated and will not be supported
-  after v. 0.2.0 is released. "
+description: " Iodine - writing C servers in Ruby."
 email:
 - Boaz@2be.co.il
-executables: []
-extensions: []
+executables:
+- iodine
+extensions:
+- ext/iodine/extconf.rb
 extra_rdoc_files: []
 files:
 - ".gitignore"
@@ -67,34 +96,80 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
+- bin/config.ru
 - bin/console
-- bin/core_http_test
 - bin/echo
-- bin/em playground
-- bin/hello_world
-- bin/setup
+- bin/http-hello
+- bin/http-playground
+- bin/playground
+- bin/poc/Gemfile.lock
+- bin/poc/README.md
+- bin/poc/config.ru
+- bin/poc/gemfile
+- bin/poc/www/index.html
+- bin/raw-rbhttp
+- bin/raw_broadcast
+- bin/test_with_faye
+- bin/ws-broadcast
+- bin/ws-echo
+- exe/iodine
+- ext/iodine/base64.c
+- ext/iodine/base64.h
+- ext/iodine/bscrypt-common.h
+- ext/iodine/bscrypt.h
+- ext/iodine/extconf.rb
+- ext/iodine/hex.c
+- ext/iodine/hex.h
+- ext/iodine/http.c
+- ext/iodine/http.h
+- ext/iodine/http1.c
+- ext/iodine/http1.h
+- ext/iodine/http1_simple_parser.c
+- ext/iodine/http1_simple_parser.h
+- ext/iodine/http_request.h
+- ext/iodine/http_response.c
+- ext/iodine/http_response.h
+- ext/iodine/http_response_http1.h
+- ext/iodine/iodine_core.c
+- ext/iodine/iodine_core.h
+- ext/iodine/iodine_http.c
+- ext/iodine/iodine_http.h
+- ext/iodine/iodine_websocket.c
+- ext/iodine/iodine_websocket.h
+- ext/iodine/libasync.c
+- ext/iodine/libasync.h
+- ext/iodine/libreact.c
+- ext/iodine/libreact.h
+- ext/iodine/libserver.c
+- ext/iodine/libserver.h
+- ext/iodine/libsock.c
+- ext/iodine/libsock.h
+- ext/iodine/misc.c
+- ext/iodine/misc.h
+- ext/iodine/random.c
+- ext/iodine/random.h
+- ext/iodine/rb-call.c
+- ext/iodine/rb-call.h
+- ext/iodine/rb-libasync.h
+- ext/iodine/rb-rack-io.c
+- ext/iodine/rb-rack-io.h
+- ext/iodine/rb-registry.c
+- ext/iodine/rb-registry.h
+- ext/iodine/sha1.c
+- ext/iodine/sha1.h
+- ext/iodine/sha2.c
+- ext/iodine/sha2.h
+- ext/iodine/siphash.c
+- ext/iodine/siphash.h
+- ext/iodine/spnlock.h
+- ext/iodine/websockets.c
+- ext/iodine/websockets.h
+- ext/iodine/xor-crypt.c
+- ext/iodine/xor-crypt.h
 - iodine.gemspec
 - lib/iodine.rb
-- lib/iodine/client.rb
-- lib/iodine/core.rb
-- lib/iodine/core_init.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_connector.rb
-- lib/iodine/timers.rb
 - lib/iodine/version.rb
 - lib/rack/handler/iodine.rb
 homepage: https://github.com/boazsegev/iodine
@@ -103,28 +178,31 @@ licenses:
 metadata:
   allowed_push_host: https://rubygems.org
 post_install_message: |-
-  The Iodine 0.1.x API is now deprecated.
-  Version 0.2.x will include a drastic change and it WILL break existing code.
-  DON'T UPGRADE BEYOND THIS POINT UNLESS YOU'RE PREPARED FOR A HUGE CANGE.
-  Future version of Iodine will be written in C and require a Linux/Unix machine.
+  ** WARNING!
+  Iodine 0.2.0 is NOT an upgrade - it's a total rewrite, it's written in C specifically for Ruby MRI.
+
+  If your application was using Iodine 0.1.x, it might not work after this "upgrade".
 rdoc_options: []
 require_paths:
 - lib
+- ext
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.2.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
-requirements: []
+requirements:
+- 'A Unix based system, i.e.: Linux / OS X / BSD.'
+- An updated C compiler, with support for C11 (i.e. gcc 4.9 or later).
+- Ruby >= 2.2.2
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
-summary: The Iodine v.0.1.X line and API is deprecated and will not be supported after
-  v. 0.2.0 is released.
+summary: Iodine - writing C servers in Ruby.
 test_files: []

data/bin/core_http_test

@@ -1,51 +0,0 @@
-#!/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"
-require 'stringio'
-
-# ab -n 10000 -c 200 -k http://127.0.0.1:3000/
-# ab -n 10000 -c 200 -k http://localhost:3000/
-# ~/ruby/wrk/wrk -c400 -d10 -t12 http://localhost:3000/
-
-class MiniServer < Iodine::Protocol
-	def on_open
-		@headers = {}
-		set_timeout 1
-	end
-
-	def on_message data
-		data = ::StringIO.new data
-		l = nil
-		headers = @headers
-		while (l = data.gets)
-			unless l =~ /^[\r]?\n/
-				if l.include? ':'
-					l = l.strip.downcase.split(':', 2)
-					headers[l[0]] = l[1]
-				else
-					headers[:method], headers[:query], headers[:version] = l.strip.split(/[\s]+/, 3)
-				end
-				next
-			end
-			if headers['connection'] =~ /keep/i || headers[:version] =~ /1\.1/
-				write "HTTP/1.1 200 OK\r\nContent-Type: text/plain\r\nContent-Length: 12\r\nConnection: keep-alive\r\nKeep-Alive: 5\r\n\r\nhello world\n"
-			else
-				write "HTTP/1.1 200 OK\r\nContent-Type: text/plain\r\nContent-Length: 12\r\nConnection: close\r\n\r\nhello world\n"
-				close
-			end
-			headers.clear
-		end
-	end
-
-end
-
-Iodine.threads = 1
-# Iodine.ssl = 1
-Iodine.protocol = MiniServer
-
-

data/bin/em playground

@@ -1,56 +0,0 @@
-#!/usr/bin/env ruby
-#encoding: UTF-8
-
-require 'eventmachine'
-require 'stringio'
-
-
-module MiniServer
-	def post_init
-	 comm_inactivity_timeout = 5
-	 @headers = {}
-	 # start_tls :private_key_file => 'server.key', :cert_chain_file => 'server.crt', :verify_peer => false
-	end
-
-	def receive_data data
-		# EventMachine.defer do 
-			data = ::StringIO.new data
-			l = nil
-			headers = @headers
-			while (l = data.gets)
-				unless l =~ /^[\r]?\n/
-					if l.include? ':'
-						l = l.strip.downcase.split(':', 2)
-						headers[l[0]] = l[1]
-					else
-						headers[:method], headers[:query], headers[:version] = l.split(/[\s]+/, 3)
-					end
-					next
-				end
-				if headers['connection'] =~ /keep/i || headers[:version] =~ /1\.1/
-					send_data "HTTP/1.1 200 OK\r\nContent-Type: text/plain\r\nContent-Length: 12\r\nConnection: keep-alive\r\nKeep-Alive: 5\r\n\r\nhello world\n"
-				else
-					send_data "HTTP/1.1 200 OK\r\nContent-Type: text/plain\r\nContent-Length: 12\r\nConnection: close\r\n\r\nhello world\n"
-					close_connection true
-				end
-				headers.clear
-			end
-			data.string.clear
-		# end
-	end
-
-	def unbind
-	end
-end
-
-# Note that this will block current thread.
-EventMachine.run {
-	trap("TERM") { EventMachine.stop_event_loop }
-	trap("INT")  { EventMachine.stop_event_loop }
-	EventMachine.start_server "127.0.0.1", 3000, MiniServer
-}
-
-
-# ab -n 10000 -c 200 -k http://127.0.0.1:3000/ctrl
-# ~/ruby/wrk/wrk -c400 -d10 -t12 http://localhost:3000/ctrl
-