mvcStudentXD 1.2.1 → 1.2.3

metadata

@@ -1,113 +1,64 @@
 --- !ruby/object:Gem::Specification
 name: mvcStudentXD
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.2.3
 platform: ruby
 authors:
 - papaSquid
 autorequire:
-bindir: bin
+bindir: exe
 cert_chain: []
 date: 2023-05-12 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
-  name: win32api
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-description: А simple ruby gem
+dependencies: []
+description: models and controllers
 email:
-- bakladjant@mail.ru
+- mrxameleonx@mail.ru
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".rubocop.yml"
+- CHANGELOG.md
+- CODE_OF_CONDUCT.md
 - Gemfile
 - Gemfile.lock
-- Lab1/arr1_3.txt
-- Lab1/lb1_1.rb
-- Lab1/lb1_2.rb
-- Lab1/lb1_3.rb
-- Lab1/lb1_4.rb
-- Lab2/1Class.jpg
-- Lab2/Web/main.rb
-- Lab2/Web/views/add.html
-- Lab2/Web/views/main.html
-- Lab2/data_storage/students1.txt
-- Lab2/data_storage/studentsRead.json
-- Lab2/data_storage/studentsRead.txt
-- Lab2/data_storage/studentsRead.yaml
-- Lab2/data_storage/studentsWrite.json
-- Lab2/data_storage/studentsWrite.txt
-- Lab2/data_storage/studentsWrite.yaml
-- Lab2/examples/Strategy.rb
-- Lab2/examples/adapter.rb
-- Lab2/examples/database.rb
-- Lab2/examples/observer_example.rb
-- Lab2/examples/pattern_pattern.rb
-- Lab2/examples/site_example.rb
-- Lab2/examples/views/about.erb
-- Lab2/examples/views/contact.erb
-- Lab2/examples/views/index.erb
-- Lab2/main.rb
-- Lab2/main_window.rb
-- Lab2/student_input_form.rb
-- Lab2/tab_students.rb
-- Lab2/test/student_test.rb
 - README.md
-- mvcStudentXD/CHANGELOG.md
-- mvcStudentXD/CODE_OF_CONDUCT.md
-- mvcStudentXD/Gemfile
-- mvcStudentXD/Gemfile.lock
-- mvcStudentXD/README.md
-- mvcStudentXD/Rakefile
-- mvcStudentXD/bin/console
-- mvcStudentXD/bin/setup
-- mvcStudentXD/lib/mvcStudentXD.rb
-- mvcStudentXD/lib/mvcStudentXD/version.rb
-- mvcStudentXD/lib/source/adapters/student_list_adapter.rb
-- mvcStudentXD/lib/source/containers/Data_list.rb
-- mvcStudentXD/lib/source/containers/Data_list_student_short.rb
-- mvcStudentXD/lib/source/containers/Data_table.rb
-- mvcStudentXD/lib/source/controllers/student_edit_form_controller.rb
-- mvcStudentXD/lib/source/controllers/student_input_form_controller.rb
-- mvcStudentXD/lib/source/controllers/student_list_controller.rb
-- mvcStudentXD/lib/source/converters/Converter.rb
-- mvcStudentXD/lib/source/converters/Converter_json.rb
-- mvcStudentXD/lib/source/converters/Converter_txt.rb
-- mvcStudentXD/lib/source/converters/Converter_yaml.rb
-- mvcStudentXD/lib/source/database/scripts/create_table.sql
-- mvcStudentXD/lib/source/database/scripts/insert_data.sql
-- mvcStudentXD/lib/source/database/student_list_db.rb
-- mvcStudentXD/lib/source/database/students_db.rb
-- mvcStudentXD/lib/source/model/Student.rb
-- mvcStudentXD/lib/source/model/StudentBase.rb
-- mvcStudentXD/lib/source/model/Student_short.rb
-- mvcStudentXD/lib/source/repositories/Student_list.rb
-- mvcStudentXD/lib/source/repositories/student_list_adv.rb
-- mvcStudentXD/lib/source/util/LoggerHolder.rb
-- mvcStudentXD/mvcStudentXD-1.2.0.gem
-- mvcStudentXD/mvcStudentXD.gemspec
-- mvcStudentXD/pkg/mvcStudentXD-0.1.0.gem
-- mvcStudentXD/pkg/mvcStudentXD-1.0.1.gem
-- mvcStudentXD/pkg/mvcStudentXD-1.1.1.gem
-- mvcStudentXD/sig/mvcStudentXD.rbs
-- mvcStudentXD/test/student_test.rb
-- mvcStudentXD/test/test_helper.rb
-- mvcStudentXD/test/test_mvcStudentXD.rb
+- Rakefile
+- lib/mvcStudentXD.rb
+- lib/mvcStudentXD/version.rb
+- lib/source/adapters/student_list_adapter.rb
+- lib/source/containers/Data_list.rb
+- lib/source/containers/Data_list_student_short.rb
+- lib/source/containers/Data_table.rb
+- lib/source/controllers/student_edit_form_controller.rb
+- lib/source/controllers/student_input_form_controller.rb
+- lib/source/controllers/student_list_controller.rb
+- lib/source/converters/Converter.rb
+- lib/source/converters/Converter_json.rb
+- lib/source/converters/Converter_txt.rb
+- lib/source/converters/Converter_yaml.rb
+- lib/source/database/scripts/create_table.sql
+- lib/source/database/scripts/insert_data.sql
+- lib/source/database/student_list_db.rb
+- lib/source/database/students_db.rb
+- lib/source/model/Student.rb
+- lib/source/model/StudentBase.rb
+- lib/source/model/Student_short.rb
+- lib/source/repositories/Student_list.rb
+- lib/source/repositories/student_list_adv.rb
+- lib/source/util/LoggerHolder.rb
+- mvcStudentXD-1.2.0.gem
+- mvcStudentXD-1.2.2.gem
+- mvcStudentXD.gemspec
+- sig/mvcStudentXD.rbs
 homepage: https://github.com/KiTTeNqz/mvcStudentXD
 licenses:
 - MIT
-metadata: {}
+metadata:
+  allowed_push_host: https://rubygems.org
+  homepage_uri: https://github.com/KiTTeNqz/mvcStudentXD
+  source_code_uri: https://github.com/KiTTeNqz/mvcStudentXD
+  changelog_uri: https://github.com/KiTTeNqz/mvcStudentXD/blob/master/CHANGELOG.md
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -126,5 +77,5 @@ requirements: []
 rubygems_version: 3.4.10
 signing_key:
 specification_version: 4
-summary: DeadInside
+summary: Gem with Student MC
 test_files: []

data/Lab1/arr1_3.txt

@@ -1 +0,0 @@
-1 3 -4 6 8 -3 -5 10

data/Lab1/lb1_1.rb

@@ -1,19 +0,0 @@
-puts 'Hello World'
-puts "Hello, #{ARGV[0]}."
-puts "Какой твой любимый язык?"
-
-r = STDIN.gets.chomp
-case r
-	when 'ruby'
-		puts 'Подлиза'
-	else
-		puts 'Почему не руби?!'
-end
-
-puts 'Enter ruby command: '
-comRuby = STDIN.gets.chomp
-system "ruby -e \'#{comRuby}\'"
-
-puts 'Enter OS command: '
-comSys = STDIN.gets.chomp
-puts `#{comSys}`

data/Lab1/lb1_2.rb

@@ -1,28 +0,0 @@
-#var2
-def vzaimProst(num1, num2)
-	if(num1.gcd(num2)==1) then true
-		else false
-	end
-end
-
-def formArrDel(num)
-	return 1.upto(num).select{|e| num%e==0}
-end
-
-def meth1(num1)
-	return 2.upto(num1-1).count{|e| num1.gcd(e)==1}
-end
-
-def meth2(num)
-	return num.digits.select{|e| e%3==0}.sum
-end
-
-def meth3(num)
-	#formirovat massiv iz kol-va vzaimno-prostih s dannim
-	arr = formArrDel(num).map{|e| num.digits.count{|e1| e.gcd(e1)==1}}
-	return formArrDel(num)[arr.rindex(arr.max)]
-end
-
-puts meth1(16)
-puts meth2(161718192023)
-puts meth3(17)

data/Lab1/lb1_3.rb

@@ -1,46 +0,0 @@
-def minArr(arr)
-	minim=arr[0]
-	for i in 0..arr.length
-		if arr[i].to_i<minim 
-			then minim=arr[i].to_i 
-		end
-	end
-	return minim
-end
-
-def firstPos(arr)
-	for i in 0..arr.length
-		return i if arr[i].to_i>0
-	end
-	return -1
-end
-
-if ARGV.count<2
-	puts 'Введите 2 аргумента(метод, путь)!!!'
-	return
-end
-
-meth = ARGV[0]
-path = ARGV[1]
-
-file = File.open(path)
-array = file.readline.split(' ').map(&:to_i)
-file.close()
-
-puts "Array: #{array}\n"
-
-case meth
-	when 'minArr'
-		puts "Min in arr: #{minArr(array)}"
-	when 'fP'
-		puts "First positive in arr: #{firstPos(array)}"
-	else
-		puts "Unknown method" 
-end
-
-
-
-
-#a=[1,3,-4,6,8,-3,-5, 10]
-#puts minArr(a)
-#puts firstPos(a)

data/Lab1/lb1_4.rb

@@ -1,82 +0,0 @@
-def idxMin(arr)
-	return arr.index(arr.min)
-end
-
-
-def countInterval(arr, a, b)
-	return arr.slice(a+1...b).length
-end
-
-
-def idxLastMin(arr)
-	return arr.rindex(arr.min)
-end
-
-def betweenMins(arr)
-	return countInterval(arr,idxMin(arr),idxLastMin(arr))
-end
-
-def countInNums(arr, a, b)
-	return arr.select{|e| e.between?(a,b)}.length
-end
-
-def differ2Arrs(arr1, arr2)
-	return arr1.find_all{|x| arr1.count(x)==1}.difference(arr2).union(arr2.find_all{|x| arr2.count(x)==1}.difference(arr1))
-end
-
-#a=[1,3,-4,-5,6,8,-3,-5,10,3]
-#b=[2,8,-4,-7,6,12,-15,-3,1,1]
-
-puts "Вечер добрый! Какую программу запустим?
-
-2 - idxMin
-14 - count in countInterval
-26 - betweenMins
-38 - countInNums
-50 - differenceBetween2Arrs"
-
-meth = gets.chomp.to_i
-
-case meth
-	when meth = 2
-		puts "Введите массив для обработки"
-		arr = gets.chomp.split(' ').map(&:to_i)
-		puts "Введённый массив: #{arr.inspect}"
-		puts idxMin(arr)
-	when meth = 14
-		puts "Введите массив для обработки"
-		arr = gets.chomp.split(' ').map(&:to_i)
-		puts "Введите a"
-  		a = gets.chomp.to_i
-  		puts "Введите b"
-  		b = gets.chomp.to_i
-  		puts countInterval(arr,a,b)
-	when meth = 26
-		puts "Введите массив для обработки"
-		arr = gets.chomp.split(' ').map(&:to_i)
-		puts betweenMins(arr)
-	when meth = 38
-		puts "Введите массив для обработки"
-		arr = gets.chomp.split(' ').map(&:to_i)
-		puts "Введите a"
-  		a = gets.chomp.to_i
-  		puts "Введите b"
-  		b = gets.chomp.to_i
-  		puts countInNums(arr,a,b)
-	when meth = 50
-		puts "Введите 1 массив для обработки"
-		arr1 = gets.chomp.split(' ').map(&:to_i)
-		puts "Введите 2 массив для обработки"
-		arr2 = gets.chomp.split(' ').map(&:to_i)
-		puts differ2Arrs(arr1, arr2)
-	else
-		puts "Error"
-end
-
-
-#puts "Array: #{a}\n"
-#puts idxMin(a)
-#puts countInterval(a, 5, -1)
-#puts betweenMins(a)
-#puts countInNums(a, -1, 10)
-#puts differ2Arrs(a, b)

data/Lab2/Web/main.rb

@@ -1,89 +0,0 @@
-# frozen_string_literal: true
-
-require 'sinatra'
-require 'mvcStudentXD'
-
-set :port, 8000
-
-puts MvcStudentXD.constants
-
-students_model = MvcStudentXD::StudentListAdv.new(
-  MvcStudentXD::StudentsListDBAdapter.new(
-    MvcStudentXD::StudentListDB.instance))
-
-main_controller = StudentListController.new(students_model)
-main_controller.on_view_created = lambda { }
-main_controller.on_add_student_clicked = lambda { }
-main_controller.on_edit_student_clicked = lambda { |id| }
-
-main_controller.selected_page = 0
-
-editing_id = nil
-
-get "/" do
-  send_file 'web/main.html'
-end
-
-post "/students" do
-  main_controller.refresh_data()
-  result = main_controller.data_list.map { |student|
-    student.as_json
-  }
-
-  result.to_json
-end
-
-post "/next_page" do
-  main_controller.next_page()
-  main_controller.refresh_data()
-end
-
-post "/last_page" do
-  main_controller.last_page()
-  main_controller.update_table()
-end
-
-get "/get_page" do
-  (main_controller.selected_page + 1).to_s
-end
-
-get "/get_pages_count" do
-  main_controller.pages_count.to_s
-end
-
-post "/set_editing_id:id" do
-  puts params[:id]
-  editing_id = params[:id]
-end
-
-get "/get_editing_id" do
-  editing_id.to_s
-end
-
-post "/delete:id" do
-  main_controller.remove_student(params[:id])
-end
-
-post "/editing:id" do
-  student = main_controller.get_student(params[:id])
-  [student.as_json].to_json
-end
-
-get "/add" do
-  if editing_id == 'null'
-    main_controller.show_modal_add
-  else
-    main_controller.show_modal_edit(editing_id)
-  end
-  send_file 'web/add.html'
-end
-
-get "/edit:student" do
-  student = Student.from_json(JSON.parse(params[:student]))
-  main_controller.replace_student(student.id, student)
-end
-
-get "/insert:student" do
-  student = Student.from_json(JSON.parse(params[:student]))
-  main_controller.add_student(student)
-end

data/Lab2/Web/views/add.html

@@ -1,168 +0,0 @@
-<html>
-<style>
-    .text {
-        font-size: 20px;
-        font-weight: bold;
-        color: #000000;
-    }
-
-    .txbox {
-        font-size: 16px;
-        padding: 7px;
-        border: 1px solid #050505;
-    }
-
-    .bt {
-        font-size: 15px;
-        padding: 5px 10px;
-        background-color: #5117d6;
-        color: #fff;
-        border: none;
-        border-radius: 5px;
-        cursor: pointer;
-        margin: 16px;
-    }
-
-    .bt:hover {
-        background-color: #22b91d;
-    }
-</style>
-
-<body style="display: flex; flex-direction: column; width: 256px;">
-<label class="text" for="user_name">Фамилия</label>
-<input class ="txbox" type="text" id="lastname">
-
-<label class="text" for="user_name">Имя</label>
-<input class ="txbox" type="text" id="firstname">
-
-<label class="text" for="user_name">Отчество</label>
-<input class ="txbox"  type="text" id="parental_name">
-
-<label class="text" for="user_name">GitHub</label>
-<input class ="txbox"  type="text" id="git">
-
-<label class="text" for="user_name">Телефон</label>
-<input class ="txbox"  type="text" id="phone">
-
-<label class="text" for="user_name">Почта</label>
-<input class ="txbox"  type="text" id="email">
-
-<label class="text" for="user_name">Телеграм</label>
-<input class ="txbox"  type="text" id="telegram">
-
-<button  class ="bt" onclick="check_button()">Готово</button>
-</body>
-
-<script>
-    let is_edit_mode = false
-    let id = null
-
-    function check_button() {
-        if (document.getElementById('firstname').value === "") {
-            alert("Имя не введено")
-            return
-        }
-
-        if (document.getElementById('lastname').value === "") {
-            alert("Фамилия не введена")
-            return
-        }
-
-        if (document.getElementById('parental_name').value === "") {
-            alert("Отчество не введено")
-            return
-        }
-
-        if (document.getElementById('git').value !== "" && document.getElementById('git').value.match(/@\w*/) == null) {
-            alert("Неверно введен GitHub")
-            return
-        }
-
-        if (document.getElementById('email').value !== "" && document.getElementById('email').value.match(/\w*@\w*.\w{2,3}/) == null) {
-            alert("Неверно введена почта")
-            return
-        }
-
-        if (document.getElementById('phone').value !== "" && document.getElementById('phone').value.match(/\d-\d{3}-\d{3}-\d{2}-\d{2}/) == null) {
-            alert("Неверно введен номер телефона")
-            return
-        }
-
-        if (document.getElementById('telegram').value !== "" && document.getElementById('telegram').value.match(/@\w*/) == null) {
-            alert("Неверно введена телеграм")
-            return
-        }
-
-        if (document.getElementById('git').value === "" && document.getElementById('phone').value == "" && document.getElementById('email').value == "" && document.getElementById('telegram').value == "") {
-            alert("Отсутствует контакт")
-            return
-        }
-
-        add_student()
-    }
-
-    function get_editing_student() {
-        var http = new XMLHttpRequest();
-        http.open('GET', 'get_editing_id', false);
-        http.send()
-
-        id = http.responseText
-
-
-        if (id !== "null") {
-            is_edit_mode = true
-
-            http.open('POST', 'editing' + id, false);
-            http.send()
-
-            let student = JSON.parse(http.responseText)
-
-            document.getElementById('firstname').value = student[0]["firstname"]
-            document.getElementById('lastname').value = student[0]["lastname"]
-            document.getElementById('parental_name').value = student[0]["parental_name"]
-            document.getElementById('git').value = student[0]["git"]
-            document.getElementById('email').value = student[0]["email"]
-            document.getElementById('phone').value = student[0]["phone"]
-            document.getElementById('telegram').value = student[0]["telegram"]
-        }
-    }
-
-    function add_student() {
-        let json = {
-            "firstname": document.getElementById('firstname').value,
-            "lastname": document.getElementById('lastname').value,
-            "parental_name": document.getElementById('parental_name').value
-        }
-
-        if (id != null) {
-            json['id'] = id
-        }
-        if (document.getElementById('git').value !== "") {
-            json['git'] = document.getElementById('git').value
-        }
-        if (document.getElementById('email').value !== "") {
-            json['email'] = document.getElementById('email').value
-        }
-        if (document.getElementById('phone').value !== "") {
-            json['phone'] = document.getElementById('phone').value
-        }
-        if (document.getElementById('telegram').value !== "") {
-            json['telegram'] = document.getElementById('telegram').value
-        }
-
-        var http = new XMLHttpRequest();
-
-        if (is_edit_mode) {
-            http.open('GET', "edit" + JSON.stringify(json), false);
-            http.send()
-        } else {
-            http.open('GET', "insert" + JSON.stringify(json), false);
-            http.send()
-        }
-
-        window.location.replace("/");
-    }
-
-    get_editing_student()
-</script>
-</html>