From ec6d9d5146a67861434b7a031df34c0e14183926 Mon Sep 17 00:00:00 2001
From: Dan Buch <daniel.buch@gmail.com>
Date: Thu, 8 Mar 2012 18:58:02 -0500
Subject: [PATCH] More touchup in map pair generation while thinking about mash
 storage

---
 rails/map-mash/app/models/map.rb | 17 ++---------------
 1 file changed, 2 insertions(+), 15 deletions(-)

diff --git a/rails/map-mash/app/models/map.rb b/rails/map-mash/app/models/map.rb
index c738ee3..3ccd4b1 100644
--- a/rails/map-mash/app/models/map.rb
+++ b/rails/map-mash/app/models/map.rb
@@ -2,31 +2,18 @@ require 'fastercsv'
 
 
 class Map < ActiveRecord::Base
-  named_scope :lowest_scoring, :conditions => [
-      %{`maps`.`points` = (
-          SELECT `points` FROM `maps`
-          ORDER BY `points` ASC
-          LIMIT 1
-      )}]
-
   def self.from_city_name(city_name)
     self.find_or_initialize_by_name(city_name).save!
   end
 
   def self.pair
-    if Mash.count == 0
-      self.all(:order => 'RANDOM()', :limit => 2)
-    else
-      self.lowest_scoring.all(:order => 'RANDOM()', :limit => 2)
-    end
+    self.all(:order => 'RANDOM()', :limit => 2)
   end
 
   def self.import(csv_filename)
     FasterCSV.parse(open(csv_filename), :headers => true,
         :header_converters => [:downcase, :symbol]).each do |row|
-      map = self.find_or_initialize_by_name(
-        "#{row[:city]}, #{row[:region]}"
-      )
+      map = self.find_or_initialize_by_name("#{row[:city]}, #{row[:region]}")
       map.save
       if block_given?
         yield map