mad_chatter 0.3.1 → 0.3.2

data/.gitignore

@@ -4,3 +4,5 @@ pkg/*
 .daemon
 coverage/
 .project
+Gemfile.lock
+

data/.travis.yml

@@ -0,0 +1,12 @@
+language: ruby
+rvm:
+#  - 1.8.7
+  - 1.9.2
+  - 1.9.3
+#  - jruby-18mode # JRuby in 1.8 mode
+#  - jruby-19mode # JRuby in 1.9 mode
+#  - rbx-18mode
+  - rbx-19mode
+#  - ree
+script: bundle exec rspec spec
+

data/README.md

@@ -77,17 +77,15 @@ Once you've got your chat server running and being used by other people, you mig
 
 ## Getting Help / Providing Feedback
 
-Feel free to submit a GitHub issue, or post to the [Google Group](https://groups.google.com/group/mad-chatter), or send me a message on GitHub.
+Feel free to submit bug reports and feature requests to our [GitHub Issues page](https://github.com/andrewhavens/mad_chatter/issues), or post to the [Google Group](https://groups.google.com/group/mad-chatter), or send me a message on GitHub.
 
 You can also vote on upcoming features: https://madchatter.uservoice.com
 
 ## Contributing
 
-Please fork and send pull requests! Or submit issues if you have suggestions on how to improve.
-
-## TODO
+[![Build Status](https://secure.travis-ci.org/andrewhavens/mad_chatter.png)](http://travis-ci.org/andrewhavens/mad_chatter)
 
- - Maybe add support for alternative web socket servers like Juggernaut, Socket.io, or Cramp and web-socket-js
+Please fork and send pull requests! Or submit issues if you have suggestions on how to improve.
 
 ##Copyright
 

data/bin/mad_chatter

@@ -11,7 +11,7 @@ module MadChatter
       File.expand_path('../../', __FILE__)
     end
     
-    desc "new [name]", "Generates a new Mad Chatter chatroom application"
+    desc "new [name]", "Generates a new Mad Chatter application"
     def new(name)
       copy_file "templates/config.yml", "#{name}/config.yml"
       copy_file "templates/extensions.rb", "#{name}/extensions.rb"

data/lib/mad_chatter.rb

@@ -14,13 +14,12 @@ require 'mad_chatter/servers/em_websocket'
 
 require 'mad_chatter/channel'
 require 'mad_chatter/user'
-require 'mad_chatter/users'
 
 require 'mad_chatter/message'
 require 'mad_chatter/message_history'
 
 require 'mad_chatter/actions'
-require 'mad_chatter/message_listeners/join'
+require 'mad_chatter/message_listeners/channel_commands'
 require 'mad_chatter/message_listeners/markdown'
 require 'mad_chatter/message_listeners/nick'
 require 'mad_chatter/message_listeners/image'
@@ -31,8 +30,6 @@ require 'mad_chatter/message_listener'
 
 module MadChatter
   
-  # attr_accessor :users, :channels, :message_listeners
-  
   class << self
     
     def users
@@ -47,6 +44,7 @@ module MadChatter
       users.each do |user|
         return user if user.token == token
       end
+      return nil
     end
     
     def channels
@@ -61,12 +59,14 @@ module MadChatter
       channels.each do |channel|
         return channel if channel.id == id
       end
+      return nil
     end
         
     def find_channel_by_name(name)
       channels.each do |channel|
         return channel if channel.name == name
       end
+      return nil
     end
     
     def message_listeners
@@ -85,6 +85,7 @@ module MadChatter
     
     def message_received(json)
       msg = JSON.parse(json)
+      # puts 'received: ' + msg['message']
       
       if msg['token'].nil?
         return # Token is required to send messages
@@ -108,5 +109,22 @@ module MadChatter
       end
     end
     
+    def send_channels_list
+      json = channels_list
+      users.each do |user|
+        user.send(json)
+      end
+    end
+    
+    def channels_list
+      channels_hash = channels.collect do |c|
+        {:id => c.id, :name => c.name }
+      end
+      JSON.generate({
+        type: 'channels',
+        json: channels_hash,
+      })
+    end
+    
   end
 end

data/lib/mad_chatter/config.rb

@@ -24,14 +24,9 @@ module MadChatter
       end
       
       def init_default_message_listeners
-        %w{ Join Nick Image Code Markdown }.each do |listener|
+        %w{ ChannelCommands Nick Image Code Markdown }.each do |listener|
           MadChatter.message_listeners << Object.const_get('MadChatter').const_get('MessageListeners').const_get(listener).new
         end
-        # MadChatter.message_listeners << MadChatter::MessageListeners::Join.new
-        # MadChatter.message_listeners << MadChatter::MessageListeners::Nick.new
-        # MadChatter.message_listeners << MadChatter::MessageListeners::Image.new
-        # MadChatter.message_listeners << MadChatter::MessageListeners::Code.new
-        # MadChatter.message_listeners << MadChatter::MessageListeners::Markdown.new
       end
 
       def init_extensions

data/lib/mad_chatter/message.rb

@@ -3,9 +3,9 @@ require 'cgi'
 module MadChatter
   class Message
     
-    attr_accessor :type, :original_text, :filtered_text, :html, :token, :channel, :growl, :add_to_history
+    attr_accessor :type, :original_text, :filtered_text, :html, :token, :channel, :growl, :add_to_history, :timestamp
     
-    def initialize(type, text = nil, token = nil, channel = nil)
+    def initialize(type, text = nil, token = nil, channel_id = nil)
       @type = type
       if text
         @original_text = text
@@ -14,8 +14,9 @@ module MadChatter
         @growl = text
       end
       @token = token
-      @channel = channel
+      @channel = channel_id
       @add_to_history = true
+      @timestamp = Time.now.to_i
     end
     
     def username=(username)
@@ -48,6 +49,7 @@ module MadChatter
         username: username,
         channel: @channel,
         growl: @growl,
+        time: @timestamp
       })
     end
     

data/lib/mad_chatter/message_listeners/channel_commands.rb

@@ -0,0 +1,53 @@
+module MadChatter
+  module MessageListeners
+    class ChannelCommands
+      
+      include MadChatter::Actions
+      
+      def handle(message)
+        @message = message
+        case @message.text
+        when '/join'
+          join_channel
+          stop_message_handling
+        when %r{^/channel create}
+          create_channel
+          stop_message_handling
+        when %r{^/channel rename}
+          rename_channel
+          stop_message_handling
+        end
+      end
+      
+      def join_channel
+        user = MadChatter.find_user_by_token(@message.token)
+        
+        unless user && @message.channel
+          stop_message_handling # user should already exist, and channel id is required
+        end
+        
+        channel = MadChatter.find_channel_by_id(@message.channel)
+        
+        unless channel
+          stop_message_handling # you cant join a channel that doesnt exist
+        end
+        
+        channel.add_user(user)
+      end
+      
+      def create_channel
+        channel_name = %r{^/channel create (.+)}.match(@message.text).captures[0]
+        MadChatter.channels << MadChatter::Channel.new(channel_name)
+        MadChatter.send_channels_list
+      end
+      
+      def rename_channel
+        channel_name = %r{^/channel rename (.+)}.match(@message.text).captures[0]
+        channel = MadChatter.find_channel_by_id(@message.channel)
+        channel.name = channel_name
+        MadChatter.send_channels_list
+      end
+      
+    end
+  end
+end

data/lib/mad_chatter/message_listeners/code.rb

@@ -8,9 +8,7 @@ module MadChatter
       
       def handle(msg)
         if msg.original_text =~ @@regex
-          # puts msg.original_text
           code = parse(msg.original_text)
-          # puts code
           message = MadChatter::Message.new('message', nil, msg.token, msg.channel)
           message.html = "<pre>" + message.filter(code) + "</pre>"
           message.growl = msg.username + ' has shared a code sample' if msg.username
@@ -22,7 +20,6 @@ module MadChatter
       
       def parse(text)
         text.sub!('/code', '')
-        # @@regex.match(message_text).captures[0]
       end
       
     end

data/lib/mad_chatter/message_listeners/markdown.rb

@@ -14,6 +14,9 @@ module MadChatter
         text.gsub!(/^[\w\<][^\n]*\n+/) do |x|
           x =~ /\n{2}/ ? x : (x.strip!; x << "  \n")
         end
+        
+        # inline code (backticks)
+        text.gsub!(%r{(^|\s)(\`)(.+?)\2(\s|$)}, %{\\1<code>\\3</code>\\4})
 
         # autolink email addresses
         text.gsub!(/([\w\.%\+\-]+)@([\w\-]+\.)+([\w]{2,})/i) do |x|
@@ -24,18 +27,21 @@ module MadChatter
         text.gsub!(/(http|https):\/\/[a-z0-9]+([\-\.]{1}[a-z0-9]+)*\.[a-z]{2,5}(([0-9]{1,5})?\/(\S)+)?/i) do |x|
           href = $&
            # check if we're in a markdown link
-           if $` =~ /[(]/
+          if $` =~ /[(]/
             x = href
-           else
+          else
             x = %Q{<a target="_blank" href="#{href}">#{href}</a>}
-           end
+          end
         end
         
+        # reference style links: [link text](http://link.url)
+        text.gsub!(%r{\[([^\]]+)\]\((\S+(?=\)))\)}, %{<a target="_blank" href="\\2">\\1</a>})
+        
         # bold (must come before italic)
-        text.gsub!(%r{(^|\s)(\*\*|__)(.+?)\2(\s|$)}x, %{\\1<strong>\\3</strong>\\4})
+        text.gsub!(%r{(^|\s)(\*\*|__)(.+?)\2(\s|$)}, %{\\1<strong>\\3</strong>\\4})
         
         # italic
-        text.gsub!(%r{(^|\s)([*_])(.+?)\2(\s|$)}x, %{\\1<em>\\3</em>\\4})
+        text.gsub!(%r{(^|\s)([*_])(.+?)\2(\s|$)}, %{\\1<em>\\3</em>\\4})
         
         return text
       end

data/lib/mad_chatter/message_listeners/nick.rb

@@ -7,7 +7,7 @@ module MadChatter
       @@regex = %r{^/nick (.+)}
       
       def handle(message)
-        if message.text =~ @@regex
+        if @@regex =~ message.text
           username = parse_username(message.text)
           user = message.user
           if user

data/lib/mad_chatter/user.rb

@@ -35,13 +35,7 @@ module MadChatter
     end
     
     def send_channels
-      channels = MadChatter.channels.collect do |c|
-        {:id => c.id, :name => c.name }
-      end
-      send JSON.generate({
-        type: 'channels',
-        json: channels,
-      })
+      send MadChatter.channels_list
     end
     
     def update_username(username)

data/lib/mad_chatter/version.rb

@@ -1,5 +1,5 @@
 module MadChatter
   
-  VERSION = '0.3.1'
+  VERSION = '0.3.2'
 
 end

data/mad_chatter.gemspec

@@ -21,14 +21,15 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency "thor"
   s.add_runtime_dependency "eventmachine"
   s.add_runtime_dependency "em-websocket"
-  # s.add_runtime_dependency "redcarpet"
   s.add_runtime_dependency "daemons", "1.1.4"
 
   s.add_development_dependency "rspec"
-  s.add_development_dependency "shoulda" # do we need this?
-  s.add_development_dependency 'simplecov'
-  s.add_development_dependency 'guard'
-  s.add_development_dependency 'guard-rspec'
-  s.add_development_dependency 'rb-fsevent'
-  s.add_development_dependency 'ruby-growl'
+  # s.add_development_dependency "shoulda" # do we need this?
+  unless ENV["CI"]
+    s.add_development_dependency 'simplecov'
+    s.add_development_dependency 'guard'
+    s.add_development_dependency 'guard-rspec'
+    s.add_development_dependency 'rb-fsevent'
+    s.add_development_dependency 'ruby-growl'
+  end
 end

data/spec/mad_chatter_spec.rb

@@ -0,0 +1,17 @@
+require 'spec_helper'
+
+describe MadChatter do
+  
+  before(:each) do
+    MadChatter.users = []
+    MadChatter.channels = []
+  end
+  
+  it 'should provide the ability to find a channel by name' do
+    channel = MadChatter::Channel.new('My special room')
+    MadChatter.channels << channel
+    MadChatter.find_channel_by_name('My special room').should == channel
+    MadChatter.find_channel_by_name('doesnt exist').should == nil
+  end
+  
+end

data/spec/message_listeners/{join_spec.rb → channel_commands_spec.rb}

@@ -1,18 +1,18 @@
-require_relative '../spec_helper'
+require 'spec_helper'
 
-describe MadChatter::MessageListeners::Join do
+describe MadChatter::MessageListeners::ChannelCommands do
 
   let (:server) { MadChatter::Server.new({'websocket_backend' => 'MadChatter::Servers::EventMachineWebSocket'}) }
   let (:user) { MadChatter::User.new('usertoken') }
   let (:channel) { MadChatter::Channel.new('myroom') }
-  let (:listener) { MadChatter::MessageListeners::Join.new }
+  let (:listener) { MadChatter::MessageListeners::ChannelCommands.new }
   
   before(:each) do
     MadChatter.users = []
     MadChatter.channels = []
   end
   
-  it 'should add user to list of users in server and channel' do
+  it 'should allow a user to join a channel' do
     MadChatter.users << user
     MadChatter.channels << channel
     begin
@@ -25,10 +25,22 @@ describe MadChatter::MessageListeners::Join do
     end
   end
   
-  it 'should parse messages correctly' do
+  it 'should allow /join to exist in a normal message' do
     message = MadChatter::Message.new('message', 'this /join should not count')
     listener.handle(message)
     # how to check that nothing happened?
   end
   
+  it 'should allow a user to create a channel' do
+    MadChatter.users << user
+    MadChatter.channels << channel
+    begin
+      MadChatter.find_channel_by_name('Foobar Room').should be_nil
+      message = MadChatter::Message.new('message', '/channel create Foobar Room', user.token, channel.id)
+      listener.handle(message)
+      MadChatter.find_channel_by_name('Foobar Room').should_not be_nil
+    rescue RuntimeError
+    end
+  end
+  
 end

data/spec/message_listeners/code_spec.rb

@@ -1,4 +1,4 @@
-require_relative '../spec_helper'
+require 'spec_helper'
 
 describe MadChatter::MessageListeners::Code do
 

data/spec/message_listeners/markdown_spec.rb

@@ -1,5 +1,4 @@
-require_relative '../spec_helper'
-require 'mad_chatter/message_listeners/markdown'
+require 'spec_helper'
 
 describe MadChatter::MessageListeners::Markdown do
 
@@ -37,11 +36,16 @@ describe MadChatter::MessageListeners::Markdown do
     message.html.should == 'here is a <strong>strong</strong> statement'
   end
   
-  # TODO
-  # it 'should interpret markdown style links' do
-  #   message = MadChatter::Message.new('message', "[link me up](http://www.example.com)")
-  #   listener.handle(message)
-  #   message.html.should == '<a target="_blank" href="http://www.example.com">link me up</a>'
-  # end
+  it 'should parse backticks as inline code' do
+    message = MadChatter::Message.new('message', "this has `some code` in it")
+    listener.handle(message)
+    message.html.should == 'this has <code>some code</code> in it'
+  end
+  
+  it 'should parse markdown style links' do
+    message = MadChatter::Message.new('message', "[link me up](http://www.example.com)")
+    listener.handle(message)
+    message.html.should == '<a target="_blank" href="http://www.example.com">link me up</a>'
+  end
   
 end