rubbish_code 1.0.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3ff6f894a469a5e30f9503c213a3a3bc722644f31c029a71be8fee6ccf374c0f
-  data.tar.gz: f3974e72e1da817190175d4e6570cc1f31c079dacfd91d5cb7d8ad56cf9d6bc9
+  metadata.gz: 8977c1f85f3d3c5a73e2d51cdf33e7104520fb2e4a9a531e394e2e6645af8ff3
+  data.tar.gz: 84ba679d683b6a3f43b5bc3f488c793c199bba66480fb4844b9d31f8e8b2cbf4
 SHA512:
-  metadata.gz: 8521e9757f7ac4f1051bab3b1ceb90174d240df639586ec644621308781374433060551621de84df2222be89b87acb593a16c7bf0122c55f8005e7931860a1db
-  data.tar.gz: 23778ca852b39757f12b23ccd8da11c0c7ffdba28884050c567b6c3593e3176c43d9f82194fd55a03f84dd3b32d091b1124ea0c687e9079c6a8d1d558d2d6453
+  metadata.gz: 4c8ef12b68cab719993c6284ddfa5ba6dd7d8d2a4c9f8273cc31f53a248e807dbaf43739b84173eb06987057fd75e4c1ccf13cc5d30382f6c607f85c6928d096
+  data.tar.gz: dba57235d419c0645ca35bf425fefdfade42c187b22944b96288810f3110349ae60b78fb51040b92a4c90070f079c4dbed89afb0a173c05aad22f6bff530a546

data/CHANGELOG.md

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

data/CODE_OF_CONDUCT.md

@@ -1,84 +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.
+# 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/Gemfile

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

data/lib/rubbish_code/version.rb

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

data/lib/rubbish_code.rb

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

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

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
-require './LabStudents/util/logger_holder'
+require 'source/util/logger_holder'
 require 'win32api'
 
 class StudentInputFormControllerCreate

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

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require './LabStudents/util/logger_holder'
+require 'source/util/logger_holder'
 require 'win32api'
 
 class StudentInputFormControllerEdit
@@ -26,7 +26,7 @@ class StudentInputFormControllerEdit
       on_db_conn_error(e)
     end
     @existing_student = @student_rep.student_by_id(@existing_student_id)
-    @view.make_readonly(:git, :telegram, :email, :phone)
+    #@view.make_readonly(:git, :telegram, :email, :phone)
     populate_fields(@existing_student)
   end
 

data/lib/source/controllers/tab_students_controller.rb

@@ -1,13 +1,13 @@
 # frozen_string_literal: true
 
-require './LabStudents/views/main_window'
-require './LabStudents/repositories/student_repository'
-require './LabStudents/repositories/adapters/db_source_adapter'
-require './LabStudents/repositories/containers/data_list_student_short'
-require './LabStudents/views/student_input_form'
-require './LabStudents/controllers/student_input_form/student_input_form_controller_create'
-require './LabStudents/controllers/student_input_form/student_input_form_controller_edit'
-require './LabStudents/util/logger_holder'
+require 'source/views/main_window'
+require 'source/repositories/student_repository'
+require 'source/repositories/adapters/db_source_adapter'
+require 'source/repositories/containers/data_list_student_short'
+require 'source/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

data/lib/source/repositories/adapters/db_source_adapter.rb

@@ -1,9 +1,9 @@
 # frozen_string_literal: true
 
-require './LabStudents/repositories/data_sources/db_data_source'
-require './LabStudents/models/student'
-require './LabStudents/models/student_short'
-require './LabStudents/repositories/containers/data_list_student_short'
+require 'source/repositories/data_sources/db_data_source'
+require 'source/models/student'
+require 'source/models/student_short'
+require 'source/repositories/containers/data_list_student_short'
 
 class DBSourceAdapter
   def initialize

data/lib/source/repositories/containers/data_list.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require './LabStudents/repositories/containers/data_table'
+require 'source/repositories/containers/data_table'
 
 class DataList
   # Это "абстрактный" класс

data/lib/source/repositories/data_sources/db_data_source.rb

@@ -7,7 +7,8 @@ class DBDataSource
   @instance_mutex = Mutex.new
 
   def initialize
-    db_config = YAML.load_file('./LabStudents/db_config/config.yaml').transform_keys(&:to_sym)
+    #тут изменить путь к своему конфигу
+    db_config = YAML.load_file('C:/Users/jakep/GitHub/Ruby_Moment/LabStudents/db_config/config.yaml').transform_keys(&:to_sym)
     @client = Mysql2::Client.new(db_config)
     @client.query_options.merge!(symbolize_keys: true)
   end

data/lib/source/repositories/data_sources/file_data_source.rb

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
-require './LabStudents/models/student'
-require './LabStudents/models/student_short'
-require './LabStudents/repositories/containers/data_list_student_short'
+require 'source/models/student'
+require 'source/models/student_short'
+require 'source/repositories/containers/data_list_student_short'
 
 class FileDataSource
   attr_writer :data_transformer

data/lib/source/views/main_window.rb

@@ -0,0 +1,25 @@
+# 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('Универ', 900, 200) {
+      tab {
+        tab_item('Студенты') {
+          @view_tab_students.create
+        }
+
+        tab_item('Вкладка 2') { }
+        tab_item('Вкладка 3') { }
+      }
+    }
+  end
+end

data/lib/source/views/student_input_form.rb

@@ -0,0 +1,71 @@
+# frozen_string_literal: true
+
+require 'glimmer-dsl-libui'
+require 'source/controllers/student_input_form/student_input_form_controller_create'
+require 'source/models/student_base'
+require 'source/controllers/tab_students_controller'
+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], [:father_name, 'Отчество', false], [:git, 'Гит', true], [:telegram, 'Телеграм', true], [:email, 'Почта', true], [:phone, 'Телефон', true]]
+
+          fields.each do |field|
+            @entries[field[0]] = entry {
+              label field[1]
+            }
+          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/views/tab_students.rb

@@ -0,0 +1,171 @@
+# frozen_string_literal: true
+
+require 'glimmer-dsl-libui'
+require 'source/controllers/tab_students_controller'
+require 'source/views/student_input_form'
+
+class TabStudents
+  include Glimmer
+
+  STUDENTS_PER_PAGE = 20
+
+  def initialize
+    @controller = TabStudentsController.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
+    arr.map do |row|
+      row[3] = [row[3][:value], contact_color(row[3][:type])] unless row[3].nil?
+    end
+    @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 contact_color(type)
+    case type
+    when 'telegram'
+      '#00ADB5'
+    when 'email'
+      '#F08A5D'
+    when 'phone'
+      '#B83B5E'
+    else
+      '#000000'
+    end
+  end
+
+  def create
+    root_container = horizontal_box {
+      # Секция 1
+      vertical_box {
+        stretchy false
+
+        form {
+          stretchy false
+
+          @filter_last_name_initials = entry {
+            label 'Фамилия И. О.'
+          }
+
+          @filters = {}
+          fields = [[:git, 'Гит'], [: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_color
+          },
+          per_page: STUDENTS_PER_PAGE
+        )
+
+        @pages = horizontal_box {
+          stretchy false
+
+          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
+
+            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 false
+
+        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_clicked {
+            @controller.refresh_data(@current_page, STUDENTS_PER_PAGE)
+          }
+        }
+      }
+    }
+    on_create
+    root_container
+  end
+end

data/sig/ribbish_code.rbs

@@ -1,4 +1,4 @@
-module RubbishCode
-  VERSION: String
-  # See the writing guide of rbs: https://github.com/ruby/rbs#guides
-end
+module RubbishCode
+  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: rubbish_code
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Jake Epps
@@ -61,7 +61,10 @@ files:
 - lib/source/repositories/data_sources/transformers/data_transformer_yaml.rb
 - lib/source/repositories/student_repository.rb
 - lib/source/util/logger_holder.rb
-- rubbish_code-0.1.4.gem
+- lib/source/views/main_window.rb
+- lib/source/views/student_input_form.rb
+- lib/source/views/tab_students.rb
+- rubbish_code-1.1.0.gem
 - rubbish_code.gemspec
 - sig/ribbish_code.rbs
 homepage: https://github.com/Jakepps/Ruby_Moment