# HG changeset patch
# User nanaya <me@myconan.net>
# Date 1445836153 -32400
# Node ID 9369ad2f2ce814d678623cfd35db043cfd7a55b1
# Parent  967233b2640486cd13f1c3595d52b4670072d81c
Simplify logic

diff -r 967233b26404 -r 9369ad2f2ce8 app/models/paste.rb
--- a/app/models/paste.rb	Sat Sep 26 03:56:24 2015 +0900
+++ b/app/models/paste.rb	Mon Oct 26 14:09:13 2015 +0900
@@ -15,13 +15,9 @@
   end
 
   def self.safe_find(raw_id)
-    id, secret = raw_id.to_s.split("-")
-    return unless id.to_i.to_s == id
-    begin
-      where(:secret => secret).find(id)
-    rescue ActiveRecord::RecordNotFound
-      nil
-    end
+    /\A(?<id>[0-9]+)(?:-(?<secret>[0-9a-f]+))?\z/ =~ raw_id.to_s
+
+    where(:secret => secret, :id => id)
   end
 
   def self.graceful_create(params)