Move getting similar requests to the InfoRequest model.

4 files changed, 38 insertions, 14 deletions

diff --git a/app/controllers/request_controller.rb b/app/controllers/request_controller.rb
index 388473b51..341ecdcd5 100644
--- a/app/controllers/request_controller.rb
+++ b/app/controllers/request_controller.rb
@@ -92,15 +92,6 @@ class RequestController < ApplicationController
 
             # Sidebar stuff
             @sidebar = true
-            # ... requests that have similar imporant terms
-            begin
-                limit = 10
-                @xapian_similar = ActsAsXapian::Similar.new([InfoRequestEvent], @info_request.info_request_events,
-                  :limit => limit, :collapse_by_prefix => 'request_collapse')
-                @xapian_similar_more = (@xapian_similar.matches_estimated > limit)
-            rescue
-                @xapian_similar = nil
-            end
             # Track corresponding to this page
             @track_thing = TrackThing.create_track_for_request(@info_request)
             @feed_autodetect = [ { :url => do_track_url(@track_thing, 'feed'), :title => @track_thing.params[:title_in_rss], :has_json => true } ]
diff --git a/app/models/info_request.rb b/app/models/info_request.rb
index 9463a236e..4b76269e3 100644
--- a/app/models/info_request.rb
+++ b/app/models/info_request.rb
@@ -1212,6 +1212,21 @@ public
       end
     end
 
+
+    # Get requests that have similar important terms
+    def similar_requests(limit=10)
+        xapian_similar = nil
+        xapian_similar_more = false
+        begin
+            xapian_similar = ActsAsXapian::Similar.new([InfoRequestEvent],
+                                                       info_request_events,
+                                                       :limit => limit,
+                                                       :collapse_by_prefix => 'request_collapse')
+            xapian_similar_more = (xapian_similar.matches_estimated > limit)
+        rescue
+        end
+        return [xapian_similar, xapian_similar_more]
+    end
     private
 
     def set_defaults
diff --git a/app/views/request/_sidebar.html.erb b/app/views/request/_sidebar.html.erb
index 8d4a4a2d8..2659a7989 100644
--- a/app/views/request/_sidebar.html.erb
+++ b/app/views/request/_sidebar.html.erb
@@ -52,12 +52,13 @@
     <%= render :partial => 'request/next_actions' %>
 
     <% # TODO: Cache for 1 day %>
-      <% if !@xapian_similar.nil? && @xapian_similar.results.size > 0 %>
+      <% xapian_similar, xapian_similar_more = @info_request.similar_requests %>
+      <% if !xapian_similar.nil? && xapian_similar.results.size > 0 %>
         <h2><%= _('Similar requests')%></h2>
-        <% for result in @xapian_similar.results %>
+        <% for result in xapian_similar.results %>
             <%= render :partial => 'request/request_listing_short_via_event', :locals => { :event => result[:model], :info_request => result[:model].info_request } %>
         <% end %>
-        <% if @xapian_similar_more %>
+        <% if xapian_similar_more %>
             <p><%= link_to _("More similar requests"), similar_request_path(@info_request.url_title) %></p>
         <% end %>
       <% end %>
diff --git a/spec/models/info_request_spec.rb b/spec/models/info_request_spec.rb
index 64ad1972e..ed7c55bb8 100644
--- a/spec/models/info_request_spec.rb
+++ b/spec/models/info_request_spec.rb
@@ -27,7 +27,7 @@ require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 
 describe InfoRequest do
 
-    describe 'when validating', :focus => true do
+    describe 'when validating' do
 
         it 'should accept a summary with ascii characters' do
             info_request = InfoRequest.new(:title => 'abcde')
@@ -1030,7 +1030,7 @@ describe InfoRequest do
                 end
             end
 
-            context "another series of events on a request", :focus => true do
+            context "another series of events on a request" do
                 it "should have sensible event states" do
                     # An initial request is sent
                     request.log_event('sent', {})
@@ -1122,5 +1122,22 @@ describe InfoRequest do
 
     end
 
+    describe InfoRequest, 'when getting similar requests' do
+
+        before(:each) do
+            get_fixtures_xapian_index
+        end
+
+        it 'should return similar requests' do
+            similar, more = info_requests(:spam_1_request).similar_requests(1)
+            similar.results.first[:model].info_request.should == info_requests(:spam_2_request)
+        end
+
+        it 'should return a flag set to true' do
+            similar, more = info_requests(:spam_1_request).similar_requests(1)
+            more.should be_true
+        end
+
+    end
 
 end