# HG changeset patch # User edogawaconan # Date 1397463452 -32400 # Node ID 96631607785f79d6c2d46ff4230c2ec25af71635 # Parent 430dadffd91ed5aa66000530cd833864295c59c0 Even more coding style. diff -r 430dadffd91e -r 96631607785f app/models/paste.rb --- 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 diff -r 430dadffd91e -r 96631607785f config/boot.rb --- a/config/boot.rb Mon Apr 14 17:13:22 2014 +0900 +++ b/config/boot.rb Mon Apr 14 17:17:32 2014 +0900 @@ -1,6 +1,6 @@ -require 'rubygems' +require "rubygems" # Set up gems listed in the Gemfile. -ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__) +ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile", __FILE__) -require 'bundler/setup' if File.exists?(ENV['BUNDLE_GEMFILE']) +require "bundler/setup" if File.exists?(ENV["BUNDLE_GEMFILE"]) diff -r 430dadffd91e -r 96631607785f config/default_config.rb --- a/config/default_config.rb Mon Apr 14 17:13:22 2014 +0900 +++ b/config/default_config.rb Mon Apr 14 17:17:32 2014 +0900 @@ -1,5 +1,5 @@ -CONFIG['standalone'] = true if CONFIG['standalone'].nil? -CONFIG['newrelic'] = false if CONFIG['newrelic'].nil? -CONFIG['bundler_groups'] ||= [:default, Rails.env] -CONFIG['bundler_groups'] << 'standalone' if CONFIG['standalone'] -CONFIG['bundler_groups'] << 'newrelic' if CONFIG['newrelic'] +CONFIG["standalone"] = true if CONFIG["standalone"].nil? +CONFIG["newrelic"] = false if CONFIG["newrelic"].nil? +CONFIG["bundler_groups"] ||= [:default, Rails.env] +CONFIG["bundler_groups"] << "standalone" if CONFIG["standalone"] +CONFIG["bundler_groups"] << "newrelic" if CONFIG["newrelic"] diff -r 430dadffd91e -r 96631607785f config/initializers/secret_token.rb --- a/config/initializers/secret_token.rb Mon Apr 14 17:13:22 2014 +0900 +++ b/config/initializers/secret_token.rb Mon Apr 14 17:17:32 2014 +0900 @@ -1,1 +1,1 @@ -Zeropaste::Application.config.secret_key_base = CONFIG['secret_key'] +Zeropaste::Application.config.secret_key_base = CONFIG["secret_key"]