domoscio_rails 0.3.2 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7de15318619ac60add7c2ebeb2157708e3a5df0256f3dcb0773631b4dd7dc256
-  data.tar.gz: 149d4a92db05a3c93feb9cbc5121d3b56773957e36585643ad477908ada0f6c1
+  metadata.gz: b0a7e03020d78226e29f7a2930c43cfb2fccbb4389b9d559b3bae047be4dbdf5
+  data.tar.gz: 63a5cfb591576eaa115737527a3f99f4d8140ae5eeb51403370bf970a0d7a438
 SHA512:
-  metadata.gz: 76d276424eb7a5863cd5f657e85e6d37a550cb04dece402c84a3965b1ab2b0254d7a2a17361ada6e60ff01cb5273f8d043d01aba95992fd5587cc2af9841c435
-  data.tar.gz: 7607882ea4f08fef22593bdc691f770dc6c791cf3034a416b09473882c73762b70e3b78169f11f931c953f64adaf8ecab54f255b643e0382e6ff472274f2d32a
+  metadata.gz: 809d75c75785aa76824e42caaed95c0ad5e4afabd07d06480ddec251d7813fdeb1383c259558ba87745b67aaf88bd1b6ed27784a70547b495c1b271893e1a3f6
+  data.tar.gz: ecebc9a43d22e8d835387a7632d0dedc3b29b156e4b48dfbb32666556eb87b202a5e23f70be29481d899013145d108414344d33d32a137cd56b92758cf8c7128

data/lib/domoscio_rails.rb

@@ -103,15 +103,14 @@ module DomoscioRails
   #
   def self.request(method, url, params={}, filters={}, headers = request_headers, before_request_proc = nil)
     return false if @disabled
+    #sets a default page size of 50
+    params.merge!({'per_page': 50}) unless params['per_page']
     uri = api_uri(url)
     uri.query = URI.encode_www_form(filters) unless filters.empty?
     res = DomoscioRails.send_request(uri, method, params, headers, before_request_proc)
     return res if res.kind_of? DomoscioRails::ProcessingError
     begin
-      unless res.kind_of? Net::HTTPSuccess
-        data = DomoscioRails::JSON.load((res.body.nil? ? '' : res.body), :symbolize_keys => true) 
-        raise ResponseError.new(uri, res.code.to_i, data, res.body, params)
-      end
+      raise_http_failure(uri, res, params)
       data = DomoscioRails::JSON.load(res.body.nil? ? '' : res.body)
       DomoscioRails::AuthorizationToken::Manager.storage.store({access_token: res['Accesstoken'], refresh_token: res['Refreshtoken']})
     rescue MultiJson::LoadError => exception
@@ -126,10 +125,7 @@ module DomoscioRails
         res = DomoscioRails.send_request(uri, method, params.merge({page: j}), headers, before_request_proc)
         return res if res.kind_of? DomoscioRails::ProcessingError
         begin
-          unless res.kind_of? Net::HTTPSuccess
-            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
+          raise_http_failure(uri, res, params)
           body = DomoscioRails::JSON.load(res.body.nil? ? '' : res.body)
           data += body
           data.flatten!
@@ -152,12 +148,23 @@ module DomoscioRails
         http.request req
       end
     rescue Timeout::Error, Errno::EINVAL, Errno::ECONNREFUSED, Errno::ECONNRESET, EOFError, Net::HTTPBadResponse, Net::HTTPHeaderSyntaxError, Net::ProtocolError => exception
-      ProcessingError.new(uri, 500, exception, res.body)
+      ProcessingError.new(uri, 500, exception, res)
     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: 'AdaptiveEngine 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
     {
@@ -177,7 +184,6 @@ module DomoscioRails
 
   def self.request_headers
     auth_token = DomoscioRails::AuthorizationToken::Manager.get_token
-
     if !auth_token.is_a? String
       headers = {
         'user_agent' => "#{DomoscioRails.user_agent}",

data/lib/domoscio_rails/errors.rb

@@ -6,17 +6,17 @@ 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, 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 DomoscioRails
   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_rails/http_calls.rb

@@ -8,7 +8,6 @@ module DomoscioRails
           DomoscioRails.request(:post, url(id), params)
         end
       end
-
       def self.included(base)
         base.extend(ClassMethods)
       end
@@ -20,7 +19,6 @@ module DomoscioRails
           DomoscioRails.request(:put, url(id), params)
         end
       end
-
       def self.included(base)
         base.extend(ClassMethods)
       end
@@ -32,7 +30,6 @@ module DomoscioRails
           DomoscioRails.request(:put, url(nil, nil, true), params)
         end
       end
-
       def self.included(base)
         base.extend(ClassMethods)
       end
@@ -40,19 +37,14 @@ module DomoscioRails
 
     module Fetch
       module ClassMethods
-        def fetch(id_or_filters = nil)
-          id, filters = DomoscioRails::HTTPCalls::Fetch.parse_id_or_filters(id_or_filters)
-          response = DomoscioRails.request(:get, url(id), {}, filters)
+        def fetch(id = nil, params = {})
+          DomoscioRails.request(:get, url(id), params)
         end
       end
 
       def self.included(base)
         base.extend(ClassMethods)
       end
-
-      def self.parse_id_or_filters(id_or_filters = nil)
-        id_or_filters.is_a?(Hash) ? [nil, id_or_filters] : [id_or_filters, {}]
-      end
     end
 
     module Destroy
@@ -81,7 +73,5 @@ module DomoscioRails
         base.extend(ClassMethods)
       end
     end
-
-
   end
 end

data/lib/domoscio_rails/version.rb

@@ -1,3 +1,3 @@
 module DomoscioRails
-  VERSION = "0.3.2"
+  VERSION = "0.3.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: domoscio_rails
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.3
 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
@@ -92,7 +92,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 DomoscioRails.