netcity 0.1.0 → 0.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 276594a434d3b63e3be1cd653a408a4ff31c6470369782e823ced1ebd6843937
-  data.tar.gz: d9522c13f09c84881135c0483619c613c9c5b3a1bbcfaf13cb1c4fcc7b04015a
+  metadata.gz: e74345b40482be87c3f32bfe664bf3fd78011b07f9a13929284a280acb14b4d2
+  data.tar.gz: abfcbee97e017fff139458d3ee8cb6fc906f121b93dd67bfce9cb20018ca5226
 SHA512:
-  metadata.gz: 96086c00b3c51bc4ce8115bb73f097c7a821556bfc9fd32760c0d5e5a59f3fa5fabc76ca5d87a97fa7077e94ea354da9095ce041f8dc54b89d9df2a4348fd83e
-  data.tar.gz: 354cf177c62adb030bb82907ce01abe6e579e4d5dafaaa9e24654c6b86bc1b3145e0b0cced42078d2129d3d51bfc6a52d699e69d109aad6a8b067bc68dbbb120
+  metadata.gz: 7493df8082793fc00598852edf70dc4fff77372179db218d36a481aeeb0247db621e825626fe05e97301ee1e6d7b17a4ac3ade38471a9114b3cb42496495ca85
+  data.tar.gz: c5e0a9b422e8784328adc8340240ace60147f07fa25899b728589227572e7dcdb38b3c44ae96476805f05078ef753af745fcfb9c3d7f8e6fd83f88265fe8f297

data/README.md

@@ -1 +1,7 @@
-# netcity
+# 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)
+[![License](https://img.shields.io/github/license/tulen34/netcity)](https://github.com/tulen34/netcity/blob/main/LICENSE)
+
+**API** клиент для "Сетевого города". Он позволяет легко взаимодействовать с **электронным дневником**.

data/bin/test

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

data/lib/netcity.rb

@@ -7,70 +7,69 @@ require "netcity/errors.rb"
 class NetCity
   attr_accessor :client, :user_name, :password, :school_address
 
-  def initialize(base_url, 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 = school_address
+    @school_address = SchoolAddress.new(state, province, city, func, school)
   end
 
   def login
-    data = Hash.new.tap do |hash|
+    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)
-      hash.update(JSON.parse(responce))
+      h.update(JSON.parse(responce))
     end
 
     encoded_password = Digest::MD5.new.tap do |md5|
       md5 << data.delete("salt") << Digest::MD5.hexdigest(@password)
     end.hexdigest
 
-    data.update(login_form, 
-                logintype: 1, 
-                un: @user_name, 
-                pw: encoded_password[...@password.size], 
-                pw2: encoded_password)
-
-    responce = JSON.parse(@client.post("/webapi/login", form: data))
-    unless responce.include?("at")
-      if responce["message"].size == 29
-        raise LoginDataError
-      else
-        raise Error, responce["message"]
-      end
-    end
-    @client = @client.headers(at: responce["at"])
+    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))
 
-    if block_given?
-      yield self
-      logout
+      @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
-
-  private
-
-  def login_form
-    login_form = JSON.parse(@client.get("/webapi/prepareloginform"))
-      .keep_if { |key| key =~ /cid|sid|pid|cn|sft|scid/ }
-
-    queue = login_form.keys[...-1].each_index.zip(@school_address.members)
-    queue.each do |index, member|
-      params = login_form.merge(lastname: login_form.keys[index])
-      form   = JSON.parse(@client.get("/webapi/loginform", params: params))
-
-      match = form["items"].find do |item|
-        item["name"] == @school_address[member]
-      end or raise LoginFormError.new(member, @school_address[member])
-
-      login_form.update(login_form.keys[index + 1] => match["id"])
-    end
-    login_form
-  end
 end

data/lib/netcity/data.rb

@@ -1,5 +1,5 @@
 class NetCity
-  VERSION = "0.1.0"
+  VERSION = "0.3.5"
 
   SchoolAddress = Struct.new(:state, :province, :city, :func, :school)
 end

data/lib/netcity/errors.rb

@@ -3,18 +3,30 @@ class NetCity
 
   class LoginFormError < Error
     def initialize(member, value)
-      @member = member
-      @value  = value
+      @member = case member
+                when :state
+                  "Регион"
+                when :province
+                  "Городской округ / Муниципальный район"
+                when :city
+                  "Населённый пункт"
+                when :func
+                  "Тип ОО"
+                when :school
+                  "Образовательная организация"
+                end
+
+      @value = value
     end
 
     def to_s
-      "Missing #{@member} with name #{@value}"
+      "Отсутствует #{@member} со значением #{@value}"
     end
   end
 
   class LoginDataError < Error
     def to_s
-      "Incorrect password or login"
+      "Неправильный логин или пароль"
     end
   end
 end

data/netcity.gemspec

@@ -12,8 +12,11 @@ Gem::Specification.new do |s|
     API клиент для "Сетевого города". Он позволяет легко взаимодействовать с
     электронным дневником.
   EOF
-  s.homepage    = "https://github.com/tulen34/netcity"
+  s.homepage    = "https://rubygems.org/gems/netcity"
   s.license     = "MIT"
+  s.metadata    = {
+    "source_code_uri" => "https://github.com/tulen34/netcity"
+  }
 
   s.files       = Rake::FileList["**/*"].exclude(*File.read(".gitignore").split)
   s.executables = s.files.grep(/^bin\/.+/) { |f| File.basename(f) }

metadata

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