mvcStudentXD 1.2.1 → 1.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a6f194590788eed899d92b2baa0ad0eac53c95c6115c1eb51b89a6d20422d6b5
-  data.tar.gz: 4bc8cd3591a37fc1392e9fd19ab3d6da6fb6ce43a59cdaa5e69b0cc947481328
+  metadata.gz: dac26f460cc0a196117b3e71d92bebeaf12c3c0abb8e0f33402851dc4dc958d2
+  data.tar.gz: 69947502e1b58e271311917b5fef5cd5401dccd643f6356d85d66929b865bdbd
 SHA512:
-  metadata.gz: 4d9acbfe05cc317b8a9e1eeb8d282384fdcefb615ba301b5647226ec5eaaa5d5a3d665e0cf95e1ee2bc280969a5a977081063c60804dc10e386b1d6ce4d4788c
-  data.tar.gz: 360a16892b3157842701c12e4216f519e2869baab5f3ebd5f029e138e63f2e0f7cebff839fbd894a9e598d89ae74485da95a7296b9337743e205a20e1a1849f5
+  metadata.gz: e3ea30dabf585d0fd1f5358f437d15e7801c236a785de81e11ccac2c9b60bd551f286763b3a3af20a84e0d5e3cb0d09a378725bb9235bc043d9db12833bd5cb4
+  data.tar.gz: dbc2ff28c507776a296f8d2f0d477f2f9a823e98095e75d4e484e98bf08a7c49710e2cc4707e3b67d9f64004a84d7b2a202766620dc88e00d96563cc38b33e52

data/.rubocop.yml

@@ -0,0 +1,13 @@
+AllCops:
+  TargetRubyVersion: 2.6
+
+Style/StringLiterals:
+  Enabled: true
+  EnforcedStyle: double_quotes
+
+Style/StringLiteralsInInterpolation:
+  Enabled: true
+  EnforcedStyle: double_quotes
+
+Layout/LineLength:
+  Max: 120

data/Gemfile

@@ -1,24 +1,22 @@
-# frozen_string_literal: true
-
-source "https://rubygems.org"
-
-gem "rake", "~> 13.0"
-
-gem "minitest", "~> 5.0"
-
-gem "rubocop", "~> 1.21"
-
-gem "mysql2"
-
-gem "glimmer-dsl-libui", '~> 0.7.4'
-
-gem 'win32api'
-
-gem 'sinatra', '~> 3.0', '>= 3.0.6'
-
-gem 'thin', '~> 1.8', '>= 1.8.2'
-
-gem "sinatra-contrib"
-
-gem 'mvcStudentXD', '~> 1.2.0'
-# gem "rails"
+# frozen_string_literal: true
+
+source "https://rubygems.org"
+
+# Specify your gem's dependencies in mvcStudentXD.gemspec
+gemspec
+
+gem "rake", "~> 13.0"
+
+gem "minitest", "~> 5.0"
+
+gem "rubocop", "~> 1.21"
+
+gem "mysql2"
+
+gem "glimmer-dsl-libui", '~> 0.7.4'
+
+gem 'win32api'
+
+gem 'sinatra', '~> 3.0', '>= 3.0.6'
+
+gem 'thin', '~> 1.8', '>= 1.8.2'

data/README.md

@@ -1,3 +1,35 @@
-# RubyLabs
-https://disk.yandex.ru/d/-5YnxFGCRloVRw/Лекции
-
+# MvcStudentXD
+
+TODO: Delete this and the text below, and describe your gem
+
+Welcome to your new gem! In this directory, you'll find the files you need to be able to package up your Ruby library into a gem. Put your Ruby code in the file `lib/mvcStudentXD`. To experiment with that code, run `bin/console` for an interactive prompt.
+
+## Installation
+
+TODO: Replace `UPDATE_WITH_YOUR_GEM_NAME_PRIOR_TO_RELEASE_TO_RUBYGEMS_ORG` with your gem name right after releasing it to RubyGems.org. Please do not do it earlier due to security reasons. Alternatively, replace this section with instructions to install your gem from git if you don't plan to release to RubyGems.org.
+
+Install the gem and add to the application's Gemfile by executing:
+
+    $ bundle add UPDATE_WITH_YOUR_GEM_NAME_PRIOR_TO_RELEASE_TO_RUBYGEMS_ORG
+
+If bundler is not being used to manage dependencies, install the gem by executing:
+
+    $ gem install UPDATE_WITH_YOUR_GEM_NAME_PRIOR_TO_RELEASE_TO_RUBYGEMS_ORG
+
+## Usage
+
+TODO: Write usage instructions here
+
+## Development
+
+After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake test` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.
+
+To install this gem onto your local machine, run `bundle exec rake install`. To release a new version, update the version number in `version.rb`, and then run `bundle exec rake release`, which will create a git tag for the version, push git commits and the created tag, and push the `.gem` file to [rubygems.org](https://rubygems.org).
+
+## Contributing
+
+Bug reports and pull requests are welcome on GitHub at https://github.com/[USERNAME]/mvcStudentXD. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [code of conduct](https://github.com/[USERNAME]/mvcStudentXD/blob/master/CODE_OF_CONDUCT.md).
+
+## Code of Conduct
+
+Everyone interacting in the MvcStudentXD project's codebases, issue trackers, chat rooms and mailing lists is expected to follow the [code of conduct](https://github.com/[USERNAME]/mvcStudentXD/blob/master/CODE_OF_CONDUCT.md).

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

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module MvcStudentXD
-  VERSION = "1.2.1"
+  VERSION = "1.2.2"
 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,113 +1,61 @@
 --- !ruby/object:Gem::Specification
 name: mvcStudentXD
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.2.2
 platform: ruby
 authors:
 - papaSquid
 autorequire:
-bindir: bin
+bindir: exe
 cert_chain: []
 date: 2023-05-12 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
-  name: win32api
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-description: А simple ruby gem
+dependencies: []
+description: models and controllers
 email:
-- bakladjant@mail.ru
+- mrxameleonx@mail.ru
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".rubocop.yml"
+- CHANGELOG.md
+- CODE_OF_CONDUCT.md
 - Gemfile
-- Gemfile.lock
-- Lab1/arr1_3.txt
-- Lab1/lb1_1.rb
-- Lab1/lb1_2.rb
-- Lab1/lb1_3.rb
-- Lab1/lb1_4.rb
-- Lab2/1Class.jpg
-- Lab2/Web/main.rb
-- Lab2/Web/views/add.html
-- Lab2/Web/views/main.html
-- Lab2/data_storage/students1.txt
-- Lab2/data_storage/studentsRead.json
-- Lab2/data_storage/studentsRead.txt
-- Lab2/data_storage/studentsRead.yaml
-- Lab2/data_storage/studentsWrite.json
-- Lab2/data_storage/studentsWrite.txt
-- Lab2/data_storage/studentsWrite.yaml
-- Lab2/examples/Strategy.rb
-- Lab2/examples/adapter.rb
-- Lab2/examples/database.rb
-- Lab2/examples/observer_example.rb
-- Lab2/examples/pattern_pattern.rb
-- Lab2/examples/site_example.rb
-- Lab2/examples/views/about.erb
-- Lab2/examples/views/contact.erb
-- Lab2/examples/views/index.erb
-- Lab2/main.rb
-- Lab2/main_window.rb
-- Lab2/student_input_form.rb
-- Lab2/tab_students.rb
-- Lab2/test/student_test.rb
 - README.md
-- mvcStudentXD/CHANGELOG.md
-- mvcStudentXD/CODE_OF_CONDUCT.md
-- mvcStudentXD/Gemfile
-- mvcStudentXD/Gemfile.lock
-- mvcStudentXD/README.md
-- mvcStudentXD/Rakefile
-- mvcStudentXD/bin/console
-- mvcStudentXD/bin/setup
-- mvcStudentXD/lib/mvcStudentXD.rb
-- mvcStudentXD/lib/mvcStudentXD/version.rb
-- mvcStudentXD/lib/source/adapters/student_list_adapter.rb
-- mvcStudentXD/lib/source/containers/Data_list.rb
-- mvcStudentXD/lib/source/containers/Data_list_student_short.rb
-- mvcStudentXD/lib/source/containers/Data_table.rb
-- mvcStudentXD/lib/source/controllers/student_edit_form_controller.rb
-- mvcStudentXD/lib/source/controllers/student_input_form_controller.rb
-- mvcStudentXD/lib/source/controllers/student_list_controller.rb
-- mvcStudentXD/lib/source/converters/Converter.rb
-- mvcStudentXD/lib/source/converters/Converter_json.rb
-- mvcStudentXD/lib/source/converters/Converter_txt.rb
-- mvcStudentXD/lib/source/converters/Converter_yaml.rb
-- mvcStudentXD/lib/source/database/scripts/create_table.sql
-- mvcStudentXD/lib/source/database/scripts/insert_data.sql
-- mvcStudentXD/lib/source/database/student_list_db.rb
-- mvcStudentXD/lib/source/database/students_db.rb
-- mvcStudentXD/lib/source/model/Student.rb
-- mvcStudentXD/lib/source/model/StudentBase.rb
-- mvcStudentXD/lib/source/model/Student_short.rb
-- mvcStudentXD/lib/source/repositories/Student_list.rb
-- mvcStudentXD/lib/source/repositories/student_list_adv.rb
-- mvcStudentXD/lib/source/util/LoggerHolder.rb
-- mvcStudentXD/mvcStudentXD-1.2.0.gem
-- mvcStudentXD/mvcStudentXD.gemspec
-- mvcStudentXD/pkg/mvcStudentXD-0.1.0.gem
-- mvcStudentXD/pkg/mvcStudentXD-1.0.1.gem
-- mvcStudentXD/pkg/mvcStudentXD-1.1.1.gem
-- mvcStudentXD/sig/mvcStudentXD.rbs
-- mvcStudentXD/test/student_test.rb
-- mvcStudentXD/test/test_helper.rb
-- mvcStudentXD/test/test_mvcStudentXD.rb
+- Rakefile
+- lib/mvcStudentXD.rb
+- lib/mvcStudentXD/version.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/repositories/Student_list.rb
+- lib/source/repositories/student_list_adv.rb
+- lib/source/util/LoggerHolder.rb
+- mvcStudentXD.gemspec
+- sig/mvcStudentXD.rbs
 homepage: https://github.com/KiTTeNqz/mvcStudentXD
 licenses:
 - MIT
-metadata: {}
+metadata:
+  allowed_push_host: https://rubygems.org
+  homepage_uri: https://github.com/KiTTeNqz/mvcStudentXD
+  source_code_uri: https://github.com/KiTTeNqz/mvcStudentXD
+  changelog_uri: https://github.com/KiTTeNqz/mvcStudentXD/blob/master/CHANGELOG.md
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -126,5 +74,5 @@ requirements: []
 rubygems_version: 3.4.10
 signing_key:
 specification_version: 4
-summary: DeadInside
+summary: Gem with Student MC
 test_files: []

data/Gemfile.lock

@@ -1,101 +0,0 @@
-GEM
-  remote: https://rubygems.org/
-  specs:
-    array_include_methods (1.4.0)
-    ast (2.4.2)
-    chunky_png (1.4.0)
-    color (1.8)
-    daemons (1.4.1)
-    equalizer (0.0.11)
-    eventmachine (1.2.7)
-    facets (3.1.0)
-    glimmer (2.7.3)
-      array_include_methods (~> 1.4.0)
-      facets (>= 3.1.0, < 4.0.0)
-    glimmer-dsl-libui (0.7.5)
-      chunky_png (~> 1.4.0)
-      color (~> 1.8)
-      equalizer (= 0.0.11)
-      glimmer (~> 2.7.3)
-      libui (~> 0.1.2.pre)
-      os (>= 1.0.0, < 2.0.0)
-      perfect-shape (~> 1.0.7)
-      rouge (>= 3.26.0, < 4.0.0)
-      super_module (~> 1.4.1)
-    json (2.6.3)
-    libui (0.1.2.pre-x64-mingw)
-    matrix (0.4.2)
-    method_source (1.0.0)
-    minitest (5.18.0)
-    multi_json (1.15.0)
-    mustermann (3.0.0)
-      ruby2_keywords (~> 0.0.1)
-    mvcStudentXD (1.2.0)
-    mysql2 (0.5.5)
-    os (1.1.4)
-    parallel (1.23.0)
-    parser (3.2.2.1)
-      ast (~> 2.4.1)
-    perfect-shape (1.0.7)
-      equalizer (>= 0.0.11, < 1.1.0)
-      matrix (>= 0.4.2, < 1.1.0)
-    rack (2.2.7)
-    rack-protection (3.0.6)
-      rack
-    rainbow (3.1.1)
-    rake (13.0.6)
-    regexp_parser (2.8.0)
-    rexml (3.2.5)
-    rouge (3.30.0)
-    rubocop (1.50.2)
-      json (~> 2.3)
-      parallel (~> 1.10)
-      parser (>= 3.2.0.0)
-      rainbow (>= 2.2.2, < 4.0)
-      regexp_parser (>= 1.8, < 3.0)
-      rexml (>= 3.2.5, < 4.0)
-      rubocop-ast (>= 1.28.0, < 2.0)
-      ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 2.4.0, < 3.0)
-    rubocop-ast (1.28.1)
-      parser (>= 3.2.1.0)
-    ruby-progressbar (1.13.0)
-    ruby2_keywords (0.0.5)
-    sinatra (3.0.6)
-      mustermann (~> 3.0)
-      rack (~> 2.2, >= 2.2.4)
-      rack-protection (= 3.0.6)
-      tilt (~> 2.0)
-    sinatra-contrib (3.0.6)
-      multi_json
-      mustermann (~> 3.0)
-      rack-protection (= 3.0.6)
-      sinatra (= 3.0.6)
-      tilt (~> 2.0)
-    super_module (1.4.1)
-      method_source (>= 0.8.2, < 1.1.0)
-    thin (1.8.2)
-      daemons (~> 1.0, >= 1.0.9)
-      eventmachine (~> 1.0, >= 1.0.4)
-      rack (>= 1, < 3)
-    tilt (2.1.0)
-    unicode-display_width (2.4.2)
-    win32api (0.1.0)
-
-PLATFORMS
-  x64-mingw-ucrt
-
-DEPENDENCIES
-  glimmer-dsl-libui (~> 0.7.4)
-  minitest (~> 5.0)
-  mvcStudentXD (~> 1.2.0)
-  mysql2
-  rake (~> 13.0)
-  rubocop (~> 1.21)
-  sinatra (~> 3.0, >= 3.0.6)
-  sinatra-contrib
-  thin (~> 1.8, >= 1.8.2)
-  win32api
-
-BUNDLED WITH
-   2.4.12

data/Lab1/arr1_3.txt

@@ -1 +0,0 @@
-1 3 -4 6 8 -3 -5 10

data/Lab1/lb1_1.rb

@@ -1,19 +0,0 @@
-puts 'Hello World'
-puts "Hello, #{ARGV[0]}."
-puts "Какой твой любимый язык?"
-
-r = STDIN.gets.chomp
-case r
-	when 'ruby'
-		puts 'Подлиза'
-	else
-		puts 'Почему не руби?!'
-end
-
-puts 'Enter ruby command: '
-comRuby = STDIN.gets.chomp
-system "ruby -e \'#{comRuby}\'"
-
-puts 'Enter OS command: '
-comSys = STDIN.gets.chomp
-puts `#{comSys}`

data/Lab1/lb1_2.rb

@@ -1,28 +0,0 @@
-#var2
-def vzaimProst(num1, num2)
-	if(num1.gcd(num2)==1) then true
-		else false
-	end
-end
-
-def formArrDel(num)
-	return 1.upto(num).select{|e| num%e==0}
-end
-
-def meth1(num1)
-	return 2.upto(num1-1).count{|e| num1.gcd(e)==1}
-end
-
-def meth2(num)
-	return num.digits.select{|e| e%3==0}.sum
-end
-
-def meth3(num)
-	#formirovat massiv iz kol-va vzaimno-prostih s dannim
-	arr = formArrDel(num).map{|e| num.digits.count{|e1| e.gcd(e1)==1}}
-	return formArrDel(num)[arr.rindex(arr.max)]
-end
-
-puts meth1(16)
-puts meth2(161718192023)
-puts meth3(17)

data/Lab1/lb1_3.rb

@@ -1,46 +0,0 @@
-def minArr(arr)
-	minim=arr[0]
-	for i in 0..arr.length
-		if arr[i].to_i<minim 
-			then minim=arr[i].to_i 
-		end
-	end
-	return minim
-end
-
-def firstPos(arr)
-	for i in 0..arr.length
-		return i if arr[i].to_i>0
-	end
-	return -1
-end
-
-if ARGV.count<2
-	puts 'Введите 2 аргумента(метод, путь)!!!'
-	return
-end
-
-meth = ARGV[0]
-path = ARGV[1]
-
-file = File.open(path)
-array = file.readline.split(' ').map(&:to_i)
-file.close()
-
-puts "Array: #{array}\n"
-
-case meth
-	when 'minArr'
-		puts "Min in arr: #{minArr(array)}"
-	when 'fP'
-		puts "First positive in arr: #{firstPos(array)}"
-	else
-		puts "Unknown method" 
-end
-
-
-
-
-#a=[1,3,-4,6,8,-3,-5, 10]
-#puts minArr(a)
-#puts firstPos(a)

data/Lab1/lb1_4.rb

@@ -1,82 +0,0 @@
-def idxMin(arr)
-	return arr.index(arr.min)
-end
-
-
-def countInterval(arr, a, b)
-	return arr.slice(a+1...b).length
-end
-
-
-def idxLastMin(arr)
-	return arr.rindex(arr.min)
-end
-
-def betweenMins(arr)
-	return countInterval(arr,idxMin(arr),idxLastMin(arr))
-end
-
-def countInNums(arr, a, b)
-	return arr.select{|e| e.between?(a,b)}.length
-end
-
-def differ2Arrs(arr1, arr2)
-	return arr1.find_all{|x| arr1.count(x)==1}.difference(arr2).union(arr2.find_all{|x| arr2.count(x)==1}.difference(arr1))
-end
-
-#a=[1,3,-4,-5,6,8,-3,-5,10,3]
-#b=[2,8,-4,-7,6,12,-15,-3,1,1]
-
-puts "Вечер добрый! Какую программу запустим?
-
-2 - idxMin
-14 - count in countInterval
-26 - betweenMins
-38 - countInNums
-50 - differenceBetween2Arrs"
-
-meth = gets.chomp.to_i
-
-case meth
-	when meth = 2
-		puts "Введите массив для обработки"
-		arr = gets.chomp.split(' ').map(&:to_i)
-		puts "Введённый массив: #{arr.inspect}"
-		puts idxMin(arr)
-	when meth = 14
-		puts "Введите массив для обработки"
-		arr = gets.chomp.split(' ').map(&:to_i)
-		puts "Введите a"
-  		a = gets.chomp.to_i
-  		puts "Введите b"
-  		b = gets.chomp.to_i
-  		puts countInterval(arr,a,b)
-	when meth = 26
-		puts "Введите массив для обработки"
-		arr = gets.chomp.split(' ').map(&:to_i)
-		puts betweenMins(arr)
-	when meth = 38
-		puts "Введите массив для обработки"
-		arr = gets.chomp.split(' ').map(&:to_i)
-		puts "Введите a"
-  		a = gets.chomp.to_i
-  		puts "Введите b"
-  		b = gets.chomp.to_i
-  		puts countInNums(arr,a,b)
-	when meth = 50
-		puts "Введите 1 массив для обработки"
-		arr1 = gets.chomp.split(' ').map(&:to_i)
-		puts "Введите 2 массив для обработки"
-		arr2 = gets.chomp.split(' ').map(&:to_i)
-		puts differ2Arrs(arr1, arr2)
-	else
-		puts "Error"
-end
-
-
-#puts "Array: #{a}\n"
-#puts idxMin(a)
-#puts countInterval(a, 5, -1)
-#puts betweenMins(a)
-#puts countInNums(a, -1, 10)
-#puts differ2Arrs(a, b)