Refactor config/ directory

* Get rid of early pathname requirement
* Use require_relative where approciate
* Drop unused files
* Imported new application.rb, environment.rb and environments/* from fresh Rails app
* Cleaned up boot.rb
* Load config in boot.rb
* Deduplicate environments/integration*.rb
* Move username blacklist into defaults.yml
* Ruby 1.9 Hash syntax everywhere
* Reorganize lib/diaspora/markdownify to match conventions
* Get rid of full path requires where possible
* Add dummy content to production section diaspora.yml.example to prevent warning
* Drop sqlite? method
* Move postgres? method into ConfigurationMethods
* Drop token authentication from User

17 files changed, 44 insertions, 80 deletions

diff --git a/config/initializers/acts_as_taggable_on.rb b/config/initializers/acts_as_taggable_on.rb
index d42a381b1..bfc309bf2 100644
--- a/config/initializers/acts_as_taggable_on.rb
+++ b/config/initializers/acts_as_taggable_on.rb
@@ -1,2 +1,2 @@
+require 'models/acts_as_taggable_on/tag'
 ActsAsTaggableOn.force_lowercase = true
-require Rails.root.join("app", "models", "acts_as_taggable_on", "tag")
diff --git a/config/initializers/backtrace_silencers.rb b/config/initializers/backtrace_silencers.rb
deleted file mode 100644
index 95f10f04a..000000000
--- a/config/initializers/backtrace_silencers.rb
+++ /dev/null
@@ -1,11 +0,0 @@
-#   Copyright (c) 2010-2011, Diaspora Inc.  This file is
-#   licensed under the Affero General Public License version 3 or later.  See
-#   the COPYRIGHT file.
-
-# Be sure to restart your server when you modify this file.
-
-# You can add backtrace silencers for libraries that you're using but don't wish to see in your backtraces.
-# Rails.backtrace_cleaner.add_silencer { |line| line =~ /my_noisy_library/ }
-
-# You can also remove all the silencers if you're trying to debug a problem that might stem from framework code.
-# Rails.backtrace_cleaner.remove_silencers!
diff --git a/config/initializers/carrierwave.rb b/config/initializers/carrierwave.rb
index b86e52528..0321d5242 100644
--- a/config/initializers/carrierwave.rb
+++ b/config/initializers/carrierwave.rb
@@ -9,10 +9,10 @@ CarrierWave.configure do |config|
     config.storage = :fog
     config.cache_dir = Rails.root.join('tmp', 'uploads').to_s
     config.fog_credentials = {
-        :provider               => 'AWS',
-        :aws_access_key_id      => AppConfig.environment.s3.key.get,
-        :aws_secret_access_key  => AppConfig.environment.s3.secret.get,
-        :region                 => AppConfig.environment.s3.region.get
+        provider:              'AWS',
+        aws_access_key_id:     AppConfig.environment.s3.key.get,
+        aws_secret_access_key: AppConfig.environment.s3.secret.get,
+        region:                AppConfig.environment.s3.region.get
     }
     if AppConfig.environment.s3.cache?
       config.fog_attributes['Cache-Control'] = 'max-age=31536000'
diff --git a/config/initializers/check_session_secret.rb b/config/initializers/check_session_secret.rb
index 563143dcf..941915356 100644
--- a/config/initializers/check_session_secret.rb
+++ b/config/initializers/check_session_secret.rb
@@ -1,6 +1,6 @@
 if AppConfig.heroku?
   Rails.application.config.secret_token = AppConfig.secret_token
-elsif !File.exists?( Rails.root.join('config', 'initializers', 'secret_token.rb'))
+elsif !Rails.root.join('config', 'initializers', 'secret_token.rb').exist?
   `bundle exec rake generate:secret_token`
   require  Rails.root.join('config', 'initializers', 'secret_token.rb')
 end 
diff --git a/config/initializers/direction_detector.rb b/config/initializers/direction_detector.rb
deleted file mode 100644
index 2f509889b..000000000
--- a/config/initializers/direction_detector.rb
+++ /dev/null
@@ -1,5 +0,0 @@
-#   Copyright (c) 2010-2011, Diaspora Inc.  This file is
-#   licensed under the Affero General Public License version 3 or later.  See
-#   the COPYRIGHT file.
-
-require Rails.root.join('lib', 'direction_detector')
diff --git a/config/initializers/faraday.rb b/config/initializers/faraday.rb
index 30b827fcb..274a998b5 100644
--- a/config/initializers/faraday.rb
+++ b/config/initializers/faraday.rb
@@ -1,9 +1,13 @@
 #   Copyright (c) 2010-2011, Diaspora Inc.  This file is
 #   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
-options = {:timeout => 25}
+options = {
+  timeout: 25,
+  ssl: {
+    ca_file: AppConfig.environment.certificate_authorities.get
+  }
+}
 
-options[:ssl] = {:ca_file => AppConfig.environment.certificate_authorities}
 Faraday.default_connection = Faraday::Connection.new(options) do |b|
   b.use FaradayMiddleware::FollowRedirects
   b.adapter Faraday.default_adapter
diff --git a/config/initializers/haml.rb b/config/initializers/haml.rb
new file mode 100644
index 000000000..83225bbd4
--- /dev/null
+++ b/config/initializers/haml.rb
@@ -0,0 +1,2 @@
+Haml::Template.options[:format] = :html5
+Haml::Template.options[:escape_html] = true
diff --git a/config/initializers/inflections.rb b/config/initializers/inflections.rb
deleted file mode 100644
index ad74fec2a..000000000
--- a/config/initializers/inflections.rb
+++ /dev/null
@@ -1,14 +0,0 @@
-#   Copyright (c) 2010-2011, Diaspora Inc.  This file is
-#   licensed under the Affero General Public License version 3 or later.  See
-#   the COPYRIGHT file.
-
-# 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
diff --git a/config/initializers/json_patch.rb b/config/initializers/json_patch.rb
deleted file mode 100644
index 13e5756d8..000000000
--- a/config/initializers/json_patch.rb
+++ /dev/null
@@ -1,6 +0,0 @@
-class Fixnum
-  def to_json(options = nil)
-    to_s
-  end
-end
-
diff --git a/config/initializers/load_analyitics.rb b/config/initializers/load_analyitics.rb
index f8731f9d3..5663b0901 100644
--- a/config/initializers/load_analyitics.rb
+++ b/config/initializers/load_analyitics.rb
@@ -6,15 +6,14 @@
 if Rails.env == 'production'
   Diaspora::Application.configure do
     if AppConfig.privacy.google_analytics_key.present?
-      config.gem 'rack-google-analytics', :lib => 'rack/google-analytics'
-      config.middleware.use Rack::GoogleAnalytics, :tracker => AppConfig.privacy.google_analytics_key.get
+      require 'rack/google-analytics'
+      config.middleware.use Rack::GoogleAnalytics, tracker: AppConfig.privacy.google_analytics_key.get
     end
 
     if AppConfig.privacy.piwik.enable?
       require 'rack/piwik'
-      config.gem 'rack-piwik', :lib => 'rack/piwik'
-      config.middleware.use Rack::Piwik, :piwik_url => AppConfig.privacy.piwik.host.get, 
-                                         :piwik_id => AppConfig.privacy.piwik.site_id.get
+      config.middleware.use Rack::Piwik, piwik_url: AppConfig.privacy.piwik.host.get,
+                                         piwik_id:  AppConfig.privacy.piwik.site_id.get
     end
   end
 end
diff --git a/config/initializers/load_libraries.rb b/config/initializers/load_libraries.rb
index 4aaa7d6d5..e66da1d87 100644
--- a/config/initializers/load_libraries.rb
+++ b/config/initializers/load_libraries.rb
@@ -19,6 +19,7 @@ require 'markdownify_helper'
 # Our libs
 require 'collect_user_photos'
 require 'diaspora'
+require 'direction_detector'
 require 'email_inviter'
 require 'evil_query'
 require 'federation_logger'
@@ -33,4 +34,3 @@ require 'stream'
 require 'template_picker'
 require 'webfinger'
 require 'webfinger_profile'
-
diff --git a/config/initializers/mailer_config.rb b/config/initializers/mailer_config.rb
index 6cd89dd87..c667fe372 100644
--- a/config/initializers/mailer_config.rb
+++ b/config/initializers/mailer_config.rb
@@ -4,8 +4,10 @@
 require Rails.root.join('lib', 'messagebus', 'mailer')
 
 Diaspora::Application.configure do
-  config.action_mailer.default_url_options = {:protocol => AppConfig.pod_uri.scheme,
-                                              :host => AppConfig.pod_uri.authority }
+  config.action_mailer.default_url_options = {
+    protocol: AppConfig.pod_uri.scheme,
+    host:     AppConfig.pod_uri.authority
+  }
   config.action_mailer.asset_host = AppConfig.pod_uri.to_s
   config.action_mailer.perform_deliveries = AppConfig.mail.enable?
 
@@ -21,26 +23,26 @@ Diaspora::Application.configure do
     elsif AppConfig.mail.method == "sendmail"
       config.action_mailer.delivery_method = :sendmail
       sendmail_settings = {
-        :location => AppConfig.mail.sendmail.location.get
+        location: AppConfig.mail.sendmail.location.get
       }
       sendmail_settings[:arguments] = "-i" if AppConfig.mail.sendmail.exim_fix?
       config.action_mailer.sendmail_settings = sendmail_settings
     elsif AppConfig.mail.method == "smtp"
       config.action_mailer.delivery_method = :smtp
       smtp_settings = {
-        :address => AppConfig.mail.smtp.host.get,
-        :port => AppConfig.mail.smtp.port.to_i,
-        :domain => AppConfig.mail.smtp.domain.get,
-        :enable_starttls_auto => false,
-        :openssl_verify_mode => AppConfig.mail.smtp.openssl_verify_mode.get
+        address:              AppConfig.mail.smtp.host.get,
+        port:                 AppConfig.mail.smtp.port.to_i,
+        domain:               AppConfig.mail.smtp.domain.get,
+        enable_starttls_auto: false,
+        openssl_verify_mode:  AppConfig.mail.smtp.openssl_verify_mode.get
       }
       
       if AppConfig.mail.smtp.authentication != "none"
         smtp_settings.merge!({
-          :authentication => AppConfig.mail.smtp.authentication.gsub('-', '_').to_sym,
-          :user_name => AppConfig.mail.smtp.username.get,
-          :password => AppConfig.mail.smtp.password.get,
-          :enable_starttls_auto => AppConfig.mail.smtp.starttls_auto?
+          authentication:       AppConfig.mail.smtp.authentication.gsub('-', '_').to_sym,
+          user_name:            AppConfig.mail.smtp.username.get,
+          password:             AppConfig.mail.smtp.password.get,
+          enable_starttls_auto: AppConfig.mail.smtp.starttls_auto?
         })
       end
       
diff --git a/config/initializers/markerb.rb b/config/initializers/markerb.rb
index 3d7351b6b..a7cccced2 100644
--- a/config/initializers/markerb.rb
+++ b/config/initializers/markerb.rb
@@ -1,3 +1 @@
-require Rails.root.join("lib", "diaspora", "markdownify_email")
-
-Rails.application.config.markerb.renderer = Diaspora::Markdownify::Email
\ No newline at end of file
+Rails.application.config.markerb.renderer = Diaspora::Markdownify::Email
diff --git a/config/initializers/mime_types.rb b/config/initializers/mime_types.rb
deleted file mode 100644
index 340afa7d7..000000000
--- a/config/initializers/mime_types.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-#   Copyright (c) 2010-2011, Diaspora Inc.  This file is
-#   licensed under the Affero General Public License version 3 or later.  See
-#   the COPYRIGHT file.
-
-# Be sure to restart your server when you modify this file.
-
-# Add new mime types for use in respond_to blocks:
-# Mime::Type.register "text/richtext", :rtf
-# Mime::Type.register_alias "text/html", :iphone
diff --git a/config/initializers/omniauth.rb b/config/initializers/omniauth.rb
index e96b8c9ed..67ec29747 100644
--- a/config/initializers/omniauth.rb
+++ b/config/initializers/omniauth.rb
@@ -16,8 +16,14 @@ Rails.application.config.middleware.use OmniAuth::Builder do
   end
   
   if AppConfig.services.facebook.enable?
-    provider :facebook, AppConfig.services.facebook.app_id, AppConfig.services.facebook.secret,
-             { :display => "popup", :scope => "publish_actions,publish_stream,offline_access",
-               :client_options => {:ssl => {:ca_file => AppConfig.environment.certificate_authorities }}}  
+    provider :facebook, AppConfig.services.facebook.app_id, AppConfig.services.facebook.secret, {
+      display: 'popup',
+      scope: 'publish_actions,publish_stream,offline_access',
+      client_options: {
+        ssl: {
+          ca_file: AppConfig.environment.certificate_authorities
+        }
+      }
+    }  
   end
 end
diff --git a/config/initializers/session_store.rb b/config/initializers/session_store.rb
index 30017169b..e46823d17 100644
--- a/config/initializers/session_store.rb
+++ b/config/initializers/session_store.rb
@@ -4,7 +4,7 @@
 
 # Be sure to restart your server when you modify this file.
 
-Rails.application.config.session_store :cookie_store, :key => '_diaspora_session', :httponly => false
+Rails.application.config.session_store :cookie_store, key: '_diaspora_session', httponly: false
 
 # Use the database for sessions instead of the cookie-based default,
 # which shouldn't be used to store highly confidential information
diff --git a/config/initializers/setup_mail.rb b/config/initializers/setup_mail.rb
deleted file mode 100644
index 0d3f958a7..000000000
--- a/config/initializers/setup_mail.rb
+++ /dev/null
@@ -1,2 +0,0 @@
-# if you wish to intercept emails to go to a particuar email address
-#ActionMailer::Base.register_interceptor(DevelopmentMailInterceptor) if Rails.env.development?