domoscio_rails 0.2.19 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 578898574b898785e24a17847ba0d5ca5bab9f4d16cfde0d07beb248bab22576
-  data.tar.gz: 8684d33aa002c0cc03126f930c72d9294e4b4f4020530b4c0d9677adc99c3382
+  metadata.gz: b0a7e03020d78226e29f7a2930c43cfb2fccbb4389b9d559b3bae047be4dbdf5
+  data.tar.gz: 63a5cfb591576eaa115737527a3f99f4d8140ae5eeb51403370bf970a0d7a438
 SHA512:
-  metadata.gz: b56d9e5cfaacca82e7de548374c4f6961c67fba2747a64a4c26d2025ce99207320a743a8a670d777429b28890b178ec0ceab8236a580bcf8422045d8fa3c214f
-  data.tar.gz: 20ca7f496caa70bb5b69454fb95b6eda21e0d77903062e4260e58f8878fbe2d03c9ccf62e7d5a6c79b5a4250d35418fe1a920c3793577a66c0c110d06965794b
+  metadata.gz: 809d75c75785aa76824e42caaed95c0ad5e4afabd07d06480ddec251d7813fdeb1383c259558ba87745b67aaf88bd1b6ed27784a70547b495c1b271893e1a3f6
+  data.tar.gz: ecebc9a43d22e8d835387a7632d0dedc3b29b156e4b48dfbb32666556eb87b202a5e23f70be29481d899013145d108414344d33d32a137cd56b92758cf8c7128

data/lib/domoscio_rails.rb

@@ -2,13 +2,11 @@
 require 'net/https'
 require 'cgi/util'
 require 'multi_json'
-
 # helpers
 require 'domoscio_rails/version'
 require 'domoscio_rails/json'
 require 'domoscio_rails/errors'
 require 'domoscio_rails/authorization_token'
-
 # resources
 require 'domoscio_rails/http_calls'
 require 'domoscio_rails/resource'
@@ -35,18 +33,15 @@ require 'domoscio_rails/metadata/tag_set'
 require 'domoscio_rails/metadata/tag_edge'
 require 'domoscio_rails/data/knowledge_node_student'
 require 'domoscio_rails/data/event'
+require 'domoscio_rails/data/learning_session'
 require 'domoscio_rails/utils/review_util'
 require 'domoscio_rails/utils/gameplay_util'
 require 'domoscio_rails/utils/alerts_util'
 require 'domoscio_rails/utils/recommendation_util'
 require 'domoscio_rails/metadata/delta_object'
-
 module DomoscioRails
-
   class Configuration
-    attr_accessor :preproduction, :test, :dev, :root_url,
-    :client_id, :client_passphrase,
-    :temp_dir, :disabled, :version
+    attr_accessor :preproduction, :test, :dev, :root_url, :client_id, :client_passphrase, :temp_dir, :disabled, :version
 
     def disabled
       @disabled || false
@@ -71,11 +66,11 @@ module DomoscioRails
     def root_url
       if @preproduction == true
         if @test == true
-          @root_url || "https://domoscio-adaptive-engine-staging.azurewebsites.net"
+          @root_url || "https://staging.adaptive-engine.domoscio.com"
         elsif @dev == true
-          @root_url || "https://domoscio-adaptive-engine-preprod.azurewebsites.net"
+          @root_url || "https://preprod.adaptive-engine.domoscio.com"
         else
-          @root_url || "https://domoscio-adaptive-engine.azurewebsites.net"
+          @root_url || "https://adaptive-engine.domoscio.com"
         end
       else
         @root_url || "http://localhost:3001"
@@ -108,74 +103,70 @@ module DomoscioRails
   #
   def self.request(method, url, params={}, filters={}, headers = request_headers, before_request_proc = nil)
     return false if @disabled
+    #sets a default page size of 50
+    params.merge!({'per_page': 50}) unless params['per_page']
     uri = api_uri(url)
     uri.query = URI.encode_www_form(filters) unless filters.empty?
-
     res = DomoscioRails.send_request(uri, method, params, headers, before_request_proc)
-
-    # decode json data
+    return res if res.kind_of? DomoscioRails::ProcessingError
     begin
+      raise_http_failure(uri, res, params)
       data = DomoscioRails::JSON.load(res.body.nil? ? '' : res.body)
-      unless (res.kind_of? Net::HTTPClientError) || (res.kind_of? Net::HTTPServerError)
-        DomoscioRails::AuthorizationToken::Manager.storage.store({access_token: res['Accesstoken'], refresh_token: res['Refreshtoken']})
-      end
-    rescue MultiJson::LoadError
-      data = {}
+      DomoscioRails::AuthorizationToken::Manager.storage.store({access_token: res['Accesstoken'], refresh_token: res['Refreshtoken']})
+    rescue MultiJson::LoadError => exception
+      data = ProcessingError.new(uri, 500, exception, res.body, params)
+    rescue ResponseError => exception
+      data = exception
     end
 
     if res['Total'] && !filters[:page]
       pagetotal = (res['Total'].to_i / res['Per-Page'].to_f).ceil
-
       for j in 2..pagetotal
-        params = params.merge({page: j})
-        res = DomoscioRails.send_request(uri, method, params, headers, before_request_proc)
-
-        # decode json data
+        res = DomoscioRails.send_request(uri, method, params.merge({page: j}), headers, before_request_proc)
+        return res if res.kind_of? DomoscioRails::ProcessingError
         begin
-          data += DomoscioRails::JSON.load(res.body.nil? ? '' : res.body)
+          raise_http_failure(uri, res, params)
+          body = DomoscioRails::JSON.load(res.body.nil? ? '' : res.body)
+          data += body
           data.flatten!
-        rescue MultiJson::LoadError
-          data = {}
+        rescue MultiJson::LoadError => exception
+          return ProcessingError.new(uri, 500, exception, res.body, params)
+        rescue ResponseError => exception
+          return exception
         end
-
       end
     end
-
-    ############### TEMP!!!! #######################################################
-    #pp method, uri.request_uri, params #, filters, headers
-    #pp res, data
-    #puts
-
-    # if (!(res.is_a? Net::HTTPOK))
-    #   ex = DomoscioRails::ResponseError.new(uri, res.code, data)
-    #   ############## TEMP!!!! ########################################################
-    #   #pp ex, data
-    #   raise ex
-    # end
-
-    # copy pagination info if any
-    # ['x-number-of-pages', 'x-number-of-items'].each { |k|
-#       filters[k.gsub('x-number-of-', 'total_')] = res[k].to_i if res[k]
-#     }
-
     data
   end
 
-
   def self.send_request(uri, method, params, headers, before_request_proc)
-    res = Net::HTTP.start(uri.host, uri.port, use_ssl: uri.scheme == 'https') do |http| # , use_ssl: uri.scheme == 'https') do |http|
-      req = Net::HTTP::const_get(method.capitalize).new(uri.request_uri, headers)
-      req.body = DomoscioRails::JSON.dump(params)
-      before_request_proc.call(req) if before_request_proc
-      http.request req
+    begin
+      res = Net::HTTP.start(uri.host, uri.port, use_ssl: uri.scheme == 'https') do |http|
+        req = Net::HTTP::const_get(method.capitalize).new(uri.request_uri, headers)
+        req.body = DomoscioRails::JSON.dump(params)
+        before_request_proc.call(req) if before_request_proc
+        http.request req
+      end
+    rescue Timeout::Error, Errno::EINVAL, Errno::ECONNREFUSED, Errno::ECONNRESET, EOFError, Net::HTTPBadResponse, Net::HTTPHeaderSyntaxError, Net::ProtocolError => exception
+      ProcessingError.new(uri, 500, exception, res)
     end
   end
 
   private
 
+  def self.raise_http_failure(uri, res, params)
+    unless res.kind_of? Net::HTTPSuccess
+      if res.blank?
+        raise ResponseError.new(uri, 500, {error: {status: 500, message: 'AdaptiveEngine not available'}}, {}, params)
+      else
+        body = DomoscioRails::JSON.load((res.body.nil? ? '' : res.body), :symbolize_keys => true)
+        raise ResponseError.new(uri, res.code.to_i, body, res.body, params)
+      end
+    end
+  end
+
   def self.user_agent
     @uname ||= get_uname
-
     {
       bindings_version: DomoscioRails::VERSION,
       lang: 'ruby',
@@ -193,24 +184,20 @@ module DomoscioRails
 
   def self.request_headers
     auth_token = DomoscioRails::AuthorizationToken::Manager.get_token
-
     if !auth_token.is_a? String
       headers = {
-        'user_agent' => "DomoscioRails V2 RubyBindings/#{DomoscioRails::VERSION}",
+        'user_agent' => "#{DomoscioRails.user_agent}",
         'AccessToken' => "#{auth_token[:access_token]}",
         'RefreshToken' => "#{auth_token[:refresh_token]}",
         'Content-Type' => 'application/json'
       }
     else
       headers = {
-        'user_agent' => "DomoscioRails V2 RubyBindings/#{DomoscioRails::VERSION}",
-        'Authorization' => "Token token=#{DomoscioRails.configuration.client_passphrase}",#"#{auth_token['token_type']} #{auth_token['access_token']}",
+        'user_agent' => "#{DomoscioRails.user_agent}",
+        'Authorization' => "Token token=#{DomoscioRails.configuration.client_passphrase}",
         'Content-Type' => 'application/json'
       }
     end
     headers
-
   end
-
-
-end
+end

data/lib/domoscio_rails/adaptative/predictive/objective_knowledge_node_student.rb

@@ -1,7 +1,6 @@
 module DomoscioRails
-    # An objective knowledge node student.
     class ObjectiveKnowledgeNodeStudent < Resource
       include DomoscioRails::HTTPCalls::Fetch
       include DomoscioRails::HTTPCalls::Update
     end
-  end
+  end

data/lib/domoscio_rails/authorization_token.rb

@@ -1,8 +1,6 @@
 module DomoscioRails
   module AuthorizationToken
-
     class Manager
-
       class << self
         def storage
           @@storage ||= FileStorage.new
@@ -19,7 +17,6 @@ module DomoscioRails
         end
       end
     end
-
     class StaticStorage
       def get
         @@token ||= nil
@@ -63,6 +60,7 @@ module DomoscioRails
       end
 
       def file_path
+        @temp_dir = DomoscioRails.configuration.temp_dir
         File.join(@temp_dir, "DomoscioRails.AuthorizationToken.FileStore.tmp")
       end
     end

data/lib/domoscio_rails/data/learning_session.rb

@@ -0,0 +1,10 @@
+module DomoscioRails
+  # A LearningSession is basicly a group of events.
+  class LearningSession < Resource
+    
+    include DomoscioRails::HTTPCalls::Create
+    include DomoscioRails::HTTPCalls::Fetch
+    include DomoscioRails::HTTPCalls::Destroy
+
+  end
+end

data/lib/domoscio_rails/errors.rb

@@ -1,24 +1,25 @@
 module DomoscioRails
-
   # Generic error superclass for MangoPay specific errors.
-  # Currently never instantiated directly.
-  # Currently only single subclass used.
   class Error < StandardError
   end
 
-  # Thrown from any MangoPay API call whenever
-  # it returns response with HTTP code != 200.
+  # Error Message from AdaptiveEngine
   class ResponseError < Error
-
-    attr_reader :request_url, :code, :details
-
-    def initialize(request_url, code, details)
-      @request_url, @code, @details = request_url, code, details
+    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
       super(message) if message
     end
+    def message; @details.is_a?(Hash) ? @details.dig(:error, :message) : @details; end
+  end
 
-    def message; @details['Message']; end
-    def type;    @details['Type']; end
-    def errors;  @details['errors']; end
+  # ProcessingError from DomoscioRails
+  class ProcessingError < 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
+      super(message) if message
+    end
+    def message; @details.message; end
   end
 end

data/lib/domoscio_rails/http_calls.rb

@@ -8,7 +8,6 @@ module DomoscioRails
           DomoscioRails.request(:post, url(id), params)
         end
       end
-
       def self.included(base)
         base.extend(ClassMethods)
       end
@@ -20,7 +19,6 @@ module DomoscioRails
           DomoscioRails.request(:put, url(id), params)
         end
       end
-
       def self.included(base)
         base.extend(ClassMethods)
       end
@@ -32,7 +30,6 @@ module DomoscioRails
           DomoscioRails.request(:put, url(nil, nil, true), params)
         end
       end
-
       def self.included(base)
         base.extend(ClassMethods)
       end
@@ -40,19 +37,14 @@ module DomoscioRails
 
     module Fetch
       module ClassMethods
-        def fetch(id_or_filters = nil)
-          id, filters = DomoscioRails::HTTPCalls::Fetch.parse_id_or_filters(id_or_filters)
-          response = DomoscioRails.request(:get, url(id), {}, filters)
+        def fetch(id = nil, params = {})
+          DomoscioRails.request(:get, url(id), params)
         end
       end
 
       def self.included(base)
         base.extend(ClassMethods)
       end
-
-      def self.parse_id_or_filters(id_or_filters = nil)
-        id_or_filters.is_a?(Hash) ? [nil, id_or_filters] : [id_or_filters, {}]
-      end
     end
 
     module Destroy
@@ -81,7 +73,5 @@ module DomoscioRails
         base.extend(ClassMethods)
       end
     end
-
-
   end
 end

data/lib/domoscio_rails/resource.rb

@@ -1,16 +1,13 @@
 module DomoscioRails
-  # @abstract
   class Resource
     class << self
       def class_name
         name.split('::')[-1]
       end
-
       def url(id = nil, util_name = nil, on_self = nil )
         if self == Resource
           raise NotImplementedError.new('Resource is an abstract class. Do not use it directly.')
         end
-        
         build_url = "/v#{DomoscioRails.configuration.version}/instances/#{DomoscioRails.configuration.client_id}"
         if !on_self
           build_url << "/#{class_name.underscore}s"
@@ -25,4 +22,4 @@ module DomoscioRails
       end
     end
   end
-end
+end

data/lib/domoscio_rails/version.rb

@@ -1,3 +1,3 @@
 module DomoscioRails
-  VERSION = "0.2.19"
-end
+  VERSION = "0.3.3"
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: domoscio_rails
 version: !ruby/object:Gem::Version
-  version: 0.2.19
+  version: 0.3.3
 platform: ruby
 authors:
 - Benoit Praly
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-09-05 00:00:00.000000000 Z
+date: 2021-01-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -51,6 +51,7 @@ files:
 - lib/domoscio_rails/content/knowledge_node_content.rb
 - lib/domoscio_rails/data/event.rb
 - lib/domoscio_rails/data/knowledge_node_student.rb
+- lib/domoscio_rails/data/learning_session.rb
 - lib/domoscio_rails/data/result.rb
 - lib/domoscio_rails/errors.rb
 - lib/domoscio_rails/http_calls.rb
@@ -72,7 +73,6 @@ files:
 - lib/domoscio_rails/utils/recommendation_util.rb
 - lib/domoscio_rails/utils/review_util.rb
 - lib/domoscio_rails/version.rb
-- lib/tasks/domoscio_rails_tasks.rake
 homepage: http://www.domoscio.com
 licenses:
 - MIT
@@ -92,7 +92,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.2
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Summary of DomoscioRails.

data/lib/tasks/domoscio_rails_tasks.rake

@@ -1,4 +0,0 @@
-# desc "Explaining what the task does"
-# task :domoscio_rails do
-#   # Task goes here
-# end