domoscio_rails 0.2.24 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 80036d711a50e0323cbd9f9fa260ebc9c9c6d194060f68b8be05d2ee7eab4206
-  data.tar.gz: 944991129c4a01704a0b24776d605ff926f408b48e17e998b1a525bcf43a469b
+  metadata.gz: 4b1afdf503120aeb74bb9d38237a533f7becd888b329098199446db697b9fe26
+  data.tar.gz: bda6a20da9b44d4ef8a32910688ec633606168f012b7d6af4047854d7e443a0e
 SHA512:
-  metadata.gz: ae6d858a4ca54802ff2504ee268fcacf8915cc45832fad48ba59c70daf1f49567112f5647b68dded5ab0056cef403cb77e52e9a06f341fc52f9ee45d52babd98
-  data.tar.gz: 01f77a383197e1e91b4b4c196d40098b44fec5a60eb2ec87a06ed34bde89633053000799b2920200d38b3b14266dda6e64cba292b34fdd726d54a4f1feb4109f
+  metadata.gz: d350f60cbbb55a8e5a8222edac01778216c3e3db07c645b3212c849ab41dc670eb1d79f9d31ff8256a0f5d702934af3043cf368fb9635bc206d44e2023ba50bb
+  data.tar.gz: 388c1db2de8db63dfccea4335a0c8542615725408501283293aa537282a8d5ed4e285231f4d3ed45dae603cde678ebef80fb6ad356cc4bf1857dff1c3a4e67a8

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'
@@ -41,9 +39,7 @@ 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
 
@@ -109,46 +105,54 @@ module DomoscioRails
     return false if @disabled
     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
-      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']})
+      unless res.kind_of? Net::HTTPSuccess
+        data = DomoscioRails::JSON.load((res.body.nil? ? '' : res.body), :symbolize_keys => true) 
+        raise ResponseError.new(uri, res.code.to_i, data, res.body)
       end
-    rescue MultiJson::LoadError
-      data = {}
+      data = DomoscioRails::JSON.load(res.body.nil? ? '' : res.body)
+      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)
+    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)
+          unless res.kind_of? Net::HTTPSuccess
+            body = DomoscioRails::JSON.load((res.body.nil? ? '' : res.body), :symbolize_keys => true) 
+            raise ResponseError.new(uri, res.code.to_i, body, res.body)
+          end
+          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)
+        rescue ResponseError => exception
+          return exception
         end
-
       end
     end
     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.body)
     end
   end
 
@@ -156,7 +160,6 @@ module DomoscioRails
 
   def self.user_agent
     @uname ||= get_uname
-
     {
       bindings_version: DomoscioRails::VERSION,
       lang: 'ruby',
@@ -177,18 +180,18 @@ module DomoscioRails
 
     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,7 +60,7 @@ module DomoscioRails
       end
 
       def file_path
-        @temp_dir = DomoscioRails.configuration.temp_dir if @temp_dir != DomoscioRails.configuration.temp_dir
+        @temp_dir = DomoscioRails.configuration.temp_dir
         File.join(@temp_dir, "DomoscioRails.AuthorizationToken.FileStore.tmp")
       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
+    def initialize(request_url, code, details, body)
+      @request_url, @code, @details, @body = request_url, code, details, body
       super(message) if message
     end
+    def message; @details.dig(:error, :message) || @details; end
+  end
 
-    def message; @details['Message']; end
-    def type;    @details['Type']; end
-    def errors;  @details['errors']; end
+  # Error Message from DomoscioRails
+  class ProcessingError < Error
+    attr_reader :request_url, :code, :details, :body
+    def initialize(request_url, code, details, body)
+      @request_url, @code, @details, @body = request_url, code, details, body
+      super(message) if message
+    end
+    def message; @details.message; 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.24"
-end
+  VERSION = "0.3.1"
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: domoscio_rails
 version: !ruby/object:Gem::Version
-  version: 0.2.24
+  version: 0.3.1
 platform: ruby
 authors:
 - Benoit Praly
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-11-04 00:00:00.000000000 Z
+date: 2020-12-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -73,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
@@ -93,7 +92,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.0.3
 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