Merge pull request #9 from bengler/handle-ack-not-found

Return 404 if record not found

api/v1.rb

@@ -12,6 +12,10 @@ class KuduV1 < Sinatra::Base
 
   register Sinatra::Pebblebed
 
+  error ActiveRecord::RecordNotFound do
+    halt 404, "Record not found"
+  end
+
   before do
     response.headers['Cache-Control'] = 'public, max-age=300'
 

lib/kudu/score.rb

@@ -38,9 +38,10 @@ def calculate_all
       end
     end
 
-    def pick(already_picked, resultset, number, random)
+    def pick(already_picked, resultset, number, random, seed = nil)
       picked = []
       until resultset.empty? || picked.size == number
+        srand seed if seed
         pos = random ? rand(resultset.length) : 0
         score = resultset.delete_at(pos)
         picked << score unless already_picked.include?(score.id)
@@ -69,7 +70,7 @@ def combine_resultsets(params)
       sampled = segments.map do |segment|
 
         results = Score.by_field(segment.query_parameters)
-        sampled = Score.pick(picked, results, segment.share_of_results, segment.randomize)
+        sampled = Score.pick(picked, results, segment.share_of_results, segment.randomize, params[:random_seed])
 
         picked |= sampled.map(&:id)
         remaining.concat results

spec/api/v1/acks_spec.rb

@@ -59,6 +59,7 @@ def get(url, *args)
   }
 
   describe 'GET /acks/:uid' do
+
     it 'returns an ack' do
       an_ack
       get "/acks/#{an_ack.uid}"
@@ -68,6 +69,12 @@ def get(url, *args)
       ack_response['ack']['kind'].should eq 'kudos'
       ack_response['ack']['uid'].should eq an_ack.uid
     end
+
+    it 'returns 404 if not found' do
+      get "/acks/post:realm.some.non.existing.post$1"
+      last_response.status.should eq 404
+    end
+
   end
 
   # FIXME: Most of these examples are testing functionality of

spec/score_collection_spec.rb

@@ -135,6 +135,7 @@ def create_scores
     params = {
       :limit => 4,
       "shuffle" => true,
+      "random_seed" => 4, # pass seed in order to get same test result every time
       :include_own => false,
       :segments => [
         {
@@ -153,8 +154,6 @@ def create_scores
     }
 
     results = []
-    # Every time you run combine_resultsets it should give you a new combination
-    # ... thus: doing it five times, should be five different sets. Most of the time.
     5.times do
       results << Score.combine_resultsets(params).map(&:external_uid)
     end