domoscio_admin 0.3.5 → 0.3.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e13dd13b5a0c4607c41a261227b9be65de5badb861d91ecbb67aba15673f805f
-  data.tar.gz: d784655c5a27452520635b6ac6583cae4d9284c0a3c4e2d179f8a6895a6ff776
+  metadata.gz: 97bfb339c4cb14de52c9e14dc52279aa19edc9985d1226968ae36ce2414a1b3b
+  data.tar.gz: 9193e30b9763df7354b9e4c07d864c120f5382c1f4266ad833c52f0055bceca6
 SHA512:
-  metadata.gz: cb361e7fbe82c675eb44ace0a1832e37b350c7b559f89fb81d9e6fe56a94134870203afe62ad7e4bd97aff8c25afe5e73a948cbe19605da0e5fb72e43cbf359c
-  data.tar.gz: 24bcca18f7358fd06da67754f7981f37d1359c752e31745b5d9d91361782faa688f14e38b72ad8eb14b6e5ed79b863865ccf692f375acd4fe5d24ea27bb7db64
+  metadata.gz: 45d91e72a7513da0c0814fefb9044f83418614e475ef839345f624777fc3c588360239d9eb7cfc9347f9829ecef404700ae9a1f53a8f812c567d016965fd54fa
+  data.tar.gz: 18507d0bffde33e49b05b34dd3fc4dfeffc0349e44832c41719d4690017a6e782b8ab7269135c9dc2af2d9291f6330223721b3a14c59662c4d681f4f884e6c96

data/lib/domoscio_admin/authorization_token.rb

@@ -41,7 +41,7 @@ module DomoscioAdmin
         f.flock(File::LOCK_SH)
         txt = f.read
         f.close
-        YAML.safe_load(txt) || nil
+        YAML.load(txt) || nil
       rescue Errno::ENOENT
         nil
       end

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

@@ -0,0 +1,8 @@
+module DomoscioAdmin
+  class LearningProgram < 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_user.rb

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

data/lib/domoscio_admin/version.rb

@@ -1,3 +1,3 @@
 module DomoscioAdmin
-  VERSION = '0.3.5'.freeze
+  VERSION = '0.3.8'.freeze
 end

data/lib/domoscio_admin.rb

@@ -12,6 +12,7 @@ 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/instances/learning_program'
 require 'domoscio_admin/resources/users/user'
 
 module DomoscioAdmin
@@ -50,15 +51,22 @@ module DomoscioAdmin
   # Raises DomoscioAdmin::ProcessingError on Internal Error
   #
   def self.request(method, url, params = {})
+    params ||= {}
     store_tokens, headers = request_headers
+    params.merge!({ 'per_page': 2000 }) unless params[:per_page]
     uri = api_uri(url)
-
     response = DomoscioAdmin.send_request(uri, method, params, headers)
     return response if response.is_a? DomoscioAdmin::ProcessingError
 
     begin
       raise_http_failure(uri, response, params)
-      data = DomoscioAdmin::JSON.load(response.body.nil? ? '' : response.body)
+
+      if response['Content-Type'] == 'application/zip'
+        data = response
+      else
+        data = DomoscioAdmin::JSON.load(response.body.nil? ? '' : response.body)
+      end
+
       if store_tokens
         DomoscioAdmin::AuthorizationToken::Manager.storage.store({
                                                                    access_token: response['Accesstoken'],
@@ -71,6 +79,24 @@ module DomoscioAdmin
       data = e
     end
 
+    if response['Total']
+      pagetotal = (response['Total'].to_i / response['Per-Page'].to_f).ceil
+      (2..pagetotal).each do |j|
+        response = DomoscioAdmin.send_request(uri, method, params.merge({ page: j }), headers)
+        return response if response.is_a? DomoscioAdmin::ProcessingError
+
+        begin
+          raise_http_failure(uri, response, params)
+          body = DomoscioAdmin::JSON.load(response.body.nil? ? '' : response.body)
+          data += body
+          data.flatten!
+        rescue MultiJson::LoadError => e
+          return ProcessingError.new(uri, 500, e, response.body, params)
+        rescue ResponseError => e
+          return e
+        end
+      end
+    end
     data
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: domoscio_admin
 version: !ruby/object:Gem::Version
-  version: 0.3.5
+  version: 0.3.8
 platform: ruby
 authors:
 - Pascal Lim
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-02-15 00:00:00.000000000 Z
+date: 2022-08-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json
@@ -55,6 +55,7 @@ files:
 - 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/learning_program.rb
 - lib/domoscio_admin/resources/instances/student_group.rb
 - lib/domoscio_admin/resources/resource.rb
 - lib/domoscio_admin/resources/resource_instance.rb