shnaider_code 1.1.6 → 2.0.1

data/lib/source/student_list_format.rb

@@ -0,0 +1,50 @@
+module McDelta
+    class StudentListFormat
+        attr_private_accessor :students
+        attr_accessor :formater
+
+        def initialize(formater)
+            self.formater = formater
+        end
+
+        def read_from(filename)
+            self.students = formater.read_from(filename)
+        end
+
+        def write_to(filename)
+            formater.write_to(filename, self.students)
+        end
+
+        def get_student(id)
+            self.students.detect { |x|
+                x.id == id .to_s
+            }
+        end
+
+        def add_student(student)
+            self.students << student
+        end
+
+        def delete_student(id)
+            index = students.index(students.detect { |x| x.id == id.to_s })
+            self.students.delete_at(index)
+        end
+
+        def replace_student(id, student)
+            self.students.map! { |x| x.id == id.to_s ? student : x }
+        end
+
+        def get_students_slice(k, count)
+            from = [k * count, self.students.count].min
+            to = [self.students.count, from + count].min
+        end
+
+        def count()
+            self.students.count
+        end
+
+        def sort()
+            self.students.sort_by(&:fio_info)
+        end
+    end
+end

data/lib/source/students_list.rb

@@ -0,0 +1,43 @@
+require "source/attr_limited_regex_accessor.rb"
+
+module McDelta
+    class StudentsList 
+        attr_private_accessor :students_list_adapter
+
+        def initialize(adapter)
+            self.students_list_adapter = adapter
+        end
+
+        def get_student(id)
+            students_list_adapter.get_student(id)
+        end
+
+        def remove_student(id)
+            students_list_adapter.remove_student(id)
+        end
+
+        def replace_student(id, student)
+            students_list_adapter.replace_student(id, student)
+        end
+
+        def get_students(from, to, data)
+            values = students_list_adapter.get_students(from, to)
+
+            if data == nil
+                data = DataList.new(list: values)
+            else
+                data.list = values
+            end
+
+            data.list
+        end
+
+        def add_student(student)
+            students_list_adapter.add_student(student)
+        end
+
+        def count
+            students_list_adapter.count()
+        end
+    end
+end

data/lib/source/students_list_adapter.rb

@@ -0,0 +1,89 @@
+module McDelta
+    class StudentsListAdapter 
+        def get_student(id)
+        end
+
+        def remove_student(id)
+        end
+
+        def replace_student(id, student, data)
+        end
+
+        def get_students(from, to, data)
+        end
+
+        def add_student(student)
+        end
+
+        def count
+        end
+    end
+
+    class StudentsListDBAdapter < StudentsListAdapter
+        attr_private_accessor :database_list
+
+        def initialize(database_list)
+            self.database_list = database_list
+        end
+
+        def get_student(id)
+            database_list.get_student(id)
+        end
+
+        def remove_student(id)
+            database_list.remove_student(id)
+        end
+
+        def replace_student(id, student)
+            database_list.replace_student(id, student)
+        end
+
+        def get_students(from, to)
+            database_list.get_students_slice(from, to)
+        end
+
+        def add_student(student)
+            database_list.add_student(student)
+        end
+
+        def count
+            database_list.count()
+        end
+    end
+
+    class StudentsListFormatterAdapter < StudentsListAdapter
+        attr_private_accessor :formatter
+
+        def initialize(formatter, filename)
+            self.formatter = formatter
+            formatter.read_from(filename)
+        end
+
+        def get_student(id)
+            formatter.get_student(id)
+        end
+
+        def remove_student(id)
+            formatter.delete_student(id)
+        end
+
+        def replace_student(id, student)
+            formatter.replace_student(id, student)
+        end
+
+        def get_students(from, to)
+            count = to - from
+            k = from / count
+            
+            formatter.get_students_slice(k, count)
+        end
+
+        def add_student(student)
+            formatter.add_student(student)
+        end
+
+        def count
+            formatter.count()
+        end
+    end
+end

data/lib/source/students_list_format_strategy.rb

@@ -0,0 +1,59 @@
+require 'json'
+require 'yaml'
+
+module McDelta
+    class StudentsListFormatStrategy
+        def read_from(filename)
+            require 'method not implemented'
+        end
+
+        def write_to(filename, students)
+            require 'method not implemented'
+        end
+    end
+
+    class TxtStudentsListFormatStrategy < StudentsListFormatStrategy
+        def read_from(filename)
+            File.read(filename)
+            .split("\n")
+            .map { |v| Student.from_string(v) }
+        end
+
+        def write_to(filename, students)
+            File.open(filename, 'w') { |file| 
+                file.write(
+                    students.map { |student| 
+                        student.get_info
+                    }
+                    .join("\n")
+                )
+            }
+        end
+    end
+
+    class JsonStudentsListFormatStrategy < StudentsListFormatStrategy
+        def read_from(filename)
+            file = File.read(filename)
+            json = JSON.parse(file)
+            json.map { |x| Student.from_json(x) }
+        end
+
+        def write_to(filename, students)
+            File.open(filename, 'w') do |f|
+                f.write(JSON.generate(students.map { |x| x.as_json }))
+            end
+        end
+    end
+
+    class YamlStudentsListFormatStrategy < StudentsListFormatStrategy
+        def read_from(filename)
+            YAML.load_file(filename)
+        end
+        
+        def write_to(filename, students)
+            File.open(filename, 'w') do |file|
+                file.write(students.to_yaml)
+            end
+        end
+    end
+end

data/shnaider_code.gemspec

@@ -2,7 +2,7 @@ require_relative "lib/shnaider_code/version"
 
 Gem::Specification.new do |spec|
   spec.name = "shnaider_code"
-  spec.version = Shnaider::VERSION
+  spec.version = ShnaiderCode::VERSION
   spec.authors = ["Iya"]
   spec.email = ["iya@gmail.com"]
   spec.summary = "Student App"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: shnaider_code
 version: !ruby/object:Gem::Version
-  version: 1.1.6
+  version: 2.0.1
 platform: ruby
 authors:
 - Iya
@@ -31,33 +31,29 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- Gemfile
 - lib/shnaider_code.rb
 - lib/shnaider_code/version.rb
-- lib/source/controllers/student_input_form/student_input_form_controller_create.rb
-- lib/source/controllers/student_input_form/student_input_form_controller_edit.rb
-- lib/source/controllers/tab_students_controller.rb
-- lib/source/db_config/config.yaml
-- lib/source/db_config/migrations/001_create_table_student.sql
-- lib/source/db_config/mock_data/fill_student.sql
-- lib/source/models/student.rb
-- lib/source/models/student_base.rb
-- lib/source/models/student_short.rb
-- lib/source/repositories/adapters/db_source_adapter.rb
-- lib/source/repositories/adapters/file_source_adapter.rb
-- lib/source/repositories/containers/data_list.rb
-- lib/source/repositories/containers/data_list_student_short.rb
-- lib/source/repositories/containers/data_table.rb
-- lib/source/repositories/data_sources/db_data_source.rb
-- lib/source/repositories/data_sources/file_data_source.rb
-- lib/source/repositories/data_sources/transformers/data_transformer_base.rb
-- lib/source/repositories/data_sources/transformers/data_transformer_json.rb
-- lib/source/repositories/data_sources/transformers/data_transformer_yaml.rb
-- lib/source/repositories/student_repository.rb
-- lib/source/util/logger_holder.rb
-- shnaider_code-1.1.4.gem
+- lib/source/attr_limited_regex_accessor.rb
+- lib/source/controllers/create_student_controller.rb
+- lib/source/controllers/edit_student_controller.rb
+- lib/source/controllers/view_controller.rb
+- lib/source/data_construct_pattern/data_construct_pattarn.rb
+- lib/source/data_list.rb
+- lib/source/data_list_student_short.rb
+- lib/source/data_table.rb
+- lib/source/database/scripts/create_table.sql
+- lib/source/database/scripts/fill_data.sql
+- lib/source/database/students_db.rb
+- lib/source/database/students_list_db.rb
+- lib/source/student/abstract_student.rb
+- lib/source/student/student.rb
+- lib/source/student/student_short.rb
+- lib/source/student_list_format.rb
+- lib/source/students_list.rb
+- lib/source/students_list_adapter.rb
+- lib/source/students_list_format_strategy.rb
+- shnaider_code-2.0.0.gem
 - shnaider_code.gemspec
-- sig/shnaider_code.rbs
 homepage: https://github.com/bushmrz/learning-patterns-with-ruby
 licenses:
 - MIT

data/Gemfile

@@ -1,13 +0,0 @@
-# frozen_string_literal: true
-
-source "https://rubygems.org"
-
-gem "mysql2"
-gem "glimmer-dsl-libui",'~> 0.7.4'
-gem 'win32api'
-gem "minitest"
-gem 'rubocop', group: 'development'
-gem 'shnaider_code'
-gem 'sinatra', '~> 3.0', '>= 3.0.6'
-gem 'thin', '~> 1.8', '>= 1.8.2'
-

data/lib/source/controllers/student_input_form/student_input_form_controller_create.rb

@@ -1,59 +0,0 @@
-# frozen_string_literal: true
-require 'source/util/logger_holder'
-require 'win32api'
-
-class StudentInputFormControllerCreate
-  def initialize(parent_controller)
-    @parent_controller = parent_controller
-    LoggerHolder.instance.debug('StudentInputFormControllerCreate: initialized')
-  end
-
-  def set_view(view)
-    @view = view
-    LoggerHolder.instance.debug('StudentInputFormControllerCreate: view set')
-  end
-
-  def refresh
-    @parent_controller.refresh_data(1, 20)
-  end
-
-  def on_view_created
-    begin
-      @student_rep = StudentRepository.new(DBSourceAdapter.new)
-    rescue Mysql2::Error::ConnectionError => e
-      on_db_conn_error(e)
-    end
-  end
-
-  def process_fields(fields)
-    begin
-      last_name = fields.delete(:last_name)
-      first_name = fields.delete(:first_name)
-      father_name = fields.delete(:father_name)
-
-      return if last_name.nil? || first_name.nil? || father_name.nil?
-
-      student = Student.new(last_name, first_name, father_name, **fields)
-
-      @student_rep.add_student(student)
-
-      LoggerHolder.instance.debug('StudentInputFormControllerCreate: adding student to DB')
-
-      @view.close
-    rescue ArgumentError => e
-      LoggerHolder.instance.debug("StudentInputFormControllerCreate: wrong fields: #{e.message}")
-      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(error)
-    LoggerHolder.instance.debug('StudentInputFormControllerCreate: 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)
-    @view.close
-  end
-end

data/lib/source/controllers/student_input_form/student_input_form_controller_edit.rb

@@ -1,68 +0,0 @@
-# frozen_string_literal: true
-
-require 'source/util/logger_holder'
-require 'win32api'
-
-class StudentInputFormControllerEdit
-  def initialize(parent_controller, existing_student_id)
-    @parent_controller = parent_controller
-    @existing_student_id = existing_student_id
-    LoggerHolder.instance.debug('StudentInputFormControllerEdit: initialized')
-  end
-
-  def set_view(view)
-    @view = view
-    LoggerHolder.instance.debug('StudentInputFormControllerEdit: view set')
-  end
-
-  def refresh
-    @parent_controller.refresh_data(1, 20)
-  end
-
-  def on_view_created
-    begin
-      @student_rep = StudentRepository.new(DBSourceAdapter.new)
-    rescue Mysql2::Error::ConnectionError => e
-      on_db_conn_error(e)
-    end
-    @existing_student = @student_rep.student_by_id(@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(:father_name, student.father_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_hash(fields)
-
-      LoggerHolder.instance.debug('StudentInputFormControllerEdit: replacing student in DB')
-
-      @student_rep.replace_student(@existing_student_id, new_student)
-
-      @view.close
-    rescue ArgumentError => e
-      LoggerHolder.instance.debug("StudentInputFormControllerEdit: wrong fields: #{e.message}")
-      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(error)
-    LoggerHolder.instance.debug('StudentInputFormControllerEdit: 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)
-    @view.close
-  end
-end

data/lib/source/controllers/tab_students_controller.rb

@@ -1,82 +0,0 @@
-# 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

data/lib/source/db_config/config.yaml

@@ -1,5 +0,0 @@
-host: 'localhost'
-port: 3306
-username: 'root'
-password: 'root'
-database: 'university'

data/lib/source/db_config/migrations/001_create_table_student.sql

@@ -1,12 +0,0 @@
-create table student (
-     id          int auto_increment,
-     last_name   varchar(128) not null,
-     first_name  varchar(128) not null,
-     father_name varchar(128) not null,
-     phone       varchar(20) null,
-     telegram    varchar(100) null,
-     email       varchar(100) null,
-     git         varchar(100) null,
-     constraint student_pk
-         primary key (id)
-);

data/lib/source/db_config/mock_data/fill_student.sql

@@ -1,6 +0,0 @@
-insert into student(last_name, first_name, father_name, phone, telegram, email, git) values
-                            ("Шнайдер", "Ия", "Ниевна", NULL, NULL, NULL, "bushmrz"),
-                            ("Худокмырлов", "Дмитрий", "Александрович", "78005553535", NULL, NULL, "kittenqz"),
-                            ("Шнайдер", "Ий", "	Ниевич", NULL, NULL, NULL, "invisible"),
-                            ("Сайксова", "Риночка", "Рири", NULL, "slowrunner3000",  NULL, NULL),
-                            ("Кузнецов", "Максим", "Александрович", "+7-900-900-90-90", "maxonhol", "maximilian@ya.ru", "maxonspb");

data/lib/source/models/student.rb

@@ -1,103 +0,0 @@
-# frozen_string_literal: true
-
-require 'json'
-require_relative 'student_base'
-
-class Student < StudentBase
-  # Делаем new предка публичным
-  public_class_method :new
-
-  def self.from_hash(hash)
-    hash = hash.dup
-    raise ArgumentError, 'Fields required: fist_name, last_name, father_name' unless hash.key?(:first_name) && hash.key?(:last_name) && hash.key?(:father_name)
-
-    first_name = hash.delete(:first_name)
-    last_name = hash.delete(:last_name)
-    father_name = hash.delete(:father_name)
-
-    Student.new(last_name, first_name, father_name, **hash)
-  end
-
-  # Конструктор из JSON строки
-  def self.from_json_str(str)
-    params = JSON.parse(str, { symbolize_names: true })
-    from_hash(params)
-  end
-
-  # Делаем публичными геттеры и сеттеры базового класса
-  public :phone, :telegram, :email, 'id=', 'phone=', 'telegram=', 'email=', 'git='
-
-  # Стандартные геттеры для полей
-  attr_reader :last_name, :first_name, :father_name
-
-  # Стандартный конструктор
-  def initialize(last_name, first_name, father_name, **options)
-    self.last_name = last_name
-    self.first_name = first_name
-    self.father_name = father_name
-    super(**options)
-  end
-
-  # Сеттеры с валидацией перед присваиванием
-  def last_name=(new_last_name)
-    raise ArgumentError, "Invalid argument: last_name=#{new_last_name}" unless Student.valid_name?(new_last_name)
-
-    @last_name = new_last_name
-  end
-
-  def first_name=(new_first_name)
-    raise ArgumentError, "Invalid argument: first_name=#{new_first_name}" unless Student.valid_name?(new_first_name)
-
-    @first_name = new_first_name
-  end
-
-  def father_name=(new_father_name)
-    raise ArgumentError, "Invalid argument: father_name=#{new_father_name}" unless Student.valid_name?(new_father_name)
-
-    @father_name = new_father_name
-  end
-
-  # Отдельный сеттер для массовой установки контактов
-  def set_contacts(phone: nil, telegram: nil, email: nil)
-    self.phone = phone if phone
-    self.telegram = telegram if telegram
-    self.email = email if email
-  end
-
-  # Имя пользователя в формате Фамилия И. О.
-  def last_name_and_initials
-    "#{last_name} #{first_name[0]}. #{father_name[0]}."
-  end
-
-  # Краткая информация о пользователе
-  def short_info
-    info = {}
-    info[:last_name_and_initials] = last_name_and_initials
-    info[:contact] = short_contact
-    info[:git] = git
-    JSON.generate(info)
-  end
-
-  # Методы приведения объекта к строке
-  def to_s
-    result = "#{last_name} #{first_name} #{father_name}"
-    %i[id phone telegram email git].each do |attr|
-      attr_val = send(attr)
-      result += ", #{attr}=#{attr_val}" unless attr_val.nil?
-    end
-    result
-  end
-
-  def to_hash
-    attrs = {}
-    %i[last_name first_name father_name id phone telegram email git].each do |attr|
-      attr_val = send(attr)
-      attrs[attr] = attr_val unless attr_val.nil?
-    end
-    attrs
-  end
-
-  def to_json_str
-    JSON.generate(to_hash)
-  end
-end