mad_chatter 0.1.0 → 0.1.1

data/.gitignore

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

data/CHANGELOG.txt

@@ -1,9 +1,14 @@
 Mad Chatter
 
+Version 0.1.1
+ - Added a 'preview' command to CLI to run both a web server and web socket server
+ - Fixed bug where user leaving chatroom didn't notify other users
+
 Version 0.1.0
  - Refactored extension architecture. Much nicer syntax now.
  - Moved some of the main configuration to a config.yml file (which is generated when you use the 'new' command)
  - Created skeleton classes for alternative web socket server implementations and moved the default implementation into its own class
+ - Switched to using Bundler (instead of Jeweler) for gem deployments, thanks to this article: http://mlomnicki.com/ruby/rubygems/2011/01/22/jeweler-vs-bundler.html
 
 Versions < 0.1.0
  - Some of the features were implemented, but there were many holes that needed to be filled

data/Gemfile

@@ -1,14 +1,3 @@
 source :rubygems
 
-# Gem dependencies
-gem 'thor'
-gem 'eventmachine', '0.12.10'
-gem 'em-websocket'
-
-# Development dependencies
-group :development do
-  gem "shoulda", ">= 0"
-  gem "bundler", "~> 1.0.0"
-  gem "jeweler", "~> 1.6.4"
-  gem "rcov", ">= 0"
-end
+gemspec

data/Gemfile.lock

@@ -1,18 +1,28 @@
+PATH
+  remote: .
+  specs:
+    mad_chatter (0.1.1)
+      em-websocket
+      eventmachine
+      thor
+
 GEM
   remote: http://rubygems.org/
   specs:
     addressable (2.2.6)
+    diff-lcs (1.1.3)
     em-websocket (0.3.5)
       addressable (>= 2.1.1)
       eventmachine (>= 0.12.9)
     eventmachine (0.12.10)
-    git (1.2.5)
-    jeweler (1.6.4)
-      bundler (~> 1.0)
-      git (>= 1.2.5)
-      rake
-    rake (0.9.2.2)
-    rcov (0.9.11)
+    rspec (2.7.0)
+      rspec-core (~> 2.7.0)
+      rspec-expectations (~> 2.7.0)
+      rspec-mocks (~> 2.7.0)
+    rspec-core (2.7.1)
+    rspec-expectations (2.7.0)
+      diff-lcs (~> 1.1.2)
+    rspec-mocks (2.7.0)
     shoulda (2.11.3)
     thor (0.14.6)
 
@@ -20,10 +30,6 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  bundler (~> 1.0.0)
-  em-websocket
-  eventmachine (= 0.12.10)
-  jeweler (~> 1.6.4)
-  rcov
+  mad_chatter!
+  rspec
   shoulda
-  thor

data/Rakefile

@@ -1,55 +1 @@
-# encoding: utf-8
-
-require 'rubygems'
-require 'bundler'
-begin
-  Bundler.setup(:default, :development)
-rescue Bundler::BundlerError => e
-  $stderr.puts e.message
-  $stderr.puts "Run `bundle install` to install missing gems"
-  exit e.status_code
-end
-require 'rake'
-
-require 'jeweler'
-require './lib/mad_chatter/version.rb'
-Jeweler::Tasks.new do |gem|
-  # gem is a Gem::Specification... see http://docs.rubygems.org/read/chapter/20 for more options
-  gem.name = "mad_chatter"
-  gem.version = MadChatter::VERSION
-  gem.homepage = "http://github.com/andrewhavens/mad_chatter"
-  gem.license = "MIT"
-  gem.summary = %Q{Mad Chatter is a fun, easy to customize chat server, utilizing HTML 5 Web Sockets}
-  gem.description = %Q{Mad Chatter is a fun, easy to customize chat server, utilizing HTML 5 Web Sockets}
-  gem.email = "email@andrewhavens.com"
-  gem.authors = ["Andrew Havens"]
-  # dependencies defined in Gemfile
-end
-Jeweler::RubygemsDotOrgTasks.new
-
-require 'rake/testtask'
-Rake::TestTask.new(:test) do |test|
-  test.libs << 'lib' << 'test'
-  test.pattern = 'test/**/test_*.rb'
-  test.verbose = true
-end
-
-require 'rcov/rcovtask'
-Rcov::RcovTask.new do |test|
-  test.libs << 'test'
-  test.pattern = 'test/**/test_*.rb'
-  test.verbose = true
-  test.rcov_opts << '--exclude "gems/*"'
-end
-
-task :default => :test
-
-require 'rake/rdoctask'
-Rake::RDocTask.new do |rdoc|
-  version = File.exist?('VERSION') ? File.read('VERSION') : ""
-
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title = "mad_chatter #{version}"
-  rdoc.rdoc_files.include('README*')
-  rdoc.rdoc_files.include('lib/**/*.rb')
-end
+require "bundler/gem_tasks"

data/TODO.txt

@@ -0,0 +1,5 @@
+Goal: to become an open-source version of https://www.hipchat.com/
+
+TODO:
+Fix 'leave chatroom' functionality
+Fix 'HTML injection' security vulnerability

data/bin/mad_chatter

@@ -1,7 +1,8 @@
 #!/usr/bin/env ruby
+# lib_dir = File.expand_path('../lib', __FILE__)
+# $:.unshift( lib_dir ) unless $:.include?( lib_dir )
 
 require 'thor'
-require File.expand_path('../../lib/mad_chatter', __FILE__)
 
 module MadChatter
   
@@ -23,8 +24,16 @@ module MadChatter
       copy_file "templates/web/stylesheets/styles.css", "#{name}/web/stylesheets/styles.css"
     end
     
+    desc 'preview', 'Starts both a web server and the Mad Chatter chat server'
+    def preview
+      t1 = Thread.new { require 'mad_chatter/web_server' }
+      t2 = Thread.new { require 'mad_chatter'; MadChatter.start }
+      t2.join()
+    end
+    
     desc 'start', 'Starts the chat server'
     def start
+      require 'mad_chatter'
       MadChatter.start
     end
     
@@ -42,6 +51,7 @@ module MadChatter
     
     desc 'version', 'Displays the current version number'
     def version
+      require "mad_chatter/version"
       puts MadChatter::VERSION
     end
     

data/lib/mad_chatter/server.rb

@@ -5,6 +5,7 @@ module MadChatter
     def initialize(config)
       @config = config
       @server = initialize_server
+      @subscribers = {};
     end
     
     def self.main_channel
@@ -14,7 +15,7 @@ module MadChatter
     def initialize_server
       # TODO: Figure out a better (more flexible/dynamic) way to initialize the server class
       if @config['websocket_backend'] && @config['websocket_backend'] == 'MadChatter::Servers::EventMachineWebSocket'
-        return MadChatter::Servers::EventMachineWebSocket.new(self, @config['websocket_port'])
+        return MadChatter::Servers::EventMachineWebSocket.new(@config['websocket_port'], self)
       end
       
       raise 'You did not specify a valid class name for websocket_backend'
@@ -27,18 +28,25 @@ module MadChatter
       end
     end
     
-    def register_connection(&send_client_message_block)
-      subscriber_id = MadChatter::Server.main_channel.subscribe(send_client_message_block)
-      send_client_message_block.call(connection_token)
+    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)
+      @subscribers[subscriber_id] = token
+      subscriber_id
     end
     
-    def connection_token
-      token = Digest::SHA1.hexdigest Time.now.to_s
-      MadChatter::Message.new('token', token).to_s
+    def generate_token
+      Digest::SHA1.hexdigest(Time.now.to_s)
     end
     
     def connection_closed(id)
+      token = @subscribers.delete(id)
+      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)
     end
     
     def message_received(json)

data/lib/mad_chatter/servers/em_websocket.rb

@@ -4,7 +4,7 @@ module MadChatter
   module Servers
     class EventMachineWebSocket
       
-      def initialize(main_server, port)
+      def initialize(port, main_server)
         @main_server = main_server
         @config = {
           :host => '0.0.0.0',

data/lib/mad_chatter/version.rb

@@ -1,5 +1,5 @@
 module MadChatter
   
-  VERSION = '0.1.0'
+  VERSION = '0.1.1'
 
 end

data/lib/mad_chatter/web_server.rb

@@ -0,0 +1,3 @@
+require 'webrick'
+web_server = WEBrick::HTTPServer.new(:Port => 3000, :DocumentRoot => Dir.pwd + '/web')
+web_server.start

data/lib/mad_chatter.rb

@@ -1,8 +1,8 @@
 lib_dir = File.expand_path('..', __FILE__)
 $:.unshift( lib_dir ) unless $:.include?( lib_dir )
 
-require 'bundler/setup'
 require 'eventmachine'
+require 'yaml'
 require 'json'
 require 'digest/sha1'
 
@@ -12,6 +12,7 @@ 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'

data/mad_chatter.gemspec

@@ -0,0 +1,28 @@
+# -*- encoding: utf-8 -*-
+$:.push File.expand_path("../lib", __FILE__)
+require "mad_chatter/version"
+
+Gem::Specification.new do |s|
+  s.name        = "mad_chatter"
+  s.version     = MadChatter::VERSION
+  s.authors     = ["Andrew Havens"]
+  s.email       = ["email@andrewhavens.com"]
+  s.homepage    = "http://github.com/andrewhavens/mad_chatter"
+  s.summary     = %q{Mad Chatter is a fun, easy to customize chat server, utilizing HTML 5 Web Sockets}
+  s.description = %q{Mad Chatter is a fun, easy to customize chat server, utilizing HTML 5 Web Sockets}
+
+  # s.rubyforge_project = "mad_chatter"
+
+  s.files         = `git ls-files`.split("\n")
+  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
+  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
+  s.require_paths = ["lib"]
+
+  s.add_runtime_dependency "thor"
+  s.add_runtime_dependency "eventmachine"
+  s.add_runtime_dependency "em-websocket"
+  # s.add_runtime_dependency "sinatra"
+  
+  s.add_development_dependency "rspec"
+  s.add_development_dependency "shoulda"
+end

data/templates/extensions/example.rb

@@ -0,0 +1,15 @@
+class Example
+  
+  # include MadChatter::Extension
+  
+  def handle(message)
+    if message.text == 'show me an example'
+      send_status_message "#{message.username} really wants an example"
+      send_message 'I said...I want an example!!!'
+      stop_message_handling   # and don't let any other extensions handle it
+    else
+      # let other extensions handle it
+    end
+  end
+  
+end

data/templates/extensions.rb

@@ -8,6 +8,6 @@
 # Example:
 #
 #   on_message /hey andrew: (.+)/ do |msg|
-#     send_status_message 'Someone sent andrew a chat message'
+#     send_status_message 'Someone is talking to andrew'
 #   end
 #

data/templates/web/javascript.js

@@ -90,6 +90,9 @@ var MadChatter = {
 		}
 		if (type == 'message') {
 			MadChatter.display_message(username, message);
+			if (!document.hasFocus) {
+				console.log(window.fluid);
+			}
 		}
 		MadChatter.scroll_to_bottom_of_chat();
 	},

data/templates/web/stylesheets/styles.css

@@ -53,6 +53,7 @@
 
 #messages p {
 	padding: 0.25em;
+	clear: both;
 }
 
 #messages p.message .username {

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mad_chatter
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-07 00:00:00.000000000Z
+date: 2011-12-13 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: &2159049300 !ruby/object:Gem::Requirement
+  requirement: &2161151040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,21 +21,21 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2159049300
+  version_requirements: *2161151040
 - !ruby/object:Gem::Dependency
   name: eventmachine
-  requirement: &2159048600 !ruby/object:Gem::Requirement
+  requirement: &2161150480 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - =
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.12.10
+        version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2159048600
+  version_requirements: *2161150480
 - !ruby/object:Gem::Dependency
   name: em-websocket
-  requirement: &2159031280 !ruby/object:Gem::Requirement
+  requirement: &2161149460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2159031280
+  version_requirements: *2161149460
 - !ruby/object:Gem::Dependency
-  name: shoulda
-  requirement: &2159030600 !ruby/object:Gem::Requirement
+  name: rspec
+  requirement: &2161148320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,32 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2159030600
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: &2159029860 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.0.0
-  type: :development
-  prerelease: false
-  version_requirements: *2159029860
-- !ruby/object:Gem::Dependency
-  name: jeweler
-  requirement: &2159028900 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.6.4
-  type: :development
-  prerelease: false
-  version_requirements: *2159028900
+  version_requirements: *2161148320
 - !ruby/object:Gem::Dependency
-  name: rcov
-  requirement: &2159027800 !ruby/object:Gem::Requirement
+  name: shoulda
+  requirement: &2161147460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,23 +65,24 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2159027800
+  version_requirements: *2161147460
 description: Mad Chatter is a fun, easy to customize chat server, utilizing HTML 5
   Web Sockets
-email: email@andrewhavens.com
+email:
+- email@andrewhavens.com
 executables:
 - mad_chatter
 extensions: []
-extra_rdoc_files:
-- LICENSE.txt
-- README.md
+extra_rdoc_files: []
 files:
+- .gitignore
 - CHANGELOG.txt
 - Gemfile
 - Gemfile.lock
 - LICENSE.txt
 - README.md
 - Rakefile
+- TODO.txt
 - bin/mad_chatter
 - lib/mad_chatter.rb
 - lib/mad_chatter/action.rb
@@ -118,8 +97,11 @@ files:
 - lib/mad_chatter/servers/websocket_rack.rb
 - lib/mad_chatter/users.rb
 - lib/mad_chatter/version.rb
+- lib/mad_chatter/web_server.rb
+- mad_chatter.gemspec
 - templates/config.yml
 - templates/extensions.rb
+- templates/extensions/example.rb
 - templates/web/index.html
 - templates/web/javascript.js
 - templates/web/stylesheets/reset.css
@@ -127,8 +109,7 @@ files:
 - test/helper.rb
 - test/test_mad_chatter.rb
 homepage: http://github.com/andrewhavens/mad_chatter
-licenses:
-- MIT
+licenses: []
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -139,9 +120,6 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -79813361519807005
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -155,4 +133,6 @@ signing_key:
 specification_version: 3
 summary: Mad Chatter is a fun, easy to customize chat server, utilizing HTML 5 Web
   Sockets
-test_files: []
+test_files:
+- test/helper.rb
+- test/test_mad_chatter.rb