mvcStudentXD 1.0.1 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 05bfbb2529d8c939220be36718ce9cbb3c90ff7056babd6bff767525894754dc
-  data.tar.gz: 2cd7ca8f883728d63d2f7c49ff24e6582cfdae96c3f7635be8e74ecfead31e54
+  metadata.gz: 5edf4f3f16bbfe82ed1302ffd8ec980a7cc0531faac61609e3cd2ae2b8abbeeb
+  data.tar.gz: d621edb76de6e5c4b7b3f27798e428fa8ba571f25a6e90408d27a8eef24923c4
 SHA512:
-  metadata.gz: 9b762d1821aba2a08e7afba5bac14ae0094ccff1a767faaefab8ca2fc47dd2a4106440e1776f56f8f69edf237f2fd0d82f909000d45119a355a7b1352ce982eb
-  data.tar.gz: 52b6e6fa83cee5074086b0aef86a87df14ff08eb6b333c870430b66b012428afeb350ef4fe0acb54ea44c0fb3f9e742605fee34227ab6870afa4519734ffe567
+  metadata.gz: c59b1615e8e6f6255f071690609df5ccb14ab45b18c42a75fc656a2fac4df5314de05bb1e2fd0eb4efc998a3973e554cb680610125b675801f46d4ff1abd3f0a
+  data.tar.gz: 710895761936a9a5c215a39931872661ca8ddfb9537565ba8ef63736f8d3548b1a5691539d528b1789def5abb93157b806b114e08b51dbee1fa375a56de390ba

data/Gemfile

@@ -15,4 +15,8 @@ gem "mysql2"
 
 gem "glimmer-dsl-libui", '~> 0.7.4'
 
-gem 'win32api'
+gem 'win32api'
+
+gem 'sinatra', '~> 3.0', '>= 3.0.6'
+
+gem 'thin', '~> 1.8', '>= 1.8.2'

data/lib/{student_list_adapter.rb → adapters/student_list_adapter.rb}

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
-require_relative 'Student_list'
+require_relative '../Student_list'
 class StudentsListAdapter
   private_class_method :new
   def get_student(id)

data/lib/{Data_list_student_short.rb → containers/Data_list_student_short.rb}

@@ -1,5 +1,5 @@
-require_relative 'Student_short'
-require_relative 'Data_table'
+require_relative '../model/Student_short'
+require_relative '../containers/Data_table'
 require_relative 'Data_list'
 class  DataListStudentShort < DataList
 

data/lib/{Converter_json.rb → converters/Converter_json.rb}

@@ -1,5 +1,5 @@
 require 'json'
-require_relative 'Converter'
+require_relative '../converters/Converter'
 class ConverterJSON < Converter
 	public_class_method :new
 

data/lib/{Converter_txt.rb → converters/Converter_txt.rb}

@@ -1,4 +1,4 @@
-require_relative 'Converter'
+require_relative '../verter'
 class ConverterTxt < Converter
 	public_class_method :new
 

data/lib/{Converter_yaml.rb → converters/Converter_yaml.rb}

@@ -1,5 +1,5 @@
 require 'yaml'
-require_relative 'Converter'
+require_relative '../verter'
 class ConverterYAML < Converter
 	public_class_method :new
 	

data/lib/database/students_db.rb

@@ -1,10 +1,10 @@
 # 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'
+require_relative '../containers/Data_list_student_short'
+require_relative '../containers/Data_list'
+require_relative '../model/Student'
+require_relative '../model/Student_short'
 class StudentDB
 
   attr_accessor :db_connection
@@ -76,7 +76,4 @@ class StudentDB
     result.first.values.first
   end
 
-end
-
-students_db = StudentDB.new
-students_db.insert_data
+end

data/lib/{Student.rb → model/Student.rb}

@@ -1,5 +1,5 @@
 require 'json'
-require_relative 'StudentBase'
+require_relative '../model/StudentBase'
 class Student < StudentBase
 
 	public_class_method :new

data/lib/{Student_short.rb → model/Student_short.rb}

@@ -1,4 +1,4 @@
-require_relative 'StudentBase'
+require_relative '../model/StudentBase'
 class StudentShort < StudentBase
 
 	public_class_method :new
@@ -11,7 +11,6 @@ class StudentShort < StudentBase
 	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
 

data/lib/mvcStudentXD/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module MvcStudentXD
-  VERSION = "1.0.1"
+  VERSION = "1.1.1"
 end

data/lib/student_edit_form_controller.rb

@@ -1,24 +1,29 @@
 # frozen_string_literal: true
-
+require_relative '../../mvcStudentXD/lib/util/LoggerHolder'
 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
-      on_db_conn_error
+    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)
-    print("IM IN ONVIEW EDIT")
     populate_fields(@existing_student)
   end
 
@@ -36,11 +41,11 @@ class StudentEditFormController
   def process_fields(fields)
     begin
       new_student = Student.from_hash(fields)
-      print("IM IN PROCESS EDIT")
       @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
@@ -48,7 +53,9 @@ class StudentEditFormController
 
   private
 
-  def on_db_conn_error
+  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

data/lib/student_input_form.rb

@@ -2,13 +2,13 @@
 
 require 'glimmer-dsl-libui'
 require_relative 'student_input_form_controller'
-require_relative 'StudentBase'
+require_relative 'model/StudentBase'
 require 'win32api'
 
 class StudentInputForm
   include Glimmer
 
-  def initialize(controller, existing_student = nil)
+  def initialize(controller,existing_student = nil)
     @existing_student = existing_student.to_hash unless existing_student.nil?
     @controller = controller
     @entries = {}
@@ -44,9 +44,8 @@ class StudentInputForm
           on_clicked {
             values = @entries.transform_values { |v| v.text.force_encoding("utf-8").strip }
             values.transform_values! { |v| v.empty? ? nil : v}
-            print
-            print values
             @controller.process_fields(values)
+            @controller.refresh
           }
         }
       }

data/lib/student_input_form_controller.rb

@@ -1,21 +1,27 @@
 # frozen_string_literal: true
 
 require 'win32api'
-
+require_relative '../../mvcStudentXD/lib/util/LoggerHolder'
 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
-      on_db_conn_error
+    rescue Mysql2::Error::ConnectionError=>e
+      on_db_conn_error(e)
     end
   end
 
@@ -30,16 +36,19 @@ class StudentInputFormController
       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
+  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

data/lib/student_list_controller.rb

@@ -2,41 +2,47 @@
 
 # frozen_string_literal: true
 require_relative 'student_list_adv'
-require_relative 'student_list_adapter'
+require_relative 'adapters/student_list_adapter'
 require_relative 'database/student_list_db'
-require_relative 'Converter_json'
-require_relative 'Converter'
+require_relative 'converters/Converter_json'
+require_relative 'converters/Converter'
 require_relative 'Student_list'
 require_relative 'student_edit_form_controller'
 require 'win32api'
 require 'mysql2'
+require_relative '../../mvcStudentXD/lib/util/LoggerHolder'
 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))
-    rescue Mysql2::Error::ConnectionError
-      on_db_conn_error
+      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
-      on_db_conn_error
+    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)
@@ -44,6 +50,7 @@ class StudentListController
   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
@@ -57,16 +64,18 @@ class StudentListController
     begin
       @data_list = @student_list.get_students_pag(page, per_page, @data_list)
       @view.update_student_count(@student_list.count)
-    rescue
-      on_db_conn_error
+    rescue => e
+      on_db_conn_error(e)
     end
   end
 
   private
-  def on_db_conn_error
+  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/mvcStudentXD.gemspec

@@ -0,0 +1,38 @@
+# frozen_string_literal: true
+
+require_relative "lib/mvcStudentXD/version"
+
+Gem::Specification.new do |spec|
+  spec.name = "mvcStudentXD"
+  spec.version = MvcStudentXD::VERSION
+  spec.authors = ["papaSquid"]
+  spec.email = ["mrxameleonx@mail.ru"]
+  spec.license       = "MIT"
+  spec.summary = "Gem with Student MC"
+  spec.description = "models and controllers"
+  spec.homepage = "https://github.com/KiTTeNqz/mvcStudentXD"
+  spec.required_ruby_version = ">= 2.6.0"
+
+  spec.metadata["allowed_push_host"] = "https://rubygems.org"
+
+  spec.metadata["homepage_uri"] = spec.homepage
+  spec.metadata["source_code_uri"] = "https://github.com/KiTTeNqz/mvcStudentXD"
+  spec.metadata["changelog_uri"] = "https://github.com/KiTTeNqz/mvcStudentXD/blob/master/CHANGELOG.md"
+
+  # Specify which files should be added to the gem when it is released.
+  # The `git ls-files -z` loads the files in the RubyGem that have been added into git.
+  spec.files = Dir.chdir(__dir__) do
+    `git ls-files -z`.split("\x0").reject do |f|
+      (File.expand_path(f) == __FILE__) || f.start_with?(*%w[bin/ test/ spec/ features/ .git .circleci appveyor])
+    end
+  end
+  spec.bindir = "exe"
+  spec.executables = spec.files.grep(%r{\Aexe/}) { |f| File.basename(f) }
+  spec.require_paths = ["lib"]
+
+  # Uncomment to register a new dependency of your gem
+  # spec.add_dependency "example-gem", "~> 1.0"
+
+  # For more information and examples about making a new gem, check out our
+  # guide at: https://bundler.io/guides/creating_gem.html
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mvcStudentXD
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.1
 platform: ruby
 authors:
 - papaSquid
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-05-05 00:00:00.000000000 Z
+date: 2023-05-12 00:00:00.000000000 Z
 dependencies: []
 description: models and controllers
 email:
@@ -23,32 +23,30 @@ files:
 - Gemfile
 - README.md
 - Rakefile
-- lib/Converter.rb
-- lib/Converter_json.rb
-- lib/Converter_txt.rb
-- lib/Converter_yaml.rb
-- lib/Data_list.rb
-- lib/Data_list_student_short.rb
-- lib/Data_table.rb
-- lib/Student.rb
-- lib/StudentBase.rb
 - lib/Student_list.rb
-- lib/Student_short.rb
+- lib/adapters/student_list_adapter.rb
+- lib/containers/Data_list.rb
+- lib/containers/Data_list_student_short.rb
+- lib/containers/Data_table.rb
+- lib/converters/Converter.rb
+- lib/converters/Converter_json.rb
+- lib/converters/Converter_txt.rb
+- lib/converters/Converter_yaml.rb
 - lib/database/scripts/create_table.sql
 - lib/database/scripts/insert_data.sql
 - lib/database/student_list_db.rb
 - lib/database/students_db.rb
-- lib/main.rb
-- lib/main_window.rb
+- lib/model/Student.rb
+- lib/model/StudentBase.rb
+- lib/model/Student_short.rb
 - lib/mvcStudentXD.rb
 - lib/mvcStudentXD/version.rb
 - lib/student_edit_form_controller.rb
 - lib/student_input_form.rb
 - lib/student_input_form_controller.rb
-- lib/student_list_adapter.rb
 - lib/student_list_adv.rb
 - lib/student_list_controller.rb
-- lib/tab_students.rb
+- mvcStudentXD.gemspec
 - sig/mvcStudentXD.rbs
 homepage: https://github.com/KiTTeNqz/mvcStudentXD
 licenses:

data/lib/main.rb

@@ -1,23 +0,0 @@
-require_relative 'Student'
-require_relative 'Student_short'
-require_relative 'Data_list'
-require_relative 'Data_list_student_short'
-require_relative 'Student_list'
-require_relative 'Converter_yaml'
-require_relative 'Converter_txt'
-require_relative 'Converter_json'
-require_relative 'database/student_list_db'
-require_relative 'student_list_adv.rb'
-require_relative 'student_list_adapter.rb'
-require 'mysql2'
-
-db = StudentListDB.instance
-puts db.get_student(2)
-puts db.count
-
-studentsList = StudentListAdv.new(StudentsListDBAdapter.new(StudentListDB.instance))
-json = StudentList.new(ConverterJSON.new)
-studentsList2 = StudentListAdv.new(StudentsListConverterAdapter.new(json, 'C:/Users/Дмитрий/RubymineProjects/RubyLabs/Lab2/studentsRead.json'))
-puts studentsList.get_student(3)
-
-puts studentsList2.get_student(2)

data/lib/main_window.rb

@@ -1,28 +0,0 @@
-# frozen_string_literal: true
-
-require 'glimmer-dsl-libui'
-require_relative 'tab_students'
-
-class MainWindow
-  include Glimmer
-
-  def initialize
-    @view_tab_students = TabStudents.new
-  end
-
-  def create
-    window('Универ', 600, 300) {
-      tab {
-        tab_item('Студенты') {
-          @view_tab_students.create
-        }
-
-        tab_item('Вкладка 2') { }
-        tab_item('Вкладка 3') { }
-      }
-    }
-  end
-end
-
-main_window = MainWindow.new.create
-main_window.show

data/lib/tab_students.rb

@@ -1,152 +0,0 @@
-# frozen_string_literal: true
-
-# frozen_string_literal: true
-require 'glimmer-dsl-libui'
-require_relative 'student_list_controller'
-require_relative 'student_input_form'
-
-class TabStudents
-  include Glimmer
-  STUDENTS_PER_PAGE = 20
-
-  def initialize
-    @controller = StudentListController.new(self)
-    @current_page = 1
-    @total_count = 0
-  end
-
-  def on_create
-    @controller.on_view_created
-    @controller.refresh_data(@current_page, STUDENTS_PER_PAGE)
-  end
-
-  # Метод наблюдателя datalist
-  def on_datalist_changed(new_table)
-    arr = new_table.to_2d_array
-    @table.model_array = arr
-  end
-
-  def update_student_count(new_cnt)
-    @total_count = new_cnt
-    @page_label.text = "#{@current_page} / #{(@total_count / STUDENTS_PER_PAGE.to_f).ceil}"
-  end
-
-  def create
-    root = horizontal_box {
-      # Секция 1
-      vertical_box {
-        stretchy false
-
-        form {
-          stretchy false
-
-          @filter_last_name_initials = entry {
-            label 'ФИО'
-          }
-
-          @filters = {}
-          fields = [[:git, 'Github'], [:email, 'Почта'], [:phone, 'Телефон'], [:telegram, 'Телеграм']]
-
-          fields.each do |field|
-            @filters[field[0]] = {}
-
-            @filters[field[0]][:combobox] = combobox {
-              label "#{field[1]}?"
-              items ['Не важно', 'Есть', 'Нет']
-              selected 0
-
-              on_selected do
-                if @filters[field[0]][:combobox].selected == 1
-                  @filters[field[0]][:entry].read_only = false
-                else
-                  @filters[field[0]][:entry].text = ''
-                  @filters[field[0]][:entry].read_only = true
-                end
-              end
-            }
-
-            @filters[field[0]][:entry] = entry {
-              label field[1]
-              read_only true
-            }
-          end
-        }
-      }
-
-      # Секция 2
-      vertical_box {
-        @table = refined_table(
-          table_editable: false,
-          filter: lambda do |row_hash, query|
-            utf8_query = query.force_encoding("utf-8")
-            row_hash['Фамилия И. О'].include?(utf8_query)
-          end,
-          table_columns: {
-            '#' => :text,
-            'Фамилия И. О' => :text,
-            'Гит' => :text,
-            'Контакт' => :text,
-          },
-          per_page: STUDENTS_PER_PAGE
-        )
-
-        @pages = horizontal_box {
-          stretchy false
-
-          button("<") { stretchy true }
-          button("<") {
-            stretchy true
-
-            on_clicked do
-              @current_page = [@current_page - 1, 1].max
-              @controller.refresh_data(@current_page, STUDENTS_PER_PAGE)
-            end
-
-          }
-          @page_label = label("...") { stretchy false }
-          button(">") { stretchy true }
-          button(">") {
-            stretchy true
-
-            on_clicked do
-              @current_page = [@current_page + 1, (@total_count / STUDENTS_PER_PAGE.to_f).ceil].min
-              @controller.refresh_data(@current_page, STUDENTS_PER_PAGE)
-            end
-          }
-        }
-      }
-
-      # Секция 3
-      vertical_box {
-        stretchy true
-
-        button('Добавить') {
-          stretchy false
-
-          on_clicked {
-            @controller.show_modal_add
-          }
-        }
-        button('Изменить') {
-          stretchy false
-
-          on_clicked {
-            @controller.show_modal_edit(@current_page, STUDENTS_PER_PAGE, @table.selection) unless @table.selection.nil?
-          }
-        }
-        button('Удалить') {
-          stretchy false
-
-          on_clicked {
-            @controller.delete_selected(@current_page, STUDENTS_PER_PAGE, @table.selection) unless @table.selection.nil?
-            @controller.refresh_data(@current_page, STUDENTS_PER_PAGE)
-          }
-        }
-        button('Обновить') { stretchy false }
-      }
-    }
-    on_create
-    root
-  end
-
-end