domoscio_viz 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '03468c791eacd5b3f47a390530f79cf17e5958f62b4c10e4dbd6ae4f7142210e'
-  data.tar.gz: 97dd49337711f35d774db1b9958524dc6ac9a20f77cda5173723cce4e79061f3
+  metadata.gz: e5a6fd426881a74f402e7f48be71c28d4890f47c140958aa72f11cfb708f24b7
+  data.tar.gz: f3674ce6135b689b8269841e8a4b08b43c8bf195ce0d1f10d203a97b0497c493
 SHA512:
-  metadata.gz: 6f96faeb12b74a5efe1d32e9e28a6d50763c05c969239114127c4cff14b45da9a6be097bd3596a2aa1976f3ab5601b916891fd423b68d5c2185a3ca4bb997b9f
-  data.tar.gz: 60fce846d350aa913453f5c35de699a26e7bae9cf7379d56b968bee6b1ae433ccf7bc065eb612a450af028738a8d81cca75f7c5e002906e953b5a681bc882931
+  metadata.gz: 0ddeeab6cb32e8499168181ba3e85dadc112b3a097c60a16c70308cc00f7f3b336d8ad9e6f8f01b615655ae72d81d041369a1b9beb5b3426b9bad9d8f4b7d18e
+  data.tar.gz: d0d29228f1ae5c0e4ffc6ba1849bf23af7140e1124534da5b08c2b907f5e746acc0c7f1e56e088f122fb2e154784e68f59044f0d3e53ee93ead40354ac90c559

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'
@@ -65,26 +62,32 @@ module DomoscioViz
     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
       data = DomoscioViz::JSON.load(res.body.nil? ? '' : res.body)
+      raise ResponseError.new(uri, res.code.to_i, data) 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
-      data = {}
+    rescue MultiJson::LoadError => exception
+      return ProcessingError.new(uri, 500, exception)
+    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)
     end
   end
 
@@ -92,7 +95,6 @@ module DomoscioViz
 
   def self.user_agent
     @uname ||= get_uname
-
     {
       bindings_version: DomoscioViz::VERSION,
       lang: 'ruby',
@@ -110,7 +112,6 @@ module DomoscioViz
 
   def self.request_headers
     auth_token = DomoscioViz::AuthorizationToken::Manager.get_token
-
     if !auth_token.is_a? String
       headers = {
         'user_agent' => "#{DomoscioViz.user_agent}",
@@ -137,5 +138,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
       super(message) if message
     end
-
-    def message; @details['Message']; end
-    def type;    @details['Type']; end
-    def errors;  @details['errors']; end
+    def message; @details.dig(:error, :message) || @details; end
+  end
+  # Processing Error from DomoscioViz
+  class ProcessingError < Error
+    attr_reader :request_url, :code, :details
+    def initialize(request_url, code, details)
+      @request_url, @code, @details = request_url, code, details
+      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/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.2.0"
-end
+  VERSION = "0.2.1"
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: domoscio_viz
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Benoit Praly
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-11-04 00:00:00.000000000 Z
+date: 2020-11-27 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

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