domoscio_rails 0.2.14 → 0.2.16.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f3eace41e37214c6a5a2649420cb57edd98ec923
-  data.tar.gz: c87f19311410ae698ff78abb40a607a1f12d0103
+  metadata.gz: add91f521b4696d8f1b28a6bf6dcc1dd72503176
+  data.tar.gz: e574faa0b6825861ce4003d727c89132b954df62
 SHA512:
-  metadata.gz: 79285394f183ebd822d66d1cab36a6185d7a6561d5a7cbf6ec01096a85c583c964b4aebaf1fab3fe07fc2fcf1ad3263f48edb3b2e256e09b3aa9361c8239a8cc
-  data.tar.gz: d0f7faa57bd977033263b18fbcfab376027ad946105be2a25525cf9797744f8aede2b6309e204464366d7bb9f428897984c294d0dbe3a2f2a59e36af6c50d316
+  metadata.gz: 5448dbccc4872fdc44a40e41bc38de1320c8e4877950191047104d6e3058f6416ebf4b10e86e63bb40df4845568267f49c1310b73e1d38522aa1653ab6fd163b
+  data.tar.gz: 344c000e34b3f35778e387fd850a5e927a31366518a877d19fa27dabf484663d51bd418ec0912ed0760c430154a66d8fa35f89d29cd093c8fb67c53daf1c19f5

data/lib/domoscio_rails.rb

@@ -1,5 +1,5 @@
-  
-require 'net/http'
+
+require 'net/https'
 require 'cgi/util'
 require 'multi_json'
 
@@ -18,13 +18,12 @@ require 'domoscio_rails/adaptative/deterministic/rule_output'
 require 'domoscio_rails/adaptative/deterministic/rule_condition'
 require 'domoscio_rails/adaptative/predictive/objective'
 require 'domoscio_rails/adaptative/predictive/objective_student'
-require 'domoscio_rails/adaptative/predictive/objective_knowledge_node_student'
 require 'domoscio_rails/adaptative/predictive/objective_knowledge_node'
+require 'domoscio_rails/adaptative/predictive/objective_knowledge_node_student'
 require 'domoscio_rails/adaptative/recommendation'
 require 'domoscio_rails/path/learning_path'
 require 'domoscio_rails/content/content'
 require 'domoscio_rails/content/knowledge_node_content'
-require 'domoscio_rails/admin/user'
 require 'domoscio_rails/student/student'
 require 'domoscio_rails/student/student_cluster'
 require 'domoscio_rails/knowledge/knowledge_graph'
@@ -38,15 +37,17 @@ require 'domoscio_rails/data/knowledge_node_student'
 require 'domoscio_rails/data/event'
 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, :root_url,
+    attr_accessor :preproduction, :test, :root_url,
     :client_id, :client_passphrase,
     :temp_dir, :disabled, :version
-    
+
     def disabled
       @disabled || false
     end
@@ -54,13 +55,25 @@ module DomoscioRails
     def preproduction
       @preproduction || false
     end
-    
+
+    def test
+      @test || false
+    end
+
     def version
       @version || 1
     end
 
     def root_url
-      @root_url || (@preproduction == true  ? ( @version > 1 ? "http://api.domoscio.com" : "http://stats-engine-api.domoscio.com" )  : "http://localhost:3001/")
+      if @preproduction == true
+        if @test == true
+          @root_url || "https://domoscio-adaptive-engine-staging.azurewebsites.net"
+        else
+          @root_url || "https://domoscio-adaptive-engine.azurewebsites.net"
+        end
+      else
+        @root_url || "http://localhost:3001"
+      end
     end
   end
 
@@ -90,22 +103,38 @@ module DomoscioRails
   def self.request(method, url, params={}, filters={}, headers = request_headers, before_request_proc = nil)
     return false if @disabled
     uri = api_uri(url)
-    uri.query = URI.encode_www_form(filters) unless filters.empty?    
-    
-    res = Net::HTTP.start(uri.host, uri.port) 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
-    end
+    uri.query = URI.encode_www_form(filters) unless filters.empty?
+
+    res = DomoscioRails.send_request(uri, method, params, headers, before_request_proc)
 
     # decode json data
     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']})
+      end
     rescue MultiJson::LoadError
       data = {}
     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
+        begin
+          data += DomoscioRails::JSON.load(res.body.nil? ? '' : res.body)
+          data.flatten!
+        rescue MultiJson::LoadError
+          data = {}
+        end
+
+      end
+    end
+
     ############### TEMP!!!! #######################################################
     #pp method, uri.request_uri, params #, filters, headers
     #pp res, data
@@ -126,6 +155,16 @@ module DomoscioRails
     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
+    end
+  end
+
   private
 
   def self.user_agent
@@ -148,17 +187,24 @@ module DomoscioRails
 
   def self.request_headers
     auth_token = DomoscioRails::AuthorizationToken::Manager.get_token
-    headers = {
-      'user_agent' => "DomoscioRails V2 RubyBindings/#{DomoscioRails::VERSION}",
-      'Authorization' => "Token token=#{DomoscioRails.configuration.client_passphrase}",#"#{auth_token['token_type']} #{auth_token['access_token']}",
-      'Content-Type' => 'application/json'
-    }
-    # begin
-#       headers.update('x_mangopay_client_user_agent' => DomoscioRails::JSON.dump(user_agent))
-#     rescue => e
-#       headers.update('x_mangopay_client_raw_user_agent' => user_agent.inspect, error: "#{e} (#{e.class})")
-#     end
+
+    if !auth_token.is_a? String
+      headers = {
+        'user_agent' => "DomoscioRails V2 RubyBindings/#{DomoscioRails::VERSION}",
+        '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']}",
+        'Content-Type' => 'application/json'
+      }
+    end
+    headers
+
   end
-  
-  
+
+
 end

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

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

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

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

data/lib/domoscio_rails/authorization_token.rb

@@ -5,7 +5,7 @@ module DomoscioRails
 
       class << self
         def storage
-          @@storage ||= StaticStorage.new
+          @@storage ||= FileStorage.new
         end
 
         def storage= (storage)
@@ -13,17 +13,8 @@ module DomoscioRails
         end
 
         def get_token
-          # token = storage.get
-          #           if token.nil? || token['timestamp'].nil? || token['timestamp'] <= Time.now
-          #             token = DomoscioRails.request(:post, '/api/oauth/token', {}, {}, {}, Proc.new do |req|
-          #               cfg = DomoscioRails.configuration
-          #               req.basic_auth cfg.client_id, cfg.client_passphrase
-          #               req.body = 'grant_type=client_credentials'
-          #             end)
-          #             token['timestamp'] = Time.now + token['expires_in'].to_i
-          #             storage.store token
-          #           end
-          token = DomoscioRails.configuration.client_passphrase
+          token = storage.get
+          token = DomoscioRails.configuration.client_passphrase if token.nil?
           token
         end
       end

data/lib/domoscio_rails/http_calls.rb

@@ -72,6 +72,9 @@ module DomoscioRails
         def util(id = nil, util_name = nil, params = {})
           DomoscioRails.request(:get, url(id, util_name), params)
         end
+        def util_post(id = nil, util_name = nil, params = {})
+          DomoscioRails.request(:post, url(id, util_name), params)
+        end
       end
 
       def self.included(base)

data/lib/domoscio_rails/metadata/delta_object.rb

@@ -0,0 +1,6 @@
+module DomoscioRails
+  # A delta object.
+  class DeltaObject < Resource
+    include DomoscioRails::HTTPCalls::Fetch
+  end
+end

data/lib/domoscio_rails/utils/alerts_util.rb

@@ -0,0 +1,6 @@
+module DomoscioRails
+    # A company.
+    class AlertsUtil < Resource
+      include DomoscioRails::HTTPCalls::Util
+    end
+  end

data/lib/domoscio_rails/utils/recommendation_util.rb

@@ -0,0 +1,6 @@
+module DomoscioRails
+    # A company.
+    class RecommendationUtil < Resource
+      include DomoscioRails::HTTPCalls::Util
+    end
+  end

data/lib/domoscio_rails/version.rb

@@ -1,3 +1,3 @@
 module DomoscioRails
-  VERSION = "0.2.14"
+  VERSION = "0.2.16.9"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: domoscio_rails
 version: !ruby/object:Gem::Version
-  version: 0.2.14
+  version: 0.2.16.9
 platform: ruby
 authors:
 - Benoit Praly
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-30 00:00:00.000000000 Z
+date: 2018-04-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -24,7 +24,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '3.2'
-description: Description of DomoscioRails.
+description: Ruby client to interact with Domoscio API.
 email:
 - benoit.praly@domoscio.com
 executables: []
@@ -46,7 +46,6 @@ files:
 - lib/domoscio_rails/adaptative/predictive/objective_student.rb
 - lib/domoscio_rails/adaptative/recommendation.rb
 - lib/domoscio_rails/admin/instance.rb
-- lib/domoscio_rails/admin/user.rb
 - lib/domoscio_rails/authorization_token.rb
 - lib/domoscio_rails/content/content.rb
 - lib/domoscio_rails/content/knowledge_node_content.rb
@@ -59,6 +58,7 @@ files:
 - lib/domoscio_rails/knowledge/knowledge_edge.rb
 - lib/domoscio_rails/knowledge/knowledge_graph.rb
 - lib/domoscio_rails/knowledge/knowledge_node.rb
+- lib/domoscio_rails/metadata/delta_object.rb
 - lib/domoscio_rails/metadata/tag.rb
 - lib/domoscio_rails/metadata/tag_edge.rb
 - lib/domoscio_rails/metadata/tag_set.rb
@@ -67,7 +67,9 @@ files:
 - lib/domoscio_rails/resource.rb
 - lib/domoscio_rails/student/student.rb
 - lib/domoscio_rails/student/student_cluster.rb
+- lib/domoscio_rails/utils/alerts_util.rb
 - lib/domoscio_rails/utils/gameplay_util.rb
+- 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
@@ -91,7 +93,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.6.14
 signing_key: 
 specification_version: 4
 summary: Summary of DomoscioRails.

data/lib/domoscio_rails/admin/user.rb

@@ -1,10 +0,0 @@
-module DomoscioRails
-  # A user of the API.
-  class User < Resource
-    
-    include DomoscioRails::HTTPCalls::Create
-    include DomoscioRails::HTTPCalls::Fetch
-    include DomoscioRails::HTTPCalls::Update
-
-  end
-end