cloudflare-rails 3.0.0 → 4.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9f6d6411a565dbb86d9a6c07ac4d54d081111e2cb8ba879fcc212923cbea7697
-  data.tar.gz: 2c7104876a1415d654d71e073c58b973ea4d3391fa91ff40d9381b6fdd300d79
+  metadata.gz: 0b385360b97f2e1611c565c4d3cbbe57ed1daa70abc8f08e2a7362d4df7a9a71
+  data.tar.gz: fc200253182549eedb20a69ba559a9dbe790adbba837d14e0348369b6238ce3d
 SHA512:
-  metadata.gz: c94dcbee61e5e5c18c232ace2357ed4d4110719c37daa23056c37a9e0f73c1431ae0e699a3e85c4adf838e531a4c82ac9095fc637bbef5e5a1e0925b6aa22bb9
-  data.tar.gz: 74b4b462193da378dbcf32b7f9638c597d8dfbe917c2bb12c1924bb889ee65f89de563aa49b62b30a557e52ba5d1563c6d571829fa90d9ea47a86cd12f7ae687
+  metadata.gz: a6a3b3a133cbe77459258c33a2944c6018c33beb5b1319d97cbef82be290e5dd81e7f60ad2502e388f7ecc7761cfd824e69d55650961739b07be33dbae558925
+  data.tar.gz: 2292d0df1ff0e5d880513131b6b1b0198019809500a76ede82406489d7ef045746fa6441603543e8732608e71cc7e8666376a7730d20aec46a62f4f41584f96b

data/.rubocop.yml

@@ -3,3 +3,4 @@ inherit_from:
   - .rubocop_todo.yml
 AllCops:
   NewCops: enable
+  SuggestExtensions: false

data/.ruby-version

@@ -1 +1 @@
-3.2.0
+3.2.2

data/Appraisals

@@ -1,7 +1,3 @@
-appraise "rails-6.0" do
-  gem "rails", "~> 6.0.0"
-end
-
 appraise "rails-6.1" do
   gem "rails", "~> 6.1.0"
 end

data/CHANGELOG.md

@@ -4,7 +4,12 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-## [3.0.0] - unreleased
+## [4.0.0] - 2023-08-06
+- Fix `appraisal` for ruby `3.x`
+- properly scope railtie initializer (https://github.com/modosc/cloudflare-rails/pull/79)
+- Drop support for unsupported `rails` version `6.0.x`
+
+## [3.0.0] - 2023-01-30
 - Drop support for unsupported `rails` version `5.2.x`
 - Fetch and cache IPs lazily instead of upon initialization (https://github.com/modosc/cloudflare-rails/pull/52)
 

data/README.md

@@ -3,10 +3,11 @@ This gem correctly configures Rails for [CloudFlare](https://www.cloudflare.com)
 
 ## Rails Compatibility
 
-This gem requires `railties`, `activesupport`, and `actionpack` >= `6.0`. For older `rails` versions see the chart below:
+This gem requires `railties`, `activesupport`, and `actionpack` >= `6.1`. For older `rails` versions see the chart below:
 
 | `rails` version | `cloudflare-rails` version |
 | --------------- | -------------------------- |
+| 6.0             | 3.0.0                      |
 | 5.2             | 2.4.0                      |
 | 5.1             | 2.0.0                      |
 | 5.0             | 2.0.0                      |

data/cloudflare-rails.gemspec

@@ -23,17 +23,17 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler", ">= 2.1.2"
   spec.add_development_dependency "rake", "~> 13.0.1"
   spec.add_development_dependency "rspec_junit_formatter", "~> 0.6.0"
-  spec.add_development_dependency "rspec-rails", "~> 5.0.1"
+  spec.add_development_dependency "rspec-rails", "~> 6.0.0"
   spec.add_development_dependency "rspec", "~> 3.12.0"
-  spec.add_development_dependency "rubocop-airbnb", "~> 4.0.0"
+  spec.add_development_dependency "rubocop-airbnb", "~> 6.0.0"
   spec.add_development_dependency "webmock", "~> 3.18.1"
-  spec.add_development_dependency "rack-attack", "~> 6.6.1"
+  spec.add_development_dependency "rack-attack", "~> 6.7.0"
   spec.add_development_dependency "pry-byebug"
-  spec.add_development_dependency "appraisal"
+  spec.add_development_dependency "appraisal", "~> 2.5.0"
 
-  spec.add_dependency "railties", ">= 6.0", "< 7.1.0"
-  spec.add_dependency "activesupport", ">= 6.0", "< 7.1.0"
-  spec.add_dependency "actionpack", ">= 6.0", "< 7.1.0"
+  spec.add_dependency "railties", ">= 6.1", "< 7.1.0"
+  spec.add_dependency "activesupport", ">= 6.1", "< 7.1.0"
+  spec.add_dependency "actionpack", ">= 6.1", "< 7.1.0"
 
   # we need Module#prepend
   spec.required_ruby_version = '>= 2.0'

data/lib/cloudflare/rails/railtie.rb

@@ -8,10 +8,8 @@ module Cloudflare
       module CheckTrustedProxies
         def trusted_proxy?(ip)
           matching = Importer.cloudflare_ips.any? do |proxy|
-            begin
-              proxy === ip
-            rescue IPAddr::InvalidAddressError
-            end
+            proxy === ip
+          rescue IPAddr::InvalidAddressError
           end
           matching || super
         end
@@ -102,7 +100,7 @@ module Cloudflare
         app.config.cloudflare.reverse_merge! DEFAULTS
       end
 
-      initializer "my_railtie.configure_rails_initialization" do
+      initializer "cloudflare_rails.configure_rails_initialization" do
         Rack::Request::Helpers.prepend CheckTrustedProxies
 
         ObjectSpace.each_object(Class).

data/lib/cloudflare/rails/version.rb

@@ -1,5 +1,5 @@
 module Cloudflare
   module Rails
-    VERSION = "3.0.0".freeze
+    VERSION = "4.0.0".freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cloudflare-rails
 version: !ruby/object:Gem::Version
-  version: 3.0.0
+  version: 4.0.0
 platform: ruby
 authors:
 - jonathan schatz
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-01-30 00:00:00.000000000 Z
+date: 2023-08-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.0.1
+        version: 6.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.0.1
+        version: 6.0.0
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -86,14 +86,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.0.0
+        version: 6.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.0.0
+        version: 6.0.0
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
@@ -114,14 +114,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 6.6.1
+        version: 6.7.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 6.6.1
+        version: 6.7.0
 - !ruby/object:Gem::Dependency
   name: pry-byebug
   requirement: !ruby/object:Gem::Requirement
@@ -140,23 +140,23 @@ dependencies:
   name: appraisal
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.5.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.5.0
 - !ruby/object:Gem::Dependency
   name: railties
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '6.1'
     - - "<"
       - !ruby/object:Gem::Version
         version: 7.1.0
@@ -166,7 +166,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '6.1'
     - - "<"
       - !ruby/object:Gem::Version
         version: 7.1.0
@@ -176,7 +176,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '6.1'
     - - "<"
       - !ruby/object:Gem::Version
         version: 7.1.0
@@ -186,7 +186,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '6.1'
     - - "<"
       - !ruby/object:Gem::Version
         version: 7.1.0
@@ -196,7 +196,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '6.1'
     - - "<"
       - !ruby/object:Gem::Version
         version: 7.1.0
@@ -206,7 +206,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '6.1'
     - - "<"
       - !ruby/object:Gem::Version
         version: 7.1.0
@@ -235,7 +235,6 @@ files:
 - bin/setup
 - cloudflare-rails.gemspec
 - gemfiles/.bundle/config
-- gemfiles/rails_6.0.gemfile
 - gemfiles/rails_6.1.gemfile
 - gemfiles/rails_7.0.gemfile
 - lib/cloudflare/rails.rb
@@ -260,7 +259,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.1
+rubygems_version: 3.4.10
 signing_key:
 specification_version: 4
 summary: This gem configures Rails for CloudFlare so that request.ip and request.remote_ip

data/gemfiles/rails_6.0.gemfile

@@ -1,7 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gem "rails", "~> 6.0.0"
-
-gemspec path: "../"