domoscio_viz 0.1.1.3 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d47506288c283595f9537fd540bf754239d0c95366e582dfe04f17c17a9fba42
-  data.tar.gz: 16c73ed3d9f6ae52dc0cc920920aa196e42104a6d339eb7a5e8127428b1b06e5
+  metadata.gz: 050c44f613da493c3ca25fd68c8ba142362bf42f461cb20e39934a88688bc53f
+  data.tar.gz: 83f2f4df4edcb932d70fd9a52b993369a3e758c2ec4f9d1d43c0da9ee458bcbd
 SHA512:
-  metadata.gz: c3854e49ac043dcc41571d90e84a6b9dd9fe9cee853fae9a3b5aab8cf3f9c3a2d57baf338cdf0ae82adf5f944e2b97bb8041373221486ff8b01adde069e6098a
-  data.tar.gz: 5e38902b0677b7d5ee5224fb32ededaebd6243cafb9cf2d710932ceb1fee8fc1e7b8e5e3ed84a228ef5b67200f00b04064e987afbe76bd52aa52befaaeacfcbd
+  metadata.gz: 7ad6e1ebc52711ef09bcaf1fbe20da7ae480750829b967702094963f63db1c7679206db7333533d02157235c5056bd8876a5cff76618bac08e584209893d5912
+  data.tar.gz: e9d0ad596fe0f9c4f8e5411d7a41e962ece08f5c19a7c6ee9b568f24008b76a4d1484914a745aa6d39fad62c4d3e270367c5b62a5da15d64e1f3d042f7c48d14

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'
@@ -63,27 +60,33 @@ module DomoscioViz
     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
-    begin
+    return res if res.kind_of? DomoscioViz::ProcessingError
+     # decode json data
+     begin
       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 = {}
+      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
+    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.body, params)
     end
   end
 
@@ -91,7 +94,6 @@ module DomoscioViz
 
   def self.user_agent
     @uname ||= get_uname
-
     {
       bindings_version: DomoscioViz::VERSION,
       lang: 'ruby',
@@ -108,12 +110,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 +137,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.
+  # ErrorMessage 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, 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
+  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, 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,10 +1,8 @@
 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"
     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

@@ -1,10 +1,13 @@
 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 = {})
-          DomoscioViz.request(:post, url(util_name), 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
         end
       end
 
@@ -12,6 +15,5 @@ module DomoscioViz
         base.extend(ClassMethods)
       end      
     end
-    
   end
 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.3"
-end
+  VERSION = "0.2.3"
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: domoscio_viz
 version: !ruby/object:Gem::Version
-  version: 0.1.1.3
+  version: 0.2.3
 platform: ruby
 authors:
 - Benoit Praly
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-08-07 00:00:00.000000000 Z
+date: 2020-12-03 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,8 +63,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.0.3
 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