domoscio_rails 0.3.9 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c6072b4a46cd9e2cf0daba6e73b4192ed603d12a9bc6139e3b90bc48fd04131d
-  data.tar.gz: c7c1e0dc7b0783625e102f62359639be583632594d385eec73f9f8232716345e
+  metadata.gz: 3018e6b4f3733f3b33ebb28fab7eccc020ea4909ff08c167fde24eb757890c14
+  data.tar.gz: 9216994f5101318046ca16eb8aa2dbaf6a3b1c6d9de533748bf18a61e6001c3d
 SHA512:
-  metadata.gz: ba71395ea5360713fd55335771184004d6268662dca37837f7918429ca23a036499d7c207c90b48b8b1efdf38ec666c48011409420766741b30583f10a5edb00
-  data.tar.gz: 4c8452c0a8358fecfadfa9a45fd2ad5f7cbccfaef9c693b7a563e70b90a30f98cb73b3c535535e65b07f9cfb28eac4760f03bce5ef55068b81decf12bc6d8875
+  metadata.gz: '08018205d6a5123cb4b1e768c2960f3fc58c8679d657c114b2ef15af06386cbf2a46c21e32c110c0680042eba72c4a49aa9b32c12555093d44d29a33e5f81848'
+  data.tar.gz: fff59acde37fe7c518cfb0da170b902c7878c52a2ac07a4f6f9c2f8e5c82611c51738490b9a4a5c0a1f85b277b6755effe6e8e7f11573322e3526baad6f0c857

data/Rakefile

@@ -14,9 +14,6 @@ RDoc::Task.new(:rdoc) do |rdoc|
   rdoc.rdoc_files.include('lib/**/*.rb')
 end
 
-
-
-
 Bundler::GemHelper.install_tasks
 
 require 'rake/testtask'
@@ -28,5 +25,4 @@ Rake::TestTask.new(:test) do |t|
   t.verbose = false
 end
 
-
 task default: :test

data/lib/domoscio_rails/authorization_token.rb

@@ -1,51 +1,53 @@
 module DomoscioRails
   module AuthorizationToken
+    # Token Manager
     class Manager
       class << self
         def storage
-          @@storage ||= FileStorage.new
+          @storage ||= DomoscioRails.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: DomoscioRails.configuration.access_token,
+          refresh_token: DomoscioRails.configuration.refresh_token
+        }
       end
 
       def store(token)
-        @@token = token
+        DomoscioRails.configuration.access_token = token[:access_token]
+        DomoscioRails.configuration.refresh_token = token[:refresh_token]
       end
     end
 
+    # Manages tokens with local File
     class FileStorage
       require 'yaml'
 
       def initialize
-        raise "Path to temporary folder is not defined" unless DomoscioRails.configuration.temp_dir
+        raise 'Path to temporary folder is not defined' unless DomoscioRails.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
@@ -54,8 +56,8 @@ module DomoscioRails
       end
 
       def file_path
-        File.join(DomoscioRails.configuration.temp_dir, "DomoscioRails.AuthorizationToken.FileStore.tmp")
+        File.join(DomoscioRails.configuration.temp_dir, 'DomoscioRails.AuthorizationToken.FileStore.tmp')
       end
     end
   end
-end
+end

data/lib/domoscio_rails/data/content.rb

@@ -1,11 +1,9 @@
 module DomoscioRails
   class Content < Resource
-
     include DomoscioRails::HTTPCalls::Create
     include DomoscioRails::HTTPCalls::Fetch
     include DomoscioRails::HTTPCalls::Update
     include DomoscioRails::HTTPCalls::Destroy
     include DomoscioRails::HTTPCalls::Util
-
   end
-end
+end

data/lib/domoscio_rails/data/event.rb

@@ -1,9 +1,7 @@
 module DomoscioRails
   class Event < Resource
-    
     include DomoscioRails::HTTPCalls::Create
     include DomoscioRails::HTTPCalls::Fetch
     include DomoscioRails::HTTPCalls::Destroy
-
   end
-end
+end

data/lib/domoscio_rails/data/instance.rb

@@ -1,10 +1,8 @@
 module DomoscioRails
   class Instance < Resource
-
     include DomoscioRails::HTTPCalls::Create
     include DomoscioRails::HTTPCalls::Fetch
     include DomoscioRails::HTTPCalls::UpdateSelf
     include DomoscioRails::HTTPCalls::Destroy
-
   end
 end

data/lib/domoscio_rails/data/learning_session.rb

@@ -1,11 +1,9 @@
 module DomoscioRails
   class LearningSession < Resource
-
     include DomoscioRails::HTTPCalls::Create
     include DomoscioRails::HTTPCalls::Fetch
     include DomoscioRails::HTTPCalls::Destroy
     include DomoscioRails::HTTPCalls::Update
     include DomoscioRails::HTTPCalls::Util
-
   end
-end
+end

data/lib/domoscio_rails/data/recommendation.rb

@@ -1,7 +1,5 @@
 module DomoscioRails
   class Recommendation < Resource
-
     include DomoscioRails::HTTPCalls::Fetch
-
   end
-end
+end

data/lib/domoscio_rails/data/student.rb

@@ -1,10 +1,8 @@
 module DomoscioRails
   class Student < Resource
-
     include DomoscioRails::HTTPCalls::Create
     include DomoscioRails::HTTPCalls::Fetch
     include DomoscioRails::HTTPCalls::Destroy
     include DomoscioRails::HTTPCalls::Update
-
   end
-end
+end

data/lib/domoscio_rails/errors.rb

@@ -6,20 +6,36 @@ module DomoscioRails
   # Error Message from AdaptiveEngine
   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[:error].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 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
+      @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
+end

data/lib/domoscio_rails/http_calls.rb

@@ -8,6 +8,7 @@ module DomoscioRails
           DomoscioRails.request(:post, url(id), params)
         end
       end
+
       def self.included(base)
         base.extend(ClassMethods)
       end
@@ -19,6 +20,7 @@ module DomoscioRails
           DomoscioRails.request(:put, url(id), params)
         end
       end
+
       def self.included(base)
         base.extend(ClassMethods)
       end
@@ -64,6 +66,7 @@ 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

data/lib/domoscio_rails/json.rb

@@ -20,4 +20,4 @@ module DomoscioRails
       end
     end
   end
-end
+end

data/lib/domoscio_rails/knowledge/knowledge_edge.rb

@@ -1,10 +1,8 @@
 module DomoscioRails
   class KnowledgeEdge < Resource
-
     include DomoscioRails::HTTPCalls::Create
     include DomoscioRails::HTTPCalls::Fetch
     include DomoscioRails::HTTPCalls::Destroy
     include DomoscioRails::HTTPCalls::Update
-
   end
-end
+end

data/lib/domoscio_rails/knowledge/knowledge_graph.rb

@@ -1,10 +1,8 @@
 module DomoscioRails
   class KnowledgeGraph < Resource
-
     include DomoscioRails::HTTPCalls::Create
     include DomoscioRails::HTTPCalls::Fetch
     include DomoscioRails::HTTPCalls::Destroy
     include DomoscioRails::HTTPCalls::Update
-
   end
-end
+end

data/lib/domoscio_rails/knowledge/knowledge_node.rb

@@ -1,10 +1,8 @@
 module DomoscioRails
   class KnowledgeNode < Resource
-
     include DomoscioRails::HTTPCalls::Create
     include DomoscioRails::HTTPCalls::Fetch
     include DomoscioRails::HTTPCalls::Destroy
     include DomoscioRails::HTTPCalls::Update
-
   end
-end
+end

data/lib/domoscio_rails/knowledge/knowledge_node_content.rb

@@ -1,10 +1,8 @@
 module DomoscioRails
   class KnowledgeNodeContent < Resource
-
     include DomoscioRails::HTTPCalls::Create
     include DomoscioRails::HTTPCalls::Fetch
     include DomoscioRails::HTTPCalls::Destroy
     include DomoscioRails::HTTPCalls::Update
-
   end
-end
+end

data/lib/domoscio_rails/knowledge/knowledge_node_student.rb

@@ -1,10 +1,8 @@
 module DomoscioRails
   class KnowledgeNodeStudent < Resource
-
     include DomoscioRails::HTTPCalls::Create
     include DomoscioRails::HTTPCalls::Fetch
     include DomoscioRails::HTTPCalls::Destroy
     include DomoscioRails::HTTPCalls::Update
-
   end
-end
+end

data/lib/domoscio_rails/objective/objective.rb

@@ -1,10 +1,8 @@
 module DomoscioRails
   class Objective < Resource
-
     include DomoscioRails::HTTPCalls::Create
     include DomoscioRails::HTTPCalls::Fetch
     include DomoscioRails::HTTPCalls::Destroy
     include DomoscioRails::HTTPCalls::Update
-
   end
-end
+end

data/lib/domoscio_rails/objective/objective_knowledge_node.rb

@@ -1,10 +1,8 @@
 module DomoscioRails
   class ObjectiveKnowledgeNode < Resource
-
     include DomoscioRails::HTTPCalls::Create
     include DomoscioRails::HTTPCalls::Fetch
     include DomoscioRails::HTTPCalls::Destroy
     include DomoscioRails::HTTPCalls::Update
-
   end
-end
+end

data/lib/domoscio_rails/objective/objective_knowledge_node_student.rb

@@ -1,10 +1,8 @@
 module DomoscioRails
   class ObjectiveKnowledgeNodeStudent < Resource
-
     include DomoscioRails::HTTPCalls::Create
     include DomoscioRails::HTTPCalls::Fetch
     include DomoscioRails::HTTPCalls::Destroy
     include DomoscioRails::HTTPCalls::Update
-
   end
-end
+end

data/lib/domoscio_rails/objective/objective_student.rb

@@ -1,11 +1,9 @@
 module DomoscioRails
   class ObjectiveStudent < Resource
-
     include DomoscioRails::HTTPCalls::Create
     include DomoscioRails::HTTPCalls::Fetch
     include DomoscioRails::HTTPCalls::Destroy
     include DomoscioRails::HTTPCalls::Update
     include DomoscioRails::HTTPCalls::Util
-
   end
 end

data/lib/domoscio_rails/resource.rb

@@ -4,22 +4,26 @@ module DomoscioRails
       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
+
+      def url(id = nil, util_name = nil, on_self = nil)
+        raise NotImplementedError, 'Resource is an abstract class. Do not use it directly.' if self == Resource
+
         build_url = "/v#{DomoscioRails.configuration.version}/instances/#{DomoscioRails.configuration.client_id}"
-        if !on_self
-          build_url << "/#{class_name.underscore}s"
-          if util_name
-            build_url << "/#{util_name}"
-          end
-          if id
-            build_url << "/#{CGI.escape(id.to_s)}"
-          end
+        unless on_self
+          build_url << "/#{underscore(class_name)}s"
+          build_url << "/#{util_name}" if util_name
+          build_url << "/#{CGI.escape(id.to_s)}" if id
         end
-        return build_url  
+        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
-end
+end

data/lib/domoscio_rails/tag/tag.rb

@@ -1,10 +1,8 @@
 module DomoscioRails
   class Tag < Resource
-
     include DomoscioRails::HTTPCalls::Create
     include DomoscioRails::HTTPCalls::Fetch
     include DomoscioRails::HTTPCalls::Destroy
     include DomoscioRails::HTTPCalls::Update
-
   end
-end
+end

data/lib/domoscio_rails/tag/tag_edge.rb

@@ -1,10 +1,8 @@
 module DomoscioRails
   class TagEdge < Resource
-
     include DomoscioRails::HTTPCalls::Create
     include DomoscioRails::HTTPCalls::Fetch
     include DomoscioRails::HTTPCalls::Destroy
     include DomoscioRails::HTTPCalls::Update
-
   end
-end
+end

data/lib/domoscio_rails/tag/tag_set.rb

@@ -1,10 +1,8 @@
 module DomoscioRails
   class TagSet < Resource
-
     include DomoscioRails::HTTPCalls::Create
     include DomoscioRails::HTTPCalls::Fetch
     include DomoscioRails::HTTPCalls::Destroy
     include DomoscioRails::HTTPCalls::Update
-
   end
-end
+end

data/lib/domoscio_rails/tag/tagging.rb

@@ -1,10 +1,8 @@
 module DomoscioRails
   class Tagging < Resource
-
     include DomoscioRails::HTTPCalls::Create
     include DomoscioRails::HTTPCalls::Fetch
     include DomoscioRails::HTTPCalls::Destroy
     include DomoscioRails::HTTPCalls::Update
-
   end
-end
+end

data/lib/domoscio_rails/utils/gameplay_util.rb

@@ -1,7 +1,5 @@
 module DomoscioRails
   class GameplayUtil < Resource
-
     include DomoscioRails::HTTPCalls::Util
-
   end
-end
+end

data/lib/domoscio_rails/utils/recommendation_util.rb

@@ -1,7 +1,5 @@
 module DomoscioRails
   class RecommendationUtil < Resource
-
     include DomoscioRails::HTTPCalls::Util
-
   end
-end
+end

data/lib/domoscio_rails/utils/review_util.rb

@@ -1,7 +1,5 @@
 module DomoscioRails
   class ReviewUtil < Resource
-
     include DomoscioRails::HTTPCalls::Util
-
   end
-end
+end

data/lib/domoscio_rails/version.rb

@@ -1,3 +1,3 @@
 module DomoscioRails
-  VERSION = "0.3.9"
-end
+  VERSION = '0.4.0'.freeze
+end

data/lib/domoscio_rails.rb

@@ -1,4 +1,3 @@
-
 require 'net/https'
 require 'cgi/util'
 require 'multi_json'
@@ -10,40 +9,39 @@ require 'domoscio_rails/authorization_token'
 # resources
 require 'domoscio_rails/http_calls'
 require 'domoscio_rails/resource'
-require 'domoscio_rails/data/content.rb'
-require 'domoscio_rails/data/event.rb'
-require 'domoscio_rails/data/instance.rb'
-require 'domoscio_rails/data/recommendation.rb'
-require 'domoscio_rails/data/learning_session.rb'
-require 'domoscio_rails/data/student.rb'
-require 'domoscio_rails/knowledge/knowledge_edge.rb'
-require 'domoscio_rails/knowledge/knowledge_graph.rb'
-require 'domoscio_rails/knowledge/knowledge_node_content.rb'
-require 'domoscio_rails/knowledge/knowledge_node_student.rb'
-require 'domoscio_rails/knowledge/knowledge_node.rb'
-require 'domoscio_rails/objective/objective_knowledge_node_student.rb'
-require 'domoscio_rails/objective/objective_knowledge_node.rb'
-require 'domoscio_rails/objective/objective_student.rb'
-require 'domoscio_rails/objective/objective.rb'
-require 'domoscio_rails/tag/tag_edge.rb'
-require 'domoscio_rails/tag/tag_set.rb'
-require 'domoscio_rails/tag/tag.rb'
-require 'domoscio_rails/tag/tagging.rb'
-require 'domoscio_rails/utils/gameplay_util.rb'
-require 'domoscio_rails/utils/recommendation_util.rb'
-require 'domoscio_rails/utils/review_util.rb'
+require 'domoscio_rails/data/content'
+require 'domoscio_rails/data/event'
+require 'domoscio_rails/data/instance'
+require 'domoscio_rails/data/recommendation'
+require 'domoscio_rails/data/learning_session'
+require 'domoscio_rails/data/student'
+require 'domoscio_rails/knowledge/knowledge_edge'
+require 'domoscio_rails/knowledge/knowledge_graph'
+require 'domoscio_rails/knowledge/knowledge_node_content'
+require 'domoscio_rails/knowledge/knowledge_node_student'
+require 'domoscio_rails/knowledge/knowledge_node'
+require 'domoscio_rails/objective/objective_knowledge_node_student'
+require 'domoscio_rails/objective/objective_knowledge_node'
+require 'domoscio_rails/objective/objective_student'
+require 'domoscio_rails/objective/objective'
+require 'domoscio_rails/tag/tag_edge'
+require 'domoscio_rails/tag/tag_set'
+require 'domoscio_rails/tag/tag'
+require 'domoscio_rails/tag/tagging'
+require 'domoscio_rails/utils/gameplay_util'
+require 'domoscio_rails/utils/recommendation_util'
+require 'domoscio_rails/utils/review_util'
 
 module DomoscioRails
+  # Configurable attributes and default values
   class Configuration
-    attr_accessor :root_url, :client_id, :client_passphrase, :temp_dir, :version
-
-    # Refers to AdaptiveEngine Version
-    def version
-      @version ||= 2
-    end
+    attr_accessor :client_id, :client_passphrase, :temp_dir, :version,
+                  :root_url, :file_storage, :access_token, :refresh_token
 
-    def root_url
-      @root_url ||= ""
+    def initialize
+      @version = 2
+      @root_url = ''
+      @file_storage ||= true
     end
   end
 
@@ -56,7 +54,7 @@ module DomoscioRails
     yield configuration
   end
 
-  def self.api_uri(url='')
+  def self.api_uri(url = '')
     URI(configuration.root_url + url)
   end
 
@@ -72,75 +70,77 @@ module DomoscioRails
   # Raises DomoscioRails::ProcessingError on Internal Error
   #
   def self.request(method, url, params={})
-
     store_tokens, headers = request_headers
-    params.merge!({'per_page': 10000}) unless params[:per_page]
+    params.merge!({ 'per_page': 1000 }) unless params[:per_page]
     uri = api_uri(url)
-
     response = DomoscioRails.send_request(uri, method, params, headers)
-    return response if response.kind_of? DomoscioRails::ProcessingError
+    return response if response.is_a? DomoscioRails::ProcessingError
 
     begin
       raise_http_failure(uri, response, params)
       data = DomoscioRails::JSON.load(response.body.nil? ? '' : response.body)
-      DomoscioRails::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
+        DomoscioRails::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
 
     if response['Total']
       pagetotal = (response['Total'].to_i / response['Per-Page'].to_f).ceil
-      for j in 2..pagetotal
-        response = DomoscioRails.send_request(uri, method, params.merge({page: j}), headers)
-        return response if response.kind_of? DomoscioRails::ProcessingError
+      (2..pagetotal).each do |j|
+        response = DomoscioRails.send_request(uri, method, params.merge({ page: j }), headers)
+        return response if response.is_a? DomoscioRails::ProcessingError
+
         begin
           raise_http_failure(uri, response, params)
           body = DomoscioRails::JSON.load(response.body.nil? ? '' : response.body)
           data += body
           data.flatten!
-        rescue MultiJson::LoadError => exception
-          return ProcessingError.new(uri, 500, exception, response.body, params)
-        rescue ResponseError => exception
-          return exception
+        rescue MultiJson::LoadError => e
+          return ProcessingError.new(uri, 500, e, response.body, params)
+        rescue ResponseError => e
+          return e
         end
       end
     end
     data
   end
 
-  private
-
-  # This function catches usual Http errors during calls
+  # This function catches usual Http errors during callsheaders
   #
   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, Errno::ECONNREFUSED, Errno::ECONNRESET, EOFError, Net::HTTPBadResponse, Net::HTTPHeaderSyntaxError, Net::ProtocolError => exception
-      ProcessingError.new(uri, 500, exception, response)
-    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)
   end
 
   # This helper will check the response status and build the correcponding DomoscioRails::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: 'AdaptiveEngine not available'}}, {}, params)
-      else
-        raise ResponseError.new(uri, response.code.to_i, DomoscioRails::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,
+      DomoscioRails::JSON.load((response.body.nil? ? '' : response.body), symbolize_keys: true),
+      response.body, params
+    )
   end
 
   # Actual HTTP call is performed here
   #
   def self.perform_call(uri, method, params, headers)
     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 = Net::HTTP.const_get(method.capitalize).new(uri.request_uri, headers)
       req.body = DomoscioRails::JSON.dump(params)
       http.request req
     end
@@ -148,26 +148,29 @@ module DomoscioRails
 
   # 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)
-    DomoscioRails::AuthorizationToken::Manager.storage.store({access_token: response['Accesstoken'], refresh_token: response['Refreshtoken']})
+    DomoscioRails::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: DomoscioRails::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
@@ -176,25 +179,23 @@ module DomoscioRails
   # will return the processed headers and a token store flag
   #
   def self.request_headers
-    begin
-      auth_token = DomoscioRails::AuthorizationToken::Manager.get_token
-      if auth_token && auth_token[:access_token] && auth_token[:refresh_token]
-        [false, send_current_tokens(auth_token)]
-      else
-        [true, request_new_tokens]
-      end
-    rescue SyntaxError, StandardError
+    auth_token = DomoscioRails::AuthorizationToken::Manager.token
+    if auth_token && auth_token[:access_token] && auth_token[:refresh_token]
+      [false, send_current_tokens(auth_token)]
+    else
       [true, request_new_tokens]
     end
+  rescue SyntaxError, StandardError
+    [true, request_new_tokens]
   end
 
   # If stored token successfully loaded we build the header with them
   #
   def self.send_current_tokens(auth_token)
     {
-      'user_agent' => "#{DomoscioRails.user_agent}",
-      'AccessToken' => "#{auth_token[:access_token]}",
-      'RefreshToken' => "#{auth_token[:refresh_token]}",
+      'user_agent' => DomoscioRails.user_agent.to_s,
+      'AccessToken' => auth_token[:access_token].to_s,
+      'RefreshToken' => auth_token[:refresh_token].to_s,
       'Content-Type' => 'application/json'
     }
   end
@@ -202,9 +203,9 @@ module DomoscioRails
   # 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' => "#{DomoscioRails.user_agent}",
+      'user_agent' => DomoscioRails.user_agent.to_s,
       'Authorization' => "Token token=#{DomoscioRails.configuration.client_passphrase}",
       'Content-Type' => 'application/json'
     }
   end
-end
+end

metadata

@@ -1,29 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: domoscio_rails
 version: !ruby/object:Gem::Version
-  version: 0.3.9
+  version: 0.4.0
 platform: ruby
 authors:
 - Benoit Praly
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-12-14 00:00:00.000000000 Z
+date: 2022-01-25 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 API.
 email:
 - benoit.praly@domoscio.com
@@ -76,15 +90,15 @@ 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.2.22
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
-summary: Summary of DomoscioRails.
+summary: Summary of DomoscioRailspec.
 test_files: []