prerender_rails 1.0.1 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5e0a30152ab67e4ed90d572fa4fea5d5b7668b69
-  data.tar.gz: 3061266e1581da3da55955244cd95c263c607c88
+  metadata.gz: 61a58c5f4239f335d7a4a22784a175e36be07306
+  data.tar.gz: d5537ee321c8f97586f4434be35299b2673993fb
 SHA512:
-  metadata.gz: c01de33e47e9d0ef09391868bdfbbef22070f862c3ea6acf9a858808b3c6ebc2f401c9604c06f9c8f662922b63d7aacb1df495773120f49382036c7fafb9ae83
-  data.tar.gz: 7c5a1b22a80375cd5a9778e0196e45f58a5d9a70ba37a03143fdd81afff0c2749e0c8dacb59a00903ba6419303b966cfc85e005e89000c7b51316bba5151197b
+  metadata.gz: e6bccf3db6f4fe476a70852c1deadec8de6ab835f157b3527bf57797c6538063680da1b9fa8f0d1d67de568c916046adcdfafd1e9b2b6769c5ec0754a7e76cca
+  data.tar.gz: 7656f38253b8253e55df48a70f4e161ef40f5380acf29ec0357f9739606cd88e6aa9f92640e9e67411c587d51cf2d40113867424aaeab9dbed4b910419b97a22

data/README.md

@@ -1,5 +1,5 @@
-Prerender Rails [![Build Status](https://travis-ci.org/prerender/prerender_rails.png)](https://travis-ci.org/prerender/prerender_rails) [![Gem Version](https://badge.fury.io/rb/prerender_rails.png)](http://badge.fury.io/rb/prerender_rails)
-=========================== 
+Prerender Rails [![Stories in Ready](https://badge.waffle.io/prerender/prerender_rails.png?label=ready&title=Ready)](https://waffle.io/prerender/prerender_rails) [![Build Status](https://travis-ci.org/prerender/prerender_rails.png)](https://travis-ci.org/prerender/prerender_rails) [![Gem Version](https://badge.fury.io/rb/prerender_rails.png)](http://badge.fury.io/rb/prerender_rails)
+===========================
 
 Google, Facebook, Twitter, Yahoo, and Bing are constantly trying to view your website... but they don't execute javascript. That's why we built Prerender. Prerender is perfect for AngularJS SEO, BackboneJS SEO, EmberJS SEO, and any other javascript framework.
 
@@ -104,6 +104,13 @@ config.middleware.use Rack::Prerender,
 	end)
 ```
 
+### protocol
+
+Option to hard-set the protocol for Prerender accessing your site instead of the middleware figuring out the protocol based on the request.
+```ruby
+config.middleware.use Rack::Prerender, protocol: 'https'
+```
+
 ## Caching
 
 This rails middleware is ready to be used with [redis](http://redis.io/) or [memcached](http://memcached.org/) to return prerendered pages in milliseconds.
@@ -164,4 +171,4 @@ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
 AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
+THE SOFTWARE.

data/lib/prerender_rails.rb

@@ -19,7 +19,8 @@ module Rack
         'bufferbot',
         'quora link preview',
         'showyoubot',
-        'outbrain'
+        'outbrain',
+        'pinterest'
       ]
 
       @extensions_to_ignore = [
@@ -90,12 +91,13 @@ module Rack
         end
       end
 
-      @app.call(env)  
+      @app.call(env)
     end
 
 
     def should_show_prerendered_page(env)
       user_agent = env['HTTP_USER_AGENT']
+      buffer_agent = env['X-BUFFERBOT']
       is_requesting_prerendered_page = false
 
       return false if !user_agent
@@ -108,6 +110,9 @@ module Rack
       #if it is a bot...show prerendered page
       is_requesting_prerendered_page = true if @crawler_user_agents.any? { |crawler_user_agent| user_agent.downcase.include?(crawler_user_agent.downcase) }
 
+      #if it is BufferBot...show prerendered page
+      is_requesting_prerendered_page = true if buffer_agent
+
       #if it is a bot and is requesting a resource...dont prerender
       return false if @extensions_to_ignore.any? { |extension| request.path.include? extension }
 
@@ -126,7 +131,7 @@ module Rack
           blacklistedUrl || blacklistedReferer
         }
         return false
-      end 
+      end
 
       return is_requesting_prerendered_page
     end
@@ -164,8 +169,13 @@ module Rack
       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"
+        new_env["HTTPS"] = true and new_env["rack.url_scheme"] = "https" and new_env["SERVER_PORT"] = 443 if env["X-FORWARDED-PROTO"].split(',')[0] == "https"
+        new_env["HTTPS"] = false and new_env["rack.url_scheme"] = "http" and new_env["SERVER_PORT"] = 80 if env["X-FORWARDED-PROTO"].split(',')[0] == "http"
+      end
+
+      if @options[:protocol]
+        new_env["HTTPS"] = true and new_env["rack.url_scheme"] = "https" and new_env["SERVER_PORT"] = 443 if @options[:protocol] == "https"
+        new_env["HTTPS"] = false and new_env["rack.url_scheme"] = "http" and new_env["SERVER_PORT"] = 80 if @options[:protocol] == "http"
       end
 
       url = Rack::Request.new(new_env).url
@@ -193,7 +203,7 @@ module Rack
       return nil unless @options[:before_render]
 
       cached_render = @options[:before_render].call(env)
-      
+
       if cached_render && cached_render.is_a?(String)
         Rack::Response.new(cached_render, 200, [])
       elsif cached_render && cached_render.is_a?(Rack::Response)

data/prerender_rails.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |spec|
   spec.name          = "prerender_rails"
-  spec.version       = "1.0.1"
+  spec.version       = "1.0.3"
   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

@@ -1,5 +1,5 @@
 require_relative '../test_helper'
- 
+
 describe Rack::Prerender do
 
   bot = 'Baiduspider+(+http://www.baidu.com/search/spider.htm)'
@@ -134,7 +134,7 @@ describe Rack::Prerender do
     assert_equal( { 'test' => 'test2Header', "Content-Length"=>"20"}, response[2].headers )
   end
 
- 
+
   describe '#buildApiUrl' do
     it "should build the correct api url with the default url" do
       request = Rack::MockRequest.env_for "https://google.com/search?q=javascript"
@@ -167,11 +167,26 @@ describe Rack::Prerender do
 
 
     # 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
+    it "should build the correct api url for the Heroku SSL Addon support with single value" 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
+
+
+    # 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 with double value" do
+      request = Rack::MockRequest.env_for "http://google.com/search?q=javascript", { 'X-FORWARDED-PROTO' => 'https,http'}
+      ENV['PRERENDER_SERVICE_URL'] = nil
+      assert_equal 'http://service.prerender.io/https://google.com/search?q=javascript', @prerender.build_api_url(request)
+    end
+
+    it "should build the correct api url for the protocol option" do
+      @prerender = Rack::Prerender.new(@app, protocol: 'https')
+      request = Rack::MockRequest.env_for "http://google.com/search?q=javascript"
+      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: 1.0.1
+  version: 1.0.3
 platform: ruby
 authors:
 - Todd Hooper
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-09 00:00:00.000000000 Z
+date: 2014-06-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack