domoscio_admin 0.2.0 → 0.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fa06e4ae7a619c9aff98963f81a181fd223caff8bfc2b918c9bae2f2c2d11547
-  data.tar.gz: 70f0295138008845cd776db1cd34a6e164436e5c41bddb7d78846e96f5736508
+  metadata.gz: 5214e024b43a24c60d9809df58679f069fddb06eefc4c77854f65b71a1a396e9
+  data.tar.gz: 6d94481bf938506dbb0ecfc101923b915c66f38b3de172be0d3eeca5729f14b9
 SHA512:
-  metadata.gz: 3dc3c6d2116930d2b29df39fe51eebd225f74c3837b4707fb37ec6bd5c8b224bfd550df41f50ffabcab50899948509f6e32c3c31e13752d2620a1fc6aaa3ed8b
-  data.tar.gz: 33cf012a480e5fb6e9b48b5ace7deff1095c95c3be5ada2e0df6ddd141c386112e0005156f9297d3fd48635d15a1eebe36ef961857d332205d50e7d8aec03f18
+  metadata.gz: 4a59bc2a5132a3dc3b797c388738aa47172a3185bae38d4b1e2d886f69e2b9e53b656d41a10089d769dad94462d4b1808cfd92b8c2acbe93ff15d60838574eda
+  data.tar.gz: 5460680c16b4b5825e80f577ad811fff669456e2db9359b39b71ccdf9a7a5c517f7fdc16032b41078d64fe94333a306a8d486d72a8aff41252dc944b81b33d83

data/lib/domoscio_admin/authorization_token.rb

@@ -1,54 +1,53 @@
 module DomoscioAdmin
   module AuthorizationToken
+    # Token Manager
     class Manager
       class << self
         def storage
-          @@storage ||= FileStorage.new
+          @storage ||= DomoscioAdmin.configuration.file_storage ? FileStorage.new : ManualSetting.new
         end
 
-        def storage=(storage)
-          @@storage = storage
-        end
-
-        def get_token
+        def token
           storage.get
         end
       end
     end
 
-    class StaticStorage
+    # Manages tokens with configuration
+    class ManualSetting
       def get
-        @@token ||= nil
+        {
+          access_token: DomoscioAdmin.configuration.access_token,
+          refresh_token: DomoscioAdmin.configuration.refresh_token
+        }
       end
 
       def store(token)
-        @@token = token
+        DomoscioAdmin.configuration.access_token = token[:access_token]
+        DomoscioAdmin.configuration.refresh_token = token[:refresh_token]
       end
     end
 
+    # Manages tokens with local File
     class FileStorage
       require 'yaml'
-      @temp_dir
 
-      def initialize(temp_dir = nil)
-        @temp_dir = temp_dir || DomoscioAdmin.configuration.temp_dir
-        raise "Path to temporary folder is not defined" unless @temp_dir
+      def initialize
+        raise 'Path to temporary folder is not defined' unless DomoscioAdmin.configuration.temp_dir
       end
 
       def get
-        begin
-          f = File.open(file_path, File::RDONLY)
-          f.flock(File::LOCK_SH)
-          txt = f.read
-          f.close
-          YAML.load(txt) || nil
-        rescue Errno::ENOENT
-          nil
-        end
+        f = File.open(file_path, File::RDONLY)
+        f.flock(File::LOCK_SH)
+        txt = f.read
+        f.close
+        YAML.safe_load(txt) || nil
+      rescue Errno::ENOENT
+        nil
       end
 
       def store(token)
-        File.open(file_path, File::RDWR | File::CREAT, 0644) do |f|
+        File.open(file_path, File::RDWR|File::CREAT, 0o644) do |f|
           f.flock(File::LOCK_EX)
           f.truncate(0)
           f.rewind
@@ -57,7 +56,7 @@ module DomoscioAdmin
       end
 
       def file_path
-        File.join(@temp_dir, "DomoscioAdmin.AuthorizationToken.FileStore.tmp")
+        File.join(DomoscioAdmin.configuration.temp_dir, 'DomoscioAdmin.AuthorizationToken.FileStore.tmp')
       end
     end
   end

data/lib/domoscio_admin/errors.rb

@@ -1,20 +1,24 @@
 module DomoscioAdmin
   # Generic error superclass for MangoPay specific errors.
-  # Currently never instantiated directly.
-  # Currently only single subclass used.
   class Error < StandardError
   end
 
-  # ResponseError from DomoscioAdmin
+  # Error Message from DomoAdmin
   class ResponseError < Error
     attr_reader :request_url, :code, :details, :body, :request_params
 
     def initialize(request_url, code, details = {}, body = nil, request_params = {})
-      @request_url, @code, @details, @body, @request_params = request_url, code, details, body, request_params
+      @request_url = request_url
+      @code = code
+      @details = details
+      @body = body
+      @request_params = request_params
       super(message) if message
     end
 
-    def message; @details.is_a?(Hash) ? @details.dig(:error, :message) : @details; end
+    def message
+      @details.is_a?(Hash) && @details[:error].is_a?(Hash) ? @details.dig(:error, :message) : @details
+    end
   end
 
   # ProcessingError from DomoscioAdmin
@@ -22,10 +26,16 @@ module DomoscioAdmin
     attr_reader :request_url, :code, :details, :body, :request_params
 
     def initialize(request_url, code, details = {}, body = nil, request_params = {})
-      @request_url, @code, @details, @body, @request_params = request_url, code, details, body, request_params
+      @request_url = request_url
+      @code = code
+      @details = details
+      @body = body
+      @request_params = request_params
       super(message) if message
     end
 
-    def message; @details.message; end
+    def message
+      @details.message
+    end
   end
 end

data/lib/domoscio_admin/resources/instances/student_group.rb

@@ -0,0 +1,8 @@
+module DomoscioAdmin
+    class StudentGroup < ResourceInstance
+      include DomoscioAdmin::HTTPCalls::Create
+      include DomoscioAdmin::HTTPCalls::Fetch
+      include DomoscioAdmin::HTTPCalls::Update
+      include DomoscioAdmin::HTTPCalls::Destroy
+    end
+end

data/lib/domoscio_admin/resources/resource_instance.rb

@@ -2,13 +2,19 @@ module DomoscioAdmin
   class ResourceInstance < Resource
     class << self
       def url(id = nil)
-        if self == Resource
-          raise NotImplementedError.new('Resource is an abstract class. Do not use it directly.')
-        end
+        raise NotImplementedError, 'Resource is an abstract class. Do not use it directly.' if self == Resource
 
-        build_url = "/instances/#{DomoscioAdmin.configuration.client_id}/#{class_name.underscore}s"
-        build_url << "/#{CGI.escape(id.to_s)}" if id
-        return build_url
+        build_url = "/instances/#{DomoscioAdmin.configuration.client_id}/#{underscore(class_name)}s"
+        build_url << "/#{CGI.escape(id.to_s.replace('.', '%2E'))}" if id
+        build_url
+      end
+
+      def underscore(string)
+        string.gsub(/::/, '/')
+              .gsub(/([A-Z]+)([A-Z][a-z])/, '\1_\2')
+              .gsub(/([a-z\d])([A-Z])/, '\1_\2')
+              .tr('-', '_')
+              .downcase
       end
     end
   end

data/lib/domoscio_admin/resources/resource_user.rb

@@ -7,7 +7,7 @@ module DomoscioAdmin
         end
 
         build_url = "/users"
-        build_url << "/#{CGI.escape(id.to_s)}" if id
+        build_url << "/#{CGI.escape(id.to_s.replace('.', '%2E'))}" if id
         return build_url
       end
     end

data/lib/domoscio_admin/version.rb

@@ -1,3 +1,3 @@
 module DomoscioAdmin
-  VERSION = "0.2.0"
+  VERSION = '0.3.4'.freeze
 end

data/lib/domoscio_admin.rb

@@ -1,28 +1,27 @@
 require 'net/https'
 require 'cgi/util'
 require 'multi_json'
-# helpers
 require 'domoscio_admin/version'
 require 'domoscio_admin/json'
 require 'domoscio_admin/errors'
 require 'domoscio_admin/authorization_token'
-# generators
-require 'domoscio_admin/generators/install_generator'
-# resources
 require 'domoscio_admin/http_calls'
 require 'domoscio_admin/resources/resource'
 require 'domoscio_admin/resources/resource_user'
 require 'domoscio_admin/resources/resource_instance'
 require 'domoscio_admin/resources/instances/instance_parameter'
 require 'domoscio_admin/resources/instances/instance_user'
+require 'domoscio_admin/resources/instances/student_group'
 require 'domoscio_admin/resources/users/user'
 
 module DomoscioAdmin
   class Configuration
-    attr_accessor :root_url, :client_id, :client_passphrase, :temp_dir
+    attr_accessor :client_id, :client_passphrase, :temp_dir, :root_url,
+                  :file_storage, :access_token, :refresh_token
 
-    def root_url
-      @root_url ||= ""
+    def initialize
+      @root_url = ''
+      @file_storage ||= true
     end
   end
 
@@ -55,45 +54,48 @@ module DomoscioAdmin
     uri = api_uri(url)
 
     response = DomoscioAdmin.send_request(uri, method, params, headers)
-    return response if response.kind_of? DomoscioAdmin::ProcessingError
+    return response if response.is_a? DomoscioAdmin::ProcessingError
 
     begin
       raise_http_failure(uri, response, params)
       data = DomoscioAdmin::JSON.load(response.body.nil? ? '' : response.body)
-      DomoscioAdmin::AuthorizationToken::Manager.storage.store({ access_token: response['Accesstoken'], refresh_token: response['Refreshtoken'] }) if store_tokens
-    rescue MultiJson::LoadError => exception
-      data = ProcessingError.new(uri, 500, exception, response.body, params)
-    rescue ResponseError => exception
-      data = exception
+      if store_tokens
+        DomoscioAdmin::AuthorizationToken::Manager.storage.store({
+                                                                   access_token: response['Accesstoken'],
+                                                                   refresh_token: response['Refreshtoken']
+                                                                 })
+      end
+    rescue MultiJson::LoadError => e
+      data = ProcessingError.new(uri, 500, e, response.body, params)
+    rescue ResponseError => e
+      data = e
     end
 
     data
   end
 
-  private
-
   # This function catches usual Http errors during calls
   #
   def self.send_request(uri, method, params, headers)
-    begin
-      response = perform_call(uri, method, params, headers)
-      response = retry_call_and_store_tokens(uri, method, params, headers) if ['401', '403'].include? response.code
-      response
-    rescue Timeout::Error, Errno::EINVAL, HTTP::ConnectionError, Errno::ECONNREFUSED, Errno::ECONNRESET, EOFError, Net::HTTPBadResponse, Net::HTTPHeaderSyntaxError, Net::ProtocolError => exception
-      ProcessingError.new(uri, 500, exception, response, params)
-    end
+    response = perform_call(uri, method, params, headers)
+    response = retry_call_and_store_tokens(uri, method, params) if %w[401 403].include? response.code
+    response
+  rescue Timeout::Error, Errno::EINVAL, Errno::ECONNREFUSED, Errno::ECONNRESET,
+         EOFError, Net::HTTPBadResponse, Net::HTTPHeaderSyntaxError, Net::ProtocolError => e
+    ProcessingError.new(uri, 500, e, response, params)
   end
 
   # This helper will check the response status and build the correcponding DomoscioAdmin::ResponseError
   #
   def self.raise_http_failure(uri, response, params)
-    unless response.kind_of? Net::HTTPSuccess
-      if response.blank?
-        raise ResponseError.new(uri, 500, { error: { status: 500, message: 'DomoscioAdmin not available' } }, {}, params)
-      else
-        raise ResponseError.new(uri, response.code.to_i, DomoscioAdmin::JSON.load((response.body.nil? ? '' : response.body), :symbolize_keys => true), response.body, params)
-      end
-    end
+    return if response.is_a? Net::HTTPSuccess
+
+    raise ResponseError.new(
+      uri,
+      response.code.to_i,
+      DomoscioAdmin::JSON.load((response.body.nil? ? '' : response.body), symbolize_keys: true),
+      response.body, params
+    )
   end
 
   # Actual HTTP call is performed here
@@ -108,26 +110,29 @@ module DomoscioAdmin
 
   # This method is called when AdaptiveEngine returns tokens errors
   # Action on those errors is to retry and request new tokens, those new token are then stored
-  def self.retry_call_and_store_tokens(uri, method, params, headers)
+  def self.retry_call_and_store_tokens(uri, method, params)
     headers = request_new_tokens
     response = perform_call(uri, method, params, headers)
-    DomoscioAdmin::AuthorizationToken::Manager.storage.store({ access_token: response['Accesstoken'], refresh_token: response['Refreshtoken'] })
+    DomoscioAdmin::AuthorizationToken::Manager.storage.store({
+                                                               access_token: response['Accesstoken'],
+                                                               refresh_token: response['Refreshtoken']
+                                                             })
     response
   end
 
   def self.user_agent
-    @uname ||= get_uname
+    @uname ||= uname
     {
       bindings_version: DomoscioAdmin::VERSION,
       lang: 'ruby',
       lang_version: "#{RUBY_VERSION} p#{RUBY_PATCHLEVEL} (#{RUBY_RELEASE_DATE})",
       platform: RUBY_PLATFORM,
       uname: @uname
-    }
+    }.to_s
   end
 
-  def self.get_uname
-    `uname -a 2>/dev/null`.strip if RUBY_PLATFORM =~ /linux|darwin/i
+  def self.uname
+    `uname -a 2>/dev/null` if RUBY_PLATFORM =~ /linux|darwin/i
   rescue Errno::ENOMEM
     'uname lookup failed'
   end
@@ -152,10 +157,10 @@ module DomoscioAdmin
   #
   def self.send_current_tokens(auth_token)
     {
-      'user_agent' => "#{DomoscioAdmin.user_agent}",
-      'ClientId' => "#{DomoscioAdmin.configuration.client_id}",
-      'AccessToken' => "#{auth_token[:access_token]}",
-      'RefreshToken' => "#{auth_token[:refresh_token]}",
+      'user_agent' => DomoscioAdmin.user_agent,
+      'ClientId' => DomoscioAdmin.configuration.client_id,
+      'AccessToken' => auth_token[:access_token],
+      'RefreshToken' => auth_token[:refresh_token],
       'Content-Type' => 'application/json'
     }
   end
@@ -163,17 +168,10 @@ module DomoscioAdmin
   # If we cant find tokens of they are corrupted / expired, then we set headers to request new ones
   def self.request_new_tokens
     {
-      'user_agent' => "#{DomoscioAdmin.user_agent}",
-      'ClientId' => "#{DomoscioAdmin.configuration.client_id}",
+      'user_agent' => DomoscioAdmin.user_agent,
+      'ClientId' => DomoscioAdmin.configuration.client_id,
       'Authorization' => "Token token=#{DomoscioAdmin.configuration.client_passphrase}",
       'Content-Type' => 'application/json'
     }
   end
-
-  DomoscioAdmin.configure do |c|
-    c.client_id = nil
-    c.client_passphrase = nil
-    c.temp_dir = File.expand_path('../tmp', __FILE__)
-    FileUtils.mkdir_p(c.temp_dir) unless File.directory?(c.temp_dir)
-  end
 end

metadata

@@ -1,29 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: domoscio_admin
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.4
 platform: ruby
 authors:
 - Pascal Lim
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-01-24 00:00:00.000000000 Z
+date: 2022-02-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rails
+  name: multi_json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: 1.15.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: 1.15.0
+- !ruby/object:Gem::Dependency
+  name: yaml
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.2.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.2.0
 description: Ruby client to interact with Domoscio Admin.
 email:
 - pascal.lim@domoscio.com
@@ -37,12 +51,11 @@ files:
 - lib/domoscio_admin.rb
 - lib/domoscio_admin/authorization_token.rb
 - lib/domoscio_admin/errors.rb
-- lib/domoscio_admin/generators/install_generator.rb
-- lib/domoscio_admin/generators/templates/install.rb
 - lib/domoscio_admin/http_calls.rb
 - lib/domoscio_admin/json.rb
 - lib/domoscio_admin/resources/instances/instance_parameter.rb
 - lib/domoscio_admin/resources/instances/instance_user.rb
+- lib/domoscio_admin/resources/instances/student_group.rb
 - lib/domoscio_admin/resources/resource.rb
 - lib/domoscio_admin/resources/resource_instance.rb
 - lib/domoscio_admin/resources/resource_user.rb
@@ -61,14 +74,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.5.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.8
+rubygems_version: 3.2.22
 signing_key: 
 specification_version: 4
 summary: Summary of DomoscioAdmin.

data/lib/domoscio_admin/generators/install_generator.rb

@@ -1,10 +0,0 @@
-require 'rails/generators'
-module DomoscioAdmin
-  class InstallGenerator < ::Rails::Generators::Base
-    source_root File.expand_path('../templates', __FILE__)
-    desc "Generate config file for DomoscioAdmin configuration"
-    def install
-      copy_file "install.rb", "config/initializers/domoscio_admin.rb"
-    end
-  end
-end

data/lib/domoscio_admin/generators/templates/install.rb

@@ -1,6 +0,0 @@
-DomoscioAdmin.configure do |c|
-  c.client_id = ENV['DOMOSCIO_ID']
-  c.client_passphrase = ENV['DOMOSCIO_PASSWORD']
-  c.temp_dir = File.expand_path('../tmp', __FILE__)
-  FileUtils.mkdir_p(c.temp_dir) unless File.directory?(c.temp_dir)
-end