From 11342163fc1ccbfb1324fb4e1721a2528ee955c9 Mon Sep 17 00:00:00 2001
From: Gahee Heo <ghbooth12@gmail.com>
Date: Thu, 19 Jan 2017 15:04:28 -0600
Subject: [PATCH] Add Faker::Educator.subject, Faker::Educator.course,
 Faker::Educator.degree (Fix #576)

---
 doc/educator.md             |  6 +++++-
 lib/faker/educator.rb       | 10 +++++++++-
 lib/locales/en.yml          |  3 ++-
 test/test_faker_educator.rb | 10 +++++++++-
 4 files changed, 25 insertions(+), 4 deletions(-)

diff --git a/doc/educator.md b/doc/educator.md
index 89d65d6c55..f905e7ee90 100644
--- a/doc/educator.md
+++ b/doc/educator.md
@@ -5,7 +5,11 @@ Faker::Educator.university #=> "Mallowtown Technical College"
 
 Faker::Educator.secondary_school #=> "Iceborough Secondary College"
 
-Faker::Educator.course #=> "Associate Degree in Criminology"
+Faker::Educator.course #=> "Criminology 101"
+
+Faker::Educator.subject #=> "Criminology"
+
+Faker::Educator.degree #=> "Associate Degree in Criminology"
 
 Faker::Educator.campus #=> "Vertapple Campus"
 ```
diff --git a/lib/faker/educator.rb b/lib/faker/educator.rb
index dc1f218356..2c32547547 100644
--- a/lib/faker/educator.rb
+++ b/lib/faker/educator.rb
@@ -8,7 +8,15 @@ def university
       end
 
       def course
-        "#{fetch('educator.tertiary.course.type')} #{fetch('educator.tertiary.course.subject')}"
+        "#{fetch('educator.tertiary.degree.subject')} #{numerify(fetch('educator.tertiary.degree.course_number'))}"
+      end
+
+      def subject
+        "#{fetch('educator.tertiary.degree.subject')}"
+      end
+
+      def degree
+        "#{fetch('educator.tertiary.degree.type')} #{fetch('educator.tertiary.degree.subject')}"
       end
 
       def secondary_school
diff --git a/lib/locales/en.yml b/lib/locales/en.yml
index 32219d0495..2da87d6f49 100755
--- a/lib/locales/en.yml
+++ b/lib/locales/en.yml
@@ -339,9 +339,10 @@ en:
       secondary: ['High School', 'Secondary College', 'High']
       tertiary:
         type: ['College', 'University', 'Technical College', 'TAFE']
-        course:
+        degree:
           subject: ['Arts', 'Business', 'Education', 'Applied Science (Psychology)', 'Architectural Technology', 'Biological Science', 'Biomedical Science', 'Commerce', 'Communications', 'Creative Arts', 'Criminology', 'Design', 'Engineering', 'Forensic Science', 'Health Science', 'Information Systems', 'Computer Science', 'Law', 'Nursing', 'Medicine', 'Psychology', 'Teaching']
           type: ['Associate Degree in', 'Bachelor of', 'Master of']
+          course_number: ['1##', '2##', '3##', '4##', '5##']
 
     space:
       planet: ['Mercury', 'Venus', 'Earth', 'Mars', 'Jupiter', 'Saturn', 'Uranus', 'Neptune']
diff --git a/test/test_faker_educator.rb b/test/test_faker_educator.rb
index 418890e7f2..b033f50726 100644
--- a/test/test_faker_educator.rb
+++ b/test/test_faker_educator.rb
@@ -11,7 +11,15 @@ def test_university
   end
 
   def test_course
-    assert @tester.university.match(/(\w+\.? ?){3,6}/)
+    assert @tester.course.match(/(\w+\.? ?\(?\)?){1,3} \d{3}/)
+  end
+
+  def test_subject
+    assert @tester.course.match(/(\w+\.? ?\(?\)?){1,3}/)
+  end
+
+  def test_degree
+    assert @tester.course.match(/(\w+\.? ?\(?\)?){3,6}/)
   end
 
   def test_secondary_school