rubbish_code 1.1.1 → 1.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8977c1f85f3d3c5a73e2d51cdf33e7104520fb2e4a9a531e394e2e6645af8ff3
-  data.tar.gz: 84ba679d683b6a3f43b5bc3f488c793c199bba66480fb4844b9d31f8e8b2cbf4
+  metadata.gz: e60f77dbf44fe895c2c670c35df9bf1d3b6a6ba7bf0a16a1a901f12dba350b74
+  data.tar.gz: 1ae50fc68a7df5d95b13e2585f8bee12db493c91364b20028537925ba883fcab
 SHA512:
-  metadata.gz: 4c8ef12b68cab719993c6284ddfa5ba6dd7d8d2a4c9f8273cc31f53a248e807dbaf43739b84173eb06987057fd75e4c1ccf13cc5d30382f6c607f85c6928d096
-  data.tar.gz: dba57235d419c0645ca35bf425fefdfade42c187b22944b96288810f3110349ae60b78fb51040b92a4c90070f079c4dbed89afb0a173c05aad22f6bff530a546
+  metadata.gz: fd3064e442d8c7f9f7dfdc66ef237b101902913e532bdd2130eee1e552b9f93ff538caf98c80097a478f266ecb2e02c5fbe1bd34d747c54502b1813fb74f7d94
+  data.tar.gz: 28cb17390dee1db13b35896ca0880c444451b7362a5f03e1913b1fc3731f4f1dc5b6a24a6b959a42f6a601182bea7e2a3e8f006dfef891b39a1b7d8cc7e04aa4

data/lib/rubbish_code/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rubbish_code
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.3
 platform: ruby
 authors:
 - Jake Epps
@@ -48,7 +48,6 @@ files:
 - lib/source/models/student.rb
 - lib/source/models/student_base.rb
 - lib/source/models/student_short.rb
-- lib/source/models/student_test.rb
 - lib/source/repositories/adapters/db_source_adapter.rb
 - lib/source/repositories/adapters/file_source_adapter.rb
 - lib/source/repositories/containers/data_list.rb
@@ -61,10 +60,6 @@ files:
 - lib/source/repositories/data_sources/transformers/data_transformer_yaml.rb
 - lib/source/repositories/student_repository.rb
 - lib/source/util/logger_holder.rb
-- 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

data/lib/source/models/student_test.rb

@@ -1,71 +0,0 @@
-require 'test/unit'
-require_relative 'student'
-
-class TestStudent < Test::Unit::TestCase
-  def setup
-    @student = Student.new('Иванов', 'Иван', 'Иванович')
-  end
-
-  def test_full_name
-    assert_equal('Иванов Иван Иванович', @student.to_s.split(', ')[0])
-  end
-
-  def test_contacts
-    @student = Student.new('Иванов', 'Иван', 'Иванович')
-    @student.set_contacts(phone: '+79991234567',  email: 'ivanov@example.com')
-    assert_equal('+79991234567', @student.phone)
-    assert_equal('ivanov@example.com', @student.email)
-  end
-
-  def test_valid_name
-    assert(Student.valid_name?('Иванов'))
-    assert(!Student.valid_name?('Сидоров-Петров'))
-    assert(!Student.valid_name?('X'))
-    assert(Student.valid_name?('Abcdefghijklmnopqrstuvwxyz'))
-    assert(!Student.valid_name?(''))
-    assert(!Student.valid_name?('Иванов 123'))
-    assert(!Student.valid_name?('Иванов.'))
-    assert(!Student.valid_name?('-Иванов'))
-  end
-
-  def test_from_hash
-    hash = {
-      first_name: 'Иван',
-      last_name: 'Иванов',
-      father_name: 'Иванович',
-      phone: '+79991234567',
-      telegram: 'ivanov',
-      email: 'ivanov@example.com',
-      git: 'ivanov'
-    }
-    student = Student.from_hash(hash)
-    assert_equal(hash[:first_name], student.first_name)
-    assert_equal(hash[:last_name], student.last_name)
-    assert_equal(hash[:father_name], student.father_name)
-    assert_equal(hash[:phone], student.phone)
-    assert_equal(hash[:telegram], student.telegram)
-    assert_equal(hash[:email], student.email)
-    assert_equal(hash[:git], student.git)
-  end
-
-  def test_from_json_str
-    hash = {
-      first_name: 'Иван',
-      last_name: 'Иванов',
-      father_name: 'Иванович',
-      phone: '+79991234567',
-      telegram: 'ivanov',
-      email: 'ivanov@example.com',
-      git: 'ivanov'
-    }
-    json_str = hash.to_json
-    student = Student.from_json_str(json_str)
-    assert_equal(hash[:first_name], student.first_name)
-    assert_equal(hash[:last_name], student.last_name)
-    assert_equal(hash[:father_name], student.father_name)
-    assert_equal(hash[:phone], student.phone)
-    assert_equal(hash[:telegram], student.telegram)
-    assert_equal(hash[:email], student.email)
-    assert_equal(hash[:git], student.git)
-  end
-end

data/lib/source/views/main_window.rb

@@ -1,25 +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('Универ', 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

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

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