domoscio_viz 0.2.3 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 050c44f613da493c3ca25fd68c8ba142362bf42f461cb20e39934a88688bc53f
-  data.tar.gz: 83f2f4df4edcb932d70fd9a52b993369a3e758c2ec4f9d1d43c0da9ee458bcbd
+  metadata.gz: 887c55dd8caa52f79ff7cdb18b53f7ed134b538f0d3783d5f4826bbe99efe0db
+  data.tar.gz: 6229db276d697d67b482d5c6bedf8bf0cd5a236ce3336f73f5187ab4d995af85
 SHA512:
-  metadata.gz: 7ad6e1ebc52711ef09bcaf1fbe20da7ae480750829b967702094963f63db1c7679206db7333533d02157235c5056bd8876a5cff76618bac08e584209893d5912
-  data.tar.gz: e9d0ad596fe0f9c4f8e5411d7a41e962ece08f5c19a7c6ee9b568f24008b76a4d1484914a745aa6d39fad62c4d3e270367c5b62a5da15d64e1f3d042f7c48d14
+  metadata.gz: 665710baedb373e38e2cfb5a821f95ce52d5ba80d16de6d56127a8cc90ad1b80cbd9391ae45a377f679f6316bff32623f99e5c1598c1bd4122207d6dae616c4e
+  data.tar.gz: e02a53ce48feffc03b70377f129339dd3e4c7ad43f0b776be02baa67d9d8741ec9fc2544ba19e762d36576f8d2bdd1f2a7eb2a433bb9d69cbfce5fb704ffae79

data/lib/domoscio_viz.rb

@@ -32,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"
@@ -55,20 +55,16 @@ 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)
     return res if res.kind_of? DomoscioViz::ProcessingError
-     # decode json data
-     begin
+    begin
+      raise_http_failure(uri, res, params)
       data = DomoscioViz::JSON.load(res.body.nil? ? '' : res.body)
-      raise ResponseError.new(uri, res.code.to_i, data, res.body, params) unless res.kind_of? Net::HTTPSuccess
-      unless (res.kind_of? Net::HTTPClientError) || (res.kind_of? Net::HTTPServerError)
-        DomoscioViz::AuthorizationToken::Manager.storage.store({access_token: res['Accesstoken'], refresh_token: res['Refreshtoken']})
-      end
+      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
@@ -86,12 +82,23 @@ module DomoscioViz
         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.body, params)
+      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
     {

data/lib/domoscio_viz/errors.rb

@@ -4,20 +4,20 @@ module DomoscioViz
   # Currently only single subclass used.
   class Error < StandardError
   end
-  # ErrorMessage from VizEngine 
+  # ResponseError from VizEngine
   class ResponseError < Error
     attr_reader :request_url, :code, :details, :body, :request_params
-    def initialize(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.dig(:error, :message) || @details; end
+    def message; @details.is_a?(Hash) ? @details.dig(:error, :message) : @details; end
   end
 
   # ProcessingError from Domoscio_viz
   class ProcessingError < Error
     attr_reader :request_url, :code, :details, :body, :request_params
-    def initialize(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

data/lib/domoscio_viz/generators/install_generator.rb

@@ -4,7 +4,7 @@ module DomoscioViz
     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/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/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: domoscio_viz
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.4
 platform: ruby
 authors:
 - Benoit Praly
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-12-03 00:00:00.000000000 Z
+date: 2021-01-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -63,7 +63,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Summary of DomoscioViz.