specs/queue_spec.rb @@ -9,9 +9,8 @@ module Isaac # Isaac.execute do # msg 'harryjr', 'you're awesome' # end - def self.execute(&block) - # add params? - app.execute(&block) + def self.execute(params={}, &block) + app.execute(params, &block) end Config = Struct.new(:nick, :server, :port, :username, :realname) @@ -67,7 +66,8 @@ module Isaac # # Execute this if you try to send a message to a non-existing nick/channel. # end def on(type, match=nil, &block) - @events[type] << Event.new(match, block) + @events[type] << e = Event.new(match, block) + return e end def execute(params={}, &block) #:nodoc: @@ -75,7 +75,6 @@ module Isaac @queue << event.invoke(params) end - private def event(type, matcher) @events[type].detect {|e| matcher =~ e.match} end @@ -85,10 +84,12 @@ module Isaac puts "Connecting to #{@config.server} at port #{@config.port}" @irc = TCPSocket.open(@config.server, @config.port) puts "Connection established." + @queue = Queue.new(@irc) @queue << "NICK #{@config.nick}" @queue << "USER #{@config.username} foobar foobar :#{@config.realname}" @queue << @events[:connect].first.invoke if @events[:connect].first + while line = @irc.gets handle line end @@ -124,7 +125,7 @@ module Isaac end end end - + class Queue #:nodoc: attr_accessor :lock def initialize(socket) @@ -137,7 +138,8 @@ module Isaac # I luvz Rubyz def << (msg) - (@queue << msg).flatten! + # .flatten! returns nill if no modifications were made, thus we do this. + @queue = (@queue << msg).flatten end # To prevent excess flood no more than 1472 bytes will be sent to the lib/isaac.rb @@ -2,6 +2,10 @@ require '../lib/isaac.rb' include Isaac describe Application do + before do + @app = Isaac.app + end + it 'configures' do config do |c| c.nick = "awesome" @@ -22,4 +26,9 @@ describe Application do context.rain_check("date") context.commands.should eql(["PRIVMSG miss_teen :can i take a rain check on the date?"]) end + + it 'creates events' do + event = on(:channel, /matchy/) { msg channel, 'oh, matching!' } + @app.event(:channel, 'this should be matchy!!').should eql(event) + end end specs/application_spec.rb 5d90e76a4813d41b138b57e279949abdfdb9587b ichverstehe ichverstehe@gmail.com http://github.com/sr/isaac/commit/afeb9c65e7cf765895e7e66c67ea515f42ed404a afeb9c65e7cf765895e7e66c67ea515f42ed404a 2008-10-07T09:00:45-07:00 2008-10-07T08:49:50-07:00 minor changes, fixes, spec. 09ea0d3bc764ebcf308f2206c097cd113d2d2413 ichverstehe ichverstehe@gmail.com