tkellem 0.9.2 → 0.9.3

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    tkellem (0.9.2)
+    tkellem (0.9.3)
       activerecord (~> 4.0.0.rc2)
       eventmachine (~> 1.0.3)
       rails-observers (~> 0.1.1)

data/lib/tkellem/bouncer.rb

@@ -13,8 +13,6 @@ class Bouncer
   cattr_accessor :plugins
   self.plugins = []
 
-  class Room < Struct.new(:name, :topic, :topic_setter, :topic_time); end
-
   def initialize(network_user)
     @network_user = network_user
     @user = network_user.user
@@ -24,7 +22,7 @@ class Bouncer
     # maps { client_conn => state_hash }
     @active_conns = {}
     @welcomes = []
-    @rooms = {}
+    @rooms = Room.where(network_user_id: network_user.id).each_with_object({}) { |room,h| h[room.name] = room }
     # maps { client_conn => away_status_or_nil }
     @away = {}
     # plugin data
@@ -114,10 +112,18 @@ class Bouncer
       ready! if msg.command == "376" # end of MOTD
       false
     when 'JOIN'
-      @rooms[msg.args.first] = Room.new(msg.args.first) if msg.target_user == @nick
+      room_name = msg.args.first
+      if msg.target_user == @nick && !@rooms[room_name]
+        room = Room.create!(network_user_id: network_user.id, name: room_name)
+        @rooms[room_name] = room
+      end
       true
     when 'PART'
-      @rooms.delete(msg.args.first) if msg.target_user == @nick
+      room_name = msg.args.first
+      if msg.target_user == @nick
+        room = @rooms.delete(room_name)
+        room.destroy
+      end
       true
     when 'TOPIC'
       if room = @rooms[msg.args.first]
@@ -223,7 +229,7 @@ class Bouncer
   end
 
   def ready!
-    @rooms.each_key do |room|
+    @rooms.each_value do |room|
       send_msg("JOIN #{room.name}")
     end
 

data/lib/tkellem/migrations/005_add_rooms.rb

@@ -0,0 +1,10 @@
+class AddRooms < ActiveRecord::Migration
+  def self.up
+    create_table 'rooms' do |t|
+      t.integer :network_user_id
+      t.string  :name
+    end
+  end
+end
+
+

data/lib/tkellem/models/room.rb

@@ -0,0 +1,6 @@
+class Room < ActiveRecord::Base
+  # these aren't persisted, we just grab them on connect
+  attr_accessor :topic, :topic_setter, :topic_time
+
+  belongs_to :network_user
+end

data/lib/tkellem/plugins/backlog.rb

@@ -204,7 +204,7 @@ class Backlog
 
   def send_backlog(conn, ctx_name, stream)
     while line = stream.gets
-      timestamp, msg = parse_line(line, ctx_name)
+      timestamp, msg = self.class.parse_line(line, ctx_name)
       next unless msg
       privmsg = msg.args.first[0] != '#'[0]
       if msg.prefix
@@ -232,7 +232,7 @@ class Backlog
     end
   end
 
-  def parse_line(line, ctx_name)
+  def self.parse_line(line, ctx_name)
     timestamp = Time.parse(line[0, 19])
     case line[20..-1]
     when %r{^> (\* )?(.+)$}
@@ -241,7 +241,7 @@ class Backlog
         msg.ctcp = 'ACTION'
       end
       return timestamp, msg
-    when %r{^< (\* )?([^:]+): (.+)$}
+    when %r{^< (\* )?([^ ]+): (.+)$}
       msg = IrcMessage.new($2, 'PRIVMSG', [ctx_name, $3])
       if $1 == '* '
         msg.ctcp = 'ACTION'

data/lib/tkellem/tkellem_server.rb

@@ -11,6 +11,7 @@ require 'tkellem/models/host'
 require 'tkellem/models/listen_address'
 require 'tkellem/models/network'
 require 'tkellem/models/network_user'
+require 'tkellem/models/room'
 require 'tkellem/models/setting'
 require 'tkellem/models/user'
 

data/lib/tkellem/version.rb

@@ -1,4 +1,4 @@
 # encoding: utf-8
 module Tkellem
-  VERSION = "0.9.2"
+  VERSION = "0.9.3"
 end

data/spec/plugins/backlog_spec.rb

@@ -0,0 +1,22 @@
+require 'spec_helper'
+require 'tkellem/irc_message'
+require 'time'
+
+include Tkellem
+
+describe Backlog do
+  describe '.parse_line' do
+    it "should parse other user names" do
+      def cmp(username, message = "test 1 2")
+        timestamp, msg = Backlog.parse_line(%{10-07-2013 10:10:36 < #{username}: #{message}}, '#testroom')
+        expected = IrcMessage.new(username, 'PRIVMSG', ['#testroom', message])
+        msg.should == expected
+      end
+
+      cmp("dude")
+      cmp("dude@some/fancy/web/addr.blah")
+      cmp("dude!~dude@12:34:56")
+      cmp("dude!~dude@12:34:56", "hey dude: test")
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tkellem
 version: !ruby/object:Gem::Version
-  version: 0.9.2
+  version: 0.9.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-28 00:00:00.000000000 Z
+date: 2013-07-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine
@@ -115,11 +115,13 @@ files:
 - lib/tkellem/migrations/002_at_connect_columns.rb
 - lib/tkellem/migrations/003_settings.rb
 - lib/tkellem/migrations/004_add_backlog_positions.rb
+- lib/tkellem/migrations/005_add_rooms.rb
 - lib/tkellem/models/backlog_position.rb
 - lib/tkellem/models/host.rb
 - lib/tkellem/models/listen_address.rb
 - lib/tkellem/models/network.rb
 - lib/tkellem/models/network_user.rb
+- lib/tkellem/models/room.rb
 - lib/tkellem/models/setting.rb
 - lib/tkellem/models/user.rb
 - lib/tkellem/plugins/backlog.rb
@@ -135,6 +137,7 @@ files:
 - spec/bouncer_connection_spec.rb
 - spec/irc_message_spec.rb
 - spec/irc_server_spec.rb
+- spec/plugins/backlog_spec.rb
 - spec/spec_helper.rb
 - tkellem.gemspec
 homepage: http://github.com/codekitchen/tkellem
@@ -151,7 +154,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1609570308087987502
+      hash: -2551777789450779146
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -160,7 +163,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1609570308087987502
+      hash: -2551777789450779146
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23
@@ -172,4 +175,5 @@ test_files:
 - spec/bouncer_connection_spec.rb
 - spec/irc_message_spec.rb
 - spec/irc_server_spec.rb
+- spec/plugins/backlog_spec.rb
 - spec/spec_helper.rb