jschat 0.3.1 → 0.3.2

data/lib/jschat/http/jschat.rb

@@ -99,6 +99,11 @@ class JsChat::Bridge
     response['messages']
   end
 
+  def search(phrase, room)
+    response = send_json({ :search => phrase, :room => room })
+    response['messages']
+  end
+
   def recent_messages(room)
     send_json({ 'since' => room })['messages']
   end
@@ -333,6 +338,13 @@ get '/lastlog' do
   end
 end
 
+get '/search' do
+  load_bridge
+  if @bridge.active?
+    messages_js @bridge.search(params['q'], params['room'])
+  end
+end
+
 post '/join' do
   load_bridge
   @bridge.join params['room']

data/lib/jschat/http/public/javascripts/app/ui/commands.js

@@ -12,6 +12,7 @@ var UserCommands = {
     help.push(['/join #room_name', 'Joins a room']);
     help.push(['/part #room_name', 'Leaves a room.  Leave room_name blank for the current room']);
     help.push(['/lastlog', 'Shows recent activity']);
+    help.push(['/search query', 'Searches the logs for this room']);
     help.push(['/names', 'Refreshes the names list']);
     help.push(['/name new_name', 'Changes your name']);
     help.push(['/toggle images', 'Toggles showing of images and videos']);
@@ -38,6 +39,17 @@ var UserCommands = {
     }.bind(this));
   },
 
+  '/search\\s+(.*)': function(query) {
+    query = query[1];
+    this.pausePollers = true;
+    $('messages').innerHTML = '';
+    JsChat.Request.get('/search?q=' + query, function(transport) {
+      Display.add_message('Search results:', 'server');
+      this.displayMessages(transport.responseText);
+      this.pausePollers = false;
+    }.bind(this));
+  },
+
   '/(name|nick)\\s+(.*)': function(name) {
     name = name[2];
     new Ajax.Request('/change-name', {

data/lib/jschat/server.rb

@@ -151,6 +151,10 @@ module JsChat
       { 'display' => 'messages', 'messages' => messages_since(since) }
     end
 
+    def search(query, limit = 100)
+      { 'display' => 'messages', 'messages' => message_search(query, limit) }
+    end
+
     def last_update_time
       message = JsChat::Storage.driver.lastlog(LASTLOG_DEFAULT, name).last
       message['time'] if message
@@ -165,6 +169,10 @@ module JsChat
       end
     end
 
+    def message_search(query, limit)
+      JsChat::Storage.driver.search(query, name, limit)
+    end
+
     def add_to_lastlog(message)
       if message
         message['time'] = Time.now.utc
@@ -277,6 +285,15 @@ module JsChat
     end
   end
 
+  def search(query, options = {})
+    room = Room.find options['room']
+    if room and room.users.include? @user
+      room.search query
+    else
+      Error.new(:not_in_room, "Please join this room first")
+    end
+  end
+
   def since(room, options = {})
     room = Room.find room
     if room and room.users.include? @user
@@ -519,7 +536,7 @@ module JsChat
         input['ip'] ||= get_remote_ip
         response << send_response(identify(input['identify'], input['ip'], input['session_length']))
       else
-        %w{lastlog change send join names part since ping list quit times}.each do |command|
+        %w{search lastlog change send join names part since ping list quit times}.each do |command|
           if @user.name.nil?
             response << send_response(Error.new(:identity_required, 'Identify first'))
             return response

data/lib/jschat/storage/mongo.rb

@@ -27,6 +27,13 @@ module JsChat::Storage
       @db['events'].find({ :room => room }, { :limit => number, :sort => ['time', Mongo::DESCENDING] }).to_a.reverse
     end
 
+    def self.search(query, room, limit)
+      query = /\b#{query}\b/i
+      @db['events'].find({ 'message.message' => query },
+        { :limit => limit, :sort => ['time', Mongo::DESCENDING] }
+      ).to_a.reverse
+    end
+
     # TODO: use twitter oauth for the key
     def self.find_user(options)
       @db['users'].find_one(options)

data/lib/jschat/storage/null.rb

@@ -14,6 +14,13 @@ module JsChat::Storage
       @messages.select { |m| m['room'] == room }.reverse[0..number].reverse
     end
 
+    def self.search(query, room, limit)
+      @messages ||= []
+      @messages.select do |m|
+        m['message'] and m['message']['message'].match(query)
+      end.reverse[0..limit].reverse
+    end
+
     def self.find_user(options)
     end
 

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 3
-  - 1
-  version: 0.3.1
+  - 2
+  version: 0.3.2
 platform: ruby
 authors: 
 - Alex R. Young