rlyeh 0.0.2 → 0.1.1

data/.gitignore

@@ -3,6 +3,7 @@
 .bundle
 .config
 .yardoc
+.rvmrc
 Gemfile.lock
 InstalledFiles
 _yardoc

data/examples/basic.rb

@@ -0,0 +1,18 @@
+#!/usr/bin/env ruby
+# -*- coding: utf-8 -*-
+$:.unshift 'lib', '../lib'
+require 'rlyeh'
+
+class BasicServer < Rlyeh::Base
+  use Rlyeh::DeepOnes::Logger
+  use Rlyeh::DeepOnes::Auth::Basic, 'dankogai', 'kogaidan'
+
+  set :server_name, 'basic-server'
+  set :server_version, '1.0.0'
+
+  on :privmsg do |env|
+    puts "RECV: #{env.message}"
+  end
+end
+
+Rlyeh.emerge BasicServer, :host => '0.0.0.0'

data/examples/echo.rb

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 # -*- coding: utf-8 -*-
-$LOAD_PATH.unshift 'lib', '../lib'
+$:.unshift 'lib', '../lib'
 require 'rlyeh'
 
 class Echo < Rlyeh::Base

data/examples/middleware.rb

@@ -5,7 +5,7 @@ require 'rlyeh'
 require 'logger'
 
 class MyMiddleware
-  include Rlyeh::Dispatcher
+  include Rlyeh::Dispatchable
 
   on :privmsg do |env|
     p "Middleware: #{env.message}"

data/examples/oauth.rb

@@ -0,0 +1,21 @@
+#!/usr/bin/env ruby
+# -*- coding: utf-8 -*-
+$LOAD_PATH.unshift 'lib', '../lib'
+require 'rlyeh'
+
+class OAuthServer < Rlyeh::Base
+  use Rlyeh::DeepOnes::Logger
+  use Rlyeh::DeepOnes::Auth::OAuth, 'consumer key', 'consumer secret', {
+    :authorize_path => '/oauth/authenticate',
+    :site => 'https://api.twitter.com'
+  }
+
+  set :server_name, 'oauth-server'
+  set :server_version, '1.0.0'
+
+  on :privmsg do |env|
+    puts "RECV: #{env.message}"
+  end
+end
+
+Rlyeh.emerge OAuthServer, :host => '0.0.0.0'

data/lib/rlyeh.rb

@@ -1,21 +1,39 @@
-require 'eventmachine'
+require 'rlyeh/version'
 
-module Rlyeh
-  autoload :VERSION,      'rlyeh/version'
+require 'rlyeh/logger'
+require 'rlyeh/dispatcher'
+require 'rlyeh/sender'
+
+require 'rlyeh/settings'
+require 'rlyeh/server'
+require 'rlyeh/connection'
+require 'rlyeh/session'
+require 'rlyeh/environment'
+require 'rlyeh/numeric_reply'
+require 'rlyeh/target'
+require 'rlyeh/base'
+
+require 'rlyeh/deep_ones'
 
-  autoload :Server,       'rlyeh/server'
-  autoload :Connection,   'rlyeh/connection'
-  autoload :Session,      'rlyeh/session'
-  autoload :Environment,  'rlyeh/environment'
-  autoload :NumericReply, 'rlyeh/numeric_reply'
-  autoload :Base,         'rlyeh/base'
+module Rlyeh
+  class << self
+    attr_accessor :logger
 
-  autoload :Dispatcher,   'rlyeh/dispatcher'
-  autoload :Filter,       'rlyeh/filter'
-  autoload :Settings,     'rlyeh/settings'
+    def run(app_class, options = {})
+      supervisor = Rlyeh::Server.supervise_as :server, app_class, options
 
-  require 'rlyeh/deep_ones'
+      trap(:INT) do
+        supervisor.terminate
+        exit
+      end
 
-  require 'rlyeh/runner'
-  include Rlyeh::Runner
+      sleep
+    end
+    alias_method :emerge, :run
+  end
 end
+
+require 'logger'
+#Celluloid.logger = nil
+Rlyeh.logger = ::Logger.new $stderr
+

data/lib/rlyeh/base.rb

@@ -10,6 +10,8 @@ module Rlyeh
 
     set :server_name, 'Rlyeh'
     set :server_version, Rlyeh::VERSION
+    set :available_user_modes, ''
+    set :available_channel_modes, ''
 
     class << self
       def middlewares
@@ -58,8 +60,7 @@ module Rlyeh
     end
 
     def call(env)
-      name = env.message.command.to_s.downcase
-      trigger name, env
+      dispatch env
       @app.call env if @app
     end
 

data/lib/rlyeh/connection.rb

@@ -1,55 +1,110 @@
+require 'celluloid'
+require 'forwardable'
+require 'rlyeh/logger'
+require 'rlyeh/sender'
+require 'rlyeh/worker'
 require 'rlyeh/environment'
-require 'rlyeh/filters'
-require 'rlyeh/sendable'
 
 module Rlyeh
-  class Connection < EventMachine::Connection
-    include EventMachine::Protocols::LineText2
-    include Rlyeh::Sendable
+  class Connection
+    include Rlyeh::Logger
+    include Rlyeh::Sender
+    include Rlyeh::Worker
+    extend Forwardable
 
-    attr_reader :server, :app_class, :options
-    attr_reader :app, :session
+    attr_reader :server, :socket
+    attr_reader :app, :host, :port, :session
 
-    def initialize(server, app_class, options)
+    def_delegators :@socket, :close, :closed?
+
+    BUFFER_SIZE = 4096
+
+    def initialize(server, socket)
       @server = server
-      @app_class = app_class
-      @options = options
-      set_delimiter "\r\n"
+      @socket = socket
+      _, @port, @host = @socket.peeraddr
+      @app = @server.app_class.new nil
+
+      debug "Connection started: #{@host}:#{@port}"
     end
 
-    def post_init
-      @app = app_class.new nil, @options
+    def close
+      @socket.close unless @socket.closed?
+
+      if attached?
+        @session.detach self
+
+        if @session.empty?
+          @session.close
+          @server.sessions.delete @session.id
+        end
+      end
+
+      debug "Connection closed: #{@host}:#{@port}"
     end
 
-    def unbind
-      @server.unbind self
+    def run
+      catch :quit do
+        read_each do |data|
+          invoke do
+            process data
+          end
+        end
+      end
     end
 
-    def receive_line(data)
+    def read_each(&block)
+      loop do
+        @buffer ||= ''.force_encoding('ASCII-8BIT')
+        @buffer << @socket.readpartial(BUFFER_SIZE).force_encoding('ASCII-8BIT')
+
+        while data = @buffer.slice!(/(.+)\n/, 1)
+          block.call data.chomp if block
+        end
+      end
+    rescue EOFError => e
+      # client disconnected
+    rescue Celluloid::Task::TerminatedError
+      # kill a running task
+    end
+
+    def process(data)
       env = Rlyeh::Environment.new
+      env.version = Rlyeh::VERSION
       env.data = data
       env.server = @server
       env.connection = self
-      env.settings = @app_class.settings
+      env.settings = @server.app_class.settings
 
       catch :halt do
-        @app.call env
+        begin
+          @app.call env
+        rescue Exception => e
+          crash e
+        end
+      end
+    end
+
+    def send_data(data, multicast = true)
+      data = data.to_s
+      if multicast && attached?
+        @session.send_data data
+      else
+        @socket.write data
       end
     end
 
-    def attached(session)
+    def attach(session)
       @session = session
     end
 
-    def detached(session)
+    def detach(session)
       @session = nil
     end
 
     def attached?
       !!@session
     end
-
-    include Rlyeh::Filters
-    define_filters :attached, :detached
   end
 end
+

data/lib/rlyeh/deep_ones/auth.rb

@@ -1,72 +1,10 @@
-require 'socket'
-require 'rlyeh/dispatcher'
-
 module Rlyeh
   module DeepOnes
-    class Auth
-      include Rlyeh::Dispatcher
-
-      attr_reader :nick, :pass, :user, :real, :host
-
-      def initialize(app, &authenticator)
-        @app = app
-        @authenticator = authenticator
-        @authorized = false
-      end
-
-      def call(env)
-        dispatch env
-
-        if authorized?
-          env.auth = self
-          @app.call env
-        end
-      end
-
-      def load_session(env, id)
-        env.server.sessions[id] ||= Rlyeh::Session.new(id)
-      end
-
-      def authorized?
-        @authorized
-      end
-
-      def authorized(env)
-        name = env.settings.server_name
-        version = env.settings.server_version
-        
-        env.connection.tap do |conn|
-          conn.send_numeric_reply :welcome, @host, "Welcome to the Internet Relay Network #{@nick}!#{@user}@#{@host}"
-          conn.send_numeric_reply :yourhost, @host, "Your host is #{name}, running version #{version}"
-          conn.send_numeric_reply :created,  @host, "This server was created #{Time.now}"
-          conn.send_numeric_reply :myinfo, @host, "#{name} #{version} #{""} #{""}"
-        end
-      end
-
-      on :pass do |env|
-        @pass = env.message.params[0]
-      end
-
-      on :nick do |env|
-        @nick = env.message.params[0]
-      end
-
-      on :user do |env|
-        @user = env.message.params[0]
-        @real = env.message.params[3]
-        port, @host = Socket.unpack_sockaddr_in(env.connection.get_peername)
-
-        session_id = @authenticator.call(self)
-        if session_id.nil?
-          p "Auth error"
-        else
-          @authorized = true
-          session = load_session env, session_id
-          session.attach env.connection
-          authorized env
-          p 'Session attached.'
-        end
-      end
+    module Auth
+      autoload :Base,  'rlyeh/deep_ones/auth/base'
+      autoload :Null,  'rlyeh/deep_ones/auth/null'
+      autoload :Basic, 'rlyeh/deep_ones/auth/basic'
+      autoload :OAuth, 'rlyeh/deep_ones/auth/oauth'
     end
   end
 end

data/lib/rlyeh/deep_ones/auth/base.rb

@@ -0,0 +1,88 @@
+require 'rlyeh/dispatcher'
+require 'rlyeh/logger'
+
+module Rlyeh
+  module DeepOnes
+    module Auth
+      class Base
+        include Rlyeh::Dispatcher
+        include Rlyeh::Logger
+
+        attr_reader :nick, :pass, :user, :real, :host
+
+        def initialize(app, &block)
+          @app = app
+          @authenticated = false
+          instance_eval &block if block
+        end
+
+        def call(env)
+          dispatch env
+
+          if authenticated?
+            env.auth = self
+            @app.call env if @app
+          end
+        end
+
+        def authenticated?
+          @authenticated
+        end
+
+        def try(env)
+          raise NotImplementedError
+        end
+
+        def session_id
+          @nick
+        end
+
+        def succeeded(env)
+          @authorized = true
+          session = env.server.load_session session_id
+          session.attach env.connection
+          debug "Authentication succeeded #{env.connection.host}:#{env.connection.port}"
+        end
+
+        def failed(env)
+          env.connection.send_numeric_reply :passwdmismatch, @host, ':Password incorrect'
+          debug "Authentication failed #{env.connection.host}:#{env.connection.port}"
+        end
+
+        def welcome(env)
+          name = env.settings.server_name
+          version = env.settings.server_version
+          user_modes = env.settings.available_user_modes
+          channel_modes = env.settings.available_channel_modes
+
+          messages = {
+            :welcome  => "Welcome to the Internet Relay Network #{@nick}!#{@user}@#{@host}",
+            :yourhost => "Your host is #{name}, running version #{version}",
+            :created => "This server was created #{Time.now}",
+            :myinfo => "#{name} #{version} #{user_modes} #{channel_modes}"
+          }
+
+          messages.each do |type, message|
+            env.connection.send_numeric_reply type, @nick, ":#{message}", :prefix => {:servername => name}
+          end
+        end
+
+        on :pass do |env|
+          @pass = env.message.params[0]
+        end
+
+        on :nick do |env|
+          @nick = env.message.params[0]
+        end
+
+        on :user do |env|
+          @user = env.message.params[0]
+          @real = env.message.params[3]
+          @host = env.connection.host
+
+          try env
+        end
+      end
+    end
+  end
+end

data/lib/rlyeh/deep_ones/auth/basic.rb

@@ -0,0 +1,21 @@
+module Rlyeh
+  module DeepOnes
+    module Auth
+      class Basic < Rlyeh::DeepOnes::Auth::Base
+        def initialize(app, nick, pass)
+          @basic = [nick, pass].freeze
+          super app
+        end
+
+        def try(env)
+          if @basic == [nick, pass]
+            succeeded env
+            welcome env
+          else
+            failed env
+          end
+        end
+      end
+    end
+  end
+end

data/lib/rlyeh/deep_ones/auth/null.rb

@@ -0,0 +1,12 @@
+module Rlyeh
+  module DeepOnes
+    module Auth
+      class Null < Rlyeh::DeepOnes::Auth::Base
+        def try(env)
+          succeeded env
+          welcome env
+        end
+      end
+    end
+  end
+end

data/lib/rlyeh/deep_ones/auth/oauth.rb

@@ -0,0 +1,55 @@
+require 'oauth'
+
+module Rlyeh
+  module DeepOnes
+    module Auth
+      class OAuth < Rlyeh::DeepOnes::Auth::Base
+        attr_accessor :consumer_key, :consumer_secret, :client_options
+        attr_accessor :open_timeout, :read_timeout
+        attr_accessor :authorize_params, :request_params
+        attr_reader :access_token
+
+        def initialize(app, consumer_key, consumer_secret, client_options = {})
+          @consumer_key = consumer_key
+          @consumer_secret = consumer_secret
+          @client_options = client_options
+          @open_timeout = nil
+          @read_timeout = nil
+          @authorize_params = {}
+          @request_params = {}
+          super app
+        end
+
+        def consumer
+          consumer = ::OAuth::Consumer.new @consumer_key, @consumer_secret, @client_options
+          consumer.http.open_timeout = @open_timeout if @open_timeout
+          consumer.http.read_timeout = @read_timeout if @read_timeout
+          consumer
+        end
+
+        def try(env)
+          welcome env
+          request_phase env
+        end
+
+        def request_phase(env)
+          request_token = consumer.get_request_token @request_params
+
+          talk env, 'Access this URL get the PIN and paste it here.'
+          talk env, request_token.authorize_url(@authorize_params)
+        end
+
+        protected
+
+        def sender_nick
+          '$oauth'
+        end
+
+        def talk(env, text)
+          target = Target.new env, @nick
+          target.privmsg text, sender_nick
+        end
+      end
+    end
+  end
+end

data/lib/rlyeh/deep_ones/closer.rb

@@ -4,14 +4,18 @@ module Rlyeh
   module DeepOnes
     class Closer
       include Rlyeh::Dispatcher
-      
+
       def initialize(app)
         @app = app
       end
 
+      def call(env)
+        dispatch env
+        @app.call env if @app
+      end
+
       on :quit do |env|
-        env.connection.close_connection_after_writing
-        throw :halt
+        throw :quit
       end
     end
   end

data/lib/rlyeh/deep_ones/logger.rb

@@ -1,21 +1,23 @@
-require 'logger'
+require 'rlyeh/logger'
 
 module Rlyeh
   module DeepOnes
     class Logger
-      def initialize(app, options = {})
+      include Rlyeh::Logger
+
+      def initialize(app, logger = nil, level = :debug)
         @app = app
-        @logger = options[:logger] || ::Logger.new(STDOUT)
-        @logger.level = options[:level] || ::Logger::INFO
+        @logger = logger || self
+        @level = level
       end
 
       def call(env)
         write env
-        @app.call env
+        @app.call env if @app
       end
 
       def write(env)
-        @logger.debug env.data
+        @logger.__send__ @level, "Message received: #{env.data}"
       end
     end
   end

data/lib/rlyeh/deep_ones/parser.rb

@@ -1,8 +1,11 @@
 require 'ircp'
+require 'rlyeh/logger'
 
 module Rlyeh
   module DeepOnes
     class Parser
+      include Rlyeh::Logger
+
       def initialize(app)
         @app = app
       end
@@ -11,9 +14,10 @@ module Rlyeh
         begin
           message = Ircp.parse env.data
           env.message = message
-          @app.call env
+          env.event = message.command.to_s.downcase
+          @app.call env if @app
         rescue Ircp::ParseError => e
-          p e
+          debug "#{e.class}: #{e.to_s}"
         end
       end
     end

data/lib/rlyeh/deep_ones/typablemap.rb

@@ -6,7 +6,7 @@ module Rlyeh
       end
 
       def call(env)
-        @app.call env
+        @app.call env if @app
       end
     end
   end

data/lib/rlyeh/dispatcher.rb

@@ -7,45 +7,43 @@ module Rlyeh
     end
 
     module ClassMethods
-      def callbacks(name)
-        @dispatchers ||= {}
-
-        callbacks = @dispatchers.select do |key, value|
-          if key.is_a?(Regexp)
-            key =~ name
-          else
-            key == name
+      def callbacks(target)
+        @dispatchers ||= []
+        callbacks = @dispatchers.select do |item|
+          key = item[0]
+          case key
+          when Regexp then key =~ target
+          else             key == target
           end
-        end.values.flatten
+        end.map { |item| item[1] }.flatten
 
         if superclass.respond_to?(:callbacks)
-          superclass.callbacks(name) + callbacks
+          superclass.callbacks(target) + callbacks
         else
           callbacks
         end
       end
 
-      def on(name, &block)
-        @dispatchers ||= {}
-        name = name.to_s if name.is_a?(Symbol)
-        callbacks = (@dispatchers[name] ||= [])
-        callbacks << Rlyeh::Utils.generate_method(self, "__on_#{name}", block)
-        callbacks.uniq!
-      end
-    end
+      def on(*args, &block)
+        options = Rlyeh::Utils.extract_options! args
+        target = args.shift
+        target = Array(options[:scope]) + Array(target) if [String, Symbol].any? { |type| target.is_a?(type) }
+        target = target.join('.') if target.is_a?(Array)
 
-    def call(env)
-      dispatch env
-      @app.call env if @app
+        @dispatchers ||= []
+        @dispatchers << [target, Rlyeh::Utils.generate_method(self, "__on_#{target}", block)]
+      end
     end
 
     def dispatch(env)
-      name = env.message.command.to_s.downcase
-      trigger name, env
+      if env.has_event?
+        target = env.event
+        trigger target, env
+      end
     end
 
-    def trigger(name, *args, &block)
-      callbacks = self.class.callbacks name
+    def trigger(target, *args, &block)
+      callbacks = self.class.callbacks target
       callbacks.each do |callback|
         break if callback.bind(self).call(*args, &block) == false
       end

data/lib/rlyeh/environment.rb

@@ -4,9 +4,10 @@ module Rlyeh
       super || respond_to_missing?(method_id, include_private)
     end
 
-    def respond_to_missing?(method_name, include_private)
+    def respond_to_missing?(method_id, include_private)
       method_name = method_id.to_s
       return true if method_name =~ /^(.+)=$/
+      return true if method_name =~ /^has_(.+)\?$/
       return true if self.key? method_name
       super
     end
@@ -14,8 +15,9 @@ module Rlyeh
     def method_missing(method_id, *args, &block)
       method_name = method_id.to_s
       return self[$1] = args.first if method_name =~ /^(.+)=$/
+      return self.has_key? $1 if method_name =~ /^has_(.+)\?$/
       return self[method_name] if self.key? method_name
-      super method_id, *args, &block
+      super
     end
   end
 end

data/lib/rlyeh/logger.rb

@@ -0,0 +1,20 @@
+module Rlyeh
+  module Logger
+    module_function
+
+    [:debug, :info, :warn, :error, :fatal].each do |level|
+      define_method level do |message|
+        Rlyeh.logger.__send__(level, message) if Rlyeh.logger
+      end
+    end
+
+    def crash(exception, message = nil)
+      error [message, format_exception(exception)].compact.join("\n")
+    end
+
+    def format_exception(exception)
+      str = "#{exception.class}: #{exception.to_s}\n"
+      str << exception.backtrace.map { |s| "  #{s}" }.join("\n")
+    end
+  end
+end

data/lib/rlyeh/sender.rb

@@ -0,0 +1,18 @@
+require 'ircp'
+require 'rlyeh/numeric_reply'
+require 'rlyeh/utils'
+
+module Rlyeh
+  module Sender
+    def send_message(command, *args)
+      options = Rlyeh::Utils.extract_options! args
+      send_data Ircp::Message.new(*args, options.merge(:command => command))
+    end
+
+    def send_numeric_reply(type, target, *args)
+      options = Rlyeh::Utils.extract_options! args
+      numeric = Rlyeh::NumericReply.to_value type
+      send_data Ircp::Message.new(target, *args, options.merge(:command => numeric))
+    end
+  end
+end

data/lib/rlyeh/server.rb

@@ -1,57 +1,51 @@
+require 'celluloid/io'
 require 'rlyeh/connection'
-require 'rlyeh/utils'
-require 'rlyeh/filters'
+require 'rlyeh/logger'
 
 module Rlyeh
   class Server
+    include Celluloid::IO
+    include Rlyeh::Logger
+
     attr_reader :options, :host, :port
-    attr_reader :app_class, :signature, :sessions
-
-    def initialize(*args)
-      @options = Rlyeh::Utils.extract_options! args
-      @host = @options.delete(:host) || "127.0.0.1"
-      @port = @options.delete(:port) || 46667
-      @app_class = args.shift
-      @signature = nil
+    attr_reader :app_class, :sessions, :server
+
+    def initialize(app_class, options = {})
+      @app_class = app_class
+      @options = options.dup
+      @host = @options.delete(:host) { '127.0.0.1' }
+      @port = @options.delete(:port) { 46667 }
       @sessions = {}
-    end
+      @server = Celluloid::IO::TCPServer.new @host, @port
 
-    def self.start(*args)
-      new(*args).start
+      info "Rlyeh has emerged on #{@host}:#{@port}"
+      async.run
     end
 
-    def start
-      args = [self, @app_class, options]
-      @signature = EventMachine.start_server @host, @port, Rlyeh::Connection, *args do |connection|
-        bind connection
-      end
-      self
+    def finalize
+      @server.close
+      info 'Rlyeh has sunk...'
     end
 
-    def stop
-      EventMachine.stop_server @signature if @signature
-      @signature = nil
+    def run
+      loop do
+        socket = @server.accept
+        async.handle_connection socket
+      end
     end
 
-    def bind(connection)
-      puts 'bind'
+    def handle_connection(socket)
+      connection = Connection.new(self, socket)
+      connection.run
+    rescue Exception => e
+      crash e
+    ensure
+      connection.close rescue nil
     end
 
-    def unbind(connection)
-      if connection.attached?
-        session = connection.session
-        session.detach connection
-
-        if session.empty?
-          session.close
-          @sessions.delete session.id
-        end
-      end
-
-      puts 'unbind'
+    def load_session(session_id)
+      @sessions[session_id] ||= Rlyeh::Session.new(session_id)
     end
-
-    include Rlyeh::Filters
-    define_filters :start, :stop, :bind, :unbind
   end
 end
+

data/lib/rlyeh/session.rb

@@ -1,42 +1,41 @@
-require 'rlyeh/filters'
+require 'celluloid'
+require 'set'
+require 'forwardable'
+require 'rlyeh/logger'
 
 module Rlyeh
   class Session
-    attr_reader :id, :channel, :connections
+    include Celluloid
+    include Rlyeh::Logger
+    extend Forwardable
+
+    attr_reader :id, :connections
+    def_delegators :@connections, :include?, :empty?
 
     def initialize(id)
       @id = id
-      @channel = EventMachine::Channel.new
-      @connections = {}
+      @connections = Set.new
+      debug "Session started: #{@id}"
     end
 
-    def attach(connection)
-      connection.attached self
-
-      @connections[connection] = @channel.subscribe do |msg|
-        connection.send_data msg
-      end
+    def close
+      debug "Session closed: #{@id}"
     end
 
-    def detach(connection)
-      id = @connections.delete connection
-      @channel.unsubscribe id if id
-
-      connection.detached self
+    def attach(connection)
+      connection.attach self
+      @connections.add connection
     end
 
-    def close
+    def detach(connection)
+      @connections.delete connection
+      connection.detach self
     end
 
     def send_data(data)
-      @channel.push data
-    end
-
-    def empty?
-      @connections.empty?
+      @connections.each do |connection|
+        connection.send_data data, false
+      end
     end
-
-    include Rlyeh::Filters
-    define_filters :attach, :detach, :close, :send_data
   end
 end

data/lib/rlyeh/target.rb

@@ -0,0 +1,27 @@
+module Rlyeh
+  class Target
+    def initialize(env, target)
+      @env = env
+      @target = target
+    end
+
+    def send_message(command, text, prefix)
+      prefix = {:nick => prefix.to_s} unless prefix.is_a?(Hash)
+      unless prefix.key? :servername
+        prefix[:nick] ||= 'rlyeh'
+        prefix[:user] ||= 'rlyeh'
+        prefix[:host] ||= @env.settings.server_name
+      end
+
+      @env.connection.send_message command, @target, ":#{text}", :prefix => prefix
+    end
+
+    def privmsg(text, prefix = nil)
+      send_message 'PRIVMSG', text, prefix
+    end
+
+    def notice(text, prefix = nil)
+      send_message 'NOTICE', text, prefix
+    end
+  end
+end

data/lib/rlyeh/version.rb

@@ -1,3 +1,3 @@
 module Rlyeh
-  VERSION = "0.0.2"
+  VERSION = "0.1.1"
 end

data/lib/rlyeh/worker.rb

@@ -0,0 +1,38 @@
+require 'celluloid'
+
+module Rlyeh
+  module Worker
+    class ThreadPool
+      include Celluloid
+
+      def invoke(*args, &block)
+        block.call *args if block
+      end
+    end
+
+    class << self
+      def included(base)
+        base.extend ClassMethods
+      end
+
+      def setup(options = {})
+        @worker_pool = ThreadPool.pool options
+      end
+
+      def worker_pool
+        @worker_pool ||= setup
+      end
+    end
+
+    module ClassMethods
+      def worker_pool
+        @worker_pool ||= Rlyeh::Worker.worker_pool
+      end
+    end
+
+    def invoke(*args, &block)
+      self.class.worker_pool.invoke *args, &block
+    end
+  end
+end
+

data/rlyeh.gemspec

@@ -15,8 +15,8 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
   gem.version       = Rlyeh::VERSION
 
+  gem.add_dependency 'celluloid-io'
   gem.add_dependency 'ircp'
-  gem.add_dependency 'eventmachine'
   gem.add_development_dependency 'rake'
   gem.add_development_dependency 'rspec'
 end

data/spec/rlyeh/environment_spec.rb

@@ -0,0 +1,42 @@
+require 'spec_helper'
+
+describe Rlyeh::Environment do
+  before do
+    @env = Rlyeh::Environment.new
+    @env.foo = 1
+    @env.bar = 2
+  end
+  subject { @env }
+  
+  describe '#respond_to?' do
+    it { should be_respond_to :foo }
+    it { should be_respond_to :bar }
+    it { should_not be_respond_to :buzz }
+  end
+
+  describe '#method_missing' do
+    context 'fetch' do
+      its(:foo) { should eq 1 }
+      its(:bar) { should eq 2 }
+      it { lambda { subject.buzz }.should raise_error NoMethodError }
+    end
+
+    context 'assign' do
+      context 'foo' do
+        before { subject.foo = 'assigned' }
+        its(:foo) { should eq 'assigned' }
+      end
+      
+      context 'buzz' do
+        before { subject.buzz = 'assigned' }
+        its(:buzz) { should eq 'assigned' }
+      end
+    end
+
+    context 'has' do
+      it { should be_has_foo }
+      it { should be_has_bar }
+      it { should_not be_has_buzz }
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rlyeh
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-26 00:00:00.000000000 Z
+date: 2012-09-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: ircp
-  requirement: &24772480 !ruby/object:Gem::Requirement
+  name: celluloid-io
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *24772480
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: eventmachine
-  requirement: &24772060 !ruby/object:Gem::Requirement
+  name: ircp
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +37,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *24772060
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &24771600 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +53,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *24771600
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &24771160 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,7 +69,12 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *24771160
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Welcome to the deep sea
 email:
 - mail@mashiro.org
@@ -68,14 +88,19 @@ files:
 - LICENSE
 - README.md
 - Rakefile
+- examples/basic.rb
 - examples/echo.rb
 - examples/middleware.rb
-- examples/simple.rb
+- examples/oauth.rb
 - lib/rlyeh.rb
 - lib/rlyeh/base.rb
 - lib/rlyeh/connection.rb
 - lib/rlyeh/deep_ones.rb
 - lib/rlyeh/deep_ones/auth.rb
+- lib/rlyeh/deep_ones/auth/base.rb
+- lib/rlyeh/deep_ones/auth/basic.rb
+- lib/rlyeh/deep_ones/auth/null.rb
+- lib/rlyeh/deep_ones/auth/oauth.rb
 - lib/rlyeh/deep_ones/builder.rb
 - lib/rlyeh/deep_ones/closer.rb
 - lib/rlyeh/deep_ones/logger.rb
@@ -84,15 +109,18 @@ files:
 - lib/rlyeh/dispatcher.rb
 - lib/rlyeh/environment.rb
 - lib/rlyeh/filters.rb
+- lib/rlyeh/logger.rb
 - lib/rlyeh/numeric_reply.rb
-- lib/rlyeh/runner.rb
-- lib/rlyeh/sendable.rb
+- lib/rlyeh/sender.rb
 - lib/rlyeh/server.rb
 - lib/rlyeh/session.rb
 - lib/rlyeh/settings.rb
+- lib/rlyeh/target.rb
 - lib/rlyeh/utils.rb
 - lib/rlyeh/version.rb
+- lib/rlyeh/worker.rb
 - rlyeh.gemspec
+- spec/rlyeh/environment_spec.rb
 - spec/rlyeh/numeric_reply_spec.rb
 - spec/rlyeh/server_spec.rb
 - spec/rlyeh/settings_spec.rb
@@ -111,7 +139,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3713533615144336693
+      hash: -2088290763749664641
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -120,10 +148,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3713533615144336693
+      hash: -2088290763749664641
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.17
+rubygems_version: 1.8.21
 signing_key: 
 specification_version: 3
 summary: IRC gateway server framework

data/examples/simple.rb

@@ -1,20 +0,0 @@
-#!/usr/bin/env ruby
-# -*- coding: utf-8 -*-
-$LOAD_PATH.unshift 'lib', '../lib'
-require 'rlyeh'
-
-class MyApp < Rlyeh::Base
-  use Rlyeh::DeepOnes::Logger, :level => 0
-  use Rlyeh::DeepOnes::Auth do |auth|
-    auth.nick if [auth.nick, auth.pass] == ['dankogai', 'kogaidan']
-  end
-  
-  set :server_name, 'MyApp'
-  set :server_version, '1.0.0'
-
-  on :privmsg do |env|
-    puts "RECV: #{env.message}"
-  end
-end
-
-Rlyeh.emerge MyApp, :host => '0.0.0.0'

data/lib/rlyeh/runner.rb

@@ -1,42 +0,0 @@
-require 'rlyeh/utils'
-
-module Rlyeh
-  module Runner
-    def self.included(base)
-      base.extend ClassMethods
-    end
-
-    module ClassMethods
-      def servers
-        @servers ||= []
-      end
-
-      def run(*args, &block)
-        default_options = {:signal_trap => true}.freeze
-        options = default_options.merge(Rlyeh::Utils.extract_options args)
-        signal_trap = options.delete(:signal_trap)
-
-        trap(:INT) { stop } if signal_trap
-
-        starter = proc do
-          server = Server.start *args, &block
-          servers << server
-        end
-
-        if EventMachine.reactor_running?
-          starter.call
-        else
-          EventMachine.run &starter
-        end
-      end
-      alias_method :emerge, :run
-
-      def stop
-        servers.each { |server| server.stop }
-        servers.clear
-
-        EventMachine.stop if EventMachine.reactor_running?
-      end
-    end
-  end
-end

data/lib/rlyeh/sendable.rb

@@ -1,11 +0,0 @@
-require 'ircp'
-require 'rlyeh/numeric_reply'
-
-module Rlyeh
-  module Sendable
-    def send_numeric_reply(numeric, target, *args)
-      numeric = Rlyeh::NumericReply.to_value numeric
-      send_data Ircp::Message.new(target, *args, :command => numeric)
-    end
-  end
-end