school21_api_sdk 0.5.0 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8c369d9fa76c0c36cb3142d0807256d9be76d9b706aedc32207899f355721d0b
-  data.tar.gz: 3b314e7f8a1235eadfe9ce7cd5147bc0889c4926169a3a29740613f72f2aeb94
+  metadata.gz: 99a326f17590996f1a32f8b90e1d33e24bb3f4c4af407246b183cbf36a373f1c
+  data.tar.gz: 0feee0967bc7bfc04e4858dfe760d0e9d8b3ce8ee01c37c3e697108aad3570d5
 SHA512:
-  metadata.gz: ddaecba86f46485941eb2a9d508ff6a2961db296657bbc28cf3b31dee962af1986648d1226cf1e46425475ef48935b2716810d4d74b34a627eba5e637d00cb4c
-  data.tar.gz: cf9e4fc8918d2b64e4361cf45a19bc8a6fc6f6e2c520f476e71b3e8c5025222bea1074a303971ff3f24ddd00e9c57b2e5d04f032bfd650c269b358e137fc9ebc
+  metadata.gz: 7fe2674e37b676d1a875eb28a29cbcf6ce6adc8de67bfddc9d87c36d132b40b7c5d90c87a6ab51112b72738b03fde0cb243387253bceaabacb2cd7014452809f
+  data.tar.gz: e0c4d8d7b09d4aaec925ab242a4ff9f3d56cd937e407156cff2b8d6ff75bdaa5799eff03430bc3254b6d8b0c7c594754bc54844515f30f8a75370526f0ee24ca

data/README.md

@@ -13,7 +13,6 @@
 > you're using for the school everyday tasks.
 > As soon as other types of authorization will be added (such as using API token), they'll be implemented for this gem as well.
 
-
 ## Installation
 
 Install the gem and add to the application's Gemfile by executing:
@@ -28,11 +27,17 @@ If bundler is not being used to manage dependencies, install the gem by executin
 gem install school21_api_sdk
 ```
 
-## Usage
+## Setup
 
 Please check [docs](https://edu.21-school.ru/docs) for more information.
 
-- Require the gem and configure client object
+- Rails:
+
+```bash
+rails generate school21:install
+```
+
+- Manual:
 
 ```ruby
 require 'school21'
@@ -48,6 +53,8 @@ School21.configure do |config|
 end
 ```
 
+## Usage
+
 - Select the domain specific API that you want to use. This API has all endpoints related to that domain. Here's an example of `Participant API` and a call to `/participants/:login`
 
 ```ruby

data/lib/generators/school21/install/install_generator.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+module School21
+  module Generators
+    class InstallGenerator < Rails::Generators::Base
+      source_root File.expand_path('templates', __dir__)
+
+      desc 'Creates a School21 initializer'
+
+      def copy_initializer
+        template 'school21.rb.tt', 'config/initializers/school21.rb'
+      end
+    end
+  end
+end

data/lib/generators/school21/install/templates/school21.rb.tt

@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+require 'school21'
+
+School21.configure do |config|
+  config.credentials = {
+    login: Rails.application.credentials.dig(:school21, :login) || ENV['SCHOOL21_LOGIN'],
+    password: Rails.application.credentials.dig(:school21, :password) || ENV['SCHOOL21_PASSWORD']
+  }
+
+  config.enable_logging = Rails.env.development?
+end

data/lib/school21/api/base_api.rb

@@ -9,9 +9,9 @@ module School21
     def self.base_uri(server)
       case server
       when :api_v1
-        'https://edu-api.21-school.ru/services/21-school/api/v1'
+        'https://platform.21-school.ru/services/21-school/api/v1'
       when :auth
-        'https://auth.sberclass.ru/auth/realms/EduPowerKeycloak/protocol/openid-connect'
+        'https://auth.21-school.ru/auth/realms/EduPowerKeycloak/protocol/openid-connect'
       end
     end
 

data/lib/school21/api/participants_api.rb

@@ -27,5 +27,12 @@ module School21
 
       execute_request(new_request)
     end
+
+    def participant_skills(login)
+      path = ['/participants/', login, '/skills'].join
+      new_request = request_with_auth_participant(HttpMethod::GET, path, :api_v1)
+
+      execute_request(new_request)
+    end
   end
 end

data/lib/school21/auth/authenticator.rb

@@ -1,23 +1,31 @@
 # frozen_string_literal: true
 
 module School21
+  class AccessTokenError < StandardError; end
+
   module Authenticator
+    MUTEX = Mutex.new
+
     def self.call
       return unless School21.config.access_token.expired?
 
-      auth_api_response = School21.auth_api.token(
-        login: School21.config.credentials[:login],
-        password: School21.config.credentials[:password]
-      )
+      MUTEX.synchronize do
+        return unless School21.config.access_token.expired?
+
+        auth_api_response = School21.auth_api.token(
+          login: School21.config.credentials[:login],
+          password: School21.config.credentials[:password]
+        )
 
-      raise 'Access Token Error' unless auth_api_response.success?
+        raise AccessTokenError unless auth_api_response.success?
 
-      access_token = AccessToken.new(*auth_api_response.data.values_at(:access_token, :expires_in))
-      bearer_auth_credentials = BearerAuthCredentials.new(access_token:)
-      auth_header = AuthorizationHeader.new(bearer_auth_credentials)
+        access_token = AccessToken.new(*auth_api_response.data.values_at(:access_token, :expires_in))
+        bearer_auth_credentials = BearerAuthCredentials.new(access_token:)
+        auth_header = AuthorizationHeader.new(bearer_auth_credentials)
 
-      School21.config.access_token = access_token
-      School21.config.auth_managers[BaseApi::PLATFORM_AUTH_PARTICIPANT] = auth_header
+        School21.config.access_token = access_token
+        School21.config.auth_managers[BaseApi::PLATFORM_AUTH_PARTICIPANT] = auth_header
+      end
     end
   end
 end

data/lib/school21/auth/bearer_auth_credentials.rb

@@ -5,9 +5,12 @@ module School21
     attr_reader :access_token
 
     def initialize(access_token:)
-      raise ArgumentError, 'access_token cannot be nil' if access_token.nil?
-
-      @access_token = access_token.access_token
+      case access_token
+      in String
+        @access_token = access_token
+      in AccessToken
+        @access_token = access_token.access_token
+      end
     end
   end
 end

data/lib/school21/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module School21
-  VERSION = '0.5.0'
+  VERSION = '0.7.0'
 end

data/lib/school21.rb

@@ -39,17 +39,18 @@ module School21
       @config = nil
     end
 
-    API_CLASSES = {
-      auth: AuthApi,
-      participants: ParticipantsApi,
-      projects: ProjectsApi,
-      campuses: CampusesApi,
-      clusters: ClustersApi,
-      graph: GraphApi
-    }.freeze
-
-    API_CLASSES.each do |name, klass|
-      define_method("#{name}_api") do
+    API_CLASSES_MAPPINGS = [
+      AuthApi,
+      ParticipantsApi,
+      ProjectsApi,
+      CampusesApi,
+      ClustersApi,
+      GraphApi
+    ].freeze
+
+    API_CLASSES_MAPPINGS.each do |klass|
+      method_name = klass.name.underscore.split('/').last.to_sym
+      define_method(method_name) do
         klass.new
       end
     end

data/test/graph_api_test.rb

@@ -0,0 +1,36 @@
+# frozen_string_literal: true
+
+require 'test_helper'
+
+describe 'Graph API Test' do
+  include AuthStub
+  include GraphStub
+
+  with_configured_client do
+    let(:graph_api_call) do
+      School21.graph_api.graph
+    end
+
+    it 'calls stub graph success' do
+      stubs = [
+        stub_token_success,
+        stub_graph_success
+      ]
+
+      graph_api_call
+
+      stubs.each { |stub| assert_requested(stub) }
+    end
+
+    it 'calls stub graph fail' do
+      stubs = [
+        stub_token_success,
+        stub_graph_fail
+      ]
+
+      graph_api_call
+
+      stubs.each { |stub| assert_requested(stub) }
+    end
+  end
+end

data/test/support/stubs/base_stub.rb

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
 module BaseStub
-  BASE_AUTH_URL = 'https://auth.sberclass.ru'
-  BASE_API_V1_URL = 'https://edu-api.21-school.ru/services/21-school/api/v1'
+  BASE_AUTH_URL = 'https://auth.21-school.ru'
+  BASE_API_V1_URL = 'https://platform.21-school.ru/services/21-school/api/v1'
 
   def base_stub_fail(http_method, url)
     stub_request(http_method, url)

data/test/support/stubs/graph_stub.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+module GraphStub
+  include BaseStub
+
+  STUBBED_GRAPH_URL = [BASE_API_V1_URL, '/graph'].join
+
+  def stub_graph_success
+    stub_request(:get, STUBBED_GRAPH_URL)
+      .to_return_json(body: { data: { user: { login: 'test_user' } } }) # Example success response
+  end
+
+  def stub_graph_fail
+    base_stub_fail(:get, STUBBED_GRAPH_URL)
+  end
+end

data/test/support/stubs/participants_stub.rb

@@ -12,7 +12,6 @@ module ParticipantsStub
   end
 
   def stub_participant_fail
-    stub_request(:get, STUBBED_PARTICIPANT_URL)
-      .to_return(status: [500, 'Internal Server Error'])
+    base_stub_fail(:get, STUBBED_PARTICIPANT_URL)
   end
 end

data/test/test_helper.rb

@@ -10,6 +10,7 @@ require_relative 'support/shared_data'
 require_relative 'support/stubs/base_stub'
 require_relative 'support/stubs/auth_stub'
 require_relative 'support/stubs/participants_stub'
+require_relative 'support/stubs/graph_stub'
 
 SimpleCov.start
 SimpleCov.formatter = SimpleCov::Formatter::CoberturaFormatter

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: school21_api_sdk
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.7.0
 platform: ruby
 authors:
 - Anton Yudin
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-05-18 00:00:00.000000000 Z
+date: 2026-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -105,6 +105,8 @@ files:
 - README.md
 - bin/console
 - bin/setup
+- lib/generators/school21/install/install_generator.rb
+- lib/generators/school21/install/templates/school21.rb.tt
 - lib/school21.rb
 - lib/school21/api/auth_api.rb
 - lib/school21/api/base_api.rb
@@ -123,10 +125,12 @@ files:
 - lib/school21/version.rb
 - test/auth_api_test.rb
 - test/configuration_test.rb
+- test/graph_api_test.rb
 - test/participants_api_test.rb
 - test/support/shared_data.rb
 - test/support/stubs/auth_stub.rb
 - test/support/stubs/base_stub.rb
+- test/support/stubs/graph_stub.rb
 - test/support/stubs/participants_stub.rb
 - test/test_helper.rb
 homepage: https://github.com/ikael21/school21_api_sdk
@@ -149,7 +153,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.17
+rubygems_version: 3.5.9
 signing_key:
 specification_version: 4
 summary: School21 API SDK