prerender_rails 0.1.16 → 0.1.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a4e4b759f45b4c50892e48fab8a71a46888988e0
-  data.tar.gz: bf5185b7e8c5bac65afc226b5536cc5593667e90
+  metadata.gz: 6edf330fb3dcade0261ecc6be8d4ac63a1efdf7f
+  data.tar.gz: 4360662571ae5ad3a2688cf441a55085308a53af
 SHA512:
-  metadata.gz: d9e2e4e7347da9ae115139517f26b03d55a91b2f8e9b4a165b86d971cfedaf1d5eacb488e7597d3eb9f81cead484628afd780db73bbf325d8b7fe17b4aaab9e3
-  data.tar.gz: 45f83dc9a8b8b0d85889132715c177b977bed42a5e4765bb3266803259b0e39315e323aef25b660c7b2c39a86aea297511115203774f869c85eba106f793ed73
+  metadata.gz: 62a64d33161fb5528d07a958ff14a8895a1994c75b8bed2b55a650f56572c655cdddfbaee1555898d74b497c24b1e98deb3ab19adfdcdba523292fe1c6cc8baf
+  data.tar.gz: 8f180ca36cfc36d31eb1620761eede3d6ca720ce69fba13d4743768675b3c8c79c51734ad2d7035a53e9932087306f585d8f1737eebf8b384a25d2a4ddde1075

data/lib/prerender_rails.rb

@@ -150,6 +150,11 @@ module Rack
         new_env["HTTPS"] = false and new_env["rack.url_scheme"] = "http" and new_env["SERVER_PORT"] = 80 if (match && match[1] == "http")
       end
 
+      if env["X-FORWARDED-PROTO"]
+        new_env["HTTPS"] = true and new_env["rack.url_scheme"] = "https" and new_env["SERVER_PORT"] = 443 if env["X-FORWARDED-PROTO"] == "https"
+        new_env["HTTPS"] = false and new_env["rack.url_scheme"] = "http" and new_env["SERVER_PORT"] = 80 if env["X-FORWARDED-PROTO"] == "http"
+      end
+
       url = Rack::Request.new(new_env).url
       prerender_url = get_prerender_service_url()
       forward_slash = prerender_url[-1, 1] == '/' ? '' : '/'

data/prerender_rails.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |spec|
   spec.name          = "prerender_rails"
-  spec.version       = "0.1.16"
+  spec.version       = "0.1.17"
   spec.authors       = ["Todd Hooper"]
   spec.email         = ["todd@prerender.io"]
   spec.description   = %q{Rails middleware to prerender your javascript heavy pages on the fly by a phantomjs service}

data/test/lib/prerender_rails.rb

@@ -164,6 +164,14 @@ describe Rack::Prerender do
       ENV['PRERENDER_SERVICE_URL'] = nil
       assert_equal 'http://service.prerender.io/https://google.com/search?q=javascript', @prerender.build_api_url(request)
     end
+
+
+    # Check X-Forwarded-Proto because Heroku SSL Support terminates at the load balancer
+    it "should build the correct api url for the Heroku SSL Addon support" do
+      request = Rack::MockRequest.env_for "http://google.com/search?q=javascript", { 'X-FORWARDED-PROTO' => 'https'}
+      ENV['PRERENDER_SERVICE_URL'] = nil
+      assert_equal 'http://service.prerender.io/https://google.com/search?q=javascript', @prerender.build_api_url(request)
+    end
   end
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: prerender_rails
 version: !ruby/object:Gem::Version
-  version: 0.1.16
+  version: 0.1.17
 platform: ruby
 authors:
 - Todd Hooper
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-09 00:00:00.000000000 Z
+date: 2014-02-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack