limiter-ruby 0.1.13 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 87a959ee34d3f771f97ce012ab718b8313057c407f6441f4beed90a021a097c5
-  data.tar.gz: 0271c7731bafb69956cc8f36636d7eab28e67def6c55c69565d911e9f757bb14
+  metadata.gz: e0f3a57515e275f8742e8657b68fc2df8e20f58f79a34825a2e36ddd3f34e403
+  data.tar.gz: dd01a79150ae330c918b6a4407c877b002bbc098f3f670cd3f558131bcf04675
 SHA512:
-  metadata.gz: 214133e80b860d1e87d1005f09cf3e728da406ddee8d34100274f2064729997271dfb481bf227f163910146f4700b96decc1e7b9837d71e7f769417c98b9010a
-  data.tar.gz: 00c72e252a8d733af4fcde4bdec7c3aa978450c53c26fc5548d992834550b54146aecc5e7ef165e42a50465ab7026c6ac36c73b4ad82ffa9604cc174d84ddbe7
+  metadata.gz: 9e67358db6e6481608a1dc5af8f3ce27c4430d47edfa819fac58348be1f22294d8443f232970911ac647d663e3450ae21f8df7199b62ffb656395be5525b8e08
+  data.tar.gz: 7a6c65468b78af623fd36a93c877df5161a4d8b21af274030b5f8e1a5d1d25b9e5f33e2ec0c6a22d47f4001ded723157a0f6abeaacf5625bff1c53eae4b4386b

data/lib/limiter/client.rb

@@ -3,22 +3,26 @@
 module Limiter
   class Client
 
-    BASE_DOMAIN = "https://api.limiter.dev".freeze
+    attr_reader :namespace, :limit, :interval, :identifier, :token, :response
+    delegate :exhausted?, :allowed?, :exceeded?, :resets_in, :to => :response
 
-    attr_reader :namespace, :limit, :interval, :identifier, :token
-
-    def initialize(namespace:, limit:, interval:, token: ENV["LIMITER_TOKEN"])
+    def initialize(namespace:, limit:, interval:)
       @namespace = namespace
       @limit = limit
       @interval = interval.to_i
-      @token = token || ENV["LIMITER_TOKEN"]
+      @logger = Limiter.logger
 
-      ErrorHandler.error("token is not set") if @token.nil?
+      ErrorHandler.error("API Token is not set") if Limiter.configuration.api_token.nil?
     end
 
     def check(identifier)
       @identifier = identifier
-      RateLimitResponse.new(request)
+      @logger.info("check: #{namespace}/#{limit}/#{interval}/#{identifier}")
+      @response = ResponseHandler.new(request)
+      self
+    rescue => e
+      ErrorHandler.error("check failed: #{e.message}")
+      self
     end
 
     def formatted_interval
@@ -37,18 +41,11 @@ module Limiter
     end
 
     def limiter_path
-      "/rl/#{namespace}/#{limit}/#{formatted_interval}/#{identifier}"
+      "/ctr/#{namespace}/#{limit}/#{formatted_interval}/#{identifier}"
     end
 
     def request(params = {})
-      @_conn ||= Faraday.new(url: BASE_DOMAIN) do |conn|
-        conn.request :authorization, :Bearer, token
-        conn.response :json
-        conn.adapter Faraday.default_adapter
-        conn.headers["User-Agent"] = "Limiter-Ruby/#{Limiter::VERSION}"
-      end
-
-      @_conn.get(limiter_path, params)
+      HTTP.auth("Bearer #{Limiter.configuration.api_token}").get(url, params: params)
     end
   end
 end

data/lib/limiter/configuration.rb

@@ -0,0 +1,16 @@
+module Limiter
+  class Configuration
+    API_BASE_URL = "https://api.limiter.dev"
+
+    attr_reader :api_token, :raise_errors
+
+    def initialize
+      @api_token = ENV["LIMITER_TOKEN"]
+      @raise_errors = true
+    end
+
+    def raise_errors?
+      @raise_errors
+    end
+  end
+end

data/lib/limiter/error_handler.rb

@@ -13,24 +13,11 @@ module Limiter
     end
 
     def handle_error
-      if !production?
+      if Limiter.configuration.raise_errors?
         raise Error, @error
       else
-        log @error
+        Limiter.logger.error(@error)
       end
     end
-
-    def production?
-      if defined?(Rails)
-        Rails.env.production?
-      else
-        (ENV["RACK_ENV"] || ENV["RAILS_ENV"] ) == "production"
-      end
-    end
-
-    def log(error)
-      @logger ||= Logger.new(STDOUT)
-      @logger.error(error)
-    end
   end
 end

data/lib/limiter/points.rb

@@ -3,12 +3,15 @@
 module Limiter
   class Points < Client
 
-    def url
-      "#{BASE_DOMAIN}/points/#{namespace}/#{limit}/#{formatted_period}/#{identifier}"
+    delegate :remaining, :points, :to => :response
+
+    def limiter_path
+      "/pts/#{namespace}/#{limit}/#{formatted_period}/#{identifier}"
     end
 
     def used(points)
-      RateLimitResponse.new(request({ used: points.to_i }))
+      @response = ResponseHandler.new(request({ used: points.to_i }))
+      self
     end
   end
 end

data/lib/limiter/{rate_limit_response.rb → response_handler.rb}

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Limiter
-  class RateLimitResponse
+  class ResponseHandler
 
     attr_reader :response
 
@@ -12,6 +12,7 @@ module Limiter
     def exhausted?
       signed_request? && @response.status == 429
     end
+    alias_method :exceeded?, :exhausted?
 
     def allowed?
       signed_request? && @response.status == 200
@@ -25,17 +26,25 @@ module Limiter
       end
     end
 
+    def remaining
+      response_data["remaining"]
+    end
+
+    def points
+      response_data["points"]
+    end
+
     def signed_request?
       @response.headers["X-Limiter-Signed"].to_s == "true"
     end
 
     private
-    def rate_limit_data
+    def response_data
       @_body ||= @response.parse
     end
 
     def resets_at
-      rate_limit_data["resetsAt"]
+      response_data["resetsAt"]
     end
   end
 end

data/lib/limiter/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Limiter
-  VERSION = "0.1.13"
+  VERSION = "0.2.0"
 end

data/lib/limiter.rb

@@ -2,10 +2,29 @@
 
 require_relative "limiter/client"
 require_relative "limiter/points"
-require_relative "limiter/rate_limit_response"
+require_relative "limiter/response_handler"
 require_relative "limiter/error_handler"
 require_relative "limiter/version"
+require "logger"
 
 module Limiter
   class Error < StandardError; end
+
+  class << self
+    attr_writer :logger, :configuration
+  end
+
+  def self.logger
+    @logger ||= Logger.new($stdout).tap do |logger|
+      logger.progname = "Limiter"
+    end
+  end
+
+  def self.configuration
+    @configuration ||= Configuration.new
+  end
+
+  def self.configure
+    yield(configuration)
+  end
 end

data/limiter.gemspec

@@ -31,7 +31,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   # Uncomment to register a new dependency of your gem
-  spec.add_dependency "faraday"
+  spec.add_dependency "http"
 
   # For more information and examples about making a new gem, check out our
   # guide at: https://bundler.io/guides/creating_gem.html

metadata

@@ -1,17 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: limiter-ruby
 version: !ruby/object:Gem::Version
-  version: 0.1.13
+  version: 0.2.0
 platform: ruby
 authors:
 - Bilal Budhani
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-12-11 00:00:00.000000000 Z
+date: 2024-12-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: faraday
+  name: http
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -37,13 +37,14 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
+- lib/limiter-ruby.rb
 - lib/limiter.rb
 - lib/limiter/client.rb
+- lib/limiter/configuration.rb
 - lib/limiter/error_handler.rb
 - lib/limiter/points.rb
-- lib/limiter/rate_limit_response.rb
+- lib/limiter/response_handler.rb
 - lib/limiter/version.rb
-- lib/limiter_ruby.rb
 - limiter.gemspec
 homepage: https://limiter.dev
 licenses: