wrapi 0.4.8 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f311f0c8d5a16deead39d219d0d266202798df6cfb4d0b23cabfabd62d1cd9ec
-  data.tar.gz: c9a7bba391164cad77f2e976ec24f7b9016e0840857a416886c81987c26015b3
+  metadata.gz: ed925af63ad49be5f7489b5af9a2702e755ab08b8fbdc5bfac74f11041488733
+  data.tar.gz: 818fda8bdea923c971cf2ea8b7854c7728df019ec922721ea800197d47a5d40b
 SHA512:
-  metadata.gz: 934bfa4e242147dcad243f8bfd6ce3c3389bea2e55d85f9444aa8c082c20b103da16fd23ff9afcad655832de37c8271ead765433e7b092669247e844a5603ba7
-  data.tar.gz: 1395f62ad20197b83a1a4f6159de38614131e3d3064229a47b77a3776c0ff251786b27b0c5978d7823ce40c2089e695b1938ca0e50bb7efff4ba4197a47e6100
+  metadata.gz: c7bbbfb4c65764f2a2a4a8f2ae8a0536d7a2eb606db91d2903e640f44f9b055de9317936a238b82cff6caf778c283037d10fe6b3e5587e58dfb11ac4fad3e636
+  data.tar.gz: 5d425345109615657aff5e211c34d4c7adc0311953daa49bc96567f4d394f4a46480ed2a1f7f7c3f80aee020e67b2c8e88107c5334e53a8a99218f0978076fca

data/CHANGELOG.md

@@ -1,24 +1,31 @@
-## Changelog
+# Changelog
 
 ## [0.1.0] - 2024-02-2
+
 - Initial release extracted from CloudAlly gem
 
 ## [0.1.1] - 2024-02-5
+
 - default endpoint to nil and raise error in connection when not available
 
 ## [0.1.2] - 2024-02-5
+
 - default endpoint to nil and raise error in connection when not available
 
 ## [0.1.3] - 2024-02-5
+
 - fix entity should return empty array insted of nil
 
 ## [0.2.0] - 2024-02-8
+
 - implement json pagination
 
 ## [0.2.0] - 2024-02-13
+
 - implement option to manipulate request
 
 ## [0.4.0] - 2024-02-13
+
 - testing/code quality
   authentication tests (mocked)
   test string/{}/[] entities returned with mock
@@ -27,25 +34,37 @@
   Request option to return raw response
 
 ## [0.4.1] - 2024-02-28
+
 - fix issue with post body only supported as json
 
 ## [0.4.2] - 2024-03-03
+
 - fix issue with escaping query parameters included in path
 
 ## [0.4.3] - 2024-03-07
+
 - fix issue json generation for updated attributes
 
 ## [0.4.4] - 2024-03-12
+
 - fix typo and implement clone for entities
 
 ## [0.4.5] - 2024-03-12
+
 - refactorings code readability
 
 ## [0.4.6] - 2024-06-17
+
 - fix issue with loading Entity from yaml
 
 ## [0.4.7] - 2025-03-18
+
 - fix obsolete escape
 
 ## [0.4.8] - 2025-03-20
+
 - scramble passwords in www encoded content
+
+## [0.4.9] - 2025-03-20
+
+- freeze causes issue so connection options can't be merged!

data/lib/wrapi/api.rb

@@ -23,7 +23,7 @@ module WrAPI
   # @see WrAPI::Request
   # @see WrAPI::Authentication
   class API
-    attr_accessor *WrAPI::Configuration::VALID_OPTIONS_KEYS
+    attr_accessor(*WrAPI::Configuration::VALID_OPTIONS_KEYS)
 
     # Initializes a new API object with the given options.
     #

data/lib/wrapi/configuration.rb

@@ -62,7 +62,11 @@ module WrAPI
     ].freeze
 
     # By default, don't set any connection options
-    DEFAULT_CONNECTION_OPTIONS = {}.freeze
+    DEFAULT_CONNECTION_OPTIONS = {}
+
+
+    # By default token type used in authorizaion header
+    DEFAULT_TOKEN_TYPE = 'Bearer'
 
     # The response format appended to the path and sent in the 'Accept' header if none is set
     #
@@ -81,7 +85,7 @@ module WrAPI
     # It uses the DefaultPager class from the WrAPI::RequestPagination module.
     DEFAULT_PAGINATION = WrAPI::RequestPagination::DefaultPager
 
-    attr_accessor *VALID_OPTIONS_KEYS
+    attr_accessor(*VALID_OPTIONS_KEYS)
 
     # When this module is extended, set all configuration options to their default values
     def self.extended(base)
@@ -103,7 +107,6 @@ module WrAPI
     # Reset all configuration options to defaults
     def reset
       self.access_token       = nil
-      self.token_type         = nil
       self.refresh_token      = nil
       self.token_expires      = nil
       self.client_id          = nil
@@ -113,6 +116,8 @@ module WrAPI
       self.endpoint           = nil
 
       self.logger             = nil
+
+      self.token_type         = DEFAULT_TOKEN_TYPE
       self.connection_options = DEFAULT_CONNECTION_OPTIONS
       self.format             = DEFAULT_FORMAT
       self.page_size          = DEFAULT_PAGE_SIZE

data/lib/wrapi/connection.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'faraday'
+require File.expand_path('middleware/rate_throttle_middleware', __dir__)
 
 module WrAPI
   # @private
@@ -73,7 +74,7 @@ module WrAPI
     # @return [void]
     # @note The authorization header will only be set if the access_token is present.
     def setup_authorization(connection)
-      connection.headers['Authorization'] = "Bearer #{access_token}" if access_token
+      connection.headers['Authorization'] = "#{token_type} #{access_token}" if access_token && token_type
     end
 
     # Sets up the headers for the given connection. Override to set own headers.

data/lib/wrapi/middleware/rate_throttle_middleware.rb

@@ -0,0 +1,72 @@
+# frozen_string_literal: true
+
+require 'faraday'
+
+module WrAPI
+  # A Faraday middleware for rate limiting requests.
+  #
+  # This middleware ensures that the number of requests made through a Faraday connection
+  # does not exceed a specified limit within a given time period.
+  #
+  # @example Add middleware to a Faraday connection
+  #   connection = Faraday.new(url: 'https://api.example.com') do |faraday|
+  #     faraday.use RateThrottleMiddleware, limit: 300, period: 60
+  #     faraday.adapter Faraday.default_adapter
+  #   end
+  #
+  # @see https://github.com/lostisland/faraday Faraday Documentation
+  #
+  class RateThrottleMiddleware < Faraday::Middleware
+    # Initializes the RateThrottleMiddleware.
+    #
+    # @param app [#call] The next middleware or the actual Faraday adapter.
+    # @param limit [Integer] The maximum number of requests allowed within the specified period. Default is 300.
+    # @param period [Integer] The time period in seconds over which the limit applies. Default is 60 seconds.
+    #
+    # @example
+    #   middleware = RateThrottleMiddleware.new(app, limit: 300, period: 60)
+    #
+    def initialize(app, limit: 300, period: 60)
+      super(app)
+      @limit = limit
+      @period = period
+      @requests = []
+      @mutex = Mutex.new
+      @condition = ConditionVariable.new
+    end
+
+    def call(env)
+      throttle_request
+      @app.call(env)
+    end
+
+    private
+
+    def throttle_request
+      @mutex.synchronize do
+        now = Time.now.to_f
+        remove_expired_requests(now)
+
+        rate_limited(now)
+
+        # Record the new request
+        @requests.push(Time.now.to_f)
+        @condition.broadcast
+      end
+    end
+
+    def remove_expired_requests(now)
+      # Clear requests older than the rate limit period
+      @requests.pop while !@requests.empty? && @requests[0] < (now - @period)
+    end
+
+    def rate_limited(now)
+      # Wait if the request limit is reached
+      while @requests.size >= @limit
+        sleep_time = @requests[0] + @period - now
+        @condition.wait(@mutex, sleep_time) if sleep_time.positive?
+        remove_expired_requests(Time.now.to_f)
+      end
+    end
+  end
+end

data/lib/wrapi/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module WrAPI
-  VERSION = '0.4.8'
+  VERSION = '0.5.0'
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: wrapi
 version: !ruby/object:Gem::Version
-  version: 0.4.8
+  version: 0.5.0
 platform: ruby
 authors:
 - Janco Tanis
 bindir: exe
 cert_chain: []
-date: 2025-03-20 00:00:00.000000000 Z
+date: 2025-10-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -96,6 +96,7 @@ files:
 - lib/wrapi/configuration.rb
 - lib/wrapi/connection.rb
 - lib/wrapi/entity.rb
+- lib/wrapi/middleware/rate_throttle_middleware.rb
 - lib/wrapi/pagination.rb
 - lib/wrapi/request.rb
 - lib/wrapi/respond_to.rb