cloudflare-rails 0.1.2 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 708b25e86234376fc261a955e9f0c3aabc5c04ba
-  data.tar.gz: 62abfd55daae6feb63eb3a6b3a5859311a8e7e3d
+  metadata.gz: 947aaffd0442fcd48550cbc359a2f5d80685d0a4
+  data.tar.gz: d29744071bb75ba4e9232466248acaa13b7cc272
 SHA512:
-  metadata.gz: f1ba5dae5d80a21e6a1cda5020d44454d17bb9de917c6e86d493b08622f4ca349a11e10235d1fa07aa9409bdc7bbc4a37199f9224ea0b0b1265f8ee4b7157054
-  data.tar.gz: 72d2b28ff23675d030aa1868cde98a4f442ada49c32106d64fd305114738ec61ed59af153f8bc12fb31bccdbb9e5c3a74d19a91d339d74fa5060e7499231ba98
+  metadata.gz: 038cacccbde117a5e9e684a351102921e2947a1b7f2248e05ba033516ce4c163d28fdcb537e1735189caf5af88256a63b142ff6ae540f6ac324454f53026a7c7
+  data.tar.gz: 146fc51215c8c709b4fed30a78fa9b8ba41c65e69ea3ffc4b16fc4c1f227186e9396b494af8c1559506997f04a80061da6038cf4d1238cb196fef3aba3c3d12e

data/README.md

@@ -2,6 +2,11 @@
 
 This gem correctly configures Rails for [CloudFlare](https://www.cloudflare.com) so that `request.remote_ip` / `request.ip` both work correctly.
 
+## Rails Compatibility
+
+For Rails 5, use 0.2.x
+For Rails 4.2, use 0.1.x
+
 ## Installation
 
 Add this line to your application's `Gemfile`:

data/cloudflare-rails.gemspec

@@ -23,11 +23,9 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec"
   spec.add_development_dependency "rspec-rails"
-
   spec.add_development_dependency "webmock"
 
-  # TODO - no idea if this is 4.x specific, should test with older versions
-  spec.add_dependency "rails", "~> 4.0"
+  spec.add_dependency "rails", "~> 5.0"
   spec.add_dependency 'httparty'
 
   # we need Module#prepend

data/lib/cloudflare/rails/railtie.rb

@@ -4,7 +4,7 @@ module Cloudflare
   module Rails
     class Railtie < ::Rails::Railtie
 
-      # patch rack::request to use our cloudflare ips - this way request.ip is
+      # patch rack::request::helpers to use our cloudflare ips - this way request.ip is
       # correct inside of rack and rails
       module CheckTrustedProxies
         def trusted_proxy?(ip)
@@ -12,11 +12,12 @@ module Cloudflare
         end
       end
 
-      Rack::Request.prepend CheckTrustedProxies
+      Rack::Request::Helpers.prepend CheckTrustedProxies
 
       # patch ActionDispatch::RemoteIP to use our cloudflare ips - this way
       # request.remote_ip is correct inside of rails
       module RemoteIpProxies
+
         def proxies
           super + ::Rails.application.config.cloudflare.ips
         end
@@ -63,7 +64,7 @@ module Cloudflare
         end
       end
 
-      # setup defaults before we configure our app. 
+      # setup defaults before we configure our app.
       DEFAULTS = {
         expires_in: 12.hours,
         timeout: 5.seconds,
@@ -93,82 +94,3 @@ module Cloudflare
     end
   end
 end
-        # bail if ActionDispatch::RemoteIp isn't already loaded
-        # if app.config.middleware.middlewares.exclude? ActionDispatch::RemoteIp
-        #   ::Rails.logger.error "Couldn't find ActionDispatch::RemoteIp middleware, skipping CloudFlare::Rails initialization"
-        #   return false
-        # end
-
-
-        # change our default timeout if specified
-      #  default_timeout app.config.cloudflare.timeout if app.config.cloudflare.timeout.present?
-
-        #cf_config = app.config.cloudflare.reverse_merge Importer::DEFAULT_CONFIG
-
-#        Importer.default_timeout Config.config
-
-
-        # caching is here so that we have app.config.cloudflare in scope - i
-        # suppose we could move this into fetch and take expires_in as a
-        # param?
-
-        # cloudflare_ips += ::Rails.cache.fetch("cloudflare-rails:ip_v4", expires_in: cf_config[:expires_in]) do
-        #   ip_v4
-        # end.map{|ip| IPAddr.new ip }
-        #
-        # cloudflare_ips += ::Rails.cache.fetch("cloudflare-rails:ip_v6", expires_in: cf_config[:expires_in]) do
-        #   ip_v6
-        # end.map{|ip| IPAddr.new "[#{ip}]" }
-#
-#         [:ips_v4, :ips_v6].each do |type|
-#           begin
-#             ips = ::Rails.cache.fetch("cloudflare-rails:#{type}", expires_in: cf_config[:expires_in]) do
-#                     Importer.send type
-#                   end
-#             app.config.cloudflare.ips += ips if ips.present?
-#           rescue Importer::ResponseError => e
-#             ::Rails.logger.error "Cloudflare::Rails: Couldn't import #{type} blocks from CloudFlare: #{e.response}"
-#           rescue => e
-#             ::Rails.logger.error "Cloudflare::Rails: Got exception: #{e} for type:#{type}, cloudflare_ips: #{cloudflare_ips}"
-#           end
-#         end
-#
-#         if app.config.cloudflare.ips.present?
-#           # i don't know what uses these beyond ActionDispatch::RemoteIp (which
-#           # we are patching below) but we should go ahead and keep this in sync
-#           # anyway
-#           if app.config.action_dispatch.trusted_proxies.blank?
-#             # this behavior is copied from:
-#             #
-#             # https://github.com/rails/rails/blob/a59a9b7f729870de6c9282bd8e2a7ed7f86fc868/actionpack/lib/action_dispatch/middleware/remote_ip.rb#L76
-#             #
-#             # we want to make the addition of cloudflare_ips as transparent as
-#             # possible but by adding our array in we change the behavior of
-#             # ActionDispatch::RemoteIp
-#             app.config.action_dispatch.trusted_proxies = ActionDispatch::RemoteIp::TRUSTED_PROXIES + cloudflare_ips
-#           elsif app.config.action_dispatch.trusted_proxies.respond_to?(:any)
-#             app.config.action_dispatch.trusted_proxies += app.config.cloudflare.ips
-#           else
-#             app.config.action_dispatch.trusted_proxies = Array(app.config.action_dispatch.trusted_proxies) + ActionDispatch::RemoteIp::TRUSTED_PROXIES + app.config.cloudflare.ips
-#           end
-#
-#           # now we have to patch ActionDispatch::RemoteIp since by the time we
-#           # get here it's already been configured and initialized and we can't
-#           # easily mess around with the middleware stack.
-#           remote_ip_patch = Module.new
-#
-#           remote_ip_patch.instance_eval do
-#             define_method :proxies do
-#               @proxies + app.config.cloudflare.ips
-#             end
-#           end
-#
-#           # remote_ip_patch.const_set :CLOUDFLARE_IPS, cloudflare_ips
-#           # pp "remote_ip_patch.constants is #{remote_ip_patch.constants}"
-#           ActionDispatch::RemoteIp.prepend remote_ip_patch
-# #          pp ActionDispatch::RemoteIp::CLOUDFLARE_IPS
-#         end
-#       end
-#     end
-#   end
-# end

data/lib/cloudflare/rails/version.rb

@@ -1,5 +1,5 @@
 module Cloudflare
   module Rails
-    VERSION = "0.1.2"
+    VERSION = "0.2.0"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cloudflare-rails
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.2.0
 platform: ruby
 authors:
 - jonathan schatz
@@ -86,14 +86,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: httparty
   requirement: !ruby/object:Gem::Requirement