Better way to find latest version by name

sj26 · Aug 1, 2012 · c5bd388 · c5bd388
1 parent 1a4c7a5
commit c5bd388
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/app/controllers/versions_controller.rb b/app/controllers/versions_controller.rb
@@ -43,7 +43,7 @@ def search?
   def prepare_version
     @version = Version.find_by_full_name! params[:id]
   rescue ActiveRecord::RecordNotFound
-    if @version = Version.ordered.not_prerelease.find_by_name(params[:id])
+    if @version = Version.find_using_name(params[:id])
       redirect_to @version
     else
       redirect_to versions_path(search: params[:id])

diff --git a/app/models/version.rb b/app/models/version.rb
@@ -25,6 +25,11 @@ def self.ordered
     order("name ASC", "version_order ASC", "created_at DESC")
   end
 
+  def self.find_using_name name
+    where(name: name).not_prerelease.ordered.first or
+      where(name: name).ordered.first
+  end
+
   def full_name
     "#{name}-#{version}#{"-#{platform}" unless platform.nil? or platform == "ruby"}"
   end