graph_attack 2.3.0 → 2.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e5c8d6555e219c82d4a4120f699037145c83a8c6ab5d890aa0f7a75f9560db2c
-  data.tar.gz: da27f205db905e6a6b3c05dd34b50d4057908372c86bae9b53b8f7cb8ef86e09
+  metadata.gz: 14073662874173af1e66adb16931c4e8817461c3f36a0ea341d75dbbafb39b1b
+  data.tar.gz: 58f889613e4ea79ce99b19b788ca837527192c85b0b212a77ce84b2355938720
 SHA512:
-  metadata.gz: 81506f5a365831038e0fff051d7ef707e4903c561bc8cbbe7148a2ff79daef43ec98e26699331163a42e07328dcd2b08797682155d91b78b54f145809d080dd6
-  data.tar.gz: 964047fc9a4e4516bdb1d6c0ae899e7fdc484c44c83268e9e7dd6fc13ffb563bdba43a4ba6b3a1cecf8ed538c61ec1804eac64fac7418d1094280280d87aeff1
+  metadata.gz: 1e9652eb2b3ec822942e58ba9d351fabc5a913ee8c7d1b06cef5a5574b85aa40e9c8140618aedd8ca1f4a30cf2559a9426762e39e2af8918e6e9b1806bdd8101
+  data.tar.gz: f0488943c372fa9bf2d0c48dae7d942b17cafe24ff3a81121fc97e0bd75ffe5d222bf527477d5279e4bcb04e906f327ea1baa2ccefafd9b99cfc11ee57100f83

data/.github/workflows/test.yml

@@ -0,0 +1,39 @@
+name: Test
+
+on: [push, pull_request]
+
+jobs:
+  test:
+    name: on ruby ${{matrix.ruby}}
+    runs-on: ubuntu-latest
+
+    strategy:
+      fail-fast: false
+      matrix:
+        ruby: ['3.0', '3.1', '3.2', '3.3', '3.4', head]
+
+    services:
+      redis:
+        image: redis
+        options: >-
+          --health-cmd "redis-cli ping"
+          --health-interval 10s
+          --health-timeout 5s
+          --health-retries 5
+        ports:
+          - 6379:6379
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v3
+
+      - name: Set up Ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{matrix.ruby}}
+
+      - name: Install dependencies
+        run: bundle install --jobs 4 --retry 3
+
+      - name: RSpec
+        run: bin/rspec

data/.rubocop.yml

@@ -1,4 +1,4 @@
-require:
+plugins:
   - rubocop-rspec
   - rubocop-rake
 
@@ -6,6 +6,10 @@ AllCops:
   TargetRubyVersion: 2.7
   DisplayCopNames: true
   NewCops: enable
+  Exclude:
+    - bin/rake
+    - bin/rspec
+    - bin/rubocop
 
 # Do not sort gems in Gemfile, since we are grouping them by functionality.
 Bundler/OrderedGems:
@@ -37,9 +41,6 @@ Metrics/MethodLength:
 # Limit line length.
 Layout/LineLength:
   Max: 80
-  Exclude:
-    - bin/rake
-    - bin/rubocop
 
 # Allow ASCII comments (e.g "…").
 Style/AsciiComments:

data/.ruby-version

@@ -1 +1 @@
-2.7.5
+3.4.2

data/CHANGELOG.md

@@ -1,6 +1,21 @@
 unreleased
 ----------
 
+v2.4.0
+------
+
+Feature:
+- Accept ConnectionPool instances as a Redis client.
+
+Support:
+- Drop Ruby 2.7 support.
+
+v2.3.1
+------
+
+Fix:
+- Relax Ruby version constraint to allow Ruby 3.2.
+
 v2.3.0
 ------
 
@@ -22,6 +37,12 @@ v2.2.0
 Feature:
 - Skip throttling when rate limited field is nil (#19)
 
+⚠️ Possibly breaking change:
+- If your app relied on `Redis.current`, please provide a `redis_client` option
+  explicitly, since
+  [`Redis.current` is deprecated](https://github.com/redis/redis-rb/commit/9745e22db65ac294be51ed393b584c0f8b72ae98)
+  and will be removed in Redis 5.
+
 v2.1.0
 ------
 

data/Gemfile

@@ -6,3 +6,21 @@ git_source(:github) { |repo_name| "https://github.com/#{repo_name}" }
 
 # Specify your gem's dependencies in graph_attack.gemspec
 gemspec
+
+# Development tasks runner.
+gem 'rake'
+
+# Testing framework.
+gem 'rspec'
+
+# CircleCI dependency to store spec results.
+gem 'rspec_junit_formatter'
+
+# Ruby code linter.
+gem 'rubocop'
+
+# RSpec extension for RuboCop.
+gem 'rubocop-rspec'
+
+# Rake extension for RuboCop
+gem 'rubocop-rake'

data/README.md

@@ -153,3 +153,7 @@ file for details.
 
 Hat tip to [Rack::Attack](https://github.com/kickstarter/rack-attack) for the
 the name.
+
+Sponsored by [Cults](https://cults3d.com).
+
+![Cults. Logo](https://github.com/user-attachments/assets/3a51b90d-1033-4df5-a903-03668fc4b966)

data/bin/rspec

@@ -0,0 +1,29 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+#
+# This file was generated by Bundler.
+#
+# The application 'rspec' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require "pathname"
+ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile",
+  Pathname.new(__FILE__).realpath)
+
+bundle_binstub = File.expand_path("../bundle", __FILE__)
+
+if File.file?(bundle_binstub)
+  if File.read(bundle_binstub, 300) =~ /This file was generated by Bundler/
+    load(bundle_binstub)
+  else
+    abort("Your `bin/bundle` was not generated by Bundler, so this binstub cannot run.
+Replace `bin/bundle` by running `bundle binstubs bundler --force`, then run this command again.")
+  end
+end
+
+require "rubygems"
+require "bundler/setup"
+
+load Gem.bin_path("rspec-core", "rspec")

data/graph_attack.gemspec

@@ -23,32 +23,11 @@ Gem::Specification.new do |spec|
   spec.executables = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
-  spec.required_ruby_version = ['>= 2.5.7', '< 3.2']
+  spec.required_ruby_version = '>= 2.5.7'
 
   # This gem is an analyser for the GraphQL ruby gem.
   spec.add_dependency 'graphql', '>= 1.7.9'
 
   # A Redis-backed rate limiter.
   spec.add_dependency 'ratelimit', '>= 1.0.4'
-
-  # Loads local dependencies.
-  spec.add_development_dependency 'bundler', '~> 2.0'
-
-  # Development tasks runner.
-  spec.add_development_dependency 'rake', '~> 13.0'
-
-  # Testing framework.
-  spec.add_development_dependency 'rspec', '~> 3.0'
-
-  # CircleCI dependency to store spec results.
-  spec.add_development_dependency 'rspec_junit_formatter', '~> 0.3'
-
-  # Ruby code linter.
-  spec.add_development_dependency 'rubocop', '~> 1.33.0'
-
-  # RSpec extension for RuboCop.
-  spec.add_development_dependency 'rubocop-rspec', '~> 2.12.1'
-
-  # Rake extension for RuboCop
-  spec.add_development_dependency 'rubocop-rake', '~> 0.6.0'
 end

data/lib/graph_attack/rate_limit.rb

@@ -25,10 +25,11 @@ module GraphAttack
     end
 
     def calls_exceeded_on_query?(rate_limited_field)
-      rate_limit = Ratelimit.new(rate_limited_field, redis: redis_client)
-      rate_limit.add(key)
-
-      rate_limit.exceeded?(key, threshold: threshold, interval: interval)
+      with_redis_client do |redis_client|
+        rate_limit = Ratelimit.new(rate_limited_field, redis: redis_client)
+        rate_limit.add(key)
+        rate_limit.exceeded?(key, threshold: threshold, interval: interval)
+      end
     end
 
     def threshold
@@ -49,8 +50,13 @@ module GraphAttack
         )
     end
 
-    def redis_client
-      options[:redis_client] || GraphAttack.configuration.redis_client
+    def with_redis_client(&block)
+      client = options[:redis_client] || GraphAttack.configuration.redis_client
+      if client.respond_to?(:then)
+        client.then(&block)
+      else
+        block.call(client)
+      end
     end
 
     def on

data/lib/graph_attack/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module GraphAttack
-  VERSION = '2.3.0'
+  VERSION = '2.4.0'
 end

metadata

@@ -1,15 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: graph_attack
 version: !ruby/object:Gem::Version
-  version: 2.3.0
+  version: 2.4.0
 platform: ruby
 authors:
 - Fanny Cheung
 - Sunny Ripert
-autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-02-03 00:00:00.000000000 Z
+date: 2025-03-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: graphql
@@ -39,104 +38,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.0.4
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.0'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '13.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '13.0'
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.0'
-- !ruby/object:Gem::Dependency
-  name: rspec_junit_formatter
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.3'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.3'
-- !ruby/object:Gem::Dependency
-  name: rubocop
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.33.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.33.0
-- !ruby/object:Gem::Dependency
-  name: rubocop-rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 2.12.1
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 2.12.1
-- !ruby/object:Gem::Dependency
-  name: rubocop-rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.6.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.6.0
 description: GraphQL analyser for blocking & throttling
 email:
 - fanny@ynote.hk
@@ -147,6 +48,7 @@ extra_rdoc_files: []
 files:
 - ".circleci/config.yml"
 - ".github/dependabot.yml"
+- ".github/workflows/test.yml"
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"
@@ -160,6 +62,7 @@ files:
 - Rakefile
 - bin/console
 - bin/rake
+- bin/rspec
 - bin/rubocop
 - bin/setup
 - graph_attack.gemspec
@@ -173,7 +76,6 @@ homepage: https://github.com/sunny/graph_attack
 licenses: []
 metadata:
   rubygems_mfa_required: 'true'
-post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -182,17 +84,13 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ">="
     - !ruby/object:Gem::Version
       version: 2.5.7
-  - - "<"
-    - !ruby/object:Gem::Version
-      version: '3.2'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
-signing_key: 
+rubygems_version: 3.6.2
 specification_version: 4
 summary: GraphQL analyser for blocking & throttling
 test_files: []