mvcStudentXD 1.1.1 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5edf4f3f16bbfe82ed1302ffd8ec980a7cc0531faac61609e3cd2ae2b8abbeeb
-  data.tar.gz: d621edb76de6e5c4b7b3f27798e428fa8ba571f25a6e90408d27a8eef24923c4
+  metadata.gz: 15c2595c813b30002f66bbb31d6f5da60749a81adc4a254c261327d2eb714509
+  data.tar.gz: 445bf2c30bc9d0c086b296d7961fd735868707ff8fcb65e0d1bcf7d39d79bc59
 SHA512:
-  metadata.gz: c59b1615e8e6f6255f071690609df5ccb14ab45b18c42a75fc656a2fac4df5314de05bb1e2fd0eb4efc998a3973e554cb680610125b675801f46d4ff1abd3f0a
-  data.tar.gz: 710895761936a9a5c215a39931872661ca8ddfb9537565ba8ef63736f8d3548b1a5691539d528b1789def5abb93157b806b114e08b51dbee1fa375a56de390ba
+  metadata.gz: 8abb660773703761fac9854de2720b3f48aec12f0ec4355622bba3676580ed70d8dee2ab7108410e3d85e6ca260e098a91e258d1ccac56ef1849fde3a8c92048
+  data.tar.gz: 82f2d965f775de9443d0871781bb01f021f8b4c9117f4079b304008a7d829579d90bd4e0a4cd6774d85a952406cb90f594ac15884c3ead76c44e08b4cc14cf41

data/lib/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 → 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/mvcStudentXD/version.rb

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

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/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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mvcStudentXD
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.2
 platform: ruby
 authors:
 - papaSquid
@@ -23,11 +23,13 @@ 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/controllers/student_edit_form_controller.rb
+- lib/controllers/student_input_form_controller.rb
+- lib/controllers/student_list_controller.rb
 - lib/converters/Converter.rb
 - lib/converters/Converter_json.rb
 - lib/converters/Converter_txt.rb
@@ -41,11 +43,10 @@ files:
 - 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/repositories/Student_list.rb
+- lib/repositories/student_list_adv.rb
+- lib/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