mc_gem3 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 84fae15ffdd7ff3e9a7e0c4585ffa10b460607a7aca15b405ef9dda94c810466
-  data.tar.gz: 49553ec9707432b103610ad40489164dc95317f502794c90921071e737b3f041
+  metadata.gz: a3f6945dda64d95c1e193112df1b4ef640054b95181d3017f9fde6c0ee2d1a8c
+  data.tar.gz: 46744255030436aeb05626d987476dfd8dcf0371aeb4a6ac1ee29f8ea56a37b9
 SHA512:
-  metadata.gz: 5f1c11f0c13a689403ff74400c8377ef7f12b13d32326e58a3b81ab5b70d5d951af13fd8ae9ff76cbd404d0c2ecb1e2b9187dec988b1cd170841949ab633f69b
-  data.tar.gz: 31a3d4d7607581b403c79ac4bbb048ffab47fcf8d79525ccbb88f7eb72c150945ff94361a491f4da247902b895fc9c34151d331810407a929eeb99d814837951
+  metadata.gz: 948c796fc4479c926c1f35e4b55d32bd4b6eb34e4ea475dbfdaa53947f6ffbbdf92a2b96fa7bcc5a87b1817421eb74a5b55bdc09ed60dba4bdc30b79be83bb51
+  data.tar.gz: 9f840a27dce88aebb7e68bfe590d55650837a0a0da3e73c3eb9227c421a0c4f81c4e14a84cc48c8ecc088dc33bf4c42a5ed8162a1badad4038c2c16cb0b93e0d

data/CHANGELOG.md

@@ -0,0 +1,5 @@
+## [Unreleased]
+
+## [0.1.0] - 2023-04-28
+
+- Initial release

data/CODE_OF_CONDUCT.md

@@ -0,0 +1,84 @@
+# Contributor Covenant Code of Conduct
+
+## Our Pledge
+
+We as members, contributors, and leaders pledge to make participation in our community a harassment-free experience for everyone, regardless of age, body size, visible or invisible disability, ethnicity, sex characteristics, gender identity and expression, level of experience, education, socio-economic status, nationality, personal appearance, race, religion, or sexual identity and orientation.
+
+We pledge to act and interact in ways that contribute to an open, welcoming, diverse, inclusive, and healthy community.
+
+## Our Standards
+
+Examples of behavior that contributes to a positive environment for our community include:
+
+* Demonstrating empathy and kindness toward other people
+* Being respectful of differing opinions, viewpoints, and experiences
+* Giving and gracefully accepting constructive feedback
+* Accepting responsibility and apologizing to those affected by our mistakes, and learning from the experience
+* Focusing on what is best not just for us as individuals, but for the overall community
+
+Examples of unacceptable behavior include:
+
+* The use of sexualized language or imagery, and sexual attention or
+  advances of any kind
+* Trolling, insulting or derogatory comments, and personal or political attacks
+* Public or private harassment
+* Publishing others' private information, such as a physical or email
+  address, without their explicit permission
+* Other conduct which could reasonably be considered inappropriate in a
+  professional setting
+
+## Enforcement Responsibilities
+
+Community leaders are responsible for clarifying and enforcing our standards of acceptable behavior and will take appropriate and fair corrective action in response to any behavior that they deem inappropriate, threatening, offensive, or harmful.
+
+Community leaders have the right and responsibility to remove, edit, or reject comments, commits, code, wiki edits, issues, and other contributions that are not aligned to this Code of Conduct, and will communicate reasons for moderation decisions when appropriate.
+
+## Scope
+
+This Code of Conduct applies within all community spaces, and also applies when an individual is officially representing the community in public spaces. Examples of representing our community include using an official e-mail address, posting via an official social media account, or acting as an appointed representative at an online or offline event.
+
+## Enforcement
+
+Instances of abusive, harassing, or otherwise unacceptable behavior may be reported to the community leaders responsible for enforcement at delta.null@vk.com. All complaints will be reviewed and investigated promptly and fairly.
+
+All community leaders are obligated to respect the privacy and security of the reporter of any incident.
+
+## Enforcement Guidelines
+
+Community leaders will follow these Community Impact Guidelines in determining the consequences for any action they deem in violation of this Code of Conduct:
+
+### 1. Correction
+
+**Community Impact**: Use of inappropriate language or other behavior deemed unprofessional or unwelcome in the community.
+
+**Consequence**: A private, written warning from community leaders, providing clarity around the nature of the violation and an explanation of why the behavior was inappropriate. A public apology may be requested.
+
+### 2. Warning
+
+**Community Impact**: A violation through a single incident or series of actions.
+
+**Consequence**: A warning with consequences for continued behavior. No interaction with the people involved, including unsolicited interaction with those enforcing the Code of Conduct, for a specified period of time. This includes avoiding interactions in community spaces as well as external channels like social media. Violating these terms may lead to a temporary or permanent ban.
+
+### 3. Temporary Ban
+
+**Community Impact**: A serious violation of community standards, including sustained inappropriate behavior.
+
+**Consequence**: A temporary ban from any sort of interaction or public communication with the community for a specified period of time. No public or private interaction with the people involved, including unsolicited interaction with those enforcing the Code of Conduct, is allowed during this period. Violating these terms may lead to a permanent ban.
+
+### 4. Permanent Ban
+
+**Community Impact**: Demonstrating a pattern of violation of community standards, including sustained inappropriate behavior,  harassment of an individual, or aggression toward or disparagement of classes of individuals.
+
+**Consequence**: A permanent ban from any sort of public interaction within the community.
+
+## Attribution
+
+This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 2.0,
+available at https://www.contributor-covenant.org/version/2/0/code_of_conduct.html.
+
+Community Impact Guidelines were inspired by [Mozilla's code of conduct enforcement ladder](https://github.com/mozilla/diversity).
+
+[homepage]: https://www.contributor-covenant.org
+
+For answers to common questions about this code of conduct, see the FAQ at
+https://www.contributor-covenant.org/faq. Translations are available at https://www.contributor-covenant.org/translations.

data/Documentation.md

@@ -0,0 +1,33 @@
+The TabStudentsController class is a controller for working with the interface for interacting with objects of the Student type.
+
+Methods of the class:
+
+1. initialize(view) - constructor of the class, takes a view object and creates an empty object of the type
+DataListStudentShort, which is assigned the add_listener method with the view argument, as a result of which the view
+is set as a listener for data state change events (data_list).
+2. on_view_created is a method that initializes an object of the StudentRepository type, which is used for interaction
+with the database, and if an error occurs connecting to the database displays a dialog box with an error message.
+3. show_view is a method that displays the main application window.
+4. show_modal_add is a method that displays a modal window for creating a new student record.
+Creates an instance of the StudentInputFormControllerCreate controller and passes it a reference to the current controller,
+creates an object of the StudentInputForm type and passes it a reference to the controller. Then it displays the modal window.
+5. show_modal_edit(current_page, per_page, selected_row) is a method that displays the modal window for
+editing a student record. Takes the values of the current page (current_page), the number of records on the page
+(per_page) and the selected row (selected_row). Calculates the number of the selected student and selects his id from
+the DataListStudentShort object, then passes it to the StudentInputFormControllerEdit controller, creates an object of the type
+StudentInputForm and passes it a link to the controller. After that, it displays a modal window.
+6. delete_selected(current_page, per_page, selected_row) is a method that deletes the selected student record.
+Takes the values of the current page (current_page), the number of records on the page (per_page)
+and the selected row (selected_row). Calculates the number of the selected student and selects his id from the DataListStudentShort object,
+then deletes the record using the remove_student method from the StudentRepository object.
+7. refresh_data(page, per_page) is a method that updates the data in the list of students. Takes the values
+of the current page (page) and the number of entries on the page (per_page).
+Calls a method of the StudentRepository paginated_short_students type to get data in the DataListStudentShort object format.
+Updates information about the number of students using the update_student_count method of the view.
+
+The Student_Input_Form_Controller_Edit controller and Student_Input_Form_Controller_Create are forms
+for modifying and creating students into the database, respectively.
+
+The student, student_base and student_short models are a student model with various fields and methods
+for setting, receiving and processing information. Student_base - super class,
+and student_short is the short information about the student.

data/Gemfile

@@ -0,0 +1,13 @@
+# 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 'mc_gem3'
+gem 'sinatra', '~> 3.0', '>= 3.0.6'
+gem 'thin', '~> 1.8', '>= 1.8.2'
+gem 'mc_delta'

data/LICENSE.txt

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2023 NullExp
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.

data/README.md

@@ -0,0 +1 @@
+![9bm](https://user-images.githubusercontent.com/96076243/218162066-5df24062-497f-4d8b-a9b2-5612afd68f07.gif)

data/check.rb

@@ -0,0 +1,3 @@
+# frozen_string_literal: true
+
+puts Dir.glob("**/*")

data/lib/mc_gem3/version.rb

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

data/lib/mc_gem3.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+require_relative "mc_gem3/version"
+
+module McGem3
+  Dir[File.dirname(__FILE__) + 'source/*.rb'].each { |file|
+    puts file
+    require file
+  }
+  Dir[File.dirname(__FILE__) + 'source/**/*.rb'].each { |file|
+    require file
+  }
+end

data/lib/source/Converter.rb

@@ -0,0 +1,11 @@
+class Converter
+	private_class_method :new
+
+	def read_file(file_content)
+		raise NotImplementedError, 'Abstract class!'
+	end
+
+	def write_file(hash_students)
+		raise NotImplementedError, 'Abstract class!'
+	end
+end

data/lib/source/Converter_json.rb

@@ -0,0 +1,14 @@
+require 'json'
+require_relative 'Converter'
+class ConverterJSON < Converter
+	public_class_method :new
+
+	def read_file(file_content)
+		JSON.parse(file_content, {symbolize_names: true})
+	end
+
+	def write_file(hash_students)
+		JSON.pretty_generate(hash_students)
+	end
+
+end

data/lib/source/Converter_txt.rb

@@ -0,0 +1,26 @@
+require_relative 'Converter'
+class ConverterTxt < Converter
+	public_class_method :new
+
+	def read_file(data)
+		result = []
+		file_content = data.split("\n")
+		file_content.each do |line|
+			hash = {}
+			puts(line)
+			pairs = line.split(',').map{|pair| pair.gsub(/\s+/, '').split(':')}
+			pairs.each do |pair|
+				hash[pair[0].to_sym]=(pair[0]=="id") ? pair[1].to_i : pair[1]
+			end
+			result << hash
+		end
+		result
+	end
+
+	def write_file(hash_students)
+		string_arr = hash_students.map do |hash|
+			hash.map{|k,v| "#{k}:#{v}"}.join(',')
+		end.join("\n")
+	end
+
+end

data/lib/source/Converter_yaml.rb

@@ -0,0 +1,14 @@
+require 'yaml'
+require_relative 'Converter'
+class ConverterYAML < Converter
+	public_class_method :new
+	
+	def read_file(file_content)
+		YAML.safe_load(file_content).map{ |h| h.transform_keys(&:to_sym)}
+	end
+
+	def write_file(hash_students)
+		YAML.dump(hash_students.map{ |h| h.transform_keys(&:to_s)})
+	end
+
+end

data/lib/source/Data_list.rb

@@ -0,0 +1,66 @@
+class DataList
+	private_class_method :new
+
+	attr_accessor :selected_num, :objects
+
+	def initialize(*elems)
+		self.objects = elems
+		@listeners = []
+	end
+
+	def add_listener(listener)
+		@listeners << listener
+	end
+
+	def remove_listener(listener)
+		@listeners.delete(listener)
+	end
+
+	def notify
+		@listeners.each { |lst| lst.on_datalist_changed(data_table) }
+	end
+
+	def select_element(number)
+		self.selected_num = number < objects.size ? number : nil
+	end
+
+	def selected_id
+		objects[selected_num].id
+	end
+
+	def get_names
+		self.objects.first.instance_variables.map{|v| v.to_s[1..-1]}
+	end
+
+	def table_fields(_obj)
+		[]
+	end
+
+	def data_table
+		result = []
+		counter = 0
+		objects.each do |obj|
+			row = []
+			row << counter
+			row.push(*table_fields(obj))
+			result << row
+			counter += 1
+		end
+		DataTable.new(result)
+	end
+
+	def append(new_data)
+		self.objects.append(new_data)
+	end
+
+	def replace_objects(objects)
+		self.objects = objects.dup
+		notify
+	end
+
+	private
+	def instance_variables_wout_id(object)
+		object.instance_variables.reject{|v| v.to_sym ==:@id}.map{|v| object.instance_variable_get(v)}
+	end
+
+end

data/lib/source/Data_list_student_short.rb

@@ -0,0 +1,16 @@
+require_relative 'Data_table'
+require_relative 'Data_list'
+class  DataListStudentShort < DataList
+
+	public_class_method :new
+
+	def get_names
+		['Фамилия И.О.','Гит','Контакт']
+	end
+
+
+	def table_fields(obj)
+		[obj.fio, obj.git, obj.contact]
+	end
+
+end

data/lib/source/Data_table.rb

@@ -0,0 +1,25 @@
+class DataTable
+
+	attr_accessor :data
+
+	def initialize(data)
+		self.data = data
+	end
+
+	def get_cell(row,col)
+		self.data[row][col]
+	end
+
+	def num_columns
+		self.data[0].length
+	end
+
+	def num_rows
+		self.data.length
+	end
+
+	def to_2d_array
+		data.dup
+	end
+
+end

data/lib/source/Student.rb

@@ -0,0 +1,106 @@
+require 'json'
+require_relative 'StudentBase'
+class Student < StudentBase
+
+	public_class_method :new
+	attr_writer :id
+	public
+	attr_reader :last_name, :first_name, :parental_name, :id, :phone, :git, :telegram, :email
+
+	def initialize(last_name, first_name, parental_name, options = {})
+		super(last_name, first_name, parental_name)
+		self.id = options[:id]
+		self.phone = options[:phone]
+		self.git = options[:git]
+		self.telegram = options[:telegram]
+		self.email = options[:email]
+	end
+
+	def to_s
+		[
+			"#{last_name} #{first_name} #{parental_name}",
+			id ? "id: #{id}" : nil,
+			git ? "git: #{git}" : nil,
+			phone ? "phone: #{phone}" : nil,
+			telegram ? "telegram: #{telegram}" : nil,
+			email ? "email: #{email}" : nil
+		].compact.join(' ')
+	end
+
+	#Setters
+	def phone=(phone)
+		raise ArgumentError, "ERROR phone=#{phone}" unless phone.nil? || StudentBase.validate_phone?(phone)
+		@phone = phone
+	end
+
+	def telegram=(tg_name)
+		raise ArgumentError, "ERROR telegram=#{tg_name}" unless telegram.nil? || StudentBase.validate_git_tg?(tg_name)
+		@telegram=tg_name
+	end
+
+	def git=(git_name)
+		raise ArgumentError, "ERROR git=#{git_name}" unless git.nil? || StudentBase.validate_git_tg?(git_name)
+		@git=git_name
+	end
+
+	def email=(email1)
+		raise ArgumentError, "ERROR email=#{email1}" unless email.nil? || StudentBase.validate_email?(email1)
+		@email=email1
+	end
+
+	def set_contacts(contacts={})
+		self.phone=contacts[:phone]
+		self.telegram=contacts[:telegram]
+		self.email=contacts[:email]
+	end
+
+	def self.from_str(string)
+		stud = string.split(',')
+				.map{|v| v.split(':')}
+				.map{|v| [v[0].to_sym, v[1]]}
+				.to_h
+		last_name, first_name, parental_name = stud[:fio].split(' ')
+		Student.new(last_name, first_name, parental_name, stud)
+	end
+
+	def self.from_hash(hash)
+		raise ArgumentError,"Missing req fields" unless hash.key?(:last_name) && hash.key?(:first_name) && hash.key?(:parental_name)
+		#переделал этот метод после тестов. Теперь вынимаю обязательные параметры из хэша, не удаляя из него
+		Student.new(hash[:last_name], hash[:first_name], hash[:parental_name], hash)
+	end
+
+	def get_short_fio
+		"fio:#{last_name} #{first_name[0]}. #{parental_name[0]}."
+	end
+
+
+	def get_short_contact
+		contact = %i[telegram phone email].find{|cont| send(cont)}
+		{type: contact, val: send(contact)} if contact
+	end
+
+	def get_git
+		"git:#{git}"
+	end
+
+	def get_info
+		"#{get_short_fio},#{get_short_contact[:type]}:#{get_short_contact[:val]},#{get_git}"
+	end
+
+	def get_info_hash
+		info={}
+		info[:fio] = get_short_fio
+		info[:contact] = get_short_contact
+		info[:git] = git
+		info
+	end
+
+	def to_hash
+		fields = {}
+		%i[last_name first_name parental_name id phone git telegram email].each do |field|
+			field_val = send(field)
+			fields[field] = field_val unless field_val.nil?
+		end
+		fields
+	end
+end

data/lib/source/StudentBase.rb

@@ -0,0 +1,50 @@
+require 'json'
+class StudentBase
+	private_class_method :new
+
+	def self.validate_phone?(phone)
+		return phone.match(/^\+?[7,8] ?\(?\d{3}\)? ?\d{3}-?\d{2}-?\d{2}$/)
+	end
+
+	def self.validate_email?(email)
+		return email.match(/^[A-Za-z0-9\-_]+@[A-Za-z]+(\.[A-Za-z]+)?\.[A-Za-z]+$/)
+	end
+
+	def self.validate_git_tg?(acc_name)
+		return acc_name.match(/^@[A-Za-z0-9\-_]+$/)
+	end
+
+	def self.validate_name?(prof_name)
+		return prof_name.match(/(^[А-Я][а-я]+$)|(^[A-Z][a-z]+$)/)
+	end
+
+	def valid_cont?
+		!email.nil? || !telegram.nil? || !phone.nil?
+	end
+
+	def validate?
+		!git.nil? && valid_cont?
+	end
+
+	def initialize(last_name, first_name, parental_name)
+		self.last_name = last_name
+		self.first_name = first_name
+		self.parental_name = parental_name
+	end
+
+	def first_name=(first_name1)
+		raise ArgumentError, "ERROR first_name=#{first_name1}" unless StudentBase.validate_name?(first_name1)
+		@first_name=first_name1
+	end
+
+	def last_name=(last_name1)
+		raise ArgumentError, "ERROR last_name=#{last_name1}" unless StudentBase.validate_name?(last_name1)
+		@last_name=last_name1
+	end
+
+	def parental_name=(parental_name1)
+		raise ArgumentError, "ERROR parental_name=#{parental_name1}" unless StudentBase.validate_name?(parental_name1)
+		@parental_name=parental_name1
+	end
+
+end

data/lib/source/Student_list.rb

@@ -0,0 +1,65 @@
+class StudentList
+  private
+	attr_accessor :students, :gen_id, :typer
+
+  public
+	def initialize(typer)
+		self.students = []
+		self.gen_id = students.count + 1
+		self.typer = typer
+	end
+
+	def read_file(file_path)
+		raise ArgumentError.new("File not found #{file_path}") unless File.file?(file_path)
+		hash_students = typer.read_file(File.read(file_path))
+		self.students = hash_students.map{|h| Student.from_hash(h)}
+		nextId
+	end
+
+	def write_file(file_path)
+		hash_students = students.map(&:to_hash)
+		File.write(file_path, typer.write_file(hash_students))
+	end
+
+	def get_student(stud_id)
+		students.find{|s| s.id == stud_id}
+	end
+
+	def sorted
+		students.sort_by(&:fio)
+	end
+
+	def add_student(student)
+		students << student
+		student.id = gen_id
+		nextId
+	end
+
+	def get_students_pag(k,n,existing_data = nil)
+		skip = (k-1) * n
+		new_data = students[skip, n].map{|s| StudentShort.from_student_class(s)}
+
+		return DataListStudentShort.new(new_data) if existing_data.nil?
+
+		existing_data.replace_objects(new_data)
+		existing_data
+	end
+
+	def replace_student(student_id, student)
+		idx = student.find{|s| s.id==student.id}
+		self.students[idx]=student
+	end
+
+	def remove_student(student_id)
+		self.students.reject! {|s| s.id==student_id}
+	end
+
+  def count
+		self.students.count
+	end
+
+	def nextId
+		self.gen_id=students.max_by(&:id).id + 1
+	end
+
+end

data/lib/source/Student_short.rb

@@ -0,0 +1,40 @@
+require_relative 'StudentBase'
+class StudentShort < StudentBase
+
+	public_class_method :new
+
+	#У нас уже есть некоторые гет\сет в базе, зачем же ещё?
+	private
+	attr_writer :fio, :contact, :git, :id
+
+	public
+	attr_reader :fio, :contact, :git, :id
+
+	def self.from_student_class(student)
+		puts("In studentShort: #{student.to_s}")
+		StudentShort.new(student.id, student.get_info)
+	end
+
+	def initialize(id, str)
+		info_short = str.split(',')
+						.map{|x| x.split(':')}
+						.map{|x| [x[0].to_sym, x[1]]}
+						.to_h
+		raise ArgumentError, 'Missing fields: fio' if info_short[:fio].nil?
+		print(info_short)
+		self.id=id
+		self.fio = info_short[:fio]
+		self.git = info_short[:git]
+		info_short.delete_if{|k,v| k==:fio||k==:git}
+		self.contact = info_short.values.first
+	end
+
+
+	def to_s
+
+		[
+			"#{id}, #{fio}, #{git}, #{contact}"
+		].compact.join(' ')
+	end
+	
+end

data/lib/source/create_table.sql

@@ -0,0 +1,10 @@
+CREATE TABLE IF NOT EXISTS student(
+    id INT NOT NULL auto_increment PRIMARY KEY,
+    last_name CHAR(255) NOT NULL,
+    first_name CHAR(255) NOT NULL,
+    parental_name CHAR(255) NOT NULL,
+    git CHAR(255),
+    phone CHAR(255),
+    email CHAR(255),
+    telegram CHAR(255)
+);

data/lib/source/insert_data.sql

@@ -0,0 +1,4 @@
+INSERT INTO student (last_name, first_name, parental_name, git, phone, email, telegram) VALUES
+    ROW("Худокормов", "Дмитрий", "Александрович", "@KiTTeNqz", NULL, NULL, "@KiTTeNqzi"),
+    ROW("Александров", "Александр", "Александрович", "@AleXxx", "89094494499", NULL, NULL),
+    ROW("Ермаков", "Ермак", "Ермакович", "@yaErmak1", NULL, "ERMAK@yandex.ru", NULL)

data/lib/source/logger_holder.rb

@@ -0,0 +1,22 @@
+require 'logger'
+
+class LoggerHolder
+  private_class_method :new
+  @instance_mutex = Mutex.new
+
+  attr_reader :logger
+
+  def initialize
+    @logger = Logger.new(STDOUT)
+  end
+
+  def self.instance
+    return @instance.logger if @instance
+
+    @instance_mutex.synchronize do
+      @instance ||= new
+    end
+
+    @instance.logger
+  end
+end

data/lib/source/student_edit_form_controller.rb

@@ -0,0 +1,63 @@
+# frozen_string_literal: true
+
+class StudentEditFormController
+  def initialize(parent_controller, existing_student_id)
+    @parent_controller = parent_controller
+    @existing_student_id = existing_student_id
+    LoggerHolder.instance.debug('StudentEditFormController: initialized')
+  end
+
+  def set_view(view)
+    @view = view
+  end
+
+  def refresh
+    @parent_controller.refresh_data(1,20)
+  end
+
+  def on_view_created
+    begin
+      @student_list = StudentListAdv.new(StudentsListDBAdapter.new(StudentListDB.instance))
+    rescue Mysql2::Error::ConnectionError=>e
+      on_db_conn_error(e)
+    end
+    @existing_student = @student_list.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(:parental_name, student.parental_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)
+    print("IM IN Populate EDIT")
+  end
+
+  def process_fields(fields)
+    begin
+      new_student = Student.from_hash(fields)
+      @student_list.replace_student(@existing_student_id, new_student)
+      LoggerHolder.instance.debug('StudentEditFormController: replacing student in DB')
+      @view.close
+    rescue ArgumentError => e
+      LoggerHolder.instance.debug("StudentEditFormController: 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('StudentEditFormController: 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/student_input_form.rb

@@ -0,0 +1,71 @@
+# frozen_string_literal: true
+
+require 'glimmer-dsl-libui'
+require_relative 'student_input_form_controller'
+require_relative 'StudentBase'
+require 'win32api'
+
+class StudentInputForm
+  include Glimmer
+
+  def initialize(controller,existing_student = nil)
+    @existing_student = existing_student.to_hash unless existing_student.nil?
+    @controller = controller
+    @entries = {}
+  end
+
+  def on_create
+    @controller.on_view_created
+  end
+
+  def create
+    @root_container = window('Универ', 300, 150) {
+      resizable false
+
+      vertical_box {
+        @student_form = form {
+          stretchy false
+
+          fields = [[:last_name, 'Фамилия', false], [:first_name, 'Имя', false], [:parental_name, 'Отчество', false], [:git, 'Гит', true], [:telegram, 'Телеграм', true], [:email, 'Почта', true], [:phone, 'Телефон', true]]
+
+          fields.each do |field|
+            @entries[field[0]] = entry {
+              label field[1]
+              text @existing_student[field[0]] unless @existing_student.nil?
+
+              read_only field[2] unless @existing_student.nil?
+            }
+          end
+        }
+
+        button('Сохранить') {
+          stretchy false
+
+          on_clicked {
+            values = @entries.transform_values { |v| v.text.force_encoding("utf-8").strip }
+            values.transform_values! { |v| v.empty? ? nil : v}
+            @controller.process_fields(values)
+            @controller.refresh
+          }
+        }
+      }
+    }
+    on_create
+    @root_container
+  end
+
+  def set_value(field, value)
+    return unless @entries.include?(field)
+    @entries[field].text = value
+  end
+
+  def make_readonly(*fields)
+    fields.each do |field|
+      @entries[field].read_only = true
+    end
+  end
+
+  def close
+    @root_container.destroy
+  end
+end

data/lib/source/student_input_form_controller.rb

@@ -0,0 +1,56 @@
+# frozen_string_literal: true
+
+require 'win32api'
+
+class StudentInputFormController
+  def initialize(parent_controller)
+    @parent_controller = parent_controller
+    LoggerHolder.instance.debug('StudentInputFormController: initialized')
+  end
+
+  def set_view(view)
+    @view = view
+  end
+
+
+  def refresh
+    @parent_controller.refresh_data(1,20)
+  end
+
+  def on_view_created
+    begin
+      @student_list = StudentListAdv.new(StudentsListDBAdapter.new(StudentListDB.instance))
+    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)
+      parental_name = fields.delete(:parental_name)
+
+      return if last_name.nil? || first_name.nil? || parental_name.nil?
+
+      student = Student.new(last_name, first_name, parental_name, **fields)
+
+      @student_list.add_student(student)
+      LoggerHolder.instance.debug('StudentInputFormController: adding student to DB')
+      @view.close
+    rescue ArgumentError => e
+      api = Win32API.new('user32', 'MessageBox', ['L', 'P', 'P', 'L'], 'I')
+      LoggerHolder.instance.debug("StudentInputFormController: wrong fields: #{e.message}")
+      api.call(0, e.message, 'Error', 0)
+    end
+  end
+
+
+  def on_db_conn_error(error)
+    LoggerHolder.instance.debug('StudentInputFormController: 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/student_list_adapter.rb

@@ -0,0 +1,95 @@
+# frozen_string_literal: true
+require_relative 'Student_list'
+class StudentsListAdapter
+  private_class_method :new
+  def get_student(id)
+  end
+
+  def remove_student(id)
+  end
+
+  def replace_student(id, student)
+  end
+
+  def get_students_pag(k, n, data)
+  end
+
+  def add_student(student)
+  end
+
+  def count
+  end
+end
+
+class StudentsListDBAdapter < StudentsListAdapter
+  private
+  attr_accessor :database_list
+
+  public_class_method :new
+  
+  public
+  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_pag(from, to, data)
+    database_list.get_students_pag(from, to, data)
+  end
+
+  def add_student(student)
+    database_list.add_student(student)
+  end
+
+  def count
+    database_list.count
+  end
+end
+
+class StudentsListConverterAdapter < StudentsListAdapter
+  private
+  attr_accessor :file_list
+
+  public_class_method :new
+  
+  public
+  def initialize(file_list, filename)
+    self.file_list = file_list
+    self.file_list.read_file(filename)
+  end
+
+  def get_student(id)
+    file_list.get_student(id)
+  end
+
+  def remove_student(id)
+    file_list.remove_student(id)
+  end
+
+  def replace_student(id, student)
+    file_list.replace_student(id, student)
+  end
+
+  def get_students_pag(k, n, data=nil)
+    file_list.get_students_pag(k, n, data)
+  end
+
+  def add_student(student)
+    file_list.add_student(student)
+  end
+
+  def count
+    file_list.count
+  end
+end

data/lib/source/student_list_adv.rb

@@ -0,0 +1,35 @@
+# frozen_string_literal: true
+
+class StudentListAdv
+  private
+  attr_accessor :students_list_adapter
+  public
+  def initialize(students_list_adapter)
+    self.students_list_adapter = students_list_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_pag(k, n, data)
+    students_list_adapter.get_students_pag(k, n, data)
+  end
+
+  def add_student(student)
+    students_list_adapter.add_student(student)
+  end
+
+  def count
+    students_list_adapter.count
+  end
+
+end

data/lib/source/student_list_controller.rb

@@ -0,0 +1,80 @@
+# frozen_string_literal: true
+
+# frozen_string_literal: true
+require_relative 'student_list_adv'
+require_relative 'student_list_adapter'
+require_relative 'student_list_db'
+require_relative 'Converter_json'
+require_relative 'Converter'
+require_relative 'Student_list'
+require_relative 'student_edit_form_controller'
+require 'win32api'
+require 'mysql2'
+require_relative 'logger_holder'
+class StudentListController
+  def initialize(view)
+    LoggerHolder.instance.debug('StudentListController: init start')
+    @view = view
+    @data_list = DataListStudentShort.new
+    @data_list.add_listener(@view)
+    LoggerHolder.instance.debug('StudentListController: init done')
+  end
+
+  def on_view_created
+    begin
+      @student_list = StudentListAdv.new(StudentsListDBAdapter.new(StudentListDB.instance))
+      LoggerHolder.instance.debug('StudentListController: created student repository')
+    rescue Mysql2::Error::ConnectionError=>e
+      on_db_conn_error(e)
+    end
+  end
+
+  def delete_selected(current_page, per_page, selected_row)
+    begin
+      LoggerHolder.instance.debug('StudentListController: 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_list.remove_student(student_id)
+    rescue => e
+      on_db_conn_error(e)
+    end
+  end
+
+  def show_modal_add
+    LoggerHolder.instance.debug('StudentListController: showing modal (add)')
+    controller = StudentInputFormController.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('StudentListController: 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 = StudentEditFormController.new(self, student_id)
+    view = StudentInputForm.new(controller)
+    controller.set_view(view)
+    view.create.show
+  end
+
+  def refresh_data(page, per_page)
+    begin
+      @data_list = @student_list.get_students_pag(page, per_page, @data_list)
+      @view.update_student_count(@student_list.count)
+    rescue => 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)
+    exit(false)
+  end
+end

data/lib/source/student_list_db.rb

@@ -0,0 +1,41 @@
+# frozen_string_literal: true
+require_relative 'students_db'
+
+class StudentListDB
+  attr_accessor :database
+
+  @@instance = nil
+
+  def self.instance
+    @@instance ||= StudentListDB.new
+  end
+
+
+  def initialize
+    self.database = StudentDB.new()
+  end
+
+  def get_student(id)
+    Student.from_hash(database.select_by_id(id).transform_keys(&:to_sym))
+  end
+
+  def remove_student(id)
+    database.remove_by_id(id)
+  end
+
+  def replace_student(id, student)
+    database.replace_by_id(id, student)
+  end
+
+  def add_student(student)
+    database.add_student(student.to_hash)
+  end
+
+  def get_students_pag(k, n, data)
+    database.get_students_pag(k, n, data)
+  end
+
+  def count
+    database.count
+  end
+end

data/lib/source/students_db.rb

@@ -0,0 +1,82 @@
+# frozen_string_literal: true
+# #encoding: UTF-8
+require 'mysql2'
+require_relative 'Data_list_student_short'
+require_relative 'Data_list'
+require_relative 'Student'
+require_relative 'Student_short'
+class StudentDB
+
+  attr_accessor :db_connection
+
+  def initialize
+    self.db_connection = Mysql2::Client.new(:host => "localhost", :username => "dimas", :password => "qwe123")
+    self.db_connection.query('CREATE DATABASE IF NOT EXISTS stud_db')
+    self.db_connection.query('USE stud_db')
+    self.db_connection.query('DROP TABLE IF EXISTS student')
+    self.db_connection.query(File.read('F:/Other/RLabs/dataset/RubyLabsReserved/Gem_fuss/lib/source/create_table.sql'))
+    self.insert_data
+  end
+
+  def insert_data
+    db_connection.query(File.read('F:/Other/RLabs/dataset/RubyLabsReserved/Gem_fuss/lib/source/insert_data.sql'))
+  end
+
+  def select_by_id(id)
+    db_connection.query("SELECT * FROM student WHERE id = #{id}").map{|x| x}[0]
+  end
+
+  def remove_by_id(id)
+    db_connection.query("DELETE FROM student WHERE id = #{id}")
+  end
+
+ def parseNil(attr)
+    if attr == nil
+      "NULL"
+    else
+      attr
+    end
+  end
+
+  def add_student(student_data)
+
+    db_connection.query("""
+        INSERT INTO student (last_name, first_name, parental_name, git, phone, email, telegram) VALUES
+        ROW(
+            \"#{parseNil(student_data[:last_name])}\",
+            \"#{parseNil(student_data[:first_name])}\",
+            \"#{parseNil(student_data[:parental_name])}\",
+            \"#{parseNil(student_data[:git])}\",
+            \"#{parseNil(student_data[:phone])}\",
+            \"#{parseNil(student_data[:email])}\",
+            \"#{parseNil(student_data[:telegram])}\"
+        )
+        """)
+  end
+
+  def replace_by_id(id, student_data)
+    self.remove_by_id(id)
+    self.add_student(student_data.to_hash)
+  end
+
+  def get_students_pag(k, n, existing_data = nil)
+    rows = db_connection.query("SELECT * FROM student ORDER BY id LIMIT #{n} OFFSET #{(k-1)*n}")
+    data_list = DataListStudentShort.new
+    rows.each do |row|
+      row_sym = row.transform_keys{|key| key.to_sym}
+      data_list.append(StudentShort.from_student_class(Student.from_hash(row_sym)))
+    end
+    return data_list if existing_data.nil?
+    existing_data.replace_objects(data_list.objects)
+    existing_data
+  end
+
+  def count
+    result = db_connection.query("SELECT count(*) FROM student")
+    result.first.values.first
+  end
+
+end
+
+students_db = StudentDB.new
+students_db.insert_data

data/mc_gem3.gemspec

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+require_relative "lib/mc_gem3/version"
+
+Gem::Specification.new do |spec|
+  spec.name = "mc_gem3"
+  spec.version = McGem3::VERSION
+  spec.authors = ["papaSquid"]
+  spec.email = ["bakladjant@mail.ru"]
+  spec.summary = "SuperDuperApp"
+  spec.description = "SuperDuperGem"
+  spec.homepage = "https://github.com/KiTTeNqz/RubyLabs"
+  spec.license = "MIT"
+  spec.required_ruby_version = ">= 3.2.0"
+  spec.add_dependency 'win32api'
+  spec.files = Dir.glob("**/*")
+end

data/sig/mc_gem3.rbs

@@ -0,0 +1,4 @@
+module McGem3
+  VERSION: String
+  # See the writing guide of rbs: https://github.com/ruby/rbs#guides
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mc_gem3
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - papaSquid
@@ -30,7 +30,42 @@ email:
 executables: []
 extensions: []
 extra_rdoc_files: []
-files: []
+files:
+- CHANGELOG.md
+- CODE_OF_CONDUCT.md
+- Documentation.md
+- Gemfile
+- LICENSE.txt
+- README.md
+- check.rb
+- lib/mc_gem3.rb
+- lib/mc_gem3/version.rb
+- lib/source/Converter.rb
+- lib/source/Converter_json.rb
+- lib/source/Converter_txt.rb
+- lib/source/Converter_yaml.rb
+- lib/source/Data_list.rb
+- lib/source/Data_list_student_short.rb
+- lib/source/Data_table.rb
+- lib/source/Student.rb
+- lib/source/StudentBase.rb
+- lib/source/Student_list.rb
+- lib/source/Student_short.rb
+- lib/source/create_table.sql
+- lib/source/insert_data.sql
+- lib/source/logger_holder.rb
+- lib/source/student_edit_form_controller.rb
+- lib/source/student_input_form.rb
+- lib/source/student_input_form_controller.rb
+- lib/source/student_list_adapter.rb
+- lib/source/student_list_adv.rb
+- lib/source/student_list_controller.rb
+- lib/source/student_list_db.rb
+- lib/source/students_db.rb
+- mc_gem3-1.0.0.gem
+- mc_gem3-1.0.1.gem
+- mc_gem3.gemspec
+- sig/mc_gem3.rbs
 homepage: https://github.com/KiTTeNqz/RubyLabs
 licenses:
 - MIT