- <%= sanitize @problem.content %>
+ <%= sanitize @problem.content %>
<% end %>
<%= link_to 'Dieses Problem auf projecteuler.net', @problem.original_url, target: '_blank' %>
-
-<%= link_to 'Edit', edit_problem_path(@problem), class: 'btn btn-default' %>
+
\ No newline at end of file
diff --git a/app/views/problems/show.json.jbuilder b/app/views/problems/show.json.jbuilder
deleted file mode 100644
index f9ddbe9..0000000
--- a/app/views/problems/show.json.jbuilder
+++ /dev/null
@@ -1 +0,0 @@
-json.extract! @problem, :id, :title, :content, :created_at, :updated_at
diff --git a/app/views/problems/untranslated.html.erb b/app/views/problems/untranslated.html.erb
new file mode 100644
index 0000000..3f6dcd5
--- /dev/null
+++ b/app/views/problems/untranslated.html.erb
@@ -0,0 +1 @@
+Dieses Problem wurde noch nicht übersetzt.
\ No newline at end of file
diff --git a/app/views/problems/_form.html.erb b/app/views/translations/_form.html.erb
similarity index 59%
rename from app/views/problems/_form.html.erb
rename to app/views/translations/_form.html.erb
index 969825d..19910fd 100644
--- a/app/views/problems/_form.html.erb
+++ b/app/views/translations/_form.html.erb
@@ -1,10 +1,10 @@
-<%= form_for(@problem) do |f| %>
- <% if @problem.errors.any? %>
+<%= form_for([@problem, @translation]) do |f| %>
+ <% if @translation.errors.any? %>
-
<%= pluralize(@problem.errors.count, "error") %> prohibited this problem from being saved:
+
<%= pluralize(@translation.errors.count, "error") %> prohibited this problem from being saved:
- <% @problem.errors.full_messages.each do |message| %>
+ <% @translation.errors.full_messages.each do |message| %>
- <%= message %>
<% end %>
diff --git a/app/views/translations/_translation_pagination.html.erb b/app/views/translations/_translation_pagination.html.erb
new file mode 100644
index 0000000..d6e5b41
--- /dev/null
+++ b/app/views/translations/_translation_pagination.html.erb
@@ -0,0 +1 @@
+<%= will_paginate @translations, renderer: BootstrapPagination::Rails %>
\ No newline at end of file
diff --git a/app/views/translations/edit.html.erb b/app/views/translations/edit.html.erb
new file mode 100644
index 0000000..b8dc5aa
--- /dev/null
+++ b/app/views/translations/edit.html.erb
@@ -0,0 +1,6 @@
+
Editing translation
+
+<%= render 'form' %>
+
+<%= link_to 'Show', @translation %> |
+<%= link_to 'Back', translations_path %>
diff --git a/app/views/translations/index.html.erb b/app/views/translations/index.html.erb
new file mode 100644
index 0000000..ad98e8d
--- /dev/null
+++ b/app/views/translations/index.html.erb
@@ -0,0 +1,22 @@
+
Listing translations
+
+<%= render 'translation_pagination' %>
+
+
+
+ | ID |
+ Title |
+
+
+
+
+ <% @translations.each do |translation| %>
+
+ | <%= translation.id %> |
+ <%= link_to translation.title, translation %> |
+
+ <% end %>
+
+
+<%= render 'translation_pagination' %>
+
\ No newline at end of file
diff --git a/app/views/translations/index.json.jbuilder b/app/views/translations/index.json.jbuilder
new file mode 100644
index 0000000..890e1ea
--- /dev/null
+++ b/app/views/translations/index.json.jbuilder
@@ -0,0 +1,4 @@
+json.array!(@translations) do |translation|
+ json.extract! translation, :id, :title, :content
+ json.url translation_url(translation, format: :json)
+end
diff --git a/app/views/translations/new.html.erb b/app/views/translations/new.html.erb
new file mode 100644
index 0000000..47224da
--- /dev/null
+++ b/app/views/translations/new.html.erb
@@ -0,0 +1,5 @@
+
New translation for problem <%= @problem.id %>
+
+<%= render 'form' %>
+
+<%= link_to 'Back', translations_path %>
diff --git a/app/views/translations/show.html.erb b/app/views/translations/show.html.erb
new file mode 100644
index 0000000..8b01959
--- /dev/null
+++ b/app/views/translations/show.html.erb
@@ -0,0 +1,16 @@
+<% if notice %>
+
<%= notice %>
+<% end %>
+
+
+
+<%= panel do %>
+
+ <%= sanitize @translation.content %>
+
+<% end %>
+
+ <%= link_to 'Dieses Problem auf projecteuler.net', @translation.problem.original_url, target: '_blank' %>
+
diff --git a/app/views/translations/show.json.jbuilder b/app/views/translations/show.json.jbuilder
new file mode 100644
index 0000000..10b6296
--- /dev/null
+++ b/app/views/translations/show.json.jbuilder
@@ -0,0 +1 @@
+json.extract! @translation, :id, :title, :content, :created_at, :updated_at
diff --git a/config/routes.rb b/config/routes.rb
index 7b67086..444ebcc 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -1,5 +1,8 @@
Rails.application.routes.draw do
- resources :problems
+ resources :problems, only: [:index, :show] do
+ resources :translations, only: [:new, :create]
+ end
+ resources :translations, only: [:index, :show]
# The priority is based upon order of creation: first created -> highest priority.
# See how all your routes lay out with "rake routes".
diff --git a/db/migrate/20141213151812_rename_problems_table_to_translations.rb b/db/migrate/20141213151812_rename_problems_table_to_translations.rb
new file mode 100644
index 0000000..801a1cc
--- /dev/null
+++ b/db/migrate/20141213151812_rename_problems_table_to_translations.rb
@@ -0,0 +1,5 @@
+class RenameProblemsTableToTranslations < ActiveRecord::Migration
+ def change
+ rename_table :problems, :translations
+ end
+end
diff --git a/db/migrate/20141214214958_create_problems_again.rb b/db/migrate/20141214214958_create_problems_again.rb
new file mode 100644
index 0000000..578d123
--- /dev/null
+++ b/db/migrate/20141214214958_create_problems_again.rb
@@ -0,0 +1,7 @@
+class CreateProblemsAgain < ActiveRecord::Migration
+ def change
+ create_table :problems do |t|
+ t.timestamps
+ end
+ end
+end
diff --git a/db/migrate/20141214220056_add_translation_to_problem.rb b/db/migrate/20141214220056_add_translation_to_problem.rb
new file mode 100644
index 0000000..02302e0
--- /dev/null
+++ b/db/migrate/20141214220056_add_translation_to_problem.rb
@@ -0,0 +1,5 @@
+class AddTranslationToProblem < ActiveRecord::Migration
+ def change
+ add_reference :problems, :translation, index: true
+ end
+end
diff --git a/db/migrate/20141214221259_add_problem_to_translation.rb b/db/migrate/20141214221259_add_problem_to_translation.rb
new file mode 100644
index 0000000..c598504
--- /dev/null
+++ b/db/migrate/20141214221259_add_problem_to_translation.rb
@@ -0,0 +1,5 @@
+class AddProblemToTranslation < ActiveRecord::Migration
+ def change
+ add_reference :translations, :problem, index: true
+ end
+end
diff --git a/db/schema.rb b/db/schema.rb
index c07b7d5..f0321ed 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -11,13 +11,24 @@
#
# It's strongly recommended that you check this file into your version control system.
-ActiveRecord::Schema.define(version: 20141130153941) do
+ActiveRecord::Schema.define(version: 20141214221259) do
create_table "problems", force: true do |t|
+ t.datetime "created_at"
+ t.datetime "updated_at"
+ t.integer "translation_id"
+ end
+
+ add_index "problems", ["translation_id"], name: "index_problems_on_translation_id"
+
+ create_table "translations", force: true do |t|
t.string "title"
t.text "content"
t.datetime "created_at"
t.datetime "updated_at"
+ t.integer "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 6fe1353..9bca30f 100644
--- a/db/seeds.rb
+++ b/db/seeds.rb
@@ -6,9 +6,16 @@
# cities = City.create([{ name: 'Chicago' }, { name: 'Copenhagen' }])
# Mayor.create(name: 'Emanuel', city: cities.first)
-for i in 1..103 do
- Problem.create(
+Translation.delete_all
+Problem.delete_all
+
+for i in 1..10 do
+ translation = Translation.create(
+ problem_id: i,
title: "Problem Nummer #{i}",
content: "Das hier ist der Inhalt von
Problem #{i}.
Hier ist die zweite Zeile."
)
-end
\ No newline at end of file
+ Problem.create(id: i, translation_id: translation.id)
+end
+
+Problem.create(id: 11)
\ No newline at end of file
diff --git a/test/controllers/problems_controller_test.rb b/test/controllers/problems_controller_test.rb
index 64d1f2a..7f202d3 100644
--- a/test/controllers/problems_controller_test.rb
+++ b/test/controllers/problems_controller_test.rb
@@ -1,53 +1,19 @@
require 'test_helper'
class ProblemsControllerTest < ActionController::TestCase
- setup do
- @problem = problems(:one)
- @update = {
- title: 'New title',
- content: 'This is the new content'
- }
- end
-
test "should get index" do
get :index
assert_response :success
- assert_not_nil assigns(:problems)
end
- test "should get new" do
- get :new
+ test "should get show" do
+ get :show, id: 1
assert_response :success
end
- test "should create problem" do
- assert_difference('Problem.count') do
- post :create, problem: @update
- end
-
- assert_redirected_to problem_path(assigns(:problem))
- end
-
- test "should show problem" do
- get :show, id: @problem
+ test "should get untranslated problem" do
+ get :show, id: 3
assert_response :success
end
- test "should get edit" do
- get :edit, id: @problem
- assert_response :success
- end
-
- test "should update problem" do
- patch :update, id: @problem, problem: @update
- assert_redirected_to problem_path(assigns(:problem))
- end
-
- test "should destroy problem" do
- assert_difference('Problem.count', -1) do
- delete :destroy, id: @problem
- end
-
- assert_redirected_to problems_path
- end
end
diff --git a/test/controllers/translations_controller_test.rb b/test/controllers/translations_controller_test.rb
new file mode 100644
index 0000000..41b3e18
--- /dev/null
+++ b/test/controllers/translations_controller_test.rb
@@ -0,0 +1,35 @@
+require 'test_helper'
+
+class TranslationsControllerTest < ActionController::TestCase
+ setup do
+ @translation = translations(:translation_one)
+ @update = {
+ title: 'New title',
+ content: 'This is the new content',
+ }
+ end
+
+ test "should get index" do
+ get :index
+ assert_response :success
+ assert_not_nil assigns(:translations)
+ end
+
+ test "should get new" do
+ get :new, problem_id: 1
+ assert_response :success
+ end
+
+ test "should create translation" do
+ assert_difference('Translation.count') do
+ post :create, problem_id: 1, translation: @update
+ end
+
+ assert_redirected_to translation_path(assigns(:translation))
+ end
+
+ test "should show translation" do
+ get :show, id: @translation
+ assert_response :success
+ end
+end
diff --git a/test/fixtures/problems.yml b/test/fixtures/problems.yml
index 0e8e4a7..48dcf94 100644
--- a/test/fixtures/problems.yml
+++ b/test/fixtures/problems.yml
@@ -1,9 +1,13 @@
# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html
one:
- title: First title
- content: The content of the problem
+ id: 1
+ translation: translation_one
two:
- title: Second title
- content: The content of the second problem
+ id: 2
+ translation: translation_two
+
+three:
+ id: 3
+
diff --git a/test/fixtures/translations.yml b/test/fixtures/translations.yml
new file mode 100644
index 0000000..f8bcb86
--- /dev/null
+++ b/test/fixtures/translations.yml
@@ -0,0 +1,11 @@
+# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html
+
+translation_one:
+ problem_id: 1
+ title: First title
+ content: The content of the translation
+
+translation_two:
+ problem_id: 2
+ title: Second title
+ content: The content of the second translation
diff --git a/test/helpers/translations_helper_test.rb b/test/helpers/translations_helper_test.rb
new file mode 100644
index 0000000..346380b
--- /dev/null
+++ b/test/helpers/translations_helper_test.rb
@@ -0,0 +1,4 @@
+require 'test_helper'
+
+class TranslationsHelperTest < ActionView::TestCase
+end
diff --git a/test/models/problem_test.rb b/test/models/problem_test.rb
index 83e1d8c..595651f 100644
--- a/test/models/problem_test.rb
+++ b/test/models/problem_test.rb
@@ -1,34 +1,20 @@
require 'test_helper'
class ProblemTest < ActiveSupport::TestCase
- test "should not save problem without title" do
- problem = Problem.new(content: 'This is some content')
- assert_not problem.save
- end
-
- test "should not save problem without content" do
- problem = Problem.new(title: 'Problem title')
- assert_not problem.save
- end
-
- test "should not save problem with duplicate title" do
- problem = Problem.new(
- title: problems(:one).title,
- content: 'This is some content'
- )
- assert_not problem.save
- end
-
test "should save correct problem" do
- problem = Problem.new(
- title: 'A unique title',
- content: 'Some content'
- )
+ problem = Problem.new
assert problem.save
end
+ test "is_translated? should return false for missing translation" do
+ assert_not problems(:three).is_translated?
+ end
+
+ test "is_translated? should return true for existing translation" do
+ assert problems(:one).is_translated?
+ end
+
test "should have correct original url" do
- first = Problem.first
- assert_equal "https://projecteuler.net/problem=#{first.id}", first.original_url
+ assert_equal "https://projecteuler.net/problem=1", problems(:one).original_url
end
end
diff --git a/test/models/translation_test.rb b/test/models/translation_test.rb
new file mode 100644
index 0000000..5549ff0
--- /dev/null
+++ b/test/models/translation_test.rb
@@ -0,0 +1,31 @@
+require 'test_helper'
+
+class TranslationTest < ActiveSupport::TestCase
+ test "should not save translation without title" do
+ translation = Translation.new(content: 'This is some content')
+ assert_not translation.save
+ end
+
+ test "should not save translation without content" do
+ translation = Translation.new(title: 'Translation title')
+ assert_not translation.save
+ end
+
+ test "should not save translation with duplicate title" do
+ translation = Translation.new(
+ title: translations(:translation_one).title,
+ content: 'This is some content',
+ problem_id: 3
+ )
+ assert_not translation.save
+ end
+
+ test "should save correct translation" do
+ translation = Translation.new(
+ title: 'A unique title',
+ content: 'Some content',
+ problem_id: 1
+ )
+ assert translation.save
+ end
+end