rlyeh 0.0.1 → 0.0.2

data/lib/rlyeh/numeric_reply.rb

@@ -0,0 +1,206 @@
+module Rlyeh
+  module NumericReply
+    class << self
+      def map
+        @map ||= {
+          # Numerics in the range from 001 to 099 are used for client-server
+          # connections only and should never travel between servers.
+          # Replies generated in the response to commands are found in the range from 200 to 399.
+          :welcome => 1,
+          :yourhost => 2,
+          :created => 3,
+          :myinfo => 4,
+          :bounce => 5,
+          :userhost => 302,
+          :ison => 303,
+          :away => 301,
+          :unaway => 305,
+          :nowaway => 306,
+          :whoisuser => 311,
+          :whoisserver => 312,
+          :whoisoperator => 313,
+          :whoisidle => 317,
+          :endofwhois => 318,
+          :whoischannels => 319,
+          :whowasuser => 314,
+          :endofwhowas => 369,
+          :liststart => 321,
+          :list => 322,
+          :listend => 323,
+          :uniqopis => 325,
+          :channelmodeis => 324,
+          :notopic => 331,
+          :topic => 332,
+          :inviting => 341,
+          :summoning => 342,
+          :invitelist => 346,
+          :endofinvitelist => 347,
+          :exceptlist => 348,
+          :endofexceptlist => 349,
+          :version => 351,
+          :whoreply => 352,
+          :endofwho => 315,
+          :namreply => 353,
+          :endofnames => 366,
+          :links => 364,
+          :endoflinks => 365,
+          :banlist => 367,
+          :endofbanlist => 368,
+          :info => 371,
+          :endofinfo => 374,
+          :motdstart => 375,
+          :motd => 372,
+          :endofmotd => 376,
+          :youreoper => 381,
+          :rehashing => 382,
+          :youreservice => 383,
+          :time => 391,
+          :usersstart => 392,
+          :users => 393,
+          :endofusers => 394,
+          :nousers => 395,
+          :tracelink => 200,
+          :traceconnecting => 201,
+          :tracehandshake => 202,
+          :traceunknown => 203,
+          :traceoperator => 204,
+          :traceuser => 205,
+          :traceserver => 206,
+          :traceservice => 207,
+          :tracenewtype => 208,
+          :traceclass => 209,
+          :tracereconnect => 210,
+          :tracelog => 261,
+          :traceend => 262,
+          :statslinkinfo => 211,
+          :statscommands => 212,
+          :endofstats => 219,
+          :statsuptime => 242,
+          :statsoline => 243,
+          :umodeis => 221,
+          :servlist => 234,
+          :servlistend => 235,
+          :luserclient => 251,
+          :luserop => 252,
+          :luserunknown => 253,
+          :luserchannels => 254,
+          :luserme => 255,
+          :adminme => 256,
+          :adminloc1 => 257,
+          :adminloc2 => 258,
+          :adminemail => 259,
+          :tryagain => 263,
+
+          # Error replies are found in the range from 400 to 599.
+          :nosuchnick => 401,
+          :nosuchserver => 402,
+          :nosuchchannel => 403,
+          :cannotsendtochan => 404,
+          :toomanychannels => 405,
+          :wasnosuchnick => 406,
+          :toomanytargets => 407,
+          :nosuchservice => 408,
+          :noorigin => 409,
+          :norecipient => 411,
+          :notexttosend => 412,
+          :notoplevel => 413,
+          :wildtoplevel => 414,
+          :badmask => 415,
+          :unknowncommand => 421,
+          :nomotd => 422,
+          :noadmininfo => 423,
+          :fileerror => 424,
+          :nonicknamegiven => 431,
+          :erroneusnickname => 432,
+          :nicknameinuse => 433,
+          :nickcollision => 436,
+          :unavailresource => 437,
+          :usernotinchannel => 441,
+          :notonchannel => 442,
+          :useronchannel => 443,
+          :nologin => 444,
+          :summondisabled => 445,
+          :usersdisabled => 446,
+          :notregistered => 451,
+          :needmoreparams => 461,
+          :alreadyregistred => 462,
+          :nopermforhost => 463,
+          :passwdmismatch => 464,
+          :yourebannedcreep => 465,
+          :youwillbebanned => 466,
+          :keyset => 467,
+          :channelisfull => 471,
+          :unknownmode => 472,
+          :inviteonlychan => 473,
+          :bannedfromchan => 474,
+          :badchannelkey => 475,
+          :badchanmask => 476,
+          :nochanmodes => 477,
+          :banlistfull => 478,
+          :noprivileges => 481,
+          :chanoprivsneeded => 482,
+          :cantkillserver => 483,
+          :restricted => 484,
+          :uniqopprivsneeded => 485,
+          :nooperhost => 491,
+          :umodeunknownflag => 501,
+          :usersdontmatch => 502,
+        }
+      end
+
+      def map_invert
+        @map_invert ||= map.invert
+      end
+
+      def to_value(value)
+        case value
+        when Integer
+          numeric_to_value value
+        when Symbol
+          name_to_value value
+        else
+          str = value.to_s
+          begin
+            numeric = Integer(str)
+            numeric_to_value numeric
+          rescue ArgumentError
+            name_to_value str
+          end
+        end
+      end
+
+      def to_key(value)
+        case value
+        when Integer
+          numeric_to_key value
+        when Symbol
+          name_to_key value
+        else
+          str = value.to_s
+          begin
+            numeric = Integer(str)
+            numeric_to_key numeric
+          rescue ArgumentError
+            name_to_key str
+          end
+        end
+      end
+
+      def numeric_to_value(numeric)
+        numeric.to_s.rjust(3, '0')
+      end
+
+      def numeric_to_key(numeric)
+        map_invert[numeric]
+      end
+
+      def name_to_value(name)
+        numeric_to_value map[name.intern]
+      end
+
+      def name_to_key(name)
+        name.intern
+      end
+    end
+  end
+end

data/lib/rlyeh/runner.rb

@@ -1,3 +1,5 @@
+require 'rlyeh/utils'
+
 module Rlyeh
   module Runner
     def self.included(base)
@@ -5,9 +7,20 @@ module Rlyeh
     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.start *args, &block
+          server = Server.start *args, &block
+          servers << server
         end
 
         if EventMachine.reactor_running?
@@ -16,8 +29,12 @@ module Rlyeh
           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

data/lib/rlyeh/sendable.rb

@@ -0,0 +1,11 @@
+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

data/lib/rlyeh/server.rb

@@ -1,13 +1,11 @@
 require 'rlyeh/connection'
 require 'rlyeh/utils'
-require 'rlyeh/filter'
+require 'rlyeh/filters'
 
 module Rlyeh
   class Server
-    include Rlyeh::Filter
-
     attr_reader :options, :host, :port
-    attr_reader :app_class, :signature, :connections, :sessions
+    attr_reader :app_class, :signature, :sessions
 
     def initialize(*args)
       @options = Rlyeh::Utils.extract_options! args
@@ -15,7 +13,6 @@ module Rlyeh
       @port = @options.delete(:port) || 46667
       @app_class = args.shift
       @signature = nil
-      @connections = []
       @sessions = {}
     end
 
@@ -28,6 +25,7 @@ module Rlyeh
       @signature = EventMachine.start_server @host, @port, Rlyeh::Connection, *args do |connection|
         bind connection
       end
+      self
     end
 
     def stop
@@ -36,7 +34,6 @@ module Rlyeh
     end
 
     def bind(connection)
-      @connections.push connection
       puts 'bind'
     end
 
@@ -47,14 +44,14 @@ module Rlyeh
 
         if session.empty?
           session.close
-          @sessions.delete session
+          @sessions.delete session.id
         end
       end
 
-      @connections.delete connection
       puts 'unbind'
     end
 
-    define_filter :start, :stop, :bind, :unbind
+    include Rlyeh::Filters
+    define_filters :start, :stop, :bind, :unbind
   end
 end

data/lib/rlyeh/session.rb

@@ -1,29 +1,28 @@
-require 'rlyeh/filter'
+require 'rlyeh/filters'
 
 module Rlyeh
   class Session
-    include Rlyeh::Filter
+    attr_reader :id, :channel, :connections
 
-    attr_accessor :channel, :connections
-
-    def initialize
+    def initialize(id)
+      @id = id
       @channel = EventMachine::Channel.new
-      @subscribers = {}
+      @connections = {}
     end
 
-    def attach(conn)
-      conn.attached self
+    def attach(connection)
+      connection.attached self
 
-      @subscribers[conn] = @channel.subscribe do |msg|
-        conn.send_data msg
+      @connections[connection] = @channel.subscribe do |msg|
+        connection.send_data msg
       end
     end
 
-    def detach(conn)
-      id = @subscribers.delete conn
+    def detach(connection)
+      id = @connections.delete connection
       @channel.unsubscribe id if id
 
-      conn.detached self
+      connection.detached self
     end
 
     def close
@@ -34,9 +33,10 @@ module Rlyeh
     end
 
     def empty?
-      @subscribes.empty?
+      @connections.empty?
     end
 
-    define_filter :attach, :detach, :close, :send_data
+    include Rlyeh::Filters
+    define_filters :attach, :detach, :close, :send_data
   end
 end

data/lib/rlyeh/settings.rb

@@ -0,0 +1,35 @@
+module Rlyeh
+  module Settings
+    def self.included(base)
+      base.extend ClassMethods
+    end
+
+    module ClassMethods
+      def settings
+        self
+      end
+
+      def set(option, value = nil, &block)
+        if option.respond_to?(:each)
+          option.each { |k, v| set k, v }
+          return self
+        end
+
+        setter = proc { |v| set option, v }
+        getter = block ? block : proc { value }
+
+        Rlyeh::Utils.singleton_class(self).class_eval do
+          define_method "#{option}=", &setter if setter
+          define_method "#{option}", &getter if getter
+          class_eval "def #{option}?; !!#{option}; end" unless method_defined?("#{option}?")
+        end
+      end
+
+      self
+    end
+
+    def settings
+      self.class.settings
+    end
+  end
+end

data/lib/rlyeh/utils.rb

@@ -1,9 +1,34 @@
 module Rlyeh
   module Utils
     class << self
+      def singleton_class(obj)
+        if obj.respond_to?(:singleton_class)
+          obj.singleton_class
+        else
+          class << obj
+            self
+          end
+        end
+      end
+
+      def extract_options(args)
+        args.last.is_a?(::Hash) ? args.last : {}
+      end
+
       def extract_options!(args)
         args.last.is_a?(::Hash) ? args.pop : {}
       end
+
+      def generate_method(obj, name, method = nil, &block)
+        name = name.to_s
+        method ||= block
+        obj.instance_eval do
+          define_method name, &method
+          method = instance_method name
+          remove_method name
+          method
+        end
+      end
     end
   end
 end

data/lib/rlyeh/version.rb

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

data/lib/rlyeh.rb

@@ -1,16 +1,20 @@
 require 'eventmachine'
 
 module Rlyeh
-  autoload :VERSION,     'rlyeh/version'
+  autoload :VERSION,      'rlyeh/version'
 
-  autoload :Server,      'rlyeh/server'
-  autoload :Connection,  'rlyeh/connection'
-  autoload :Session,     'rlyeh/session'
-  autoload :Environment, 'rlyeh/environment'
-  autoload :Base,        'rlyeh/base'
+  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'
 
-  autoload :Dispatcher,  'rlyeh/dispatcher'
-  autoload :Filter,      'rlyeh/filter'
+  autoload :Dispatcher,   'rlyeh/dispatcher'
+  autoload :Filter,       'rlyeh/filter'
+  autoload :Settings,     'rlyeh/settings'
+
+  require 'rlyeh/deep_ones'
 
   require 'rlyeh/runner'
   include Rlyeh::Runner

data/spec/rlyeh/numeric_reply_spec.rb

@@ -0,0 +1,21 @@
+require 'spec_helper'
+
+describe Rlyeh::NumericReply do
+  describe '#to_value' do
+    [1, '1', '01', '001', 'welcome', :welcome].each do |arg|
+      context "with argument #{arg.inspect}" do
+        subject { Rlyeh::NumericReply.to_value arg }
+        it { should eq '001' }
+      end
+    end
+  end
+
+  describe '#to_key' do
+    [1, '1', '01', '001', 'welcome', :welcome].each do |arg|
+      context "with argument #{arg.inspect}" do
+        subject { Rlyeh::NumericReply.to_key arg }
+        it { should eq :welcome }
+      end
+    end
+  end
+end

data/spec/rlyeh/settings_spec.rb

@@ -0,0 +1,54 @@
+require 'spec_helper'
+
+describe Rlyeh::Settings do
+  describe '#settings' do
+    class Test
+      include Rlyeh::Settings
+    end
+    
+    context 'class' do
+      subject { Test }
+      its(:settings) { should eq Test }
+    end
+
+    context 'instance' do
+      subject { Test.new }
+      its(:settings) { should eq Test }
+    end
+  end
+  
+  describe '#set' do
+    class Test
+      include Rlyeh::Settings
+      set :logging, false
+      set :default_encoding, 'utf-8'
+    end
+    subject { Test.settings }
+    
+    context 'getter' do
+      its(:logging) { should eq false }
+      its(:default_encoding) { should eq 'utf-8' }
+    end
+    
+    context 'setter' do
+      before { Test.settings.logging = true }
+      its(:logging) { should eq true }
+    end
+    
+    context 'condition' do
+      before { Test.settings.logging = false }
+      it { should_not be_logging }
+    end
+
+    context 'no method' do
+      it { lambda { Test.settings.not_found }.should raise_error(NoMethodError) }
+    end
+    
+    context 'multi set' do
+      before { Test.set :foo => 1, :bar => 2, :buzz => 'zzz' }
+      its(:foo) { should eq 1 }
+      its(:bar) { should eq 2 }
+      its(:buzz) { should eq 'zzz' }
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -1,7 +1,7 @@
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 require 'rspec'
-require 'ircp'
+require 'rlyeh'
 
 # Requires supporting files with custom matchers and macros, etc,
 # in ./support/ and its subdirectories.

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rlyeh
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-10 00:00:00.000000000Z
+date: 2012-03-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ircp
-  requirement: &14960720 !ruby/object:Gem::Requirement
+  requirement: &24772480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *14960720
+  version_requirements: *24772480
 - !ruby/object:Gem::Dependency
   name: eventmachine
-  requirement: &14960300 !ruby/object:Gem::Requirement
+  requirement: &24772060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *14960300
+  version_requirements: *24772060
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &14959880 !ruby/object:Gem::Requirement
+  requirement: &24771600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *14959880
+  version_requirements: *24771600
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &15007960 !ruby/object:Gem::Requirement
+  requirement: &24771160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,7 +54,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *15007960
+  version_requirements: *24771160
 description: Welcome to the deep sea
 email:
 - mail@mashiro.org
@@ -68,23 +68,34 @@ files:
 - LICENSE
 - README.md
 - Rakefile
-- example/middleware.rb
-- example/simple.rb
+- examples/echo.rb
+- examples/middleware.rb
+- examples/simple.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/builder.rb
+- lib/rlyeh/deep_ones/closer.rb
+- lib/rlyeh/deep_ones/logger.rb
+- lib/rlyeh/deep_ones/parser.rb
+- lib/rlyeh/deep_ones/typablemap.rb
 - lib/rlyeh/dispatcher.rb
 - lib/rlyeh/environment.rb
-- lib/rlyeh/filter.rb
-- lib/rlyeh/middleware/builder.rb
-- lib/rlyeh/middleware/typablemap.rb
+- lib/rlyeh/filters.rb
+- lib/rlyeh/numeric_reply.rb
 - lib/rlyeh/runner.rb
+- lib/rlyeh/sendable.rb
 - lib/rlyeh/server.rb
 - lib/rlyeh/session.rb
+- lib/rlyeh/settings.rb
 - lib/rlyeh/utils.rb
 - lib/rlyeh/version.rb
 - rlyeh.gemspec
+- spec/rlyeh/numeric_reply_spec.rb
 - spec/rlyeh/server_spec.rb
+- spec/rlyeh/settings_spec.rb
 - spec/spec_helper.rb
 homepage: ''
 licenses: []
@@ -98,15 +109,21 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -3713533615144336693
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -3713533615144336693
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.17
 signing_key: 
 specification_version: 3
 summary: IRC gateway server framework