rybish_code 1.1.4 → 1.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 903026f159b4bba3e278fb0863fc648975d50e380387b8996f5783a64098cad8
-  data.tar.gz: 8543b5b56e90e0416a5db0515a56359c7e9d45c02a843bca3555d01aa136b5d7
+  metadata.gz: e09972789f424e2541e157cb6dcadefed4d477e1efb6bd80710d4ae27e27bfff
+  data.tar.gz: b97f74213ba3356bc99263b55495964f25e2d07ff5fe6f2daf3bc81fcac9a788
 SHA512:
-  metadata.gz: edd8f732ac02ec41cd9f4637794b1428d7aa9c044e15b990d7ee7043473facce3c22a35d42a680330d9917ba2ece4739449f20ba482a2bfe5386400c7fa43858
-  data.tar.gz: 4456594e4430f6e0f8fa9c9f3b2093bad0662c60f06678b848fd3b2c2e9a964bddce1cbca51e4695d491601958bb6298c76160ddc5c5db48648023b0544bdd19
+  metadata.gz: 521f45b3bdafe593f2cc2de1b8bbfc5a81edce2fe8f474fc4ffcab03bd536bc03c7c551cd0e737d724fa6e54274687b5b1d050eeb945fd8e1a1a362ef40616dd
+  data.tar.gz: 8c2b2dc6845596ec1f5fb40aa511c4ac31145ad9feb784272fa053d2ef9902530680ec1c11a3fcd3fb0bc703bb76b944f618ec25f88bbf4c4bf6669b8a836f76

data/lib/rybish_code/version.rb

@@ -0,0 +1,5 @@
+# frozen_string_literal: true
+
+module RybishCode
+  VERSION = "1.1.6"
+end

data/lib/{rubbish_code.rb → rybish_code.rb}

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
-require_relative "rubbish_code/version"
+require_relative "rybish_code/version"
 
-module RubbishCode
+module RybishCode
   Dir[File.dirname(__FILE__) + '/source/**/*.rb'].each { |file|
     puts file
     require file

data/lib/source/controllers/student_input_form_controller.rb

@@ -0,0 +1,43 @@
+# frozen_string_literal: true
+
+require 'win32api'
+
+class StudentInputFormControllerCreate
+  def initialize(parent_controller)
+    @parent_controller = parent_controller
+  end
+
+  def set_view(view)
+    @view = view
+  end
+
+  def on_view_created
+  end
+
+  def process_fields(fields)
+    begin
+      last_name = fields.delete(:last_name)
+      first_name = fields.delete(:first_name)
+      paternal_name = fields.delete(:paternal_name)
+
+      return if last_name.nil? || first_name.nil? || paternal_name.nil?
+
+      student = Student.new(last_name, first_name, paternal_name, **fields)
+
+      StudentsListDB.add_student(student)
+
+      @view.close
+    rescue ArgumentError => e
+      api = Win32API.new('user32', 'MessageBox', ['L', 'P', 'P', 'L'], 'I')
+      api.call(0, e.message, 'Error', 0)
+    end
+  end
+
+  private
+
+  def on_db_conn_error
+    api = Win32API.new('user32', 'MessageBox', ['L', 'P', 'P', 'L'], 'I')
+    api.call(0, "No connection to DB", "Error", 0)
+    @view.close
+  end
+end

data/lib/source/controllers/student_input_form_controller_edit.rb

@@ -0,0 +1,51 @@
+# frozen_string_literal: true
+
+require 'win32api'
+
+class StudentInputFormControllerEdit
+  def initialize(parent_controller, existing_student_id)
+    @parent_controller = parent_controller
+    @existing_student_id = existing_student_id
+  end
+
+  def set_view(view)
+    @view = view
+  end
+
+  def on_view_created
+    @existing_student = StudentsListDB.get_student(@existing_student_id)
+    @view.make_readonly(:git, :telegram, :email, :phone)
+    populate_fields(@existing_student)
+  end
+
+  def populate_fields(student)
+    @view.set_value(:last_name, student.last_name)
+    @view.set_value(:first_name, student.first_name)
+    @view.set_value(:paternal_name, student.paternal_name)
+    @view.set_value(:git, student.git)
+    @view.set_value(:telegram, student.telegram)
+    @view.set_value(:email, student.email)
+    @view.set_value(:phone, student.phone)
+  end
+
+  def process_fields(fields)
+    begin
+      new_student = Student.from_json(JSON(fields))
+
+      StudentsListDB.replace_student(@existing_student_id, new_student)
+
+      @view.close
+    rescue ArgumentError => e
+      api = Win32API.new('user32', 'MessageBox', ['L', 'P', 'P', 'L'], 'I')
+      api.call(0, e.message, 'Error', 0)
+    end
+  end
+
+  private
+
+  def on_db_conn_error
+    api = Win32API.new('user32', 'MessageBox', ['L', 'P', 'P', 'L'], 'I')
+    api.call(0, "No connection to DB", "Error", 0)
+    @view.close
+  end
+end

data/lib/source/controllers/tab_students_controller.rb

@@ -1,82 +1,68 @@
-# frozen_string_literal: true
-
-require './LabStudents/views/main_window'
-require 'source/repositories/student_repository'
-require 'source/repositories/adapters/db_source_adapter'
-require 'source/repositories/containers/data_list_student_short'
-require './LabStudents/views/student_input_form'
-require 'source/controllers/student_input_form/student_input_form_controller_create'
-require 'source/controllers/student_input_form/student_input_form_controller_edit'
-require 'source/util/logger_holder'
-require 'win32api'
-
-class TabStudentsController
-  def initialize(view)
-    LoggerHolder.instance.debug('TabStudentsController: init start')
-    @view = view
-    @data_list = DataListStudentShort.new([])
-    @data_list.add_listener(@view)
-    LoggerHolder.instance.debug('TabStudentsController: init done')
-  end
-
-  def on_view_created
-    begin
-      @student_rep = StudentRepository.new(DBSourceAdapter.new)
-      LoggerHolder.instance.debug('TabStudentsController: created student repository')
-    rescue Mysql2::Error::ConnectionError => e
-       on_db_conn_error(e)
-    end
-  end
-
-  def show_modal_add
-    LoggerHolder.instance.debug('TabStudentsController: showing modal (add)')
-    controller = StudentInputFormControllerCreate.new(self)
-    view = StudentInputForm.new(controller)
-    controller.set_view(view)
-    view.create.show
-  end
-
-  def show_modal_edit(current_page, per_page, selected_row)
-    LoggerHolder.instance.debug('TabStudentsController: showing modal (edit)')
-    student_num = (current_page - 1) * per_page + selected_row
-    @data_list.select_element(student_num)
-    student_id = @data_list.selected_id
-    controller = StudentInputFormControllerEdit.new(self, student_id)
-    view = StudentInputForm.new(controller)
-    controller.set_view(view)
-    view.create.show
-  end
-
-  def delete_selected(current_page, per_page, selected_row)
-    begin
-      LoggerHolder.instance.debug('TabStudentsController: deleting selected student')
-      student_num = (current_page - 1) * per_page + selected_row
-      @data_list.select_element(student_num)
-      student_id = @data_list.selected_id
-      @student_rep.remove_student(student_id)
-    rescue Mysql2::Error::ConnectionError => e
-      on_db_conn_error(e)
-    end
-  end
-
-  def refresh_data(page, per_page)
-    begin
-      LoggerHolder.instance.debug('TabStudentsController: refreshing data...')
-      @data_list = @student_rep.paginated_short_students(page, per_page, @data_list)
-      @view.update_student_count(@student_rep.student_count)
-    rescue Mysql2::Error::ConnectionError => e
-      on_db_conn_error(e)
-    end
-  end
-
-  private
-
-  def on_db_conn_error(error)
-    LoggerHolder.instance.error('TabStudentsController: DB connection error:')
-    LoggerHolder.instance.error(error.message)
-    api = Win32API.new('user32', 'MessageBox', ['L', 'P', 'P', 'L'], 'I')
-    api.call(0, "No connection to DB", "Error", 0)
-    # TODO: Возможность переключения на JSON помимо exit
-    exit(false)
-  end
-end
+# frozen_string_literal: true
+
+require_relative '../ui/main_screen'
+require_relative '../data_base/students_list_db'
+require_relative '../models/data_list/data_list_short'
+require_relative '../event/event_manager'
+require_relative '../event/event_update_students_table'
+require_relative '../event/event_update_students_count'
+require_relative 'student_input_form_controller'
+require_relative 'student_input_form_controller_edit'
+
+class TabStudentsController
+  def initialize(view, student_per_page)
+    @view = view
+    @data_list = DataListStudentShort.new(list: [])
+    @student_per_page = student_per_page
+    @current_page = 1
+  end
+
+  def show_view
+    @view.create.show
+  end
+
+  def show_modal_add
+    controller = StudentInputFormControllerCreate.new(self)
+    view = StudentInputForm.new(controller,self)
+    controller.set_view(view)
+    view.create.show
+  end
+
+  def show_modal_edit(selected_row)
+    student_num = (@current_page - 1) * @student_per_page + selected_row
+    student_id = @data_list.get_id_by_index(student_num)
+    controller = StudentInputFormControllerEdit.new(self, student_id)
+    view = StudentInputForm.new(controller, self)
+    controller.set_view(view)
+    view.create.show
+  end
+
+  def delete_selected(selected_row)
+    begin
+      student_num = (@current_page - 1) * @student_per_page + selected_row
+      student_id = @data_list.get_id_by_index(student_num)
+      StudentsListDB.remove_student(student_id)
+    rescue
+      on_db_conn_error
+    end
+  end
+
+
+  def refresh_data
+    StudentsListDB.get_students_slice(@current_page, @student_per_page, @data_list)
+    EventManager.notify(EventUpdateStudentsCount.new(StudentsListDB.count))
+  end
+
+  def get_page
+    @current_page
+  end
+
+  def next_page(is_left)
+    if is_left
+      @current_page = [@current_page - 1, 1].max
+    else
+      @current_page = [@current_page + 1, (@total_count / STUDENTS_PER_PAGE.to_f).ceil].min
+    end
+    @controller.refresh_data(@current_page)
+  end
+end

data/lib/source/models/data_list/data_list.rb

@@ -0,0 +1,47 @@
+require_relative "../../support/meta_code"
+
+class DataList
+    private_attr_accessor :list
+    private_attr_accessor :selected_objects
+
+    def initialize(list:)
+        self.list = list
+        self.selected_objects = []
+    end
+
+    def select(index)
+        selected_objects << list[index].id
+    end
+
+    def get_id_by_index(index)
+        list[index].id
+    end
+
+    MESS = "SYSTEM ERROR: method missing"
+    protected def get_vars; raise MESS; end
+    protected def filter(object); raise MESS; end
+    protected def create_data(objects_names); raise MESS; end
+    protected def get_real_vars; raise MESS; end
+    protected def format_data(objects); end
+
+    def get_names
+        filter(get_vars)
+    end
+
+    def get_data
+        DataTable.new(
+                    data: create_data(
+                        (0..list.size-1).map { |object_index|
+                            get_real_vars
+                        }
+                    )
+                )
+    end
+
+    def replace_objects(objects)
+        objects = format_data(objects)
+
+        self.list = objects.dup
+        EventManager.notify(EventUpdateStudentsTable.new(get_data, get_names))
+    end
+end

data/lib/source/models/data_list/data_list_short.rb

@@ -0,0 +1,46 @@
+require_relative './data_list.rb'
+require_relative './data_table.rb'
+require_relative '../student/student_short.rb'
+
+class DataListStudentShort < DataList
+
+    private_attr_accessor :names  
+
+    def initialize(list:) 
+        super(list: list)
+
+        self.names = get_names
+    end
+
+    private def get_vars
+        ["ID","ФИО","Git","Контакт"]
+    end
+
+    private def get_real_vars
+        ["fio","git","contact"]
+    end
+
+    private def filter(object)
+        object.filter { |x| x  != "ID" }
+    end
+
+    private def format_data(objects)
+        if objects[0].is_a?(Student)
+            objects = objects.map { |x| StudentShort.from_student(x)}
+        end
+        objects
+    end
+
+    private def create_data(objects_names)
+        (0...objects_names.size).map { |item_index|
+            (0...objects_names[item_index].size + 1).map { |name_index|
+                if name_index == 0 then item_index else
+                   tmp = list[item_index].instance_variable_get("@#{objects_names[item_index][name_index - 1]}")
+                   tmp
+                end
+            }
+        }
+    end
+
+    
+end

data/lib/source/models/data_list/data_table.rb

@@ -0,0 +1,23 @@
+class DataTable 
+    private_attr_accessor :data
+
+    def initialize(data:)
+        self.data = data
+    end
+
+    def element(row:, column:)
+        data[row][column]
+    end
+
+    def columns_count
+        data[0].size
+    end
+
+    def to_2d_array
+        data.dup
+    end
+
+    def rows_count
+        data.size
+    end
+end

data/lib/source/models/student/student.rb

@@ -0,0 +1,98 @@
+# frozen_string_literal: true
+require 'json'
+require 'yaml'
+require_relative "../../support/meta_code"
+require_relative "./student_abstract.rb"
+
+class Student < AbstractStudent
+    attr_writer :id
+    attr_validate_accessor :phone, '/^\+?[7,8] ?\(?\d{3}\)?-?\d{3}-?\d{2}-?\d{2}$/'
+    attr_validate_accessor :email, '/\w*@\w*.\w{2,3}/'
+    attr_validate_accessor :telegram, '/@\w*/'
+    attr_validate_accessor :git, '/@\w*/'
+    attr_validate_accessor :last_name, '/^[А-Я][а-я]+$/'
+    attr_validate_accessor :first_name, '/^[А-Я][а-я]+$/'
+    attr_validate_accessor :paternal_name, '/^[А-Я][а-я]+$/'
+
+    def initialize(last_name, first_name, paternal_name, options = {})
+      self.last_name = last_name
+      self.first_name = first_name
+      self.paternal_name = paternal_name
+      self.id = options[:id] == 'NULL' ? nil : options[:id]
+      self.phone = options[:phone] == 'NULL' ? nil : options[:phone]
+      self.git = options[:git] == 'NULL' ? nil : options[:git]
+      self.telegram = options[:telegram] == 'NULL' ? nil : options[:telegram]
+      self.email = options[:email] == 'NULL' ? nil : options[:email]
+    end
+
+    attr_is_have_reader :fio
+    def fio
+      "#{last_name} #{first_name.upcase[0]}. #{paternal_name.upcase[0]}."
+    end
+
+    attr_is_have_reader :contact
+    def contact
+      return "#{phone}" unless phone.nil?
+      return "#{telegram}" unless telegram.nil?
+      return "#{email}" unless email.nil?
+      nil
+    end
+
+    def validate
+      git? && contact?
+    end
+
+    def set_contacts(contacts)
+      self.phone = contacts[:phone] if contacts.key?(:phone)
+      self.telegram = contacts[:telegram] if contacts.key?(:telegram)
+      self.email = contacts[:email] if contacts.key?(:email)
+    end
+  
+    def self.from_json(str)
+      unless str.is_a?(String)
+        str = JSON.pretty_generate(str)
+      end
+      result = JSON.parse(str)
+      raise ArgumentError, 'Missing fields: last_name, first_name, paternal_name' unless result.key?('first_name') && result.key?('last_name') && result.key?('paternal_name')
+
+      last_name = result.delete('last_name')
+      first_name = result.delete('first_name')
+      paternal_name = result.delete('paternal_name')
+      Student.new(last_name, first_name, paternal_name, **result.transform_keys(&:to_sym))
+    end
+
+    def self.from_yaml(str)
+      result = YAML.load(str)
+      raise ArgumentError, 'Missing fields: last_name, first_name, paternal_name' unless result.key?('first_name') && result.key?('last_name') && result.key?('paternal_name')
+
+      last_name = result.delete('last_name')
+      first_name = result.delete('first_name')
+      paternal_name = result.delete('paternal_name')
+      Student.new(last_name, first_name, paternal_name, **result.transform_keys(&:to_sym))
+    end
+
+    def self.read_from_txt(file_path)
+      arr = []
+      begin
+        File.foreach(file_path) do |line|
+          arr += [Student.from_json(line)]
+        end
+        return arr
+      rescue => exception
+        raise "File not found at the given address #{file_path}. Exception: #{exception.message}"
+      end
+    end
+
+    def self.write_to_txt(file_path, students)
+      begin
+        File.open(file_path, 'w') do |file|
+          students.each do |student|
+            file.puts student.to_s
+          end
+        end
+      rescue => exception
+        raise "Error writing to file at the given address #{file_path}. Exception: #{exception.message}"
+      end
+    end
+
+  end

data/lib/source/models/student/student_abstract.rb

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+require_relative '../../support/meta_code'
+
+class AbstractStudent
+  attr_reader :git, :contact, :id
+
+  getter :fio, :git, :contact, :id
+
+  def get_info
+    "#{get_fio};#{get_contact};#{get_git}"
+  end
+
+  def to_s
+    vars = {}
+    instance_variables.map do |attribute|
+      vars[attribute.to_s[1..]] = instance_variable_get(attribute)
+    end
+    JSON(vars)
+  end
+end

data/lib/source/models/student/student_short.rb

@@ -0,0 +1,38 @@
+# frozen_string_literal: true
+require 'json'
+require_relative "../../support/meta_code"
+require_relative "./student_abstract.rb"
+
+class StudentShort < AbstractStudent
+    attr_reader :fio
+    private_attr_writer :git, :contact, :id, :fio
+
+    def initialize(id:, fio:, git:, contact:)
+        self.id = id
+        self.fio = fio
+        self.git = git
+        self.contact = contact
+    end
+
+    def self.from_student(student) 
+        StudentShort.new(
+            id: student.id, 
+            fio: "#{student.first_name} #{student.last_name.upcase[0]}. #{student.paternal_name.upcase[0]}.",
+            git: student.git,
+            contact: student.contact
+        )
+    end
+
+    def self.from_json(json)
+      result = JSON.parse(json)
+      raise ArgumentError, 'Missing field: fio' unless result.key?('fio')
+
+      fio = result.delete('fio')
+      StudentShort.new(
+        id: result['id'],
+        fio: fio,
+        git: result['git'],
+        contact: result['contact']
+      )
+    end    
+end

data/lib/source/models/student_list/data_transformers.rb

@@ -0,0 +1,43 @@
+require 'yaml'
+require 'json'
+
+class DataTransformer
+
+  MESS = "SYSTEM ERROR: method missing"
+  def parse_to_student(line); raise MESS; end
+
+  def puts_student(student); raise MESS; end
+
+end
+
+class DataTransformerYaml < DataTransformer
+
+  def parse_to_student(line)
+    Student.from_yaml(line)
+  end
+
+  def puts_student(student)
+    vars = {}
+    student.instance_variables.map do |attribute|
+      vars[attribute.to_s[1..-1]]=student.instance_variable_get(attribute)
+    end
+    (vars).to_yaml
+  end
+
+end
+
+class DataTransformerJson < DataTransformer
+
+  def parse_to_student(line)
+    Student.from_json(line)
+  end
+
+  def puts_student(student)
+    vars = {}
+    student.instance_variables.map do |attribute|
+      vars[attribute.to_s[1..-1]]=student.instance_variable_get(attribute)
+    end
+    JSON(vars)
+  end
+
+end

data/lib/source/models/student_list/student_list.rb

@@ -0,0 +1,70 @@
+class StudentsList
+    private_attr_accessor :students
+    private_attr_accessor :transformer
+
+
+    def initialize(dt)
+      self.students = []
+      self.transformer = dt
+    end
+  
+    def read_from_txt(file_path)
+        begin
+            File.foreach(file_path) do |line|
+              students << transformer.parse_to_student(line)
+            end
+        rescue => exception
+            raise "File not found at the given address #{file_path}. Exception: #{exception.message}"
+        end
+    end
+
+    def write_to_txt(file_path)
+        begin
+            File.open(file_path, 'w') do |file|
+            students.each do |student|
+              file.puts transformer.puts_student(student)
+            end
+            end
+        rescue => exception
+            raise "Error writing to file at the given address #{file_path}. Exception: #{exception.message}"
+        end
+    end
+
+    def student_by_id(student_id)
+      students.detect { |s| s.id == student_id }
+    end
+
+    def sorted
+        students.sort_by(&:fio)
+    end
+  
+    def add_student(student)
+      maxID = students.max_by(&:id)
+      student.id = maxID != nil ? maxID.id + 1 : 0
+      students << student
+    end
+    
+    def replace(student_id, student)
+      idx = student.find_index { |s| s.id == student_id }
+      students[idx] = student
+    end
+  
+    def remove(student_id)
+      students.reject! { |s| s.id == student_id }
+    end
+  
+    def get_student_short_count
+      students.count
+    end
+  
+    # Получить page по счету count элементов (страница начинается с 1)
+    def get_k_n_student_short_list(page, count, existing_data_list: nil)
+      offset = (page - 1) * count
+      slice = students[offset, count].map { |s| StudentShort.from_student(s) }
+  
+      return DataListStudentShort.new(list: slice) if existing_data_list.nil?
+  
+      existing_data_list.append(slice)
+    end
+  
+  end