added searching

Author: Jeff Dickey

.gitignore

@@ -3,6 +3,8 @@ log/*.log
 pkg/
 test/dummy/db/*.sqlite3
 test/dummy/log/*.log
+test/dummy/log/*.lck
+test/dummy/solr
 test/dummy/public/uploads
 test/dummy/tmp/
 .sass-cache

Gemfile

@@ -10,7 +10,9 @@ gem 'carrierwave'
 gem "jquery-rails"
 gem 'coffee-rails'
 gem 'sass-rails'
+gem 'sunspot_rails'
 
 group :development, :test do
   gem 'sqlite3'
+  gem 'sunspot_solr'
 end

Gemfile.lock

@@ -1,11 +1,12 @@
 GIT
   remote: git://github.com/dickeytk/mailboxer
-  revision: 18b7aad4ac06265c952a30f212db6ead1c8cc94a
+  revision: 5c8cdb8044b6710b5762dec38d17bb883362c075
   specs:
     mailboxer (0.5.4)
       carrierwave (>= 0.5.8)
       foreigner (>= 0.9.1)
       rails (>= 3.1.0)
+      sunspot_rails (>= 1.3.0)
 
 PATH
   remote: .
@@ -61,7 +62,8 @@ GEM
       orm_adapter (~> 0.0.3)
       warden (~> 1.1)
     erubis (2.7.0)
-    execjs (1.2.9)
+    escape (0.0.4)
+    execjs (1.2.11)
       multi_json (~> 1.0)
     foreigner (1.1.1)
       activerecord (>= 3.0.0)
@@ -78,8 +80,10 @@ GEM
       treetop (~> 1.4.8)
     mime-types (1.17.2)
     multi_json (1.0.4)
+    nokogiri (1.5.0)
     orm_adapter (0.0.5)
     polyglot (0.3.3)
+    pr_geohash (1.0.0)
     rack (1.3.5)
     rack-cache (1.1)
       rack (>= 0.4)
@@ -107,6 +111,8 @@ GEM
     rake (0.9.2.2)
     rdoc (3.11)
       json (~> 1.4)
+    rsolr (1.0.6)
+      builder (>= 2.1.2)
     sass (3.1.11)
     sass-rails (3.1.5)
       actionpack (~> 3.1.0)
@@ -121,6 +127,15 @@ GEM
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
     sqlite3 (1.3.5)
+    sunspot (1.3.0)
+      escape (~> 0.0.4)
+      pr_geohash (~> 1.0)
+      rsolr (~> 1.0.6)
+    sunspot_rails (1.3.0)
+      nokogiri
+      sunspot (= 1.3.0)
+    sunspot_solr (1.3.0)
+      escape (~> 0.0.4)
     thor (0.14.6)
     tilt (1.3.3)
     treetop (1.4.10)
@@ -144,3 +159,5 @@ DEPENDENCIES
   sass-rails
   simple_form
   sqlite3
+  sunspot_rails
+  sunspot_solr

README.md

@@ -35,3 +35,18 @@ Start the server!
 ````
 $ rails server
 ````
+
+Enabling Search
+===============
+
+To enable search, install the config file
+
+````
+$ rails g sunspot_rails:install
+````
+
+Run the development solr server
+
+````
+$ rake sunspot:solr:start
+````

app/assets/stylesheets/messaging/messages.sass

@@ -64,6 +64,8 @@ nav
       color: white
       text-align: center
       margin-bottom: 40px
+  form
+    margin: 10px 0
 
 ul.ui-autocomplete
   position: absolute
@@ -136,6 +138,8 @@ h2
     padding: 10px 5px
   tr
     border-bottom: 1px solid #bbb
+  .unread
+    font-weight: bold
 
 #reply
   margin-top: 10px

app/controllers/messaging/messages_controller.rb

@@ -61,5 +61,11 @@ def untrash
       flash[:notice] = "Message untrashed."
       redirect_to messages_path(box: 'inbox')
     end
+
+    def search
+      @search = params[:search]
+      @messages = current_user.search_messages(@search)
+      render :index
+    end
   end
 end

app/views/layouts/messaging/application.html.haml

@@ -52,6 +52,8 @@
               = link_to "Trash", messages_path(box: 'trash'), class: 'selected'
             -else
               = link_to "Trash", messages_path(box: 'trash')
+            = form_tag search_path do
+              %input{ type: 'search', placeholder: 'Search', name: 'search' }
         #main.grid_10
           = yield
     #footer

app/views/messaging/messages/index.html.haml

@@ -1,3 +1,5 @@
+- if @search
+  %h2 Search results for '#{@search}'
 - if @box == 'inbox'
   %h2 Inbox
 - if @box == 'sent'
@@ -15,7 +17,7 @@
       %th Messages
       %th
     - @messages.each do |m|
-      %tr
+      %tr{ class: "#{ 'unread' if m.is_unread?(current_user) }" }
         - unless @box == 'trash'
           %td= check_box_tag '', m.id, false, class: 'delete_multiple_checkbox', name: "conversations[]"
         %td= link_to m.last_sender, message_path(m)

config/routes.rb

@@ -8,5 +8,6 @@
       delete 'trash'
     end
   end
+  post 'search' => 'messages#search'
   root to: 'messages#index'
 end