From 828ab3a5cb5e9ba16d30b8edac5044566b9f7709 Mon Sep 17 00:00:00 2001 From: Artem Darius Weber Date: Fri, 14 Feb 2025 23:25:26 +0300 Subject: [PATCH] feat: reorganize student list classes into providers and implement TXT/JSON handling --- lab2/{ => providers}/students_list_base.rb | 8 ++++---- lab2/{ => providers}/students_list_json.rb | 2 +- lab2/{ => providers}/students_list_txt.rb | 2 +- lab2/{ => providers}/students_list_yaml.rb | 2 +- lab2/tests/test_students_list_json.rb | 2 +- lab2/tests/test_students_list_txt.rb | 2 +- lab2/tests/test_students_list_yaml.rb | 2 +- 7 files changed, 10 insertions(+), 10 deletions(-) rename lab2/{ => providers}/students_list_base.rb (94%) rename lab2/{ => providers}/students_list_json.rb (98%) rename lab2/{ => providers}/students_list_txt.rb (96%) rename lab2/{ => providers}/students_list_yaml.rb (98%) diff --git a/lab2/students_list_base.rb b/lab2/providers/students_list_base.rb similarity index 94% rename from lab2/students_list_base.rb rename to lab2/providers/students_list_base.rb index 8a96e46..d26ed13 100644 --- a/lab2/students_list_base.rb +++ b/lab2/providers/students_list_base.rb @@ -1,7 +1,7 @@ -require_relative 'student' -require_relative 'student_short' -require_relative 'data_list_student_short' -require_relative 'data_table' +require_relative '../student' +require_relative '../student_short' +require_relative '../data_list_student_short' +require_relative '../data_table' class StudentsListBase attr_reader :students diff --git a/lab2/students_list_json.rb b/lab2/providers/students_list_json.rb similarity index 98% rename from lab2/students_list_json.rb rename to lab2/providers/students_list_json.rb index 13d8897..f681f28 100644 --- a/lab2/students_list_json.rb +++ b/lab2/providers/students_list_json.rb @@ -1,7 +1,7 @@ require 'json' require 'date' require_relative 'students_list_base' -require_relative 'student' +require_relative '../student' class StudentsListJSON < StudentsListBase def load_from_file diff --git a/lab2/students_list_txt.rb b/lab2/providers/students_list_txt.rb similarity index 96% rename from lab2/students_list_txt.rb rename to lab2/providers/students_list_txt.rb index f7a2527..5d87b06 100644 --- a/lab2/students_list_txt.rb +++ b/lab2/providers/students_list_txt.rb @@ -1,5 +1,5 @@ require_relative 'students_list_base' -require_relative 'student' +require_relative '../student' class StudentsListTXT < StudentsListBase def load_from_file diff --git a/lab2/students_list_yaml.rb b/lab2/providers/students_list_yaml.rb similarity index 98% rename from lab2/students_list_yaml.rb rename to lab2/providers/students_list_yaml.rb index ef759f1..fb69463 100644 --- a/lab2/students_list_yaml.rb +++ b/lab2/providers/students_list_yaml.rb @@ -2,7 +2,7 @@ require 'yaml' require 'date' require_relative 'students_list_base' -require_relative 'student' +require_relative '../student' class StudentsListYAML < StudentsListBase def load_from_file diff --git a/lab2/tests/test_students_list_json.rb b/lab2/tests/test_students_list_json.rb index 730a01b..f9e7d52 100644 --- a/lab2/tests/test_students_list_json.rb +++ b/lab2/tests/test_students_list_json.rb @@ -1,7 +1,7 @@ require 'minitest/autorun' require 'json' require 'date' -require_relative '../students_list_json' +require_relative '../providers/students_list_json' require_relative '../student' require_relative '../student_short' diff --git a/lab2/tests/test_students_list_txt.rb b/lab2/tests/test_students_list_txt.rb index a240a8c..6f78904 100644 --- a/lab2/tests/test_students_list_txt.rb +++ b/lab2/tests/test_students_list_txt.rb @@ -1,5 +1,5 @@ require 'date' -require_relative '../students_list_txt' +require_relative '../providers/students_list_txt' require_relative '../student' require_relative '../student_short' diff --git a/lab2/tests/test_students_list_yaml.rb b/lab2/tests/test_students_list_yaml.rb index d18dfa9..f41e681 100644 --- a/lab2/tests/test_students_list_yaml.rb +++ b/lab2/tests/test_students_list_yaml.rb @@ -1,7 +1,7 @@ require 'minitest/autorun' require 'yaml' require 'date' -require_relative '../students_list_yaml' +require_relative '../providers/students_list_yaml' require_relative '../student' require_relative '../student_short'