macmillan-utils 1.0.30 → 1.0.31

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 264d16416f0255bd1acd4e7726ba9b8cac771965
-  data.tar.gz: 0faf3e3ed4d047880dadf0b35ed94491e59f7215
+  metadata.gz: 7ae6079821a9d8aeea074790ab1ae354fa3b6554
+  data.tar.gz: e444d8c35eb98e1156f91c04559bfda77fc063d0
 SHA512:
-  metadata.gz: d497fef0654cefb7b49eb8a4ff481983b3e926dd47df8ae626ea33de97a128556f27548ec7d110f9d20b5f35bc7cf185f3ffff5b6e93504cb7dd442023a0ee49
-  data.tar.gz: a2770670c0a9ef6d84b04746882f138a4d2b7a7422370582c502d8ae5f7b2af169ac756bd95a4fe143cdf2c50b5fbb8b7160b3db93b0939646733af34c40d914
+  metadata.gz: d3a50baa236a6b1b7feb48bd270cfd676101c1967cda53a2fb6fb2f0857811888393225eb03987e56bd7c4b053b18afaa45225693b1def2a62467763911b1c5a
+  data.tar.gz: f62ee633295943b1aa944d6da3e87605038977096ad667dc57182dbdeed4db24c68b4f5796303fd8e3db779e698052e3bb9af02f7d2bc871580adb501efd506e

data/lib/macmillan/utils/middleware/uuid.rb

@@ -22,7 +22,7 @@ module Macmillan
         end
 
         class CallHandler
-          attr_reader :app, :request, :user_env_key, :user_id_method, :cookie_key
+          attr_reader :app, :request, :user_env_key, :user_id_method, :cookie_key, :rack_errors, :uuid_is_new_key
 
           def initialize(env, app, user_env_key, user_id_method, cookie_key)
             @app            = app
@@ -30,10 +30,21 @@ module Macmillan
             @user_env_key   = user_env_key
             @user_id_method = user_id_method
             @cookie_key     = cookie_key
+            @rack_errors    = env['rack.errors']
+            @uuid_is_new_key = "#{cookie_key}_is_new"
 
-            env[cookie_key] = final_user_uuid
+            env[cookie_key]      = final_user_uuid
+            env[uuid_is_new_key] = true if uuid_is_new?
           end
 
+          def finish
+            save_cookie if store_cookie?
+            clean_old_cookies
+            response.finish
+          end
+
+          private
+
           def response
             @response ||= begin
                             status, headers, body = app.call(request.env)
@@ -41,26 +52,16 @@ module Macmillan
                           end
           end
 
-          def finish
-            save_cookie if store_cookie?
-            clean_old_cookies
-            response.finish
-          end
-
           def user
             request.env[user_env_key]
           end
 
+          def user_hexdigest
+            Digest::SHA1.hexdigest(user.public_send(user_id_method).to_s) if user
+          end
+
           def final_user_uuid
-            @final_user_uuid ||= begin
-                             if user
-                               Digest::SHA1.hexdigest(user.public_send(user_id_method).to_s)
-                             elsif uuid_from_cookies
-                               uuid_from_cookies
-                             else
-                               SecureRandom.uuid
-                             end
-                           end
+            @final_user_uuid ||= user_hexdigest || uuid_from_cookies || SecureRandom.uuid
           end
 
           def uuid_from_cookies
@@ -70,6 +71,7 @@ module Macmillan
           def store_cookie?
             final_user_uuid != uuid_from_cookies
           end
+          alias_method :uuid_is_new?, :store_cookie?
 
           def save_cookie
             cookie_value = { value: final_user_uuid, path: '/', expires: DateTime.now.next_year.to_time }

data/spec/lib/macmillan/utils/middleware/uuid_spec.rb

@@ -24,6 +24,11 @@ RSpec.describe Macmillan::Utils::Middleware::Uuid do
         expect(app).to receive(:call).with(hash_including('user.uuid' => user_uuid)).and_return(app_return)
         _status, _headers, _body = subject.call(request.env)
       end
+
+      it 'tells following rack app the user_uuid is new' do
+        expect(app).to receive(:call).with(hash_including('user.uuid_is_new' => true)).and_return(app_return)
+        _status, _headers, _body = subject.call(request.env)
+      end
     end
 
     context 'who also has a randomly assigned user_uuid cookie (from a previous non-authenticated session)' do
@@ -35,6 +40,11 @@ RSpec.describe Macmillan::Utils::Middleware::Uuid do
         _status, headers, _body = subject.call(request.env)
         expect(headers['Set-Cookie']).to include("user.uuid=#{user_uuid}")
       end
+
+      it 'tells following rack app the user_uuid is new' do
+        expect(app).to receive(:call).with(hash_including('user.uuid_is_new' => true)).and_return(app_return)
+        _status, _headers, _body = subject.call(request.env)
+      end
     end
   end
 
@@ -54,6 +64,11 @@ RSpec.describe Macmillan::Utils::Middleware::Uuid do
         _status, headers, _body = subject.call(request.env)
         expect(headers['Set-Cookie']).to include('user.uuid=wibble')
       end
+
+      it 'tells following rack app the user_uuid is new' do
+        expect(app).to receive(:call).with(hash_including('user.uuid_is_new' => true)).and_return(app_return)
+        _status, _headers, _body = subject.call(request.env)
+      end
     end
 
     context 'who has visited before and has a user_uuid cookie' do
@@ -70,6 +85,13 @@ RSpec.describe Macmillan::Utils::Middleware::Uuid do
         _status, headers, _body = subject.call(request.env)
         expect(headers['Set-Cookie']).to be_nil
       end
+
+      it 'does not tell following rack app the user_uuid is new' do
+        expect(app).to receive(:call) do |args|
+          expect(args).not_to have_key('user.uuid_is_new')
+        end.and_return(app_return)
+        _status, _headers, _body = subject.call(request.env)
+      end
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: macmillan-utils
 version: !ruby/object:Gem::Version
-  version: 1.0.30
+  version: 1.0.31
 platform: ruby
 authors:
 - Springer Nature
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-03 00:00:00.000000000 Z
+date: 2016-08-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler