mad_chatter 0.2.5 → 0.2.6

data/.gitignore

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

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    mad_chatter (0.2.3)
+    mad_chatter (0.2.6)
       daemons (= 1.1.4)
       em-websocket
       eventmachine
@@ -18,6 +18,11 @@ GEM
       addressable (>= 2.1.1)
       eventmachine (>= 0.12.9)
     eventmachine (0.12.10)
+    guard (0.8.8)
+      thor (~> 0.14.6)
+    guard-rspec (0.5.10)
+      guard (>= 0.8.4)
+    multi_json (1.0.4)
     redcarpet (2.0.1)
     rspec (2.7.0)
       rspec-core (~> 2.7.0)
@@ -28,12 +33,19 @@ GEM
       diff-lcs (~> 1.1.2)
     rspec-mocks (2.7.0)
     shoulda (2.11.3)
+    simplecov (0.5.4)
+      multi_json (~> 1.0.3)
+      simplecov-html (~> 0.5.3)
+    simplecov-html (0.5.3)
     thor (0.14.6)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
+  guard
+  guard-rspec
   mad_chatter!
   rspec
   shoulda
+  simplecov

data/Guardfile

@@ -0,0 +1,9 @@
+# A sample Guardfile
+# More info at https://github.com/guard/guard#readme
+
+guard 'rspec', :cli => "--color --format nested --fail-fast --drb", :notification => false do
+  watch(%r{^spec/.+_spec\.rb$})
+  watch(%r{^lib/(.+)\.rb$})     { |m| "spec/lib/#{m[1]}_spec.rb" }
+  watch('spec/spec_helper.rb')  { "spec" }
+end
+

data/README.md

@@ -1,8 +1,8 @@
-#Mad Chatter
+# Mad Chatter
 
-Mad Chatter is a fun, easy to customize chat server. It's written in Ruby and utilizes HTML 5 Web Sockets for fast communication.
+Mad Chatter is a fun, easy to customize chat server. It's written in Ruby and utilizes HTML 5 Web Sockets for fast communication. It also has support for Markdown.
 
-##Getting Started
+## Getting Started
 
 To get started, first install the Mad Chatter gem:
 
@@ -19,10 +19,9 @@ This command will generate the following structure:
         extensions.rb
         web/
             index.html
-            javascript.js
-            stylesheets/
-                reset.css
-                styles.css
+            styles.css
+            mad_chatter.js
+            mad_chatter_actions.js
 
 To start your chat server, navigate to the directory that was just created and run...
 
@@ -34,8 +33,7 @@ The start command will launch the web socket server in the background. You can u
 
     mad_chatter stop
 
-
-##Chat Actions
+## Chat Actions
 
 Hopefully, the default chatroom will be relatively intuitive to use. However, there are some extra features that Mad Chatter provides. Every chat message is parsed to see if it is a normal chat message, or if its a special action. These actions are much like IRC commands. For example, if I wanted to change my screen name from Andrew to Andy I could chat this message:
 
@@ -47,29 +45,45 @@ If I wanted to embed a YouTube video for all the members of the chatroom to enjo
 
     /youtube http://youtu.be/n1NVfDlU6yQ
 
-You can even create your own actions to do whatever you want.
+Or if I wanted to shake everyone's chat window:
+
+    /earthquake
+
+You can also create your own actions to do whatever you want.
 
 
-##Customizing
+## Customizing
 
 The goal of Mad Chatter is to make it easy to create, host, and customize your own chat server. Let's take a look at the different ways you can customize your new chat server.
 
-If you want to customize the html/css of your chatroom, you'll find them in the web directory.
+If you want to customize the html/css of your chatroom, you'll find it in the web directory.
 
 There is an example config file that shows a few examples of things you can customize.
 
-The extensions.rb file is for you to create your own chat extensions. You will find an example in that file.
+The extensions.rb file is for you to create your own chat extensions. You will find a few examples in that file.
+
+
+## Mac, Windows, and Linux Wrappers
+
+Once you've got your chat server running and being used by other people, you might be interested in using/distributing an installable application, so you can leave it running and don't need to pull it up in a browser anymore. Here's a list of the currently available GUI wrapper applications:
+
+ * [Mad Chatter for Mac](https://github.com/andrewhavens/mad_chatter_for_mac) (a MacRuby app based on WebKit)
+
+## 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.
 
+You can also vote on upcoming features: https://madchatter.uservoice.com
 
-##Contributing
+## Contributing
 
 Please fork and send pull requests! Or submit issues if you have suggestions on how to improve.
 
-##TODO
+## TODO
 
- - Add support for alternative web socket servers like Juggernaut, Socket.io, or Cramp and web-socket-js for better cross-browser support
+ - Maybe add support for alternative web socket servers like Juggernaut, Socket.io, or Cramp and web-socket-js
  - Add tests! (I'm new to this, so I need help)
 
 ##Copyright
 
-Copyright (c) 2011 Andrew Havens. See LICENSE.txt for further details.
+Copyright (c) 2011-2012 Andrew Havens. MIT license. See LICENSE.txt for further details.

data/TODO.txt

@@ -1,4 +1,4 @@
-Goal: to become an open-source version of https://www.hipchat.com/
+Goal: to become an open-source version of https://www.hipchat.com/ or https://www.flowdock.com
 
 TODO:
 

data/lib/mad_chatter/message.rb

@@ -26,7 +26,10 @@ module MadChatter
     
     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
+      # remove the <p> tags that markdown wraps by default
+      @filtered_text.sub!(/^<p>/, '')
+      @filtered_text.sub!(/<\/p>$/, '')
+      @filtered_text
     end
     
   end

data/lib/mad_chatter/version.rb

@@ -1,5 +1,5 @@
 module MadChatter
   
-  VERSION = '0.2.5'
+  VERSION = '0.2.6'
 
 end

data/mad_chatter.gemspec

@@ -23,7 +23,10 @@ Gem::Specification.new do |s|
   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"
+  s.add_development_dependency 'guard'
+  s.add_development_dependency 'guard-rspec'
+  s.add_development_dependency 'simplecov'
 end

data/spec/message_spec.rb

@@ -0,0 +1,27 @@
+require 'spec_helper' # see http://stackoverflow.com/q/5061179/314318
+
+describe MadChatter::Message do
+  let (:message) { MadChatter::Message.new('joy', 'I am the model of the modern major general') }
+
+  it 'should have a well-known interface' do
+    [:text, :to_json, :filter].each do |m|
+      message.should respond_to(m)
+    end
+  end
+
+  it 'should encode into JSON correctly' do
+    message.to_json.should match /modern major general/
+  end
+
+  context '#filter' do
+    it 'should remove <p> tags' do
+      message.filter.should_not match /<[\s\\]*p[\s]*>/
+    end
+    
+    it 'should be able to handle messages made of empty space' do
+      message = MadChatter::Message.new('message', "    ")
+      message.filter.should match ''
+    end
+  end
+
+end

data/spec/spec_helper.rb

@@ -0,0 +1,14 @@
+require 'simplecov'
+SimpleCov.start
+
+require 'mad_chatter'
+require 'rspec/mocks'
+
+# See http://rubydoc.info/gems/rspec-mocks/frames for more details on
+# the API.
+## Don't like RSpec mocks? See: https://www.relishapp.com/rspec/rspec-core/docs/mock-framework-integration/mock-with-rspec
+RSpec.configure do |config|
+  config.mock_framework = :rspec
+end
+
+

data/templates/extensions.rb

@@ -19,4 +19,11 @@ end
 
 on_message %r{/alert (.*)} do |alert_message|
   send_action 'show_alert', alert_message
+  stop_message_handling
+end
+
+on_message %r{/earthquake} do
+  send_status_message 'Someone has just caused an earthquake!'
+  send_action 'earthquake'
+  stop_message_handling
 end

data/templates/web/index.html

@@ -7,9 +7,17 @@
 	<script src='http://ajax.googleapis.com/ajax/libs/jqueryui/1.8.16/jquery-ui.min.js'></script>
 	<script src='mad_chatter.js'></script>
 	<script src='mad_chatter_actions.js'></script>
+	
+	<!-- markItUp! -->
+	<script type="text/javascript" src="markitup/jquery.markitup.js"></script>
+	<script type="text/javascript" src="markitup/sets/markdown/set.js"></script>
+	<link rel="stylesheet" type="text/css" href="markitup/skins/mad_chatter/style.css" />
+	<link rel="stylesheet" type="text/css" href="markitup/sets/markdown/style.css" />
+	
 	<script>
 		$(document).ready(function(){
 			MadChatter.init('ws://localhost:8100');
+			$('#keyboard textarea').markItUp(mySettings);
 		});
 	</script>
   </head>
@@ -31,7 +39,8 @@
 			<ul id="members"></ul>
 		</div>
 		<div id="keyboard">
-			<input type="text">
+			<!-- <input type="text"> -->
+			<textarea></textarea>
 		</div>
 		<div id="messages"></div>
 	</div>

data/templates/web/mad_chatter.js

@@ -37,10 +37,10 @@ var MadChatter = {
 	},
 	
 	wait_for_chat_submit: function(){
-		var keyboard = $("#keyboard input");
+		var keyboard = $("#keyboard textarea");
 	    keyboard.keyup(function (event) {
 	      if (event.keyCode == 13) { // The enter key.
-					MadChatter.send_message(keyboard.val());
+			MadChatter.send_message(keyboard.val());
 	        keyboard.val('');
 	      }
 	    });

data/templates/web/mad_chatter_actions.js

@@ -1,4 +1,19 @@
 // This function is called when '/alert' is sent in a chat message
 function show_alert(message) {
 	alert(message);
+}
+
+// This function is called when '/earthquake' is sent as a chat message
+function earthquake() {
+	var n = 4;
+	if (parent.moveBy) {
+		for (i = 10; i > 0; i--) {
+			for (j = n; j > 0; j--) {
+				parent.moveBy(0, i);
+				parent.moveBy(i, 0);
+				parent.moveBy(0, -i);
+				parent.moveBy(-i, 0);
+			}
+		}
+	}
 }