Skip to content

Commit

Permalink
Rails is optional.
Browse files Browse the repository at this point in the history
  • Loading branch information
ioquatix committed Jul 25, 2023
1 parent d660667 commit 553f173
Show file tree
Hide file tree
Showing 5 changed files with 25 additions and 15 deletions.
1 change: 1 addition & 0 deletions gemfiles/rack_2.gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,6 @@
source "https://rubygems.org"

gem "rack", "~> 2.0"
gem "railties"

gemspec path: "../"
12 changes: 10 additions & 2 deletions lib/rack/attack/cache.rb
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,16 @@ class Cache
attr_accessor :prefix
attr_reader :last_epoch_time

def initialize
self.store = ::Rails.cache if defined?(::Rails.cache)
def self.default_store
if Object.const_defined?(:Rails) && Rails.singleton_class.method_defined?(:cache)
::Rails.cache
else
ActiveSupport::Cache::MemoryStore.new
end
end

def initialize(store = self.class.default_store)
self.store = store
@prefix = 'rack::attack'
end

Expand Down
6 changes: 6 additions & 0 deletions lib/rack/attack/railtie.rb
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
# frozen_string_literal: true

begin
require 'rails/railtie'
rescue LoadError
return
end

module Rack
class Attack
class Railtie < ::Rails::Railtie
Expand Down
2 changes: 1 addition & 1 deletion spec/acceptance/rails_middleware_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

require_relative "../spec_helper"

if defined?(Rails)
if defined?(Rails::Application)
describe "Middleware for Rails" do
before do
@app = Class.new(Rails::Application) do
Expand Down
19 changes: 7 additions & 12 deletions spec/spec_helper.rb
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,8 @@
require "minitest/autorun"
require "minitest/pride"
require "rack/test"

begin
require "rails"
rescue LoadError
# Ignore.
end

# require "rails"
require "active_support"
require "rack/attack"

if RUBY_ENGINE == "ruby"
Expand All @@ -33,11 +28,11 @@ def safe_require(name)
class MiniTest::Spec
include Rack::Test::Methods

if Object.const_defined?(:Rails)
before do
Rails.cache = nil
end
end
# if Object.const_defined?(:Rails)
# before do
# Rails.cache = nil
# end
# end

after do
Rack::Attack.clear_configuration
Expand Down

0 comments on commit 553f173

Please sign in to comment.