jschat 0.2.6 → 0.2.7

data/lib/jschat/http/jschat.rb

@@ -236,6 +236,10 @@ helpers do
     end
   end
 
+  def delete_twitter_user
+    JsChat::Storage.driver.delete_user({ 'twitter_name' => session[:twitter_name] })
+  end
+
   def load_twitter_user
     JsChat::Storage.driver.find_user({ 'twitter_name' => session[:twitter_name] }) || {}
   end
@@ -243,7 +247,7 @@ helpers do
   def load_twitter_user_and_set_bridge_id
     user = load_twitter_user
     if user['jschat_id'] and user['jschat_id'].size > 0
-      response.set_cookie 'jschat_id', user['jschat_id']
+      session[:jschat_id] = user['jschat_id']
     end
   end
 
@@ -363,7 +367,7 @@ end
 get '/quit' do
   load_bridge
   @bridge.send_quit nickname
-  load_bridge
+  delete_twitter_user if twitter_user?
   clear_cookies
   redirect '/'
 end
@@ -403,8 +407,8 @@ get '/twitter_auth' do
 
     # TODO: Make this cope if someone has the same name
     room = '#jschat'
-    save_nickname @twitter.info['screen_name']
     user = load_twitter_user
+    save_nickname user['name']
     session[:jschat_id] = user['jschat_id'] if user['jschat_id'] and !user['jschat_id'].empty?
     save_twitter_user('twitter_name' => @twitter.info['screen_name'], 'jschat_id' => session[:jschat_id])
     user = load_twitter_user
@@ -415,6 +419,7 @@ get '/twitter_auth' do
         room = user['rooms'].first
       end
     else
+      # Reconnect
       session[:jschat_id] = nil
       load_and_connect
       save_twitter_user('jschat_id' => session[:jschat_id])

data/lib/jschat/server.rb

@@ -372,7 +372,7 @@ module JsChat
     Array.new(8, '').collect { chars[rand(chars.size)] }.join
   end
 
-  def register_stateless_cient
+  def register_stateless_client
     @stateless_cookie = new_cookie
     user = User.new(self)
     @@stateless_cookies << { :cookie => @stateless_cookie, :user => user }
@@ -510,7 +510,7 @@ module JsChat
       if input.has_key? 'protocol'
         if input['protocol'] == 'stateless'
           @stateless = true
-          response << send_response(register_stateless_cient)
+          response << send_response(register_stateless_client)
         end
       elsif input.has_key? 'identify'
         input['ip'] ||= get_remote_ip

data/lib/jschat/storage/mongo.rb

@@ -24,7 +24,7 @@ module JsChat::Storage
     end
 
     def self.lastlog(number, room)
-      @db['events'].find({ :room => room }, { :limit => number, :sort => ['time', Mongo::DESCENDING] }).to_a
+      @db['events'].find({ :room => room }, { :limit => number, :sort => ['time', Mongo::DESCENDING] }).to_a.reverse
     end
 
     # TODO: use twitter oauth for the key
@@ -36,11 +36,8 @@ module JsChat::Storage
       @db['users'].save user
     end
 
-    def self.set_rooms(name, rooms)
-      user = find_user({ 'name' => name })
-      user ||= { 'name' => name }
-      user['rooms'] = rooms
-      save_user user
+    def self.delete_user(user)
+      @db['users'].remove user
     end
 
     def self.available?

data/lib/jschat/storage/null.rb

@@ -20,7 +20,7 @@ module JsChat::Storage
     def self.save_user(user)
     end
 
-    def self.set_rooms(name, rooms)
+    def self.delete_user(user)
     end
   end
 end

metadata

@@ -1,12 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: jschat
 version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 2
-  - 6
-  version: 0.2.6
+  version: 0.2.7
 platform: ruby
 authors: 
 - Alex R. Young
@@ -19,74 +14,54 @@ default_executable: bin/jschat-server
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: sinatra
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 9
-        - 4
         version: 0.9.4
-  type: :runtime
-  version_requirements: *id001
+    version: 
 - !ruby/object:Gem::Dependency 
   name: json
-  prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 1
-        - 9
         version: 1.1.9
-  type: :runtime
-  version_requirements: *id002
+    version: 
 - !ruby/object:Gem::Dependency 
   name: sprockets
-  prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 0
-        - 2
         version: 1.0.2
-  type: :runtime
-  version_requirements: *id003
+    version: 
 - !ruby/object:Gem::Dependency 
   name: eventmachine
-  prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 12
-        - 8
         version: 0.12.8
-  type: :runtime
-  version_requirements: *id004
+    version: 
 - !ruby/object:Gem::Dependency 
   name: ncurses
-  prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 9
-        - 1
         version: 0.9.1
-  type: :runtime
-  version_requirements: *id005
+    version: 
 description: JsChat is a JSON-based web and console chat app.
 email: alex@alexyoung.org
 executables: 
@@ -101,14 +76,21 @@ files:
 - bin/jschat-client
 - bin/jschat-server
 - bin/jschat-web
+- lib/jschat
 - lib/jschat/client.rb
 - lib/jschat/errors.rb
 - lib/jschat/flood_protection.rb
+- lib/jschat/http
+- lib/jschat/http/config
 - lib/jschat/http/config/sprockets.yml
 - lib/jschat/http/config.ru
+- lib/jschat/http/helpers
 - lib/jschat/http/helpers/url_for.rb
 - lib/jschat/http/jschat.rb
+- lib/jschat/http/public
 - lib/jschat/http/public/favicon.ico
+- lib/jschat/http/public/images
+- lib/jschat/http/public/images/emoticons
 - lib/jschat/http/public/images/emoticons/angry.gif
 - lib/jschat/http/public/images/emoticons/arr.gif
 - lib/jschat/http/public/images/emoticons/blink.gif
@@ -161,25 +143,37 @@ files:
 - lib/jschat/http/public/images/emoticons/yucky.gif
 - lib/jschat/http/public/images/jschat.gif
 - lib/jschat/http/public/images/shadow.png
+- lib/jschat/http/public/javascripts
+- lib/jschat/http/public/javascripts/app
+- lib/jschat/http/public/javascripts/app/controllers
 - lib/jschat/http/public/javascripts/app/controllers/chat_controller.js
 - lib/jschat/http/public/javascripts/app/controllers/signon_controller.js
+- lib/jschat/http/public/javascripts/app/helpers
 - lib/jschat/http/public/javascripts/app/helpers/emote_helper.js
 - lib/jschat/http/public/javascripts/app/helpers/form_helpers.js
 - lib/jschat/http/public/javascripts/app/helpers/link_helper.js
 - lib/jschat/http/public/javascripts/app/helpers/page_helper.js
 - lib/jschat/http/public/javascripts/app/helpers/text_helper.js
+- lib/jschat/http/public/javascripts/app/lib
 - lib/jschat/http/public/javascripts/app/lib/split.js
+- lib/jschat/http/public/javascripts/app/models
 - lib/jschat/http/public/javascripts/app/models/cookie.js
+- lib/jschat/http/public/javascripts/app/protocol
 - lib/jschat/http/public/javascripts/app/protocol/change.js
 - lib/jschat/http/public/javascripts/app/protocol/chat_request.js
 - lib/jschat/http/public/javascripts/app/protocol/display.js
+- lib/jschat/http/public/javascripts/app/ui
 - lib/jschat/http/public/javascripts/app/ui/commands.js
 - lib/jschat/http/public/javascripts/app/ui/tab_completion.js
 - lib/jschat/http/public/javascripts/init.js
+- lib/jschat/http/public/stylesheets
 - lib/jschat/http/public/stylesheets/iphone.css
 - lib/jschat/http/public/stylesheets/screen.css
+- lib/jschat/http/script
 - lib/jschat/http/script/sprockets.rb
+- lib/jschat/http/tmp
 - lib/jschat/http/tmp/restart.txt
+- lib/jschat/http/views
 - lib/jschat/http/views/form.erb
 - lib/jschat/http/views/index.erb
 - lib/jschat/http/views/iphone.erb
@@ -189,6 +183,7 @@ files:
 - lib/jschat/init.rb
 - lib/jschat/server.rb
 - lib/jschat/server_options.rb
+- lib/jschat/storage
 - lib/jschat/storage/init.rb
 - lib/jschat/storage/mongo.rb
 - lib/jschat/storage/null.rb
@@ -199,8 +194,6 @@ files:
 - MIT-LICENSE
 has_rdoc: false
 homepage: http://github.com/alexyoung/jschat
-licenses: []
-
 post_install_message: 
 rdoc_options: []
 
@@ -210,22 +203,20 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
+  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
+  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.3.1
 signing_key: 
-specification_version: 3
+specification_version: 2
 summary: JsChat features a chat server, client and web app.
 test_files: []