mad_chatter 0.2.0 → 0.2.1

data/CHANGELOG.txt

@@ -1,5 +1,9 @@
 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.
+
 Version 0.2.0
  - Added a '/clear' command to client-side javascript to be able to clear all chat messages
  - Fixed HTML injection vulnerability by adding markdown parsing and escaping all incoming html

data/lib/mad_chatter/server.rb

@@ -52,7 +52,9 @@ module MadChatter
     def message_received(json)
       msg = JSON.parse(json)
       username = MadChatter::Users.find_username_by_token(msg['token'])
-      message = MadChatter::Message.new(msg['type'], filter_message(msg['message']), msg['token'], username)
+      original_message = msg['message']
+      filtered_message = filter_message(original_message)
+      message = MadChatter::Message.new(msg['type'], filtered_message, msg['token'], username)
       
       if message.token.nil?
         return # Token is required to send messages
@@ -60,9 +62,9 @@ module MadChatter
       
       begin
           MadChatter.simple_extensions.each do |extension|
-          if message.text =~ extension[:regex]
+          if original_message =~ extension[:regex]
             MadChatter::Action.instance_exec do
-              args = extension[:regex].match(message.text).captures
+              args = extension[:regex].match(original_message).captures
               extension[:block].call(args)
             end
           end

data/lib/mad_chatter/version.rb

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

data/templates/extensions.rb

@@ -12,7 +12,8 @@
 #   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
+# 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

data/templates/web/styles.css

@@ -110,6 +110,9 @@ table {
 	clear: both;
 }
 
+#messages strong { font-weight: bold; }
+#messages em { font-style: italic; }
+
 #messages p.message .username {
 	font-weight: bold;
 }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mad_chatter
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: &2169116300 !ruby/object:Gem::Requirement
+  requirement: &2169907800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2169116300
+  version_requirements: *2169907800
 - !ruby/object:Gem::Dependency
   name: eventmachine
-  requirement: &2156007600 !ruby/object:Gem::Requirement
+  requirement: &2169907380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2156007600
+  version_requirements: *2169907380
 - !ruby/object:Gem::Dependency
   name: em-websocket
-  requirement: &2156002260 !ruby/object:Gem::Requirement
+  requirement: &2169906960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2156002260
+  version_requirements: *2169906960
 - !ruby/object:Gem::Dependency
   name: redcarpet
-  requirement: &2164626100 !ruby/object:Gem::Requirement
+  requirement: &2156004680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2164626100
+  version_requirements: *2156004680
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2164625680 !ruby/object:Gem::Requirement
+  requirement: &2152011900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2164625680
+  version_requirements: *2152011900
 - !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: &2164625260 !ruby/object:Gem::Requirement
+  requirement: &2152011480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,7 +76,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2164625260
+  version_requirements: *2152011480
 description: Mad Chatter is a fun, easy to customize chat server, utilizing HTML 5
   Web Sockets
 email: