students_lab4_s0195941 0.1.0 → 0.1.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/.yardopts +7 -0
- data/{src → controller}/create_student_controller.rb +1 -0
- data/{src → controller}/student_form_controller.rb +56 -48
- data/{src → controller}/student_list_controller.rb +98 -89
- data/{src → controller}/update_student_controller.rb +1 -0
- data/lib/students_lab4_s0195941.rb +1 -1
- data/{src → model}/data_list.rb +64 -57
- data/{src → model}/data_list_student_short.rb +9 -0
- data/{src → model}/data_table.rb +34 -30
- data/model/db.rb +19 -0
- data/{src → model}/student.rb +135 -126
- data/{src → model}/student_base.rb +35 -33
- data/{src → model}/student_short.rb +33 -29
- data/{src → model}/students_list.rb +200 -172
- data/{src → model}/validated_attr_writer.rb +27 -24
- data/student_list_app.rb +23 -0
- data/uml/class_diagram.md +247 -0
- data/uml/create_student_sequence.md +109 -0
- data/uml/delete_student_sequence.md +81 -0
- data/uml/startup_sequence.md +361 -0
- data/uml/update_student_sequence.md +144 -0
- data/{src → view}/student_form_view.rb +89 -71
- data/{src → view}/student_list_view.rb +119 -100
- metadata +24 -18
- data/README.md +0 -15
- data/src/db.rb +0 -14
- data/src/student_list_app.rb +0 -18
data/{src → model}/student.rb
RENAMED
|
@@ -1,126 +1,135 @@
|
|
|
1
|
-
require_relative 'student_base'
|
|
2
|
-
require_relative 'validated_attr_writer'
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
self.
|
|
28
|
-
|
|
29
|
-
self.
|
|
30
|
-
self.
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
end
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
|
|
118
|
-
|
|
119
|
-
|
|
120
|
-
|
|
121
|
-
|
|
122
|
-
|
|
123
|
-
|
|
124
|
-
|
|
125
|
-
|
|
126
|
-
|
|
1
|
+
require_relative 'student_base'
|
|
2
|
+
require_relative 'validated_attr_writer'
|
|
3
|
+
|
|
4
|
+
# Полная модель студента с проверкой имени и форматов контактов.
|
|
5
|
+
class Student < StudentBase
|
|
6
|
+
include Comparable
|
|
7
|
+
singleton_class.prepend(ValidatedAttrWriter)
|
|
8
|
+
|
|
9
|
+
attr_accessor :last_name, :first_name, :patronymic
|
|
10
|
+
attr_reader :phone, :telegram, :email
|
|
11
|
+
attr_writer :git, :phone, :telegram, :email
|
|
12
|
+
private :phone=, :telegram=, :email=
|
|
13
|
+
|
|
14
|
+
# Сравнивает ФИО лексикографически, считая отсутствующее отчество пустой строкой.
|
|
15
|
+
def <=>(other)
|
|
16
|
+
return nil unless other.is_a?(Student)
|
|
17
|
+
|
|
18
|
+
[last_name, first_name, patronymic.to_s] <=>
|
|
19
|
+
[other.last_name, other.first_name, other.patronymic.to_s]
|
|
20
|
+
end
|
|
21
|
+
|
|
22
|
+
def initialize(last_name:, first_name:, id: nil, patronymic: nil,
|
|
23
|
+
phone: nil, telegram: nil, email: nil, git: nil)
|
|
24
|
+
raise ArgumentError, "Невалидный ID: #{id}" unless valid_id?(id)
|
|
25
|
+
|
|
26
|
+
super(id: id)
|
|
27
|
+
self.contact = { phone: phone, telegram: telegram, email: email }
|
|
28
|
+
|
|
29
|
+
self.last_name = last_name
|
|
30
|
+
self.first_name = first_name
|
|
31
|
+
self.patronymic = patronymic
|
|
32
|
+
self.git = git
|
|
33
|
+
end
|
|
34
|
+
|
|
35
|
+
# Создаёт студента из строки, возвращённой PostgreSQL.
|
|
36
|
+
# @param attributes [Hash{String => Object}] значения столбцов со строковыми ключами
|
|
37
|
+
# @return [Student] студент с проверенными полями
|
|
38
|
+
def self.from_hash(attributes)
|
|
39
|
+
new(
|
|
40
|
+
id: attributes['id'],
|
|
41
|
+
last_name: attributes['last_name'],
|
|
42
|
+
first_name: attributes['first_name'],
|
|
43
|
+
patronymic: attributes['patronymic'],
|
|
44
|
+
phone: attributes['phone'],
|
|
45
|
+
telegram: attributes['telegram'],
|
|
46
|
+
email: attributes['email'],
|
|
47
|
+
git: attributes['git']
|
|
48
|
+
)
|
|
49
|
+
end
|
|
50
|
+
|
|
51
|
+
def self.valid_name?(name)
|
|
52
|
+
valid_format?(name, /\A[А-ЯЁA-Z][а-яёa-z]+\z/, required: true)
|
|
53
|
+
end
|
|
54
|
+
|
|
55
|
+
def self.valid_phone?(phone)
|
|
56
|
+
valid_format?(
|
|
57
|
+
phone,
|
|
58
|
+
/\A(?:\+7\d{10}|8\d{10}|8\(\d{3}\)\d{3}-\d{2}-\d{2})\z/
|
|
59
|
+
)
|
|
60
|
+
end
|
|
61
|
+
|
|
62
|
+
def self.valid_telegram?(telegram)
|
|
63
|
+
valid_format?(telegram, /\A@[a-zA-Z0-9_]{5,32}\z/)
|
|
64
|
+
end
|
|
65
|
+
|
|
66
|
+
def self.valid_email?(email)
|
|
67
|
+
valid_format?(email, /\A[\w+\-.]+@[a-z\d\-]+(\.[a-z\d\-]+)*\.[a-z]+\z/i)
|
|
68
|
+
end
|
|
69
|
+
|
|
70
|
+
def self.valid_git?(git)
|
|
71
|
+
valid_format?(git, /\Ahttps:\/\/(www\.)?(github|gitlab)\.com\/[\w\-]+\z/)
|
|
72
|
+
end
|
|
73
|
+
|
|
74
|
+
def self.valid_format?(value, pattern, required: false)
|
|
75
|
+
return !required if value.nil?
|
|
76
|
+
|
|
77
|
+
value.is_a?(String) && value.match?(pattern)
|
|
78
|
+
end
|
|
79
|
+
|
|
80
|
+
def self.valid_last_name?(value)
|
|
81
|
+
valid_name?(value)
|
|
82
|
+
end
|
|
83
|
+
|
|
84
|
+
def self.valid_first_name?(value)
|
|
85
|
+
valid_name?(value)
|
|
86
|
+
end
|
|
87
|
+
|
|
88
|
+
def self.valid_patronymic?(value)
|
|
89
|
+
value.nil? || valid_name?(value)
|
|
90
|
+
end
|
|
91
|
+
|
|
92
|
+
private_class_method :valid_format?, :valid_last_name?, :valid_first_name?, :valid_patronymic?
|
|
93
|
+
|
|
94
|
+
# @return [String, nil] контакт для списка, с приоритетом Telegram, email, телефон
|
|
95
|
+
def contact
|
|
96
|
+
return "telegram - #{telegram}" if telegram
|
|
97
|
+
return "email - #{email}" if email
|
|
98
|
+
return "phone - #{phone}" if phone
|
|
99
|
+
|
|
100
|
+
nil
|
|
101
|
+
end
|
|
102
|
+
|
|
103
|
+
# Присваивает телефон, Telegram и почту через проверяющие сеттеры.
|
|
104
|
+
def contact=(contacts)
|
|
105
|
+
self.phone = contacts[:phone]
|
|
106
|
+
self.telegram = contacts[:telegram]
|
|
107
|
+
self.email = contacts[:email]
|
|
108
|
+
end
|
|
109
|
+
|
|
110
|
+
# @return [String] фамилия и инициалы для краткого представления
|
|
111
|
+
def last_name_initials
|
|
112
|
+
initials = "#{last_name} #{first_name[0]}."
|
|
113
|
+
initials += " #{patronymic[0]}." if patronymic
|
|
114
|
+
initials
|
|
115
|
+
end
|
|
116
|
+
|
|
117
|
+
# @return [String] ФИО и заполненные поля студента
|
|
118
|
+
def to_s
|
|
119
|
+
fio = "#{last_name} #{first_name}"
|
|
120
|
+
fio += " #{patronymic}" if patronymic
|
|
121
|
+
parts = [fio]
|
|
122
|
+
parts << "ID: #{id}" if id
|
|
123
|
+
parts << "git: #{git}" if git
|
|
124
|
+
parts << "phone: #{phone}" if phone
|
|
125
|
+
parts << "telegram: #{telegram}" if telegram
|
|
126
|
+
parts << "email: #{email}" if email
|
|
127
|
+
parts.join(", ")
|
|
128
|
+
end
|
|
129
|
+
|
|
130
|
+
private
|
|
131
|
+
|
|
132
|
+
def valid_id?(value)
|
|
133
|
+
value.nil? || value.to_s.match?(/\A\d+\z/)
|
|
134
|
+
end
|
|
135
|
+
end
|
|
@@ -1,33 +1,35 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
@
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
parts <<
|
|
30
|
-
|
|
31
|
-
parts
|
|
32
|
-
|
|
33
|
-
|
|
1
|
+
# Общий интерфейс полного и краткого представлений студента.
|
|
2
|
+
class StudentBase
|
|
3
|
+
attr_reader :id, :git
|
|
4
|
+
|
|
5
|
+
def initialize(id:, git: nil)
|
|
6
|
+
@id = id
|
|
7
|
+
@git = git
|
|
8
|
+
end
|
|
9
|
+
|
|
10
|
+
def has_git?
|
|
11
|
+
!git.nil?
|
|
12
|
+
end
|
|
13
|
+
|
|
14
|
+
def has_contact?
|
|
15
|
+
!contact.nil?
|
|
16
|
+
end
|
|
17
|
+
|
|
18
|
+
def last_name_initials
|
|
19
|
+
raise NotImplementedError, 'Наследник должен реализовать last_name_initials'
|
|
20
|
+
end
|
|
21
|
+
|
|
22
|
+
def contact
|
|
23
|
+
raise NotImplementedError, 'Наследник должен реализовать contact'
|
|
24
|
+
end
|
|
25
|
+
|
|
26
|
+
# Формирует общую строку из инициалов, ID, доступного контакта и Git.
|
|
27
|
+
def short_info
|
|
28
|
+
parts = [last_name_initials]
|
|
29
|
+
parts << "ID: #{id}" if id
|
|
30
|
+
selected_contact = contact
|
|
31
|
+
parts << selected_contact if selected_contact
|
|
32
|
+
parts << "git: #{git}" if git
|
|
33
|
+
parts.join(", ")
|
|
34
|
+
end
|
|
35
|
+
end
|
|
@@ -1,29 +1,33 @@
|
|
|
1
|
-
require_relative 'student_base'
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
raise ArgumentError, '
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
@
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
1
|
+
require_relative 'student_base'
|
|
2
|
+
|
|
3
|
+
# Краткое представление студента для строк таблицы.
|
|
4
|
+
class StudentShort < StudentBase
|
|
5
|
+
attr_reader :last_name_initials, :contact
|
|
6
|
+
|
|
7
|
+
def initialize(id:, last_name_initials:, contact: nil, git: nil)
|
|
8
|
+
raise ArgumentError, 'ID обязателен' if id.nil?
|
|
9
|
+
raise ArgumentError, 'Фамилия и инициалы обязательны' if last_name_initials.nil?
|
|
10
|
+
|
|
11
|
+
super(id: id, git: git)
|
|
12
|
+
|
|
13
|
+
@last_name_initials = last_name_initials
|
|
14
|
+
@contact = contact
|
|
15
|
+
end
|
|
16
|
+
|
|
17
|
+
# @param student [Student] студент с назначенным ID
|
|
18
|
+
# @return [StudentShort] инициалы, выбранный контакт и Git
|
|
19
|
+
def self.from_student(student)
|
|
20
|
+
new(
|
|
21
|
+
id: student.id,
|
|
22
|
+
last_name_initials: student.last_name_initials,
|
|
23
|
+
contact: student.contact,
|
|
24
|
+
git: student.git
|
|
25
|
+
)
|
|
26
|
+
end
|
|
27
|
+
|
|
28
|
+
# @return [String] краткая информация о студенте
|
|
29
|
+
def to_s
|
|
30
|
+
short_info
|
|
31
|
+
end
|
|
32
|
+
|
|
33
|
+
end
|