From 9e6762204a653ae73f8cbcacb07b5bd7465552ee Mon Sep 17 00:00:00 2001
From: Gahee Heo <ghbooth12@gmail.com>
Date: Thu, 19 Jan 2017 15:04:28 -0600
Subject: [PATCH 1/3] Add subject, course_name, degree method for
 Faker::Educator (Fix #576)

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

diff --git a/doc/educator.md b/doc/educator.md
index 4d571360c0..fc6d6a131c 100644
--- a/doc/educator.md
+++ b/doc/educator.md
@@ -7,7 +7,12 @@ Faker::Educator.university #=> "Mallowtown Technical College"
 
 Faker::Educator.secondary_school #=> "Iceborough Secondary College"
 
-Faker::Educator.course #=> "Associate Degree in Criminology"
+# [DEPRECATION] `course` is deprecated. Please use `degree` instead.
+Faker::Educator.degree #=> "Associate Degree in Criminology"
+
+Faker::Educator.course_name #=> "Criminology 101"
+
+Faker::Educator.subject #=> "Criminology"
 
 Faker::Educator.campus #=> "Vertapple Campus"
 ```
diff --git a/lib/faker/educator.rb b/lib/faker/educator.rb
index dc1f218356..828bb10852 100644
--- a/lib/faker/educator.rb
+++ b/lib/faker/educator.rb
@@ -3,12 +3,25 @@ class Educator < Base
     flexible :educator
 
     class << self
+      extend Gem::Deprecate
+
       def university
         "#{parse('educator.name')} #{fetch('educator.tertiary.type')}"
       end
 
-      def course
-        "#{fetch('educator.tertiary.course.type')} #{fetch('educator.tertiary.course.subject')}"
+      def degree
+        "#{fetch('educator.tertiary.degree.type')} #{fetch('educator.tertiary.degree.subject')}"
+      end
+
+      alias course degree
+      deprecate :course, :course_name, 2018, 7
+
+      def subject
+        fetch('educator.tertiary.degree.subject').to_s
+      end
+
+      def course_name
+        "#{fetch('educator.tertiary.degree.subject')} #{numerify(fetch('educator.tertiary.degree.course_number'))}"
       end
 
       def secondary_school
diff --git a/lib/locales/en/educator.yml b/lib/locales/en/educator.yml
index 9031314dc4..93bb9344c7 100644
--- a/lib/locales/en/educator.yml
+++ b/lib/locales/en/educator.yml
@@ -5,6 +5,7 @@ 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##']
diff --git a/test/test_faker_educator.rb b/test/test_faker_educator.rb
index 35128bf4f6..43ce664c8e 100644
--- a/test/test_faker_educator.rb
+++ b/test/test_faker_educator.rb
@@ -9,8 +9,16 @@ def test_university
     assert @tester.university.match(/(\w+\.? ?){2,3}/)
   end
 
-  def test_course
-    assert @tester.university.match(/(\w+\.? ?){3,6}/)
+  def test_degree
+    assert @tester.degree.match(/(\w+\.? ?\(?\)?){3,6}/)
+  end
+
+  def test_subject
+    assert @tester.subject.match(/(\w+\.? ?\(?\)?){1,3}/)
+  end
+
+  def test_course_name
+    assert @tester.course_name.match(/(\w+\.? ?\(?\)?){1,3} \d{3}/)
   end
 
   def test_secondary_school

From a3a2a855cec764ffbff71e690190632724e0fdd2 Mon Sep 17 00:00:00 2001
From: Vitor Oliveira <vbrazo@gmail.com>
Date: Mon, 20 Aug 2018 18:03:36 -0300
Subject: [PATCH 2/3] Update educator.rb

---
 lib/faker/educator.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/faker/educator.rb b/lib/faker/educator.rb
index 828bb10852..2010f5fb65 100644
--- a/lib/faker/educator.rb
+++ b/lib/faker/educator.rb
@@ -14,7 +14,7 @@ def degree
       end
 
       alias course degree
-      deprecate :course, :course_name, 2018, 7
+      deprecate :course, :course_name, 2018, 10
 
       def subject
         fetch('educator.tertiary.degree.subject').to_s

From a1131e0c42d5b5ba248fa57eabc1a750d0138826 Mon Sep 17 00:00:00 2001
From: Vitor Oliveira <vbrazo@gmail.com>
Date: Mon, 20 Aug 2018 18:07:01 -0300
Subject: [PATCH 3/3] Update educator.rb

---
 lib/faker/educator.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/faker/educator.rb b/lib/faker/educator.rb
index 2010f5fb65..9c4395911a 100644
--- a/lib/faker/educator.rb
+++ b/lib/faker/educator.rb
@@ -17,7 +17,7 @@ def degree
       deprecate :course, :course_name, 2018, 10
 
       def subject
-        fetch('educator.tertiary.degree.subject').to_s
+        fetch('educator.tertiary.degree.subject')
       end
 
       def course_name