mvcStudentXD 1.1.1 → 1.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5edf4f3f16bbfe82ed1302ffd8ec980a7cc0531faac61609e3cd2ae2b8abbeeb
-  data.tar.gz: d621edb76de6e5c4b7b3f27798e428fa8ba571f25a6e90408d27a8eef24923c4
+  metadata.gz: 3b8ee4de624d2ae1dc09ecd233294181ff8070703c289b544e177c1e569f374f
+  data.tar.gz: 32717b23dadc5a9722a1187418973715cd7e42660e0ae1006df90e33c141854a
 SHA512:
-  metadata.gz: c59b1615e8e6f6255f071690609df5ccb14ab45b18c42a75fc656a2fac4df5314de05bb1e2fd0eb4efc998a3973e554cb680610125b675801f46d4ff1abd3f0a
-  data.tar.gz: 710895761936a9a5c215a39931872661ca8ddfb9537565ba8ef63736f8d3548b1a5691539d528b1789def5abb93157b806b114e08b51dbee1fa375a56de390ba
+  metadata.gz: c6e5f27a6781ab2e666d9c4f53033f63a8dff96b0f39bc60118f3221a1995b941ecba0f3cc6a9edc7b69245841070dfc1a37fa4846ba4fdfdf7ea75fb5240ee9
+  data.tar.gz: 4db0f8e59ab637c164077bc09931b528353329cec4ad006ba37934b9a81772e0ae7f5dfc8de7cb6893bd4b0622ffb43eee5af0f0f2426c63182faf440dc7ee73

data/lib/mvcStudentXD.rb

@@ -3,6 +3,8 @@
 require_relative "mvcStudentXD/version"
 
 module MvcStudentXD
-  class Error < StandardError; end
-  # Your code goes here...
+  Dir[File.dirname(__FILE__) + '/source/**/*.rb'].each { |file|
+    puts file
+    require file
+  }
 end

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

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

data/lib/{student_list_controller.rb → source/controllers/student_list_controller.rb}

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 # frozen_string_literal: true
-require_relative 'student_list_adv'
+require_relative '../repositories/student_list_adv'
 require_relative 'adapters/student_list_adapter'
 require_relative 'database/student_list_db'
 require_relative 'converters/Converter_json'

data/lib/{database → source/database}/student_list_db.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
-require_relative './students_db.rb'
+require_relative './udents_db.rb'
 
 class StudentListDB
   attr_accessor :database

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

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

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

@@ -1,4 +1,4 @@
-require_relative '../model/StudentBase'
+require_relative '../model/se'
 class StudentShort < StudentBase
 
 	public_class_method :new

data/lib/{mvcStudentXD → source/mvcStudentXD}/version.rb

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

data/lib/source/util/LoggerHolder.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/mvcStudentXD.gemspec

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require_relative "lib/mvcStudentXD/version"
+require_relative "lib/source/mvcStudentXD/version"
 
 Gem::Specification.new do |spec|
   spec.name = "mvcStudentXD"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mvcStudentXD
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.3
 platform: ruby
 authors:
 - papaSquid
@@ -23,29 +23,30 @@ files:
 - Gemfile
 - README.md
 - Rakefile
-- lib/Student_list.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/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_adv.rb
-- lib/student_list_controller.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/mvcStudentXD/version.rb
+- lib/source/repositories/Student_list.rb
+- lib/source/repositories/student_list_adv.rb
+- lib/source/util/LoggerHolder.rb
+- mvcStudentXD-1.1.1.gem
 - mvcStudentXD.gemspec
 - sig/mvcStudentXD.rbs
 homepage: https://github.com/KiTTeNqz/mvcStudentXD

data/lib/student_input_form.rb

@@ -1,71 +0,0 @@
-# frozen_string_literal: true
-
-require 'glimmer-dsl-libui'
-require_relative 'student_input_form_controller'
-require_relative 'model/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