ac 0.2.2 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 643c497232d37751e8f24f1e429e4da6de134fe5fb8c9ee7a553a72e96afc511
-  data.tar.gz: 887dab256a947fb6ec90be7e63814832d4b868f6873ff13d64944969391d4d51
+  metadata.gz: 93ef1a831829470267227d302c604be300a45566557fdeca5dfc90666fe66b37
+  data.tar.gz: 90e08375261aaf5a34067944c38a553d45778afafbaf2528ff4507f05f792dcf
 SHA512:
-  metadata.gz: bda3634f53042d6d31d4cae8191b0f31f87fbd00553cb67b60e0fd806e02487b8ff26ff85d5860050c0af66b6738d55864acfa1dd0c94881eb56b2fc8f106255
-  data.tar.gz: 956b86c314638bc2d577716622c25c1dbebc8741603c6e3c029e21d989f93a0439ae68cba1d307997a46f89337276f9f691254d84d2dfd8c54e96b2aac1f9253
+  metadata.gz: 533a28626dc522e2202767c59ab9a3d9ab605f8b8fb9c7598f1f0719780f91761639acb9f644cc4d8814a4117424cc4dce5269e371924875f4d8481971c2ec97
+  data.tar.gz: 012ff28a3e8d92e680106d93acdeabf5b04d167163999b55e251fa64a044ebf876700b1ab43be384b4b60ebfeada194f180a7d3ca168e6ab0c4c61cd00dedeef

data/lib/ac/ac_object.rb

@@ -0,0 +1,71 @@
+module Ac
+  class AcObject
+    attr_reader :response
+
+    def self.from_response(response)
+      parsed_json = JSON.parse(response.body) rescue {}
+      ac_object = new(parsed_json)
+      ac_object.instance_variable_set("@response", response)
+      ac_object
+    end
+
+    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
+      end
+    end
+
+    def [](key)
+      wrap(@values[key.to_s])
+    end
+
+    def to_s(*_args)
+      JSON.pretty_generate(@values)
+    end
+
+    def inspect
+      id_string = respond_to?(:id) && !id.nil? ? " id=#{id}" : ''
+      "#<#{self.class}:0x#{object_id.to_s(16)}#{id_string}> JSON: " +
+        JSON.pretty_generate(@values)
+    end
+
+    def ==(other)
+      other.is_a? AcObject
+      @values == other.instance_variable_get('@values')
+    end
+
+    def eql?(other)
+      self == other
+    end
+
+    def keys
+      @values.keys
+    end
+
+    def values
+      @values.values
+    end
+
+    def json
+      @values
+    end
+
+    private
+
+    def wrap(value)
+      AcObject.new value
+    end
+  end
+end

data/lib/ac/base.rb

@@ -3,11 +3,21 @@ module Ac
     MAX_RETRIES = 3
     SAVE_RESPONSES = false
 
-    attr_reader :access_token
+    attr_reader :token_expires_at
     def initialize access_token = nil
       @access_token = access_token
     end
 
+    def access_token
+      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
@@ -32,26 +42,43 @@ module Ac
 
       define_method http_verb do |path, options = {}, &block|
         retries_count ||= 0
-        raise "Too many retries" if retries_count > self.class::MAX_RETRIES
-        # puts "Requesting #{path}, retry number #{retries_count}"
+
         response = send(:"#{http_verb}_request", path, options).run
+        Database.save_request response, class_name: self.class.name if self.class::SAVE_RESPONSES
 
         if block
-          begin
-            raise unless block.call(response)
-            Database.save_request response, class_name: self.class.name if self.class::SAVE_RESPONSES
-          rescue
-            Database.save_request(response, class_name: self.class.name + "_errors") if self.class::SAVE_RESPONSES
-            retries_count += 1 # standard:disable Lint/UselessAssignment
-            sleep(2**retries_count)  # Exponential backoff
-            redo
+          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
           end
-        elsif self.class::SAVE_RESPONSES
-          Database.save_request response, class_name: self.class.name
         end
-
-        response
+        return AcObject.from_response(response)
       end
     end
+
+    def run_block_validation response, block
+      block.call response
+    rescue StandardError => e
+      false
+    end
+
+    def can_retry? response
+      response.timed_out? || response.code == 0 || response.code == 429 || response.code >= 500
+    end
   end
 end

data/lib/ac/version.rb

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

data/lib/ac.rb

@@ -2,11 +2,60 @@
 
 require "typhoeus"
 require "json"
+require "active_support/all"
 require_relative "ac/version"
+require_relative "ac/ac_object"
 require_relative "ac/base"
 require_relative "ac/json_patch"
 require_relative "ac/database"
 
 module Ac
   Typhoeus::Response.prepend JsonPatch
+
+  class AcError < StandardError
+
+    def self.from_response response
+      case response.response.code
+      when 401
+        UnauthorizedError.new(response)
+      when 404
+        NotFoundError.new(response)
+      when 422
+        UnprocessableEntityError.new(response)
+      when 429
+        TooManyRequestsError.new(response)
+      when 500..599
+        ServerError.new(response)
+      else
+        AcError.new(response)
+      end
+    end
+
+    attr_reader :response
+    def initialize response
+      @response = response
+    end
+
+    def to_s
+      "#{self.class}: #{response.response.code} - #{response.values.present? ? response.inspect : response.response.body}"
+    end
+  end
+
+  class BlockValidationError < AcError
+  end
+
+  class NotFoundError < AcError
+  end
+
+  class UnauthorizedError < AcError
+  end
+
+  class UnprocessableEntityError < AcError
+  end
+
+  class TooManyRequestsError < AcError
+  end
+
+  class ServerError < AcError
+  end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: ac
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 1.0.2
 platform: ruby
 authors:
 - felipedmesquita
 bindir: exe
 cert_chain: []
-date: 2025-03-06 00:00:00.000000000 Z
+date: 2025-03-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: typhoeus
@@ -23,6 +23,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 email:
 - 16197684+felipedmesquita@users.noreply.github.com
 executables: []
@@ -34,6 +48,7 @@ files:
 - README.md
 - Rakefile
 - lib/ac.rb
+- lib/ac/ac_object.rb
 - lib/ac/base.rb
 - lib/ac/database.rb
 - lib/ac/json_patch.rb
@@ -58,7 +73,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.2
+rubygems_version: 3.6.5
 specification_version: 4
 summary: Api Client for Typhoeus
 test_files: []