Merge pull request #402 from mumuki/issue-inconsistent-extra-code

Rename extra_code to just extra

app/controllers/api/guides_controller.rb

@@ -24,7 +24,7 @@ def create
 
   def guide_params
     params.permit(:slug, :beta, :type, :name, :description, :corollary, :locale, :expectations, :language, :id_format,
-                  exercises: [:type, :tag_list, :layout, :name, :description, :hint, :corollary, :test, :expectations, :id, :extra_code])
+                  exercises: [:type, :tag_list, :layout, :name, :description, :hint, :corollary, :test, :expectations, :id, :extra])
   end
 
 end

app/controllers/exercises_controller.rb

@@ -37,7 +37,7 @@ def set_guide
   def exercise_params
     params.require(:exercise).
         permit(:name, :description, :locale, :test,
-               :extra_code, :language_id, :hint, :tag_list,
+               :extra, :language_id, :hint, :tag_list,
                :guide_id, :position,
                :layout, :expectations_yaml)
   end

app/models/concerns/submittable/queriable.rb

@@ -4,6 +4,6 @@ def submit_query!(user, attributes)
   end
 
   def run_query!(params)
-    language.run_query!(params.merge(extra: extra_code))
+    language.run_query!(params.merge(extra: extra))
   end
 end

app/models/concerns/submittable/solvable.rb

@@ -8,7 +8,7 @@ def run_tests!(params)
     language.run_tests!(
         params.merge(
             test: test,
-            extra: extra_code,
+            extra: extra,
             locale: locale,
             expectations: expectations))
   end

app/models/exercise.rb

@@ -31,8 +31,8 @@ def search_tags
     tag_list + [language.name]
   end
 
-  def extra_code
-    [guide.extra, self[:extra_code]].compact.join("\n")
+  def extra
+    [guide.extra, self[:extra]].compact.join("\n")
   end
 
   def friendly

config/locales/activerecord.es.yml

@@ -4,7 +4,7 @@ es:
     attributes:
       exercise:
         description: Descripción
-        extra_code: Código Adicional
+        extra: Código Adicional
         hint: Ayudas
         language: Lenguaje
         locale: Idioma

db/migrate/20160108191156_rename_extra_code.rb

@@ -0,0 +1,5 @@
+class RenameExtraCode < ActiveRecord::Migration
+  def change
+    rename_column :exercises, :extra_code, :extra
+  end
+end

db/schema.rb

@@ -114,7 +114,7 @@
     t.integer  "guide_id"
     t.string   "locale",            default: "en"
     t.text     "hint"
-    t.text     "extra_code"
+    t.text     "extra"
     t.integer  "position"
     t.text     "corollary"
     t.integer  "layout",            default: 0,         null: false

spec/models/exercise_spec.rb

@@ -74,30 +74,30 @@
     end
   end
 
-  describe '#extra_code' do
+  describe '#extra' do
     context 'when exercise has no extra code' do
-      it { expect(exercise.extra_code).to eq '' }
+      it { expect(exercise.extra).to eq '' }
     end
 
     context 'when exercise has extra code and has no guide' do
-      let!(:exercise_with_extra_code) { create(:exercise, extra_code: 'exercise extra code') }
+      let!(:exercise_with_extra) { create(:exercise, extra: 'exercise extra code') }
 
-      it { expect(exercise_with_extra_code.extra_code).to eq 'exercise extra code' }
+      it { expect(exercise_with_extra.extra).to eq 'exercise extra code' }
     end
 
     context 'when exercise has extra code and belong to a guide with no extra code' do
-      let!(:exercise_with_extra_code) { create(:exercise, guide: guide, extra_code: 'exercise extra code') }
+      let!(:exercise_with_extra) { create(:exercise, guide: guide, extra: 'exercise extra code') }
       let!(:guide) { create(:guide) }
 
-      it { expect(exercise_with_extra_code.extra_code).to eq 'exercise extra code' }
+      it { expect(exercise_with_extra.extra).to eq 'exercise extra code' }
     end
 
     context 'when exercise has extra code and belong to a guide with extra code' do
-      let!(:exercise_with_extra_code) { create(:exercise, guide: guide, extra_code: 'exercise extra code') }
+      let!(:exercise_with_extra) { create(:exercise, guide: guide, extra: 'exercise extra code') }
       let!(:guide) { create(:guide, extra: 'guide extra code') }
 
-      it { expect(exercise_with_extra_code.extra_code).to eq "guide extra code\nexercise extra code" }
-      it { expect(exercise_with_extra_code[:extra_code]).to eq 'exercise extra code' }
+      it { expect(exercise_with_extra.extra).to eq "guide extra code\nexercise extra code" }
+      it { expect(exercise_with_extra[:extra]).to eq 'exercise extra code' }
     end
   end