openpix-ruby_sdk 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4f2da0e8d196d0f8de84bbb882297bf72d8db63851d8f77af14870af9751b71e
-  data.tar.gz: 651770374930d1e49a2c49ef0b05ac83a6a8c138f071c5cd20a1966d86e77de2
+  metadata.gz: 3310c2caec359545c07a46c319954794ccff9ef89a19f34c8726f1440433b7af
+  data.tar.gz: ebf2e933e28d2e8f6ffa79e9b73923ca34ad8317e121f5d065988da43acc5fc9
 SHA512:
-  metadata.gz: 4df6938509465c2701d86954f42b5270c6b0dcff8a40a80ee7ecd21fb8a1201d6a22630991416b4bd02396ad82094ecce1870bc2b7ee6af2ec99679c042b7d97
-  data.tar.gz: c84ca77a7e65899cc0c3d7a1343eedafee16e64a06867d8ec7f5d58610284abd5de25f8d23f5da11df79fdcf89d30dd4f059009ad036d51b56fe53c7824eca9f
+  metadata.gz: 652af0e17c4fc7de2d6b613ad7adcc91cee42ba70a71353bd9bc934355689319c3a76cecf17147d68c81e4d943971630fe03ad1102a01d8b7c3c1920f1068e23
+  data.tar.gz: 2cb979e8a7c5720db959873e58c116fc64abea665104239fd6c46a06491c1083e97399e112d6e9fbaa684ca922dd53a5984f4abddbd2b8f855338f5b384f2e9c

data/CHANGELOG.md

@@ -1,5 +1,12 @@
 ## [Unreleased]
 
+## [1.1.1](https://github.com/Open-Pix/ruby-sdk/compare/v1.1.0...v1.1.1) (2023-07-04)
+
+
+### Bug Fixes
+
+* Fix not authorized response parsing ([#24](https://github.com/Open-Pix/ruby-sdk/issues/24)) ([00f508d](https://github.com/Open-Pix/ruby-sdk/commit/00f508d4463b25b774ca4c0449c3cd050fdad549))
+
 ## [1.1.0](https://github.com/Open-Pix/ruby-sdk/compare/v1.0.0...v1.1.0) (2023-06-25)
 
 

data/README.md

@@ -22,7 +22,7 @@ Main class `openpix/ruby_sdk/client` is your entrypoint to the endpoints.
 ```ruby
 require 'openpix/ruby_sdk'
 
-# Your AppID from https://app.woovi.com/home/applications/tab/list
+# Your AppID from https://app.openpix.com/home/applications/tab/list
 app_id = 'xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx'
 
 client = Openpix::RubySdk::Client.new(app_id)

data/lib/openpix/ruby_sdk/api_response.rb

@@ -4,19 +4,38 @@ module Openpix
   module RubySdk
     # An Object representing the response from a call to Woovi API
     class ApiResponse
-      attr_reader :success, :resource_response, :pagination_meta, :error_response, :status
+      attr_reader :success, :body, :status
 
-      def initialize(status:, resource_response: nil, error_response: nil, pagination_meta: {})
+      def initialize(status:, body:, single_resource: nil, collection_resource: nil)
         @success = status == 200
         @status = status
-        @resource_response = resource_response
-        @pagination_meta = pagination_meta
-        @error_response = error_response
+        @body = body
+        @single_resource = single_resource
+        @collection_resource = collection_resource
       end
 
       def success?
         success
       end
+
+      def resource_response
+        return @body[@single_resource] if @single_resource
+
+        @body[@collection_resource]
+      end
+
+      def error_response
+        return @body['error'] if @body['error']
+        return @body['errors'].first['message'] if @body['errors'] && !@body['errors'].empty?
+
+        ''
+      end
+
+      def pagination_meta
+        return @body['pageInfo'] if @body['pageInfo']
+
+        {}
+      end
     end
   end
 end

data/lib/openpix/ruby_sdk/resources/resource.rb

@@ -58,6 +58,10 @@ module Openpix
           to_url
         end
 
+        def to_collection_resource
+          to_url.pluralize
+        end
+
         def create_attributes
           raise NotImplementedError.new(method: __method__)
         end
@@ -81,66 +85,69 @@ module Openpix
 
           Openpix::RubySdk::ApiResponse.new(
             status: response.status,
-            resource_response: response.body[to_single_resource],
-            error_response: response.body['error']
+            body: response.body,
+            single_resource: to_single_resource
           )
         end
 
         def save!(extra_headers: {}, return_existing: false)
           response = post_request(extra_headers, return_existing)
+          api_response = Openpix::RubySdk::ApiResponse.new(
+            status: response.status,
+            body: response.body,
+            single_resource: to_single_resource
+          )
 
           if response.status != 200
             raise(
               RequestError,
-              "Error while saving, API response: #{response.body['error']}, status: #{response.status}"
+              "Error while saving, API response: #{api_response.error_response}, status: #{api_response.status}"
             )
           end
 
-          Openpix::RubySdk::ApiResponse.new(
-            status: response.status,
-            resource_response: response.body[to_single_resource]
-          )
+          api_response
         end
 
         def fetch(skip: nil, limit: nil, extra_headers: {}, params: {})
           set_pagination(skip, limit)
 
           response = get_request(extra_headers: extra_headers, params: @pagination_params.merge(params))
+          api_response = Openpix::RubySdk::ApiResponse.new(
+            status: response.status,
+            body: response.body,
+            collection_resource: to_collection_resource
+          )
 
-          @fetched = response.status == 200
+          @fetched = api_response.status == 200
 
-          set_pagination_meta(response.body['pageInfo']) if @fetched
+          set_pagination_meta(api_response.pagination_meta) if @fetched
           @last_fetched_params = params if @fetched && !params.empty?
 
-          Openpix::RubySdk::ApiResponse.new(
-            status: response.status,
-            resource_response: response.body[to_url.pluralize],
-            pagination_meta: response.body['pageInfo'],
-            error_response: response.body['error']
-          )
+          api_response
         end
 
         def fetch!(skip: nil, limit: nil, extra_headers: {}, params: {})
           set_pagination(skip, limit)
 
           response = get_request(extra_headers: extra_headers, params: @pagination_params.merge(params))
+          api_response = Openpix::RubySdk::ApiResponse.new(
+            status: response.status,
+            body: response.body,
+            collection_resource: to_collection_resource
+          )
 
           if response.status != 200
             raise(
               RequestError,
-              "Error while fetching, API response: #{response.body['error']}, status: #{response.status}"
+              "Error while fetching, API response: #{api_response.error_response}, status: #{api_response.status}"
             )
           end
 
           @fetched = true
           @last_fetched_params = params unless params.empty?
-          set_pagination_meta(response.body['pageInfo'])
+          set_pagination_meta(api_response.pagination_meta)
 
-          Openpix::RubySdk::ApiResponse.new(
-            status: response.status,
-            pagination_meta: response.body['pageInfo'],
-            resource_response: response.body[to_url.pluralize]
-          )
+          api_response
         end
 
         def fetch_next_page!(extra_headers: {})
@@ -156,25 +163,27 @@ module Openpix
 
           Openpix::RubySdk::ApiResponse.new(
             status: response.status,
-            resource_response: response.body[to_single_resource],
-            error_response: response.body['error']
+            body: response.body,
+            single_resource: to_single_resource
           )
         end
 
         def find!(id:, extra_headers: {})
           response = get_request(url: encoded_url(id), extra_headers: extra_headers)
+          api_response = Openpix::RubySdk::ApiResponse.new(
+            status: response.status,
+            body: response.body,
+            single_resource: to_single_resource
+          )
 
           if response.status != 200
             raise(
               RequestError,
-              "Error while getting #{to_single_resource} of id = #{id}, API response: #{response.body['error']}, status: #{response.status}"
+              "Error while getting #{to_single_resource} of id = #{id}, API response: #{api_response.error_response}, status: #{api_response.status}"
             )
           end
 
-          Openpix::RubySdk::ApiResponse.new(
-            status: response.status,
-            resource_response: response.body[to_single_resource]
-          )
+          api_response
         end
 
         def destroy(id:, extra_headers: {})
@@ -182,23 +191,27 @@ module Openpix
 
           Openpix::RubySdk::ApiResponse.new(
             status: response.status,
-            error_response: response.body['error']
+            body: response.body,
+            single_resource: to_single_resource
           )
         end
 
         def destroy!(id:, extra_headers: {})
           response = delete_request(url: encoded_url(id), extra_headers: extra_headers)
+          api_response = Openpix::RubySdk::ApiResponse.new(
+            status: response.status,
+            body: response.body,
+            single_resource: to_single_resource
+          )
 
           if response.status != 200
             raise(
               RequestError,
-              "Error while deleting #{to_url} of id = #{id}, API response: #{response.body['error']}, status: #{response.status}"
+              "Error while deleting #{to_url} of id = #{id}, API response: #{api_response.error_response}, status: #{api_response.status}"
             )
           end
 
-          Openpix::RubySdk::ApiResponse.new(
-            status: response.status
-          )
+          api_response
         end
 
         private
@@ -272,26 +285,29 @@ module Openpix
           end
 
           calculate_pagination_params(page_orientation)
+
           request_params = if @last_fetched_params.nil?
                              @pagination_params
                            else
                              @pagination_params.merge(@last_fetched_params)
                            end
           response = get_request(extra_headers: extra_headers, params: request_params)
+          api_response = Openpix::RubySdk::ApiResponse.new(
+            status: response.status,
+            body: response.body,
+            collection_resource: to_collection_resource
+          )
 
           if response.status != 200
             raise(
               RequestError,
-              "Error while fetching #{page_orientation} page, API response: #{response.body['error']}, status: #{response.status}"
+              "Error while fetching #{page_orientation} page, API response: #{api_response.error_response}, status: #{api_response.status}"
             )
           end
 
-          set_pagination_meta(response.body['pageInfo'])
-          Openpix::RubySdk::ApiResponse.new(
-            status: response.status,
-            pagination_meta: response.body['pageInfo'],
-            resource_response: response.body[to_url.pluralize]
-          )
+          set_pagination_meta(api_response.pagination_meta)
+
+          api_response
         end
 
         def encoded_url(id)

data/lib/openpix/ruby_sdk/version.rb

@@ -2,6 +2,6 @@
 
 module Openpix
   module RubySdk
-    VERSION = '1.1.0'
+    VERSION = '1.1.1'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: openpix-ruby_sdk
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Erick Takeshi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-06-25 00:00:00.000000000 Z
+date: 2023-07-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport