lib/uncharted/territory.rb in uncharted-0.0.11 vs lib/uncharted/territory.rb in uncharted-0.0.12

@@ -54,11 +54,11 @@
     def to_s
       @abbr
     end
     
     def self.find(object)
-      territory = object.is_a?(Territory) ? object : data[object]
+      territory = object && object.is_a?(Territory) ? object : data[object]
     end
    
     def self.data
       @data ||= {}
     end
@@ -71,9 +71,13 @@
         size = intersection.size
         return territory if size == territory.names.size
         closest = [territory, size] if closest.last < size 
       end
       return closest.first
+    end
+    
+    def self.search(object)
+      find(object) || find_by_name(object)
     end
     
 
   end
 
\ No newline at end of file