cloudfront-rails 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 798f5816174c333e4a0273531b9f61d77ae04af1
-  data.tar.gz: ca2a70549d3c1745cdce2dc0bcbc9a358d8ff7d2
+  metadata.gz: e30b0bb4a44345937f2986776c042412d0a8e1e3
+  data.tar.gz: 97bd443050d29199c36c7fa4d7a6028e58a19e73
 SHA512:
-  metadata.gz: b41926c050986fbe69cf4c6a1866a1ded71700c91a360f9c15c022b8e26eb129c0d7098175d993d66fd1e02cb2eab3628bbe1a13b5af6e9bf2b987cf0d7335c5
-  data.tar.gz: 5ac4581c46586d5535582b6f444196acfb22f8dff443ad6cd2babe9676ac7a18b2a941e81ee04e4de69159f6ad2ea1673c48a0c6fd5df069b6844eaf3b3ec81f
+  metadata.gz: 3b3d4634990288efd052dec24cfed2ab94023923cdf633e457d4e591c1ebc674fb60f8328f9344f644d9e0d1450b0a5a05aefe60bde253871753cb1246d7c4c4
+  data.tar.gz: 05ca80e7d87e5a68fbec61ce837a1651a826173d1e4e6d21489fc3a435e7816b2b0ad74f6e177b31f701b07bcd3a863531c1e1a3cf579cdd7c7a06f5b6846141

data/.gitignore

@@ -1,6 +1,7 @@
 /.bundle/
 /.yardoc
 /Gemfile.lock
+/gemfiles/Gemfile-*.lock
 /_yardoc/
 /coverage/
 /doc/

data/.travis.yml

@@ -2,7 +2,8 @@ sudo: false
 cache: bundler
 language: ruby
 rvm:
-  - 2.2.7
   - 2.3.4
   - 2.4.1
-before_install: gem install bundler -v 1.15.1
+gemfile:
+  - gemfiles/Gemfile-4.x
+  - gemfiles/Gemfile-5.x

data/CONTRIBUTING.md

@@ -0,0 +1,11 @@
+# Contributing
+
+Thank you for contributing!
+
+For Feature/Bug Fixes create a Pull Request and I'll get to it as soon as I can (Promise!)
+
+## Testing
+
+Please do complete your Pull Request with `spec` changes for completeness.
+
+**Thanks**

data/README.md

@@ -6,7 +6,7 @@ This Gem is a shameless copy of [cloudflare-rails](https://github.com/modosc/clo
 
 ## Installation
 
-__This gem now supports Rails 5,, for Rails 4, please use version ~> 0.1.0__
+__This gem supports Rails 4 and 5__
 
 Add this line to your application's Gemfile:
 
@@ -49,4 +49,3 @@ Bug reports and pull requests are welcome on GitHub at https://github.com/dinks/
 ## License
 
 The gem is available as open source under the terms of the [MIT License](http://opensource.org/licenses/MIT).
-

data/cloudfront-rails.gemspec

@@ -20,12 +20,10 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler", "~> 1.12"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec", "~> 3.0"
-  spec.add_development_dependency "rspec-rails"
 
   spec.add_development_dependency "webmock"
 
-  spec.add_dependency "rails", "~> 5.0"
-  spec.add_dependency "httparty", ">= 0.13.7"
+  spec.add_dependency "railties", "> 4.0"
 
   spec.required_ruby_version = ">= 2.0"
 end

data/gemfiles/Gemfile-4.x

@@ -0,0 +1,5 @@
+source 'https://rubygems.org'
+
+gemspec path: '..'
+
+gem 'railties', '~> 4.0'

data/gemfiles/Gemfile-5.x

@@ -0,0 +1,5 @@
+source 'https://rubygems.org'
+
+gemspec path: '..'
+
+gem 'railties', '~> 5.0'

data/lib/cloudfront/rails.rb

@@ -1,3 +1,6 @@
+require "rails"
+require "net/http"
+
 require "cloudfront/rails/version"
 
 module Cloudfront
@@ -6,4 +9,6 @@ module Cloudfront
   end
 end
 
+require "cloudfront/rails/importer"
+require "cloudfront/rails/importer/response_error"
 require "cloudfront/rails/railtie"

data/lib/cloudfront/rails/importer.rb

@@ -0,0 +1,47 @@
+module Cloudfront
+  module Rails
+    class Importer
+      class << self
+        def fetch
+          uri = URI("https://ip-ranges.amazonaws.com/ip-ranges.json")
+           response = Net::HTTP.start(uri.host,
+                                     uri.port,
+                                     use_ssl: uri.scheme == 'https',
+                                     open_timeout: ::Rails.application.config.cloudfront.timeout,
+                                     read_timeout: ::Rails.application.config.cloudfront.timeout,
+                                     ssl_timeout:  ::Rails.application.config.cloudfront.timeout
+                                    ) do |http|
+            http.request(Net::HTTP::Get.new(uri))
+          end
+
+          case response
+          when Net::HTTPSuccess
+            json = ActiveSupport::JSON.decode response.body
+
+            trusted_ipv4_proxies = json["prefixes"].select do |details|
+              details["service"] == 'CLOUDFRONT'
+            end.map do |details|
+              IPAddr.new(details["ip_prefix"])
+            end
+
+            trusted_ipv6_proxies = json["ipv6_prefixes"].select do |details|
+              details["service"] == 'CLOUDFRONT'
+            end.map do |details|
+              IPAddr.new(details["ipv6_prefix"])
+            end
+
+            trusted_ipv4_proxies + trusted_ipv6_proxies
+          else
+            raise ResponseError.new(response)
+          end
+        end
+         def fetch_with_cache
+          ::Rails.cache.fetch("cloudfront-rails-ips",
+                              expires_in: ::Rails.application.config.cloudfront.expires_in) do
+            self.fetch
+          end
+        end
+      end
+    end
+  end
+end

data/lib/cloudfront/rails/importer/response_error.rb

@@ -0,0 +1,12 @@
+module Cloudfront
+  module Rails
+    class Importer
+      class ResponseError < StandardError
+        attr_reader :response
+         def initialize(response)
+          @response = response
+        end
+      end
+    end
+  end
+end

data/lib/cloudfront/rails/railtie.rb

@@ -1,5 +1,3 @@
-require "httparty"
-
 module Cloudfront
   module Rails
     class Railtie < ::Rails::Railtie
@@ -10,7 +8,11 @@ module Cloudfront
         end
       end
 
-      Rack::Request::Helpers.prepend CheckTrustedProxies
+      if ::Rails.version.start_with? '4.'
+        Rack::Request.prepend CheckTrustedProxies
+      else
+        Rack::Request::Helpers.prepend CheckTrustedProxies
+      end
 
       module RemoteIpProxies
         def proxies
@@ -20,49 +22,6 @@ module Cloudfront
 
       ActionDispatch::RemoteIp.prepend RemoteIpProxies
 
-      class Importer
-        include HTTParty
-
-        base_uri "https://ip-ranges.amazonaws.com"
-        follow_redirects true
-        default_options.update(verify: true)
-
-        class ResponseError < HTTParty::ResponseError; end
-
-        class << self
-          def fetch
-            resp = get "/ip-ranges.json", timeout: ::Rails.application.config.cloudfront.timeout
-
-            if resp.success?
-              json = ActiveSupport::JSON.decode resp.body
-
-              trusted_ipv4_proxies = json["prefixes"].select do |details|
-                                       details["service"] == 'CLOUDFRONT'
-                                     end.map do |details|
-                                       IPAddr.new(details["ip_prefix"])
-                                     end
-
-              trusted_ipv6_proxies = json["ipv6_prefixes"].select do |details|
-                                       details["service"] == 'CLOUDFRONT'
-                                     end.map do |details|
-                                       IPAddr.new(details["ipv6_prefix"])
-                                     end
-
-              trusted_ipv4_proxies + trusted_ipv6_proxies
-            else
-              raise ResponseError.new(resp.response)
-            end
-          end
-
-          def fetch_with_cache
-            ::Rails.cache.fetch("cloudfront-rails-ips",
-                                expires_in: ::Rails.application.config.cloudfront.expires_in) do
-              self.fetch
-            end
-          end
-        end
-      end
-
       CLOUDFRONT_DEFAULTS = {
         expires_in: 12.hours,
         timeout: 5.seconds,

data/lib/cloudfront/rails/version.rb

@@ -1,5 +1,5 @@
 module Cloudfront
   module Rails
-    VERSION = "0.3.0"
+    VERSION = "0.4.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cloudfront-rails
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Dinesh V
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-07-30 00:00:00.000000000 Z
+date: 2018-07-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -52,20 +52,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
-- !ruby/object:Gem::Dependency
-  name: rspec-rails
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
@@ -81,33 +67,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rails
+  name: railties
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '5.0'
-- !ruby/object:Gem::Dependency
-  name: httparty
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.13.7
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
+    - - ">"
       - !ruby/object:Gem::Version
-        version: 0.13.7
+        version: '4.0'
 description: " Whitelist Cloudfront Proxies for Rails so that request.ip and request.remote_ip
   work properly "
 email:
@@ -120,6 +92,7 @@ files:
 - ".rspec"
 - ".travis.yml"
 - CODE_OF_CONDUCT.md
+- CONTRIBUTING.md
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -127,7 +100,11 @@ files:
 - bin/console
 - bin/setup
 - cloudfront-rails.gemspec
+- gemfiles/Gemfile-4.x
+- gemfiles/Gemfile-5.x
 - lib/cloudfront/rails.rb
+- lib/cloudfront/rails/importer.rb
+- lib/cloudfront/rails/importer/response_error.rb
 - lib/cloudfront/rails/railtie.rb
 - lib/cloudfront/rails/version.rb
 homepage: https://github.com/dinks/cloudfront-rails/