ac 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d91a0bc77820fc802d1e7d4228c334f76dafd306b8d827acb0efb31d5fb22c56
-  data.tar.gz: 3ffde7cc5ca9c2fb1041a95c0e3d4a4b7aae953d23713bb446a2e2b3ddabcbe4
+  metadata.gz: b5a2d1fa03242bf80f9cded8b72e0bdcea929fd4bac989c6c4b151f252befa8b
+  data.tar.gz: 934887067b76c1d18bbeb06d1005ddce8b6e84e14ea1bf148760690a377d8060
 SHA512:
-  metadata.gz: fe75a02d340f7c3e785eebf6fc4a190910b9fb36b8ebf5a90e4d13fbbde36f33e383b49b9d63d6ea6cd7078d1965fe268aab609b6512cda5c731e67a27332a28
-  data.tar.gz: b5472513e94d0b463ada98ba4639471baf125e9a34dd234eb7bf045738b5367b5f83ddb7656531d338b097ea557974a5dee0cecbc70af6d19a9f0a26ecfd64ee
+  metadata.gz: f04ef8d80ec85f3f7578055f9c557a3dcc9a92617edcc742a680d9ed29291d0658cbf19b4c9d6ab6383680e687345ce105bb34d5d09e9895c7877b7285519d49
+  data.tar.gz: 1d5b65ce852fee47b9e8f75b50d7d526161e4967964d0e024e4e96121f121809b8f02f0c5d62af06a96bb13d97531c18eaaa52171379217c45e4e65dc95b85d4

data/lib/ac/ac_object.rb

@@ -4,11 +4,23 @@ module Ac
 
     def self.from_response(response)
       parsed_json = JSON.parse(response.body) rescue {}
-      new(parsed_json, response: response)
+      ac_object = new(parsed_json)
+      ac_object.instance_variable_set("@response", response)
+      ac_object
     end
 
-    def initialize(parsed_json, response: nil)
-      @response = response
+    def self.new value
+      case value
+      when Hash
+        super(value)
+      when Array
+        value.map { new(_1) }
+      else
+        value
+      end
+    end
+
+    def initialize(parsed_json)
       @values = parsed_json.transform_keys(&:to_s)
       @values.keys.each do |key|
         define_singleton_method(key) { self.[](key) } unless respond_to? key
@@ -53,14 +65,7 @@ module Ac
     private
 
     def wrap(value)
-      case value
-      when Hash
-        AcObject.new(value)
-      when Array
-        value.map { wrap(_1) }
-      else
-        value
-      end
+      AcObject.new value
     end
   end
 end

data/lib/ac/base.rb

@@ -9,10 +9,15 @@ module Ac
     end
 
     def access_token
-      refresh_token if respond_to?(:refresh_token) && (@access_token.blank? || @token_expires_at&.past?)
+      refresh_token if should_refresh?
       @access_token
     end
 
+    def should_refresh?
+      return false unless respond_to?(:refresh_token)
+      @access_token.blank? || @token_expires_at&.past?
+    end
+
     def url path
       if path.start_with?("http://") || path.start_with?("https://")
         path
@@ -21,55 +26,61 @@ module Ac
       end
     end
 
-     def authenticate! options
+    def default_options
+      {
+        headers: {
+          "Content-Type" => "application/json",
+          "x-idempotency-key" => SecureRandom.uuid
+        }
+      }
+    end
+
+    def authenticate! options
       if access_token
         options[:headers] ||= {}
         options[:headers]["Authorization"] = "Bearer #{access_token}"
       end
-     end
+    end
 
     %i[get post put patch delete].each do |http_verb|
       define_method :"#{http_verb}_request" do |path, options = {}|
+        options.symbolize_keys!
         options[:method] = http_verb
+        options = default_options.deep_merge(options) if default_options
         authenticate!(options) unless options.delete(:skip_authentication)
+        if options[:body]
+          options[:body] = JSON.dump(options[:body]) if options[:body].is_a?(Hash) && options.dig(:headers, "Content-Type") == "application/json"
+        end
         Typhoeus::Request.new url(path), options
       end
 
       define_method http_verb do |path, options = {}, &block|
-        retries_count ||= 0
+        options.symbolize_keys!
+        request = send(:"#{http_verb}_request", path, options)
 
-        response = send(:"#{http_verb}_request", path, options).run
-        Database.save_request response, class_name: self.class.name if self.class::SAVE_RESPONSES
-
-        if block
-          unless run_block_validation(AcObject.from_response(response), block)
-            if retries_count < self.class::MAX_RETRIES
-              sleep(2**retries_count)
-              retries_count += 1
-              redo
-            else
-              raise BlockValidationError.new(AcObject.from_response(response))
-            end
-          end
-        else
-          unless response.success?
-            if can_retry?(response) && retries_count < self.class::MAX_RETRIES
-              sleep(2**retries_count)
-              retries_count += 1
-              redo
-            else
-              raise AcError.from_response(AcObject.from_response(response))
-            end
+        for retry_number in 0..MAX_RETRIES
+          response = request.run
+          Database.save_request response, class_name: self.class.name if self.class::SAVE_RESPONSES
+          ac_object = AcObject.from_response(response)
+          if validate(ac_object, block)
+            return ac_object
+          else
+            break unless block || can_retry?(ac_object.response)
+            sleep(2**retry_number)
           end
         end
-        return AcObject.from_response(response)
+
+        raise AcError.from_response(ac_object)
+
       end
     end
 
-    def run_block_validation response, block
-      block.call response
-    rescue StandardError => e
-      false
+    def validate ac_object, block=nil
+      if block
+        block.call ac_object rescue false
+      else
+        ac_object.response.success?
+      end
     end
 
     def can_retry? response

data/lib/ac/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Ac
-  VERSION = "1.0.0"
+  VERSION = "1.1.0"
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: ac
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - felipedmesquita
 bindir: exe
 cert_chain: []
-date: 2025-03-11 00:00:00.000000000 Z
+date: 2025-03-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: typhoeus