-
+
+ <%= render 'layouts/header' %>
+
+ <%= flash_messages %>
+
<%= yield %>
+
<%= render 'layouts/footer' %>
diff --git a/bin/bundle b/bin/bundle
index e3c2f62..8d5f7a5 100644
--- a/bin/bundle
+++ b/bin/bundle
@@ -1,3 +1,3 @@
#!/usr/bin/env ruby.exe
-ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__)
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../Gemfile', __dir__)
load Gem.bin_path('bundler', 'bundle')
diff --git a/bin/setup b/bin/setup
index 00ad3ec..237a371 100644
--- a/bin/setup
+++ b/bin/setup
@@ -1,10 +1,9 @@
#!/usr/bin/env ruby.exe
-require 'pathname'
require 'fileutils'
include FileUtils
# path to your application root.
-APP_ROOT = Pathname.new File.expand_path('../../', __FILE__)
+APP_ROOT = File.expand_path('..', __dir__)
def system!(*args)
system(*args) || abort("\n== Command #{args} failed ==")
@@ -21,7 +20,6 @@ chdir APP_ROOT do
# Install JavaScript dependencies if using Yarn
# system('bin/yarn')
-
# puts "\n== Copying sample files =="
# unless File.exist?('config/database.yml')
# cp 'config/database.yml.sample', 'config/database.yml'
diff --git a/bin/update b/bin/update
index deb1df2..1db4ab5 100644
--- a/bin/update
+++ b/bin/update
@@ -1,10 +1,9 @@
#!/usr/bin/env ruby.exe
-require 'pathname'
require 'fileutils'
include FileUtils
# path to your application root.
-APP_ROOT = Pathname.new File.expand_path('../../', __FILE__)
+APP_ROOT = File.expand_path('..', __dir__)
def system!(*args)
system(*args) || abort("\n== Command #{args} failed ==")
@@ -18,6 +17,9 @@ chdir APP_ROOT do
system! 'gem install bundler --conservative'
system('bundle check') || system!('bundle install')
+ # Install JavaScript dependencies if using Yarn
+ # system('bin/yarn')
+
puts "\n== Updating database =="
system! 'bin/rails db:migrate'
diff --git a/bin/yarn b/bin/yarn
index 07471fe..3389822 100644
--- a/bin/yarn
+++ b/bin/yarn
@@ -1,8 +1,8 @@
#!/usr/bin/env ruby.exe
-VENDOR_PATH = File.expand_path('..', __dir__)
-Dir.chdir(VENDOR_PATH) do
+APP_ROOT = File.expand_path('..', __dir__)
+Dir.chdir(APP_ROOT) do
begin
- exec "yarnpkg #{ARGV.join(" ")}"
+ exec "yarnpkg", *ARGV
rescue Errno::ENOENT
$stderr.puts "Yarn executable was not detected in the system."
$stderr.puts "Download Yarn at https://yarnpkg.com/en/docs/install"
diff --git a/config/application.rb b/config/application.rb
index e5e1434..b4c1e2b 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -9,11 +9,12 @@ Bundler.require(*Rails.groups)
module Projekteuler
class Application < Rails::Application
# Initialize configuration defaults for originally generated Rails version.
- config.load_defaults 5.1
+ 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.
+ # 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.
# 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.
diff --git a/config/boot.rb b/config/boot.rb
index 30f5120..b9e460c 100644
--- a/config/boot.rb
+++ b/config/boot.rb
@@ -1,3 +1,4 @@
ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../Gemfile', __dir__)
require 'bundler/setup' # Set up gems listed in the Gemfile.
+require 'bootsnap/setup' # Speed up boot time by caching expensive operations.
diff --git a/config/cable.yml b/config/cable.yml
index 4ff27ac..0c84e98 100644
--- a/config/cable.yml
+++ b/config/cable.yml
@@ -6,5 +6,5 @@ test:
production:
adapter: redis
- url: redis://localhost:6379/1
+ url: <%= ENV.fetch("REDIS_URL") { "redis://localhost:6379/1" } %>
channel_prefix: projekteuler_production
diff --git a/config/environments/development.rb b/config/environments/development.rb
index c6e62d1..8a3fed0 100644
--- a/config/environments/development.rb
+++ b/config/environments/development.rb
@@ -13,12 +13,13 @@ Rails.application.configure do
config.consider_all_requests_local = true
# Enable/disable caching. By default caching is disabled.
- if Rails.root.join('tmp/caching-dev.txt').exist?
+ # Run rails dev:cache to toggle caching.
+ if Rails.root.join('tmp', 'caching-dev.txt').exist?
config.action_controller.perform_caching = true
config.cache_store = :memory_store
config.public_file_server.headers = {
- 'Cache-Control' => "public, max-age=#{2.days.seconds.to_i}"
+ 'Cache-Control' => "public, max-age=#{2.days.to_i}"
}
else
config.action_controller.perform_caching = false
@@ -26,6 +27,9 @@ Rails.application.configure do
config.cache_store = :null_store
end
+ # Store uploaded files on the local file system (see config/storage.yml for options)
+ config.active_storage.service = :local
+
# Don't care if the mailer can't send.
config.action_mailer.raise_delivery_errors = false
@@ -37,6 +41,9 @@ Rails.application.configure do
# Raise an error on page load if there are pending migrations.
config.active_record.migration_error = :page_load
+ # Highlight code that triggered database queries in logs.
+ config.active_record.verbose_query_logs = true
+
# Debug mode disables concatenation and preprocessing of assets.
# This option may cause significant delays in view rendering with a large
# number of complex assets.
diff --git a/config/environments/production.rb b/config/environments/production.rb
index cd32635..7312a67 100644
--- a/config/environments/production.rb
+++ b/config/environments/production.rb
@@ -14,10 +14,9 @@ Rails.application.configure do
config.consider_all_requests_local = false
config.action_controller.perform_caching = true
- # Attempt to read encrypted secrets from `config/secrets.yml.enc`.
- # Requires an encryption key in `ENV["RAILS_MASTER_KEY"]` or
- # `config/secrets.yml.key`.
- config.read_encrypted_secrets = true
+ # Ensures that a master key has been made available in either ENV["RAILS_MASTER_KEY"]
+ # or in config/master.key. This key is used to decrypt credentials (and other encrypted files).
+ config.require_master_key = true
# Disable serving static files from the `/public` folder by default since
# Apache or NGINX already handles this.
@@ -30,8 +29,6 @@ Rails.application.configure do
# Do not fallback to assets pipeline if a precompiled asset is missed.
config.assets.compile = false
- config.assets.digest = true
-
# `config.assets.precompile` and `config.assets.version` have moved to config/initializers/assets.rb
# Enable serving of images, stylesheets, and JavaScripts from an asset server.
@@ -41,6 +38,9 @@ Rails.application.configure do
# config.action_dispatch.x_sendfile_header = 'X-Sendfile' # for Apache
# config.action_dispatch.x_sendfile_header = 'X-Accel-Redirect' # for NGINX
+ # Store uploaded files on the local file system (see config/storage.yml for options)
+ config.active_storage.service = :local
+
# Mount Action Cable outside main process or domain
# config.action_cable.mount_path = nil
# config.action_cable.url = 'wss://example.com/cable'
@@ -62,6 +62,7 @@ Rails.application.configure do
# Use a real queuing backend for Active Job (and separate queues per environment)
# config.active_job.queue_adapter = :resque
# config.active_job.queue_name_prefix = "projekteuler_#{Rails.env}"
+
config.action_mailer.perform_caching = false
# Ignore bad email addresses and do not raise email delivery errors.
diff --git a/config/environments/test.rb b/config/environments/test.rb
index 4fc9260..9f71b93 100644
--- a/config/environments/test.rb
+++ b/config/environments/test.rb
@@ -15,7 +15,7 @@ Rails.application.configure do
# Configure public file server for tests with Cache-Control for performance.
config.public_file_server.enabled = true
config.public_file_server.headers = {
- 'Cache-Control' => "public, max-age=#{1.hour.seconds.to_i}"
+ 'Cache-Control' => "public, max-age=#{1.hour.to_i}"
}
# Show full error reports and disable caching.
@@ -27,6 +27,10 @@ Rails.application.configure do
# Disable request forgery protection in test environment.
config.action_controller.allow_forgery_protection = false
+
+ # Store uploaded files on the local file system in a temporary directory
+ config.active_storage.service = :test
+
config.action_mailer.perform_caching = false
# Tell Action Mailer not to deliver emails to the real world.
diff --git a/config/initializers/content_security_policy.rb b/config/initializers/content_security_policy.rb
new file mode 100644
index 0000000..d3bcaa5
--- /dev/null
+++ b/config/initializers/content_security_policy.rb
@@ -0,0 +1,25 @@
+# Be sure to restart your server when you modify this file.
+
+# Define an application-wide content security policy
+# For further information see the following documentation
+# https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Content-Security-Policy
+
+# Rails.application.config.content_security_policy do |policy|
+# policy.default_src :self, :https
+# policy.font_src :self, :https, :data
+# policy.img_src :self, :https, :data
+# policy.object_src :none
+# policy.script_src :self, :https
+# policy.style_src :self, :https
+
+# # Specify URI for violation reports
+# # policy.report_uri "/csp-violation-report-endpoint"
+# end
+
+# If you are using UJS then enable automatic nonce generation
+# Rails.application.config.content_security_policy_nonce_generator = -> request { SecureRandom.base64(16) }
+
+# Report CSP violations to a specified URI
+# For further information see the following documentation:
+# https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Content-Security-Policy-Report-Only
+# Rails.application.config.content_security_policy_report_only = true
diff --git a/config/locales/views/admin/de.yml b/config/locales/views/admin/de.yml
index 4a41b80..2f1e4a9 100644
--- a/config/locales/views/admin/de.yml
+++ b/config/locales/views/admin/de.yml
@@ -9,4 +9,16 @@ de:
update_problem_count:
success_message: "Problem-Anzahl wurde erfolgreich aktualisiert!"
failure_message: "Problem-Anzahl konnte nicht aktualisiert werden! Grund: %{error}"
- no_problem_count: "Keine Problem-Anzahl gegeben!"
\ No newline at end of file
+ no_problem_count: "Keine Problem-Anzahl gegeben!"
+ translations:
+ must_be_pending: "Übersetzung muss ausstehend sein, um akzeptiert oder abgelehnt zu werden!"
+ show:
+ accept_translation: "Akzeptieren"
+ decline_translation: "Ablehnen"
+ visit_current_translation: "Aktuelle Übersetzung anschauen"
+ already_translated: "Dieses Problem wurde bereits übersetzt."
+ is_new_translation: "Dieses Problem hat bisher keine Übersetzung."
+ accept:
+ success_message: "Übersetzung wurde erfolgreich akzeptiert!"
+ decline:
+ success_message: "Übersetzung wurde erfolgreich abgelehnt!"
\ No newline at end of file
diff --git a/config/locales/views/application/de.yml b/config/locales/views/application/de.yml
index 2340f66..cccda7c 100644
--- a/config/locales/views/application/de.yml
+++ b/config/locales/views/application/de.yml
@@ -1,6 +1,9 @@
# ruby encoding: utf-8
de:
+ attributes:
+ created_at: Erstellt
+ updated_at: Aktualisiert
application:
site_title: "Projekt Euler"
sign_in: 'Einloggen'
@@ -8,4 +11,8 @@ de:
info: "Info"
legal: "Impressum"
copyright: "Copyright-Informationen"
- bootstrap_html: 'Entworfen mit
Bootstrap'
\ No newline at end of file
+ bootstrap_html: 'Entworfen mit
Bootstrap'
+ helpers:
+ submit:
+ translation:
+ create: "%{model} vorschlagen"
diff --git a/config/locales/views/translations/de.yml b/config/locales/views/translations/de.yml
index 69ea5f2..df84c5e 100644
--- a/config/locales/views/translations/de.yml
+++ b/config/locales/views/translations/de.yml
@@ -9,4 +9,4 @@ de:
new:
new_translation: Neue Übersetzung für Problem %{id}
notice:
- successfully_created: Übersetzung wurde erfolgreich erstellt.
\ No newline at end of file
+ successfully_created: Der Übersetzungsvorschlag wurde eingereicht. Ein Organisator wird sich Ihren Vorschlag so bald wie möglich anschauen.
\ No newline at end of file
diff --git a/config/routes.rb b/config/routes.rb
index 27b3c81..cb13527 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -1,4 +1,12 @@
Rails.application.routes.draw do
+ # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html
+
+ # The priority is based upon order of creation: first created -> highest priority.
+ # See how all your routes lay out with "rake routes".
+
+ # You can have the root of your site routed with "root"
+ root 'about#index'
+
get 'about/index'
get 'about/info'
get 'about/copyright'
@@ -18,64 +26,10 @@ Rails.application.routes.draw do
namespace :admin do
get '', to: 'dashboard#index', as: 'dashboard_index'
post '/update_problem_count', to: 'dashboard#update_problem_count', as: 'dashboard_update_problem_count'
- resources :translations, only: [:index, :show]
+ resources :translations, only: [:index] do
+ get '', to: 'translations#show', as: ''
+ post 'accept', to: 'translations#accept'
+ post 'decline', to: 'translations#decline'
+ end
end
-
- mathjax 'mathjax'
-
- # The priority is based upon order of creation: first created -> highest priority.
- # See how all your routes lay out with "rake routes".
-
- # You can have the root of your site routed with "root"
- root 'about#index'
-
- # Example of regular route:
- # get 'products/:id' => 'catalog#view'
-
- # Example of named route that can be invoked with purchase_url(id: product.id)
- # get 'products/:id/purchase' => 'catalog#purchase', as: :purchase
-
- # Example resource route (maps HTTP verbs to controller actions automatically):
- # resources :products
-
- # Example resource route with options:
- # resources :products do
- # member do
- # get 'short'
- # post 'toggle'
- # end
- #
- # collection do
- # get 'sold'
- # end
- # end
-
- # Example resource route with sub-resources:
- # resources :products do
- # resources :comments, :sales
- # resource :seller
- # end
-
- # Example resource route with more complex sub-resources:
- # resources :products do
- # resources :comments
- # resources :sales do
- # get 'recent', on: :collection
- # end
- # end
-
- # Example resource route with concerns:
- # concern :toggleable do
- # post 'toggle'
- # end
- # resources :posts, concerns: :toggleable
- # resources :photos, concerns: :toggleable
-
- # Example resource route within a namespace:
- # namespace :admin do
- # # Directs /admin/products/* to Admin::ProductsController
- # # (app/controllers/admin/products_controller.rb)
- # resources :products
- # end
- # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html
-end
+end
\ No newline at end of file
diff --git a/config/storage.yml b/config/storage.yml
new file mode 100644
index 0000000..d32f76e
--- /dev/null
+++ b/config/storage.yml
@@ -0,0 +1,34 @@
+test:
+ service: Disk
+ root: <%= Rails.root.join("tmp/storage") %>
+
+local:
+ service: Disk
+ root: <%= Rails.root.join("storage") %>
+
+# Use rails credentials:edit to set the AWS secrets (as aws:access_key_id|secret_access_key)
+# amazon:
+# service: S3
+# access_key_id: <%= Rails.application.credentials.dig(:aws, :access_key_id) %>
+# secret_access_key: <%= Rails.application.credentials.dig(:aws, :secret_access_key) %>
+# region: us-east-1
+# bucket: your_own_bucket
+
+# Remember not to checkin your GCS keyfile to a repository
+# google:
+# service: GCS
+# project: your_project
+# credentials: <%= Rails.root.join("path/to/gcs.keyfile") %>
+# bucket: your_own_bucket
+
+# Use rails credentials:edit to set the Azure Storage secret (as azure_storage:storage_access_key)
+# microsoft:
+# service: AzureStorage
+# storage_account_name: your_account_name
+# storage_access_key: <%= Rails.application.credentials.dig(:azure_storage, :storage_access_key) %>
+# container: your_container_name
+
+# mirror:
+# service: Mirror
+# primary: local
+# mirrors: [ amazon, google, microsoft ]
diff --git a/db/migrate/20190202113250_add_status_to_translations.rb b/db/migrate/20190202113250_add_status_to_translations.rb
new file mode 100644
index 0000000..86583d5
--- /dev/null
+++ b/db/migrate/20190202113250_add_status_to_translations.rb
@@ -0,0 +1,15 @@
+class AddStatusToTranslations < ActiveRecord::Migration[5.2]
+ def change
+ add_column :translations, :status, :integer, default: 0
+
+ reversible do |dir|
+ dir.up do
+ Problem.all.each do |problem|
+ if problem.is_translated?
+ problem.translation.in_use!
+ end
+ end
+ end
+ end
+ end
+end
diff --git a/db/schema.rb b/db/schema.rb
index ee93b97..f50f95e 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -1,4 +1,3 @@
-# encoding: UTF-8
# This file is auto-generated from the current state of the database. Instead
# of editing this file, please use the migrations feature of Active Record to
# incrementally modify your database, and then regenerate this schema definition.
@@ -11,42 +10,40 @@
#
# It's strongly recommended that you check this file into your version control system.
-ActiveRecord::Schema.define(version: 20150131103802) do
+ActiveRecord::Schema.define(version: 2019_02_02_113250) do
create_table "admins", force: :cascade do |t|
- t.string "email", default: "", null: false
- t.string "encrypted_password", default: "", null: false
- t.string "reset_password_token"
+ t.string "email", default: "", null: false
+ t.string "encrypted_password", default: "", null: false
+ t.string "reset_password_token"
t.datetime "reset_password_sent_at"
t.datetime "remember_created_at"
- t.integer "sign_in_count", default: 0, null: false
+ t.integer "sign_in_count", default: 0, null: false
t.datetime "current_sign_in_at"
t.datetime "last_sign_in_at"
- t.string "current_sign_in_ip"
- t.string "last_sign_in_ip"
+ t.string "current_sign_in_ip"
+ t.string "last_sign_in_ip"
t.datetime "created_at"
t.datetime "updated_at"
+ t.index ["email"], name: "index_admins_on_email", unique: true
+ t.index ["reset_password_token"], name: "index_admins_on_reset_password_token", unique: true
end
- add_index "admins", ["email"], name: "index_admins_on_email", unique: true
- add_index "admins", ["reset_password_token"], name: "index_admins_on_reset_password_token", unique: true
-
create_table "problems", force: :cascade do |t|
t.datetime "created_at"
t.datetime "updated_at"
- t.integer "translation_id"
+ t.integer "translation_id"
+ t.index ["translation_id"], name: "index_problems_on_translation_id"
end
- add_index "problems", ["translation_id"], name: "index_problems_on_translation_id"
-
create_table "translations", force: :cascade do |t|
- t.string "title"
- t.text "content"
+ t.string "title"
+ t.text "content"
t.datetime "created_at"
t.datetime "updated_at"
- t.integer "problem_id"
+ t.integer "problem_id"
+ t.integer "status", default: 0
+ t.index ["problem_id"], name: "index_translations_on_problem_id"
end
- add_index "translations", ["problem_id"], name: "index_translations_on_problem_id"
-
end
diff --git a/db/seeds.rb b/db/seeds.rb
index 452dab4..0986997 100644
--- a/db/seeds.rb
+++ b/db/seeds.rb
@@ -27,7 +27,7 @@ for i in 1..10 do
)
problem = Problem.find(i)
- problem.translation = translation
+ problem.set_translation(translation)
problem.save!
end
diff --git a/test/controllers/admin/translations_controller_test.rb b/test/controllers/admin/translations_controller_test.rb
index 31bc4d0..4536ae0 100644
--- a/test/controllers/admin/translations_controller_test.rb
+++ b/test/controllers/admin/translations_controller_test.rb
@@ -6,6 +6,7 @@ class Admin::TranslationsControllerTest < ActionDispatch::IntegrationTest
setup do
login
@translation = translations(:translation_one)
+ @translation_alternative = translations(:translation_two_alternative)
end
test "should get index" do
get admin_translations_url
@@ -14,8 +15,19 @@ class Admin::TranslationsControllerTest < ActionDispatch::IntegrationTest
end
test "should show translation" do
- get admin_translation_url(id: @translation)
+ get admin_translation_url(translation_id: @translation)
assert_response :success
end
+ test "should accept translation" do
+ post admin_translation_accept_path(@translation_alternative)
+ assert_redirected_to problem_path(2)
+ assert_equal @translation_alternative, Problem.find(2).translation
+ end
+
+ test "should decline translation" do
+ post admin_translation_decline_path(@translation_alternative)
+ assert_redirected_to admin_translations_path
+ assert Translation.find(@translation_alternative.id).declined?
+ end
end
diff --git a/test/fixtures/translations.yml b/test/fixtures/translations.yml
index f8bcb86..2122ecd 100644
--- a/test/fixtures/translations.yml
+++ b/test/fixtures/translations.yml
@@ -4,8 +4,16 @@ translation_one:
problem_id: 1
title: First title
content: The content of the translation
+ status: 1
translation_two:
problem_id: 2
title: Second title
content: The content of the second translation
+ status: 1
+
+translation_two_alternative:
+ problem_id: 2
+ title: Second title
+ content: The changed content for the second problem
+ status: 0
diff --git a/test/models/problem_test.rb b/test/models/problem_test.rb
index b203bed..eff3db1 100644
--- a/test/models/problem_test.rb
+++ b/test/models/problem_test.rb
@@ -14,6 +14,13 @@ class ProblemTest < ActiveSupport::TestCase
assert problems(:one).is_translated?
end
+ test "set_translation should modify status correctly" do
+ problems(:two).set_translation(translations(:translation_two_alternative))
+ assert translations(:translation_two).outdated?
+ assert translations(:translation_two_alternative).in_use?
+ assert_equal translations(:translation_two_alternative), problems(:two).translation
+ end
+
test "should have correct original url" do
assert_equal "https://projecteuler.net/problem=1", problems(:one).original_url
end
diff --git a/test/models/translation_test.rb b/test/models/translation_test.rb
index 3deb421..38233bd 100644
--- a/test/models/translation_test.rb
+++ b/test/models/translation_test.rb
@@ -36,5 +36,6 @@ class TranslationTest < ActiveSupport::TestCase
problem_id: 1
)
assert translation.save
+ assert translation.pending?
end
end