sync

config/initializers/cookie_verification_secret.rb

@@ -1,7 +0,0 @@
-# Be sure to restart your server when you modify this file.
-
-# Your secret key for verifying the integrity of signed cookies.
-# If you change this key, all old signed cookies will become invalid!
-# Make sure the secret is at least 30 characters and all random, 
-# no regular words or you'll be exposed to dictionary attacks.
-ActionController::Base.cookie_verifier_secret = '214c98302eef905ab8bce4a19562e322097c526f28e718160a3c0d617ddc8edab6ae7e22cb5eec8930e215bfb936a7086d6f5b146c0092a9af1884613ce0a260'

config/initializers/core_extensions.rb

@@ -1,31 +1,37 @@
+module Danbooru
+  module Extensions
+    module ActiveRecord
+      %w(execute select_value select_values select_all).each do |method_name|
+        define_method("#{method_name}_sql") do |sql, *params|
+          connection.__send__(method_name, self.class.sanitize_sql_array([sql, *params]))
+        end
+
+        self.class.__send__(:define_method, "#{method_name}_sql") do |sql, *params|
+          connection.__send__(method_name, sanitize_sql_array([sql, *params]))
+        end
+      end
+    end
+
+    module String
+      def to_escaped_for_sql_like
+        return self.gsub(/\\/, '\0\0').gsub(/%/, '\\%').gsub(/_/, '\\_').gsub(/\*/, '%')
+      end
+
+      def to_escaped_js
+        return self.gsub(/\\/, '\0\0').gsub(/['"]/) {|m| "\\#{m}"}.gsub(/\r\n|\r|\n/, '\\n')
+      end
+    end
+  end
+end
+
 class ActiveRecord::Base
   class << self    
     public :sanitize_sql_array
   end
-  
-  %w(execute select_value select_values select_all).each do |method_name|
-    define_method("#{method_name}_sql") do |sql, *params|
-      connection.__send__(method_name, self.class.sanitize_sql_array([sql, *params]))
-    end
 
-    self.class.__send__(:define_method, "#{method_name}_sql") do |sql, *params|
-      connection.__send__(method_name, sanitize_sql_array([sql, *params]))
-    end
-  end
-end
-
-class NilClass
-  def id
-    raise NoMethodError
-  end
+  include Danbooru::Extensions::ActiveRecord
 end
 
 class String
-  def to_escaped_for_sql_like
-    return self.gsub(/\\/, '\0\0').gsub(/%/, '\\%').gsub(/_/, '\\_').gsub(/\*/, '%')
-  end
-
-  def to_escaped_js
-    return self.gsub(/\\/, '\0\0').gsub(/['"]/) {|m| "\\#{m}"}.gsub(/\r\n|\r|\n/, '\\n')
-  end
+  include Danbooru::Extensions::String
 end

config/initializers/inflections.rb

@@ -1,3 +1,10 @@
-ActiveSupport::Inflector.inflections do |inflect|
-  inflect.uncountable %w( user_feedback )
-end
+# Be sure to restart your server when you modify this file.
+
+# Add new inflection rules using the following format
+# (all these examples are active by default):
+# ActiveSupport::Inflector.inflections do |inflect|
+#   inflect.plural /^(ox)$/i, '\1en'
+#   inflect.singular /^(ox)en/i, '\1'
+#   inflect.irregular 'person', 'people'
+#   inflect.uncountable %w( fish sheep )
+# end

config/initializers/session_store.rb

@@ -1,15 +1,8 @@
 # Be sure to restart your server when you modify this file.
 
-# Your secret key for verifying cookie session data integrity.
-# If you change this key, all old sessions will become invalid!
-# Make sure the secret is at least 30 characters and all random, 
-# no regular words or you'll be exposed to dictionary attacks.
-ActionController::Base.session = {
-  :key    => '_danbooru_session',
-  :secret => '3102c705148af8124298f9e89d45da3d26e47cc4d9a67cb1c8d9c42c008ee253786346efda50331bb14811f1f445c1c9ed2d51597ad2017328de0dd263048d1a'
-}
+Danbooru::Application.config.session_store :cookie_store, :key => '_config_session'
 
 # Use the database for sessions instead of the cookie-based default,
 # which shouldn't be used to store highly confidential information
 # (create the session table with "rake db:sessions:create")
-# ActionController::Base.session_store = :active_record_store
+# Config::Application.config.session_store :active_record_store