domoscio_viz 0.1.1.4 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4b56d8068cc89b1fd70f1d0d085e960307ce7038261c9a2640fc2033286f7b49
-  data.tar.gz: d64091ea450a17c5500f13caa3b48618c12f8cdf7e135eac6912fff31254367e
+  metadata.gz: 887c55dd8caa52f79ff7cdb18b53f7ed134b538f0d3783d5f4826bbe99efe0db
+  data.tar.gz: 6229db276d697d67b482d5c6bedf8bf0cd5a236ce3336f73f5187ab4d995af85
 SHA512:
-  metadata.gz: 5fd0f66253608031e7ccb578492430d9b4d0febc8b8c9fff50f8cae52a910f3ae77d81acc53b3b6c21e6deedbb07a81a677b1855bc255989e046084370fe817c
-  data.tar.gz: ecf4b4b43f307db1d29950ecadbbccc25ebd3cec5ad2e0a310afe6d1aa5200d7c1ce7bfc57b15f3f604f0cb89882192dc2339a2b65bfeeda1ef48ee35e30983f
+  metadata.gz: 665710baedb373e38e2cfb5a821f95ce52d5ba80d16de6d56127a8cc90ad1b80cbd9391ae45a377f679f6316bff32623f99e5c1598c1bd4122207d6dae616c4e
+  data.tar.gz: e02a53ce48feffc03b70377f129339dd3e4c7ad43f0b776be02baa67d9d8741ec9fc2544ba19e762d36576f8d2bdd1f2a7eb2a433bb9d69cbfce5fb704ffae79

data/lib/domoscio_viz.rb

@@ -2,16 +2,13 @@
 require 'net/https'
 require 'cgi/util'
 require 'multi_json'
-
 # helpers
 require 'domoscio_viz/version'
 require 'domoscio_viz/json'
 require 'domoscio_viz/errors'
 require 'domoscio_viz/authorization_token'
-
 # generators
 require 'domoscio_viz/generators/install_generator'
-
 # resources
 require 'domoscio_viz/http_calls'
 require 'domoscio_viz/resource'
@@ -35,9 +32,9 @@ module DomoscioViz
     def root_url
       if @preproduction == true
         if @test == true
-          @root_url || "https://domoscio-viz-engine-preprod.azurewebsites.net"
+          @root_url || "https://domoscio-viz-engine-v2-preprod.azurewebsites.net"
         else
-          @root_url || "https://domoscio-viz-engine-v2.azurewebsites.net"
+          @root_url || "https://visualization-engine.domoscio.com"
         end
       else
         @root_url || "http://localhost:3002"
@@ -58,40 +55,52 @@ module DomoscioViz
     URI(configuration.root_url + url)
   end
 
-  #
   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 = DomoscioViz.send_request(uri, method, params, headers, before_request_proc)
-
-    # decode json data
+    return res if res.kind_of? DomoscioViz::ProcessingError
     begin
+      raise_http_failure(uri, res, params)
       data = DomoscioViz::JSON.load(res.body.nil? ? '' : res.body)
-      DomoscioViz::AuthorizationToken::Manager.storage.store({client_id: res['ClientID'], client_passphrase: res['ClientPassphrase']})
-    rescue MultiJson::LoadError
-      data = {}
+      DomoscioViz::AuthorizationToken::Manager.storage.store({access_token: res['Accesstoken'], refresh_token: res['Refreshtoken']})
+    rescue MultiJson::LoadError => exception
+      return ProcessingError.new(uri, 500, exception, res.body, params)
+    rescue ResponseError => exception
+      return exception
     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 = DomoscioViz::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, HTTP::ConnectionError, Errno::ECONNREFUSED, Errno::ECONNRESET, EOFError, Net::HTTPBadResponse, Net::HTTPHeaderSyntaxError, Net::ProtocolError => exception
+      ProcessingError.new(uri, 500, exception, res, params)
     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: 'VisualizationEngine 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: DomoscioViz::VERSION,
       lang: 'ruby',
@@ -108,12 +117,23 @@ module DomoscioViz
   end
 
   def self.request_headers
-    headers = {
-      'user_agent' => "DomoscioViz RubyBindings/#{DomoscioViz::VERSION}",
-      'ClientID' => "#{DomoscioViz.configuration.client_id}",
-      'ClientPassphrase' => "#{DomoscioViz.configuration.client_passphrase}",
-      'Content-Type' => 'application/json'
-    }
+    auth_token = DomoscioViz::AuthorizationToken::Manager.get_token
+    if !auth_token.is_a? String
+      headers = {
+        'user_agent' => "#{DomoscioViz.user_agent}",
+        'ClientId' => "#{DomoscioViz.configuration.client_id}",
+        'AccessToken' => "#{auth_token[:access_token]}",
+        'RefreshToken' => "#{auth_token[:refresh_token]}",
+        'Content-Type' => 'application/json'
+      }
+    else
+      headers = {
+        'user_agent' => "#{DomoscioViz.user_agent}",
+        'ClientId' => "#{DomoscioViz.configuration.client_id}",
+        'Authorization' => "Token token=#{DomoscioViz.configuration.client_passphrase}",
+        'Content-Type' => 'application/json'
+      }
+    end
     headers
   end
 
@@ -124,5 +144,4 @@ module DomoscioViz
       c.temp_dir = File.expand_path('../tmp', __FILE__)
       FileUtils.mkdir_p(c.temp_dir) unless File.directory?(c.temp_dir)
   end
-
-end
+end

data/lib/domoscio_viz/authorization_token.rb

@@ -1,6 +1,5 @@
 module DomoscioViz
   module AuthorizationToken
-
     class Manager
 
       class << self

data/lib/domoscio_viz/errors.rb

@@ -1,24 +1,26 @@
 module DomoscioViz
-
   # 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.
+  # ResponseError from VizEngine
   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 Domoscio_viz
+  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_viz/generators/install_generator.rb

@@ -1,12 +1,10 @@
 require 'rails/generators'
-
 module DomoscioViz
   class InstallGenerator < ::Rails::Generators::Base
     source_root File.expand_path('../templates', __FILE__)
     desc "Generate config file for DomoscioViz configuration"
-
     def install
-        copy_file "install.rb", "config/initializers/domoscio_viz.rb"
+      copy_file "install.rb", "config/initializers/domoscio_viz.rb"
     end
   end
 end

data/lib/domoscio_viz/generators/templates/install.rb

@@ -6,8 +6,6 @@ DomoscioViz.configure do |c|
     end
     c.client_id = ENV['DOMOSCIO_ID']
     c.client_passphrase = ENV['DOMOSCIO_PASSWORD']
-
     c.temp_dir = File.expand_path('../tmp', __FILE__)
-
     FileUtils.mkdir_p(c.temp_dir) unless File.directory?(c.temp_dir)
 end

data/lib/domoscio_viz/http_calls.rb

@@ -2,15 +2,10 @@ module DomoscioViz
   module HTTPCalls
     module GetUrl
       module ClassMethods
-        # In order to catch current SocketsTimeoutError that seem to appear when the VizEngine stays Idle for too long
-        # Perform the request a second time if it fails the fisrt time
         def get_url(util_name = nil, params = {})
-          response = DomoscioViz.request(:post, url(util_name), params)
-          response = DomoscioViz.request(:post, url(util_name), params) unless response && response.is_a?(Hash) && response['url'] && response['success'] == true
-          response
+          DomoscioViz.request(:post, url(util_name), params)
         end
       end
-
       def self.included(base)
         base.extend(ClassMethods)
       end      

data/lib/domoscio_viz/resource.rb

@@ -21,4 +21,4 @@ module DomoscioViz
       end
     end
   end
-end
+end

data/lib/domoscio_viz/version.rb

@@ -1,3 +1,3 @@
 module DomoscioViz
-  VERSION = "0.1.1.4"
-end
+  VERSION = "0.2.4"
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: domoscio_viz
 version: !ruby/object:Gem::Version
-  version: 0.1.1.4
+  version: 0.2.4
 platform: ruby
 authors:
 - Benoit Praly
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-10-17 00:00:00.000000000 Z
+date: 2021-01-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -44,7 +44,6 @@ files:
 - lib/domoscio_viz/json.rb
 - lib/domoscio_viz/resource.rb
 - lib/domoscio_viz/version.rb
-- lib/tasks/domoscio_rails_tasks.rake
 homepage: http://www.domoscio.com
 licenses:
 - MIT
@@ -64,7 +63,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.8
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Summary of DomoscioViz.

data/lib/tasks/domoscio_rails_tasks.rake

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