Update method order

Author: Unai Abrisketa

lib/beyond_api/utils.rb

@@ -4,14 +4,23 @@ module BeyondApi
   module Utils
     extend self
 
-    def handle_response(response, status, respond_with_true: false)
-      if status.between?(200, 299)
-        return true if respond_with_true
+    def handle_all_request(url, resource, params = {})
+      paginated_size = BeyondApi.configuration.all_pagination_size
 
-        response = sanitize_response(response)
-        BeyondApi.configuration.object_struct_responses ? to_object_struct(response) : response
+      if params[:paginated] == false
+        result = all_paginated(url, params.merge(page: 0, size: paginated_size))
+
+        (1..result[:page][:total_pages] - 1).each do |page|
+          result[:embedded][resource].concat(all_paginated(url, params.merge(page: page, size: paginated_size))[:embedded][resource])
+        end
+
+        result[:page][:size] = result[:page][:total_elements]
+        result[:page][:total_pages] = 1
+        result[:page][:number] = 0
+
+        result
       else
-        handle_error(response, status)
+        all_paginated(url, params)
       end
     end
 
@@ -21,16 +30,21 @@ def handle_error(response, status)
       BeyondApi.configuration.raise_error_requests ? raise(error) : error
     end
 
-    def to_object_struct(data)
-      if data.is_a? Hash
-        return OpenStruct.new(data.map { |key, val| [key, to_object_struct(val)] }.to_h)
-      elsif data.is_a? Array
-        return data.map { |o| to_object_struct(o) }
+    def handle_response(response, status, respond_with_true: false)
+      if status.between?(200, 299)
+        return true if respond_with_true
+
+        response = sanitize_response(response)
+        BeyondApi.configuration.object_struct_responses ? to_object_struct(response) : response
       else
-        return data
+        handle_error(response, status)
       end
     end
 
+    def sanitize_key(key)
+      key.chars.first == "_" ? key[1..-1] : key
+    end
+
     def sanitize_response(hash)
       {}.tap do |h|
         hash.each do |key, value|
@@ -42,44 +56,30 @@ def sanitize_response(hash)
       end
     end
 
-    def sanitize_key(key)
-      key.chars.first == "_" ? key[1..-1] : key
-    end
-
-    def handle_all_request(url, resource, params = {})
-      paginated_size = BeyondApi.configuration.all_pagination_size
-
-      if params[:paginated] == false
-        result = all_paginated(url, params.merge(page: 0, size: paginated_size))
-
-        (1..result[:page][:total_pages] - 1).each do |page|
-          result[:embedded][resource].concat(all_paginated(url, params.merge(page: page, size: paginated_size))[:embedded][resource])
-        end
-
-        result[:page][:size] = result[:page][:total_elements]
-        result[:page][:total_pages] = 1
-        result[:page][:number] = 0
-
-        result
+    def to_object_struct(data)
+      if data.is_a? Hash
+        return OpenStruct.new(data.map { |key, val| [key, to_object_struct(val)] }.to_h)
+      elsif data.is_a? Array
+        return data.map { |o| to_object_struct(o) }
       else
-        all_paginated(url, params)
+        return data
       end
     end
 
     private
 
+    def all_paginated(url, params = {})
+      response, status = BeyondApi::Request.get(@session, url, params)
+
+      handle_response(response, status)
+    end
+
     def transform(thing)
       case thing
       when Hash; sanitize_response(thing)
       when Array; thing.map { |v| transform(v) }
       else; thing
       end
     end
-
-    def all_paginated(url, params = {})
-      response, status = BeyondApi::Request.get(@session, url, params)
-
-      handle_response(response, status)
-    end
   end
 end