Clean config & sentry

.env.development

@@ -1,3 +0,0 @@
-MONGO_URL=localhost:27017
-MONGO_DATABASE=cryptcheck
-REDIS_URL=redis://localhost:6379/0

.gitignore

@@ -4,6 +4,8 @@
 *.iml
 Gemfile.lock
 .env.production
+.env.*.local
+.env.local
 
 /db/*.sqlite3
 /db/*.sqlite3-journal

Gemfile

@@ -1,31 +1,35 @@
+ruby '2.3.8'
 source 'https://rubygems.org'
 
-gem 'cryptcheck', '~> 2.0.0', path: '../engine'
-
-gem 'rails', '~> 5.2.3'
+gem 'rails', '~> 5.2.4'
+gem 'puma', '~> 3.11'
+gem 'bootsnap', '>= 1.1.0', require: false
 gem 'dotenv-rails'
-gem 'bootsnap', require: false
-gem 'puma'
+gem 'sentry-raven', "~> 2.12"
 
-gem 'sidekiq'
 gem 'pg'
+gem 'sidekiq'
+gem 'gush', github: 'aeris/gush', branch: :master
 gem 'simpleidn'
 gem 'http_accept_language'
 gem 'recursive-open-struct'
 
-gem 'uglifier'
-gem 'sass-rails'
-gem 'coffee-rails'
+gem 'uglifier', '>= 1.3.0'
+gem 'sass-rails', '~> 5.0'
+gem 'coffee-rails', '~> 4.2'
 gem 'jquery-rails'
 gem 'bootstrap-sass'
 gem 'font-awesome-sass'
 
+gem 'cryptcheck', '~> 2.0.0', path: '../engine'
+
 group :development do
-	gem 'web-console'
+  gem 'web-console', '>= 3.3.0'
+  gem 'listen', '>= 3.0.5', '< 3.2'
 	gem 'awesome_print'
 
-	gem 'spring'
-	gem 'spring-watcher-listen'
+  gem 'spring'
+  gem 'spring-watcher-listen', '~> 2.0.0'
 
 	gem 'pry-rails'
 	gem 'pry-byebug'

bin/bundle

@@ -1,105 +1,3 @@
 #!/usr/bin/env ruby
-# frozen_string_literal: true
-
-#
-# This file was generated by Bundler.
-#
-# The application 'bundle' is installed as part of a gem, and
-# this file is here to facilitate running it.
-#
-
-require "rubygems"
-
-m = Module.new do
-    module_function
-
-  def invoked_as_script?
-    File.expand_path($0) == File.expand_path(__FILE__)
-  end
-
-  def env_var_version
-    ENV["BUNDLER_VERSION"]
-  end
-
-  def cli_arg_version
-    return unless invoked_as_script? # don't want to hijack other binstubs
-    return unless "update".start_with?(ARGV.first || " ") # must be running `bundle update`
-    bundler_version = nil
-    update_index = nil
-    ARGV.each_with_index do |a, i|
-      if update_index && update_index.succ == i && a =~ Gem::Version::ANCHORED_VERSION_PATTERN
-        bundler_version = a
-      end
-      next unless a =~ /\A--bundler(?:[= ](#{Gem::Version::VERSION_PATTERN}))?\z/
-      bundler_version = $1 || ">= 0.a"
-      update_index = i
-    end
-    bundler_version
-  end
-
-  def gemfile
-    gemfile = ENV["BUNDLE_GEMFILE"]
-    return gemfile if gemfile && !gemfile.empty?
-
-    File.expand_path("../../Gemfile", __FILE__)
-  end
-
-  def lockfile
-    lockfile =
-      case File.basename(gemfile)
-      when "gems.rb" then gemfile.sub(/\.rb$/, gemfile)
-      else "#{gemfile}.lock"
-      end
-    File.expand_path(lockfile)
-  end
-
-  def lockfile_version
-    return unless File.file?(lockfile)
-    lockfile_contents = File.read(lockfile)
-    return unless lockfile_contents =~ /\n\nBUNDLED WITH\n\s{2,}(#{Gem::Version::VERSION_PATTERN})\n/
-    Regexp.last_match(1)
-  end
-
-  def bundler_version
-    @bundler_version ||= begin
-      env_var_version || cli_arg_version ||
-        lockfile_version || "#{Gem::Requirement.default}.a"
-    end
-  end
-
-  def load_bundler!
-    ENV["BUNDLE_GEMFILE"] ||= gemfile
-
-    # must dup string for RG < 1.8 compatibility
-    activate_bundler(bundler_version.dup)
-  end
-
-  def activate_bundler(bundler_version)
-    if Gem::Version.correct?(bundler_version) && Gem::Version.new(bundler_version).release < Gem::Version.new("2.0")
-      bundler_version = "< 2"
-    end
-    gem_error = activation_error_handling do
-      gem "bundler", bundler_version
-    end
-    return if gem_error.nil?
-    require_error = activation_error_handling do
-      require "bundler/version"
-    end
-    return if require_error.nil? && Gem::Requirement.new(bundler_version).satisfied_by?(Gem::Version.new(Bundler::VERSION))
-    warn "Activating bundler (#{bundler_version}) failed:\n#{gem_error.message}\n\nTo install the version of bundler this project requires, run `gem install bundler -v '#{bundler_version}'`"
-    exit 42
-  end
-
-  def activation_error_handling
-    yield
-    nil
-  rescue StandardError, LoadError => e
-    e
-  end
-end
-
-m.load_bundler!
-
-if m.invoked_as_script?
-  load Gem.bin_path("bundler", "bundle")
-end
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../Gemfile', __dir__)
+load Gem.bin_path('bundler', 'bundle')

bin/rails

@@ -1,12 +1,9 @@
 #!/usr/bin/env ruby
-$:.unshift File.expand_path File.join File.dirname(__FILE__), '../../cryptcheck/lib'
-require 'rubygems'
-require 'bundler/setup'
-
 begin
   load File.expand_path('../spring', __FILE__)
-rescue LoadError
+rescue LoadError => e
+  raise unless e.message.include?('spring')
 end
-APP_PATH = File.expand_path('../../config/application', __FILE__)
+APP_PATH = File.expand_path('../config/application', __dir__)
 require_relative '../config/boot'
 require 'rails/commands'

bin/rake

@@ -1,7 +1,8 @@
 #!/usr/bin/env ruby
 begin
-  load File.expand_path("../spring", __FILE__)
-rescue LoadError
+  load File.expand_path('../spring', __FILE__)
+rescue LoadError => e
+  raise unless e.message.include?('spring')
 end
 require_relative '../config/boot'
 require 'rake'

bin/setup

@@ -1,29 +0,0 @@
-#!/usr/bin/env ruby
-require 'pathname'
-
-# path to your application root.
-APP_ROOT = Pathname.new File.expand_path('../../',  __FILE__)
-
-Dir.chdir APP_ROOT do
-  # This script is a starting point to setup your application.
-  # Add necessary setup steps to this file:
-
-  puts "== Installing dependencies =="
-  system "gem install bundler --conservative"
-  system "bundle check || bundle install"
-
-  # puts "\n== Copying sample files =="
-  # unless File.exist?("config/database.yml")
-  #   system "cp config/database.yml.sample config/database.yml"
-  # end
-
-  puts "\n== Preparing database =="
-  system "bin/rake db:setup"
-
-  puts "\n== Removing old logs and tempfiles =="
-  system "rm -f log/*"
-  system "rm -rf tmp/cache"
-
-  puts "\n== Restarting application server =="
-  system "touch tmp/restart.txt"
-end

bin/spring

@@ -0,0 +1,17 @@
+#!/usr/bin/env ruby
+
+# This file loads spring without using Bundler, in order to be fast.
+# It gets overwritten when you run the `spring binstub` command.
+
+unless defined?(Spring)
+  require 'rubygems'
+  require 'bundler'
+
+  lockfile = Bundler::LockfileParser.new(Bundler.default_lockfile.read)
+  spring = lockfile.specs.detect { |spec| spec.name == "spring" }
+  if spring
+    Gem.use_paths Gem.dir, Bundler.bundle_path.to_s, *Gem.path
+    gem 'spring', spring.version
+    require 'spring/binstub'
+  end
+end

config.ru

@@ -1,7 +1,3 @@
 # This file is used by Rack-based servers to start the application.
-$:.unshift File.expand_path File.join File.dirname(__FILE__), '../../cryptcheck/lib'
-require 'rubygems'
-require 'bundler/setup'
-
-require ::File.expand_path('../config/environment', __FILE__)
+require_relative 'config/environment'
 run Rails.application

config/application.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../boot', __FILE__)
+require_relative 'boot'
 
 require 'rails'
 %w[
@@ -6,8 +6,8 @@ require 'rails'
   active_record
   action_controller
   action_view
-  rails/test_unit
   sprockets
+  rails/test_unit
 ].each do |framework|
 	begin
 		require "#{framework}/railtie"
@@ -20,27 +20,24 @@ end
 Bundler.require *Rails.groups
 
 module CryptcheckRails
-	class Application < Rails::Application
-		config.load_defaults 5.2
-
-		# Settings in config/environments/* take precedence over those specified here.
-		# Application configuration should go into files in config/initializers
-		# -- all .rb files in that directory are automatically loaded.
-
-		# Set Time.zone default to the specified zone and make Active Record auto-convert to this zone.
-		# Run "rake -D time" for a list of tasks for finding time zone names. Default is UTC.
-		# config.time_zone = 'Central Time (US & Canada)'
-
-		# The default locale is :en and all translations from config/locales/*.rb,yml are auto loaded.
-		# config.i18n.load_path += Dir[Rails.root.join('my', 'locales', '*.{rb,yml}').to_s]
-		config.i18n.default_locale                   = :fr
-		config.i18n.available_locales                = %w(en fr de)
-		config.action_controller.include_all_helpers = false
-
-		config.refresh_delay = 1.hour
-
-		config.generators do |g|
-			g.orm :active_record, primary_key_type: :uuid
-		end
-	end
+  class Application < Rails::Application
+    # Initialize configuration defaults for originally generated Rails version.
+    config.load_defaults 5.2
+
+    # Settings in config/environments/* take precedence over those specified here.
+    # Application configuration can go into files in config/initializers
+    # -- all .rb files in that directory are automatically loaded after loading
+    # the framework and any gems in your application.
+
+    # The default locale is :en and all translations from config/locales/*.rb,yml are auto loaded.
+    # config.i18n.load_path += Dir[Rails.root.join('my', 'locales', '*.{rb,yml}').to_s]
+    config.i18n.default_locale    = :fr
+    config.i18n.available_locales = %w(en fr de)
+
+    config.refresh_delay = 1.hour
+
+    config.generators do |g|
+      g.orm :active_record, primary_key_type: :uuid
+    end
+  end
 end

config/initializers/better_errors.rb

@@ -0,0 +1,21 @@
+if defined? BetterErrors
+  class BetterErrors::Middleware
+    def protected_app_call(env)
+      @app.call env
+    rescue Exception => ex
+      @error_page = @handler.new ex, env
+      log_exception ex
+      show_error_page(env, ex)
+    end
+
+    def log_exception(exception)
+      Raven.capture_exception exception if defined? Raven
+      return unless BetterErrors.logger
+
+      message = "\n#{@error_page.exception_type} - #{@error_page.exception_message}:\n"
+      message += backtrace_frames.map { |frame| "  #{frame}\n" }.join
+
+      BetterErrors.logger.fatal message
+    end
+  end
+end