phrender 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ed3ad1d4b44735e82d185bca486adb853fb15fba
-  data.tar.gz: 1f37c26795b0cacf96926f1a3ebae75f41b15f4b
+  metadata.gz: 2c071fb71537894c6506cda8fdf3107307aff153
+  data.tar.gz: 1db4ff01dbba039dd67fce848435dfbfc82c8f9e
 SHA512:
-  metadata.gz: 9b1dbdae233a0fb2754378696a7757beee1c2ee197cc5aa5a0dac36be76be5b867d9649688c24c23f84b80dbf9a1ea269dc7b113085c1b0fd09459721c65b7ee
-  data.tar.gz: 42bbbaac4dd4aedae6504f5c972b02794dab825a368e00ec8b88accb65a6cc667dbb87ed2ac29ca9fcbde96c341d34a16ad0b96f9f71602272695ba5861da262
+  metadata.gz: 6706612f43d4d98a2eca5f8d5479aef880a933cd90a03b2309ad251c52896afbf3e4e1e4aef6730a9edea83fe8e312ab817a74bb4aadefdbe9f679d0710802e4
+  data.tar.gz: 7d7d8093472e1b8d49a6be861a900458072129fae8789672f2f13056ccb334ef35ec178ce5a23f1a7a17339412c28d5994934548a576df4b5ed0cd5240fe5933

data/lib/phrender/rack_middleware.rb

@@ -12,13 +12,23 @@ class Phrender::RackMiddleware
   end
 
   def call(env)
-    status, headers, body = @app.call(env)
-    if (status == 404 || headers['Content-Type'] == 'text/html')
-      if (env['HTTP_USER_AGENT'].match(/PhantomJS/))
+    @req = Rack::Request.new(env)
+
+    # Check if the next middleware can handle the request
+    status, headers, body = @app.call(@req.env)
+
+    # If it can't, or if it's just the index file delivered via aliasing for
+    # pushstate, do phrender stuff.
+    if (status == 404 || headers['Push-State-Redirect'])
+      # If it's phantom making the request, then the phrender index file has
+      # a request that the upstream server can't resolve, so catch it, instead
+      # of recursively invoking the index
+      if (@req.user_agent.match(/PhantomJS/))
         [ 500, { 'Content-Type'  => 'text/html' }, [
         'Server Error: HTML file contains recursive lookup' ] ]
       else
-        body = render(env['REQUEST_URI'])
+        # Render the page
+        body = render(@req.url)
         [ 200, { 'Content-Type'  => 'text/html' }, [ body ] ]
       end
     else
@@ -35,11 +45,16 @@ class Phrender::RackMiddleware
   end
 
   def load_html
-    req = Rack::MockRequest.env_for('',
-      'PATH_INFO' => @index_file,
-      'REQUEST_METHOD' => 'GET'
-    )
-    status, headers, body = @app.call(req)
+    req = @req.dup
+    req.path_info = @index_file
+
+    # Attach a param to indicate that it's phrender requesting the page. This is
+    # only useful if the index file is delivered via a dynamic backend. Ignored
+    # otherwise.
+    req.update_param('phrender', true)
+    req.env['REQUEST_METHOD'] = 'GET'
+
+    status, headers, body = @app.call(req.env)
     parse_body body
   end
 
@@ -48,11 +63,11 @@ class Phrender::RackMiddleware
       if path == :ember_driver
         Phrender::EMBER_DRIVER
       else
-        req = Rack::MockRequest.env_for('',
-          'PATH_INFO' => path,
-          'REQUEST_METHOD' => 'GET'
-        )
-        status, headers, body = @app.call(req)
+        req = @req.dup
+        req.path_info = path
+        req.env['REQUEST_METHOD'] = 'GET'
+
+        status, headers, body = @app.call(req.env)
         parse_body body
       end
     end.join(';')
@@ -61,6 +76,9 @@ class Phrender::RackMiddleware
   end
 
   def parse_body(body)
+    # Rack responses must respond to each, which is generally a polyfil that
+    # yields the response, so reassemble it here, or just treat it like a
+    # string.
     if body.respond_to? :each
       data = ''
       body.each{ |part| data << part }

data/lib/phrender/version.rb

@@ -1,3 +1,3 @@
 class Phrender
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: phrender
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - M Smart, theScore Inc.