netcity 0.3.5 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e74345b40482be87c3f32bfe664bf3fd78011b07f9a13929284a280acb14b4d2
-  data.tar.gz: abfcbee97e017fff139458d3ee8cb6fc906f121b93dd67bfce9cb20018ca5226
+  metadata.gz: 24de9d2d19d1e4fbb099524730790458a61d98f2dc75fc139c74b6c86b636b05
+  data.tar.gz: 1fbf557670cebc5faa508d18fde393c26b95c2ae3fcd5dcce1b4c8fb8011b3b2
 SHA512:
-  metadata.gz: 7493df8082793fc00598852edf70dc4fff77372179db218d36a481aeeb0247db621e825626fe05e97301ee1e6d7b17a4ac3ade38471a9114b3cb42496495ca85
-  data.tar.gz: c5e0a9b422e8784328adc8340240ace60147f07fa25899b728589227572e7dcdb38b3c44ae96476805f05078ef753af745fcfb9c3d7f8e6fd83f88265fe8f297
+  metadata.gz: 73002751295a82ab78a9f4af076f2b33fc9307b6af3aff75b4708b604cce17e8d44f54091e6f6f0b35b1bdf3e6c74d4bc01b252402c38feea7953b0a90e94361
+  data.tar.gz: 1713737e21a113d0f0068f0205d3d71df483e719e982e34cdd73904e7df35a27263a0f5abb39d704480c4812f773cb6d384231ee8eaaa3879f97d4439ac23617

data/Gemfile

@@ -1,7 +1,5 @@
 source "https://rubygems.org"
 
-# Specify your gem's dependencies in test.gemspec
 gemspec
 
-gem "rake", "~> 13.0"
 gem "http", "~> 4.4.1"

data/README.md

@@ -1,7 +1,21 @@
 # netcity
 
-[![Build Status](https://travis-ci.com/tulen34/netcity.svg?branch=main)](https://travis-ci.com/tulen34/netcity)
 [![Gem Version](https://badge.fury.io/rb/netcity.svg)](https://badge.fury.io/rb/netcity)
+![Gem](https://img.shields.io/gem/dt/netcity)
 [![License](https://img.shields.io/github/license/tulen34/netcity)](https://github.com/tulen34/netcity/blob/main/LICENSE)
 
 **API** клиент для "Сетевого города". Он позволяет легко взаимодействовать с **электронным дневником**.
+
+### Установка
+
+```bash
+gem install netcity
+```
+
+### :warning: Внимание 
+
+Клиент разрабатывался изначально для **Волгоградской области**, поэтому, возможно, у вас он может **не работать**
+
+### :love_letter: Благодарность
+
+Меня вдохновил **[проект другого человека](https://github.com/nm17/netschoolapi)**. Я лишь **адаптировал** его под свой регион и на любимом языке.

data/lib/netcity.rb

@@ -1,75 +1,4 @@
-require "http"
-require "digest"
-
-require "netcity/data.rb"
-require "netcity/errors.rb"
-
-class NetCity
-  attr_accessor :client, :user_name, :password, :school_address
-
-  def initialize(base_url, state, province, city, func, school, 
-                 user_name, password)
-    @client = HTTP["user-agent": "netcity/#{VERSION}", referer: base_url]
-      .persistent(base_url)
-
-    @user_name      = user_name
-    @password       = password
-    @school_address = SchoolAddress.new(state, province, city, func, school)
-  end
-
-  def login
-    form = JSON.parse(@client.get("/webapi/prepareloginform"))
-      .keep_if { |k| %w(cid sid pid cn sft scid).include?(k) }
-
-    queue = form.keys[...-1].each_index
-      .zip(@school_address.members)
-
-    queue.each do |index, member|
-      concrete_form = JSON.parse(@client.get("/webapi/loginform", params: {
-        lastname: form.keys[index]
-      }.merge(form)))
-
-      match = concrete_form["items"].find do |item|
-        item["name"] == @school_address[member]
-      end or raise LoginFormError.new(member, @school_address[member])
-
-      form.update(form.keys[index + 1] => match["id"])
-    end
-
-    data = {}.tap do |h|
-      responce = @client.post("/webapi/auth/getdata")
-      @client  = @client.cookies(responce.cookies)
-      h.update(JSON.parse(responce))
-    end
-
-    encoded_password = Digest::MD5.new.tap do |md5|
-      md5 << data.delete("salt") << Digest::MD5.hexdigest(@password)
-    end.hexdigest
-
-    info = {}.tap do |h|
-      responce = @client.post("/webapi/login", form: {
-        logintype: 1,
-        un: @user_name,
-        pw: encoded_password[...@password.size],
-        pw2: encoded_password
-      }.merge(form, data))
-
-      @client = @client.cookies(responce.cookies)
-      h.update(JSON.parse(responce))
-    end
-
-    raise Error, info["message"] unless info.include?("at")
-    @client = @client.headers(at: info["at"])
-
-    students, id = JSON.parse(@client.get("/webapi/student/diary/init"))
-      .values_at("students", "currentStudentId")
-
-    @student_id = students[id]["studentId"]
-    @year_id    = JSON.parse(@client.get("/webapi/context"))["schoolYearId"]
-  end
-
-  def logout
-    @client.post("/webapi/auth/logout")
-    nil
-  end
-end
+require 'netcity/netcity'
+require 'netcity/data'
+require 'netcity/errors'
+require 'netcity/version'

data/lib/netcity/data.rb

@@ -1,5 +1,21 @@
 class NetCity
-  VERSION = "0.3.5"
-
   SchoolAddress = Struct.new(:state, :province, :city, :func, :school)
+
+  class Context
+    attr_reader :full_name, :user_id, :year_id
+
+    def initialize(data)
+      @full_name = data['user']['name']
+      @user_id   = data['user']['id']
+      @year_id   = data['schoolYearId']
+    end
+  end
+
+  class Diary
+    attr_reader :week_start, :week_end, :schedule
+
+    def initilaize(data)
+
+    end
+  end
 end

data/lib/netcity/errors.rb

@@ -5,15 +5,15 @@ class NetCity
     def initialize(member, value)
       @member = case member
                 when :state
-                  "Регион"
+                  'Регион'
                 when :province
-                  "Городской округ / Муниципальный район"
+                  'Городской округ / Муниципальный район'
                 when :city
-                  "Населённый пункт"
+                  'Населённый пункт'
                 when :func
-                  "Тип ОО"
+                  'Тип ОО'
                 when :school
-                  "Образовательная организация"
+                  'Образовательная организация'
                 end
 
       @value = value
@@ -23,10 +23,4 @@ class NetCity
       "Отсутствует #{@member} со значением #{@value}"
     end
   end
-
-  class LoginDataError < Error
-    def to_s
-      "Неправильный логин или пароль"
-    end
-  end
 end

data/lib/netcity/netcity.rb

@@ -0,0 +1,85 @@
+require 'http'
+require 'digest'
+
+class NetCity
+  attr_accessor :client, :user_name, :password, :school_address
+  attr_reader :context
+
+  def initialize(base_url, 
+                 state, province, city, func, school, 
+                 user_name, password)
+    @client = HTTP["user-agent": "netcity/#{VERSION}", referer: base_url]
+      .persistent(base_url)
+
+    @user_name      = user_name
+    @password       = password
+    @school_address = SchoolAddress.new(state, province, city, func, school)
+  end
+
+  def diary(options = {})
+
+  end
+
+  def session
+    login
+    yield self
+  ensure
+    logout
+  end
+
+  def login
+    form = JSON.parse(@client.get('/webapi/prepareloginform')).keep_if do |k|
+      %w[cid sid pid cn sft scid].include?(k) 
+    end
+
+    queue = form
+      .keys[...-1]
+      .each_index
+      .zip(@school_address.members)
+
+    queue.each do |i, member|
+      current_form = JSON.parse(@client.get('/webapi/loginform', params: {
+        lastname: form.keys[i]
+      }.merge(form)))
+
+      match = current_form['items'].find do |item|
+        item['name'] == @school_address[member]
+      end or raise LoginFormError.new(member, @school_address[member])
+
+      form.update(form.keys[i + 1] => match['id'])
+    end
+
+    data = {}.tap do |h|
+      responce = @client.post('/webapi/auth/getdata')
+      @client  = @client.cookies(responce.cookies)
+      h.update(JSON.parse(responce))
+    end
+
+    md5 = Digest::MD5.new.tap do |md5|
+      md5 << data.delete("salt") << Digest::MD5.hexdigest(@password)
+    end.hexdigest
+
+    info = {}.tap do |h|
+      responce = @client.post('/webapi/login', form: {
+        logintype: 1,
+        un: @user_name,
+        pw: md5[...@password.size],
+        pw2: md5
+      }.merge(form, data))
+
+      @client = @client.cookies(responce.cookies)
+      h.update(JSON.parse(responce))
+    end
+
+    raise Error, info['message'] unless info.include?('at')
+    @client = @client.headers(at: info['at'])
+
+    @context = Context.new(JSON.parse(@client.get('/webapi/context')))
+    nil
+  end
+
+  def logout
+    @client.post('/webapi/auth/logout')
+    nil
+  end
+end

data/lib/netcity/version.rb

@@ -0,0 +1,3 @@
+class NetCity
+  VERSION = "0.4.0"
+end

data/netcity.gemspec

@@ -1,5 +1,4 @@
-require "rake/file_list"
-require_relative "lib/netcity/data.rb"
+require_relative "lib/netcity/version.rb"
 
 Gem::Specification.new do |s|
   s.name    = "netcity"
@@ -17,8 +16,18 @@ Gem::Specification.new do |s|
   s.metadata    = {
     "source_code_uri" => "https://github.com/tulen34/netcity"
   }
-
-  s.files       = Rake::FileList["**/*"].exclude(*File.read(".gitignore").split)
+  s.files       = [
+    "bin/netcity",
+    "lib/netcity.rb",
+    "lib/netcity/netcity.rb",
+    "lib/netcity/version.rb",
+    "lib/netcity/data.rb",
+    "lib/netcity/errors.rb",
+    "Gemfile",
+    "LICENSE",
+    "netcity.gemspec",
+    "README.md",
+  ]
   s.executables = s.files.grep(/^bin\/.+/) { |f| File.basename(f) }
 
   s.required_ruby_version = Gem::Requirement.new(">= 2.7.0")

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: netcity
 version: !ruby/object:Gem::Version
-  version: 0.3.5
+  version: 0.4.0
 platform: ruby
 authors:
 - Glushonkov Ilya
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-03-03 00:00:00.000000000 Z
+date: 2021-03-08 00:00:00.000000000 Z
 dependencies: []
 description: |
   API клиент для "Сетевого города". Он позволяет легко взаимодействовать с
@@ -16,7 +16,6 @@ description: |
 email: pulsar04040@gmail.com
 executables:
 - netcity
-- test
 extensions: []
 extra_rdoc_files: []
 files:
@@ -24,10 +23,11 @@ files:
 - LICENSE
 - README.md
 - bin/netcity
-- bin/test
 - lib/netcity.rb
 - lib/netcity/data.rb
 - lib/netcity/errors.rb
+- lib/netcity/netcity.rb
+- lib/netcity/version.rb
 - netcity.gemspec
 homepage: https://rubygems.org/gems/netcity
 licenses:

data/bin/test

@@ -1,15 +0,0 @@
-#!/usr/bin/ruby
-
-require "netcity"
-
-client = NetCity.new("https://sgo.volganet.ru", 
-                     "Волгоградская обл",
-                     "Городской округ Волжский",
-                     "Волжский, г.",
-                     "Общеобразовательная",
-                     "МОУ СШ № 28",
-                     "Глушонков",
-                     "22081979As")
-client.login
-pp client
-client.logout