lib/source/student/student_short.rb in mc_delta-0.4.0 vs lib/source/student/student_short.rb in mc_delta-0.7.0

@@ -1,57 +1,59 @@
-require_relative "../attr_limited_regex_accessor.rb"
-require_relative "./abstract_student.rb"
+require "source/attr_limited_regex_accessor.rb"
+require "source/student/abstract_student.rb"
 
-class StudentShort < AbstractStudent
-    attr_private_limited_regex_accessor :git, '/@\w*/'
-    attr_private_limited_regex_accessor :email, '/\w*@\w*.\w{2,3}/'
+module McDelta
+    class StudentShort < AbstractStudent
+        attr_private_limited_regex_accessor :git, '/@\w*/'
+        attr_private_limited_regex_accessor :email, '/\w*@\w*.\w{2,3}/'
 
-    public_class_method :new
+        public_class_method :new
 
-    def initialize(id:, fio:, git:, email:)
-        fio_components = fio.split(" ")
+        def initialize(id:, fio:, git:, email:)
+            fio_components = fio.split(" ")
 
-        self.id = id
-        self.firstname = fio_components[0]
-        self.lastname = fio_components[1]
-        self.patronymic = fio_components[2]
+            self.id = id
+            self.firstname = fio_components[0]
+            self.lastname = fio_components[1]
+            self.patronymic = fio_components[2]
 
-        self.git = git
-        self.email = email
-    end
+            self.git = git
+            self.email = email
+        end
 
-    def self.from_student(student) 
-        StudentShort.new(
-            id: student.id, 
-            fio: "#{student.firstname} #{student.lastname} #{student.patronymic}",
-            git: student.git,
-            email: student.email
-        )
-    end
+        def self.from_student(student) 
+            StudentShort.new(
+                id: student.id, 
+                fio: "#{student.firstname} #{student.lastname} #{student.patronymic}",
+                git: student.git,
+                email: student.email
+            )
+        end
 
-    def self.from_string(id, info) 
-        params = info
-        .split(";")
-        .map { |x| x.split(":") }
-        .map { |x| [x[0].to_sym, x[1]] }
-        .to_h
+        def self.from_string(id, info) 
+            params = info
+            .split(";")
+            .map { |x| x.split(":") }
+            .map { |x| [x[0].to_sym, x[1]] }
+            .to_h
 
-        StudentShort.new(
-            id: id, 
-            fio: params[:fio],
-            git: params[:git],
-            email: params[:email]
-        )
-    end
+            StudentShort.new(
+                id: id, 
+                fio: params[:fio],
+                git: params[:git],
+                email: params[:email]
+            )
+        end
 
-    def fio_info
-        "fio:#{firstname} #{lastname.upcase[0]} #{patronymic.upcase[0]}"
-    end
+        def fio_info
+            "fio:#{firstname} #{lastname.upcase[0]} #{patronymic.upcase[0]}"
+        end
 
-    def contacts_info
-        "git:#{git};email:#{email}"
-    end
+        def contacts_info
+            "git:#{git};email:#{email}"
+        end
 
-    def get_info
-        [fio_info, contacts_info].join(";")
+        def get_info
+            [fio_info, contacts_info].join(";")
+        end
     end
 end
\ No newline at end of file