mad_chatter 0.2.1 → 0.2.3

data/.gitignore

@@ -1,3 +1,4 @@
 *.gem
 .bundle
-pkg/*
+pkg/*
+.daemon

data/CHANGELOG.txt

@@ -1,5 +1,11 @@
 Mad Chatter
 
+Version 0.2.3
+ - Finally got extensions working by refactoring a bunch of stuff
+
+Version 0.2.2
+ - Added daemonization so you can start, stop, restart Mad Chatter
+
 Version 0.2.1
  - Realized the simple extensions aren't actually working. This is why we need tests. :(
  - Also, fixed some styles that weren't being applied.

data/Gemfile.lock

@@ -1,7 +1,8 @@
 PATH
   remote: .
   specs:
-    mad_chatter (0.2.0)
+    mad_chatter (0.2.3)
+      daemons (= 1.1.4)
       em-websocket
       eventmachine
       redcarpet
@@ -11,6 +12,7 @@ GEM
   remote: http://rubygems.org/
   specs:
     addressable (2.2.6)
+    daemons (1.1.4)
     diff-lcs (1.1.3)
     em-websocket (0.3.6)
       addressable (>= 2.1.1)

data/bin/mad_chatter

@@ -30,25 +30,22 @@ module MadChatter
     
     desc 'start', 'Starts the chat server'
     def start
-      require 'mad_chatter'
-      MadChatter.start
+      require 'mad_chatter/daemon'
     end
     
     desc 'stop', 'Stops the chat server'
     def stop
-      # stop the currently running daemon
-      # not sure how to best implement this part yet
+      require 'mad_chatter/daemon'
     end
     
     desc 'restart', 'Restarts the chat server'
     def restart
-      # restarts the currently running daemon
-      # not sure how to best implement this part yet
+      require 'mad_chatter/daemon'
     end
     
     desc 'version', 'Displays the current version number'
     def version
-      require "mad_chatter/version"
+      require 'mad_chatter/version'
       puts MadChatter::VERSION
     end
     

data/lib/mad_chatter/actions/base.rb

@@ -0,0 +1,26 @@
+module MadChatter
+  module Actions
+    class Base
+    
+      include MadChatter::Actions::Dsl
+    
+      def initialize(regex = nil, block = nil)
+        @regex = regex
+        @block = block
+      end
+    
+      def handle(message)
+        if message.original_text =~ @regex
+          args = @regex.match(message.original_text).captures
+          @block.call(args)
+        end
+      end
+    
+      # used to register a class that extends MadChatter::Actions::Base
+      def self.inherited(extension_class)
+        MadChatter.message_listeners << extension_class.new
+      end
+      
+    end
+  end
+end

data/lib/mad_chatter/actions/dsl.rb

@@ -0,0 +1,42 @@
+module MadChatter
+  module Actions
+    module Dsl
+      
+      # Used to define a simple extension
+      def on_message(regex, &block)
+        MadChatter.message_listeners << MadChatter::Actions::Base.new(regex, block)
+      end
+      
+      # Helper methods
+    
+      def stop_message_handling
+        raise "Don't call any more message listeners"
+      end
+    
+      def send_json(json)
+        MadChatter::Server.send_json(json)
+      end
+    
+      def send_message(text)
+        message = MadChatter::Message.new('message', text)
+        send_json(message.to_json)
+      end
+    
+      def send_status_message(text)
+        message = MadChatter::Message.new('status', text)
+        send_json(message.to_json)
+      end
+    
+      def send_users_list
+        message = MadChatter::Message.new('users', MadChatter::Users.current)
+        send_json(message.to_json)
+      end
+    
+      def send_action(action, *args)
+        message = MadChatter::Message.new('action', {function: action, args: args})
+        send_json(message.to_json)
+      end
+      
+    end
+  end
+end

data/lib/mad_chatter/actions/join.rb

@@ -1,12 +1,12 @@
 module MadChatter
   module Actions
-    class Join < MadChatter::Action
+    class Join < MadChatter::Actions::Base
       
       @@regex = /\/join (.+)/
       
       def handle(message)
-        if message.text =~ @@regex
-          username = parse_username(message.text)
+        if message.filtered_text =~ @@regex
+          username = parse_username(message.filtered_text)
           MadChatter::Users.update(message.token, username)
           send_status_message "#{username} has joined the chatroom"
           send_users_list

data/lib/mad_chatter/actions/rename.rb

@@ -1,13 +1,13 @@
 module MadChatter
   module Actions
-    class Rename < MadChatter::Action
+    class Rename < MadChatter::Actions::Base
       
       @@regex = /\/nick (.+)/
       
       def handle(message)
-        if message.text =~ @@regex
+        if message.filtered_text =~ @@regex
           old_username = message.username
-          username = parse_username(message.text)
+          username = parse_username(message.filtered_text)
           MadChatter::Users.update(message.token, username)
           send_status_message "#{old_username} is now known as #{username}"
           send_users_list

data/lib/mad_chatter/config.rb

@@ -1,13 +1,5 @@
 module MadChatter
   
-  def self.simple_extensions
-    @@simple_extensions ||= []
-  end
-  
-  def self.extension_classes
-    @@extension_classes ||= []
-  end
-  
   module Config
     class << self
       
@@ -19,10 +11,7 @@ module MadChatter
     
       def initialize_config
         config_file = File.join(Dir.pwd, 'config.yml')
-      
-        unless File.exist?(config_file)
-          abort 'Could not find Mad Chatter config.yml file'
-        end
+        abort 'Could not find Mad Chatter config.yml file' unless File.exist?(config_file)
         
         config = YAML::load(File.open(config_file))
         defaults = {
@@ -36,7 +25,7 @@ module MadChatter
         simple_extensions_file = File.join(Dir.pwd, 'extensions.rb')
         if File.exist?(simple_extensions_file)
           file_contents = File.read(simple_extensions_file)
-          MadChatter::Extensions.load_simple_extensions(file_contents)
+          MadChatter::Actions::Base.new.instance_eval file_contents
         end
         
         # Dir[Dir.pwd + '/extensions/*.rb'].each do |file|

data/lib/mad_chatter/daemon.rb

@@ -0,0 +1,16 @@
+require 'daemons'
+
+daemon_dir  = Dir.pwd + '/.daemon'
+Dir::mkdir(daemon_dir) unless File.directory?(daemon_dir)
+
+options = {
+  :dir        => daemon_dir,
+  :log_output => true,
+  :multiple   => false, # only allow one daemon to run at a time
+  :monitor    => true
+}
+
+Daemons.run_proc('Mad Chatter', options) do
+  require 'mad_chatter'
+  MadChatter.start
+end

data/lib/mad_chatter/message.rb

@@ -1,22 +1,33 @@
 module MadChatter
   class Message
     
-    attr_accessor :type, :text, :token, :username
+    attr_accessor :type, :original_text, :filtered_text, :token, :username
     
-    def initialize(type, message_text, token = nil, username = nil)
+    def initialize(type, original_text, token = nil, username = nil)
       @type = type
-      @text = message_text
+      @original_text = original_text
+      @filtered_text = original_text  # if filter is never called, message will be original text
       @token = token
       @username = username
     end
     
-    def to_s
+    # Helper method for returning filtered text.
+    def text
+      @filtered_text
+    end
+    
+    def to_json
       JSON.generate({
         type: @type,
-        message: @text,
+        message: @filtered_text,
         username: @username,
       })
     end
     
+    def filter
+      @filtered_text = MadChatter.markdown.render(@original_text)
+      @filtered_text = /^<p>(.*)<\/p>$/.match(@filtered_text)[1] # remove the <p> tags that markdown wraps by default
+    end
+    
   end
 end

data/lib/mad_chatter/server.rb

@@ -31,7 +31,7 @@ module MadChatter
     def register_connection(&send_message)
       subscriber_id = MadChatter::Server.main_channel.subscribe(send_message)
       token = generate_token
-      send_message.call(MadChatter::Message.new('token', token).to_s)
+      send_message.call(MadChatter::Message.new('token', token).to_json)
       @subscribers[subscriber_id] = token
       subscriber_id
     end
@@ -45,54 +45,31 @@ module MadChatter
       username = MadChatter::Users.find_username_by_token(token)
       MadChatter::Server.main_channel.unsubscribe(id)
       MadChatter::Users.remove(token)
-      MadChatter::Server.send_json(MadChatter::Message.new('status', "#{username} has left the chatroom").to_s)
-      MadChatter::Server.send_json(MadChatter::Message.new('users', MadChatter::Users.current).to_s)
+      MadChatter::Server.send_json(MadChatter::Message.new('status', "#{username} has left the chatroom").to_json)
+      MadChatter::Server.send_json(MadChatter::Message.new('users', MadChatter::Users.current).to_json)
     end
     
     def message_received(json)
       msg = JSON.parse(json)
       username = MadChatter::Users.find_username_by_token(msg['token'])
-      original_message = msg['message']
-      filtered_message = filter_message(original_message)
-      message = MadChatter::Message.new(msg['type'], filtered_message, msg['token'], username)
+      message = MadChatter::Message.new(msg['type'], msg['message'], msg['token'], username)
+      message.filter
       
       if message.token.nil?
         return # Token is required to send messages
       end
       
       begin
-          MadChatter.simple_extensions.each do |extension|
-          if original_message =~ extension[:regex]
-            MadChatter::Action.instance_exec do
-              args = extension[:regex].match(original_message).captures
-              extension[:block].call(args)
-            end
-          end
-        end
-    
-        MadChatter.extension_classes.each do |extension|
-          extension.handle(message)
+        MadChatter.message_listeners.each do |listener|
+          listener.handle(message)
         end
         
-        MadChatter::Server.send_json(message.to_s)
+        MadChatter::Server.send_json(message.to_json)
       rescue RuntimeError
         # dont need to do anything, just prevent any errors from stopping the server
       end
     end
-    
-    def filter_message(text)
-      @markdown ||= Redcarpet::Markdown.new(
-        Redcarpet::Render::HTML.new(
-          :filter_html => true, 
-          :hard_wrap => true
-        ), 
-        :autolink => true, 
-        :no_intra_emphasis => true
-      )
-      filtered_text = @markdown.render(text)
-      filtered_text = /^<p>(.*)<\/p>$/.match(filtered_text)[1] # remove the <p> tags that markdown wraps by default
-    end
-    
+
     def self.send_json(json)
       MadChatter::Server.main_channel.push(json)
     end

data/lib/mad_chatter/version.rb

@@ -1,5 +1,5 @@
 module MadChatter
   
-  VERSION = '0.2.1'
+  VERSION = '0.2.3'
 
 end

data/lib/mad_chatter.rb

@@ -7,20 +7,34 @@ require 'yaml'
 require 'json'
 require 'digest/sha1'
 
-require 'mad_chatter/action'
-require 'mad_chatter/config'
-require 'mad_chatter/extensions'
-require 'mad_chatter/message'
-require 'mad_chatter/server'
-require 'mad_chatter/users'
-require 'mad_chatter/version'
-
-require 'mad_chatter/actions/join'
-require 'mad_chatter/actions/rename'
-
-require 'mad_chatter/servers/em_websocket'
-
 module MadChatter
+  
+  def self.message_listeners
+    @@message_listeners ||= []
+  end
+  
+  require 'mad_chatter/config'
+  require 'mad_chatter/message'
+  require 'mad_chatter/server'
+  require 'mad_chatter/users'
+  require 'mad_chatter/version'
+  require 'mad_chatter/actions/dsl'
+  require 'mad_chatter/actions/base'
+  require 'mad_chatter/actions/join'
+  require 'mad_chatter/actions/rename'
+
+  require 'mad_chatter/servers/em_websocket'
+  
+  def self.markdown
+    @markdown ||= Redcarpet::Markdown.new(
+      Redcarpet::Render::HTML.new(
+        :filter_html => true, 
+        :hard_wrap => true
+      ), 
+      :autolink => true, 
+      :no_intra_emphasis => true
+    )
+  end
 
   def self.start
     config = MadChatter::Config.init

data/mad_chatter.gemspec

@@ -22,6 +22,7 @@ Gem::Specification.new do |s|
   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"

data/templates/extensions.rb

@@ -12,8 +12,11 @@
 #   end
 #
 
-# this still doesnt work yet. hopefully soon
-# on_message %r{/youtube http://youtu.be/(.*)} do |youtube_id|
-#   send_message "<iframe width='560' height='315' src='http://www.youtube.com/embed/#{youtube_id}' frameborder='0' allowfullscreen></iframe>"
-#   stop_message_handling
-# end
+on_message %r{/youtube http://youtu.be/(.*)} do |youtube_id|
+  send_message "<iframe width='560' height='315' src='http://www.youtube.com/embed/#{youtube_id}' frameborder='0' allowfullscreen></iframe>"
+  stop_message_handling
+end
+
+on_message %r{/alert (.*)} do |alert_message|
+  send_action 'show_alert', alert_message
+end

data/templates/web/index.html

@@ -5,7 +5,8 @@
 	<link rel="stylesheet" href="styles.css">
     <script src='http://ajax.googleapis.com/ajax/libs/jquery/1.5.2/jquery.min.js'></script>
 	<script src='http://ajax.googleapis.com/ajax/libs/jqueryui/1.8.16/jquery-ui.min.js'></script>
-	<script src='javascript.js'></script>
+	<script src='/mad_chatter.js'></script>
+	<script src='/mad_chatter_actions.js'></script>
 	<script>
 		$(document).ready(function(){
 			MadChatter.init('ws://localhost:8100');

data/templates/web/{javascript.js → mad_chatter.js}

@@ -74,7 +74,7 @@ var MadChatter = {
 			MadChatter.display_status(message);
 		}
 		if (type == 'action') {
-			MadChatter.run_action(message);
+			MadChatter.exec_action(message);
 		}
 		if (type == 'message') {
 			MadChatter.display_message(username, message);
@@ -92,8 +92,8 @@ var MadChatter = {
 		});
 	},
 
-	run_action: function(action){
-		eval(action);
+	exec_action: function(message){
+		window[message.function].apply(window, message.args);
 	},
 			
 	display_status: function(message){

data/templates/web/mad_chatter_actions.js

@@ -0,0 +1,4 @@
+// This function is called when '/alert' is sent in a chat message
+function show_alert(message) {
+	alert(message);
+}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mad_chatter
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-02 00:00:00.000000000 Z
+date: 2012-01-03 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: &2169907800 !ruby/object:Gem::Requirement
+  requirement: &2165825680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2169907800
+  version_requirements: *2165825680
 - !ruby/object:Gem::Dependency
   name: eventmachine
-  requirement: &2169907380 !ruby/object:Gem::Requirement
+  requirement: &2165825260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2169907380
+  version_requirements: *2165825260
 - !ruby/object:Gem::Dependency
   name: em-websocket
-  requirement: &2169906960 !ruby/object:Gem::Requirement
+  requirement: &2165824840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2169906960
+  version_requirements: *2165824840
 - !ruby/object:Gem::Dependency
   name: redcarpet
-  requirement: &2156004680 !ruby/object:Gem::Requirement
+  requirement: &2165824420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,21 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2156004680
+  version_requirements: *2165824420
+- !ruby/object:Gem::Dependency
+  name: daemons
+  requirement: &2165823920 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - =
+      - !ruby/object:Gem::Version
+        version: 1.1.4
+  type: :runtime
+  prerelease: false
+  version_requirements: *2165823920
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2152011900 !ruby/object:Gem::Requirement
+  requirement: &2165823500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152011900
+  version_requirements: *2165823500
 - !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: &2152011480 !ruby/object:Gem::Requirement
+  requirement: &2165823040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,7 +87,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152011480
+  version_requirements: *2165823040
 description: Mad Chatter is a fun, easy to customize chat server, utilizing HTML 5
   Web Sockets
 email:
@@ -96,11 +107,12 @@ files:
 - TODO.txt
 - bin/mad_chatter
 - lib/mad_chatter.rb
-- lib/mad_chatter/action.rb
+- lib/mad_chatter/actions/base.rb
+- lib/mad_chatter/actions/dsl.rb
 - lib/mad_chatter/actions/join.rb
 - lib/mad_chatter/actions/rename.rb
 - lib/mad_chatter/config.rb
-- lib/mad_chatter/extensions.rb
+- lib/mad_chatter/daemon.rb
 - lib/mad_chatter/message.rb
 - lib/mad_chatter/server.rb
 - lib/mad_chatter/servers/em_websocket.rb
@@ -114,7 +126,8 @@ files:
 - templates/extensions.rb
 - templates/extensions/example.rb
 - templates/web/index.html
-- templates/web/javascript.js
+- templates/web/mad_chatter.js
+- templates/web/mad_chatter_actions.js
 - templates/web/styles.css
 - test/helper.rb
 - test/test_mad_chatter.rb
@@ -138,7 +151,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.6
 signing_key: 
 specification_version: 3
 summary: Mad Chatter is a fun, easy to customize chat server, utilizing HTML 5 Web

data/lib/mad_chatter/action.rb

@@ -1,34 +0,0 @@
-module MadChatter
-  class Action
-    
-    def self.inherited(extension_class)
-      MadChatter.extension_classes << extension_class.new
-    end    
-    
-    # Helper methods
-    
-    def stop_message_handling
-      raise 'Dont call anymore message listeners'
-    end
-    
-    def send_json(json)
-      MadChatter::Server.send_json(json)
-    end
-    
-    def send_message(text)
-      message = MadChatter::Message.new('message', text)
-      send_json(message.to_s)
-    end
-    
-    def send_status_message(text)
-      message = MadChatter::Message.new('status', text)
-      send_json(message.to_s)
-    end
-    
-    def send_users_list
-      message = MadChatter::Message.new('users', MadChatter::Users.current)
-      send_json(message.to_s)
-    end
-    
-  end
-end

data/lib/mad_chatter/extensions.rb

@@ -1,13 +0,0 @@
-module MadChatter
-  class Extensions
-    
-    def self.load_simple_extensions(extensions)
-      instance_eval extensions, __FILE__, __LINE__
-    end
-    
-    def self.on_message(regex, &block)
-      MadChatter.simple_extensions << { regex: regex, block: block }
-    end
-    
-  end
-end