diff app/models/paste.rb @ 330:96631607785f

Even more coding style.
author edogawaconan <me@myconan.net>
date Mon, 14 Apr 2014 17:17:32 +0900
parents 61f7f258a6fb
children 6e3e1e7b0212
line wrap: on
line diff
--- a/app/models/paste.rb	Mon Apr 14 17:13:22 2014 +0900
+++ b/app/models/paste.rb	Mon Apr 14 17:17:32 2014 +0900
@@ -16,7 +16,7 @@
     id, secret = raw_id.to_s.split("-")
     return unless id.to_i.to_s == id
     begin
-      self.where(:secret => secret).find(id)
+      where(:secret => secret).find(id)
     rescue ActiveRecord::RecordNotFound
       nil
     end
@@ -52,29 +52,29 @@
   end
 
   def set_paste_secret
-    self.secret = SecureRandom.hex(4) if self.is_private?
+    self.secret = SecureRandom.hex(4) if is_private?
   end
 
   def is_private?
-    self.is_private == "1"
+    is_private == "1"
   end
 
   def convert_newlines
-    self.paste = self.paste.to_s.gsub("\r\n", "\n").gsub("\r", "\n")
+    self.paste = paste.to_s.gsub("\r\n", "\n").gsub("\r", "\n")
   end
 
   def paste_limit
-    ip_post_recent_count = self.class.where(:ip => self.ip).where('created_at > ?', Time.now - 1.hour).count
+    ip_post_recent_count = self.class.where(:ip => ip).where("created_at > ?", Time.now - 1.hour).count
     errors.add :base, :limit if ip_post_recent_count > 100
   end
 
   def self.fix_all
     stats = Hash.new(0)
-    self.all.each do |p|
+    all.each do |p|
       p.save
       stats[:count] += 1
       stats[:private] += 1 if p.secret
     end
-    return stats
+    stats
   end
 end