macmillan-utils 1.0.29 → 1.0.30

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a52b592a6dc2fa6a8e43dab0d7bdcb0a124faec2
-  data.tar.gz: d69410c60657a9a6926737cf947a3f9dee7ffcfe
+  metadata.gz: 264d16416f0255bd1acd4e7726ba9b8cac771965
+  data.tar.gz: 0faf3e3ed4d047880dadf0b35ed94491e59f7215
 SHA512:
-  metadata.gz: 8af1e77116a173bc52941b007216f674848039649e48e3d738f2a86c78b33638065aa7890c35bb10d2102e3347a2720fb557625149acb05457805bc340a9451a
-  data.tar.gz: bbc21e028c0be122c1edbd0aa6269bea942e425818ad2c340bd01c84935d13531e39cf590877aa06f6096b5af4326aa30f7a1354a4f895389469c073a44ac57b
+  metadata.gz: d497fef0654cefb7b49eb8a4ff481983b3e926dd47df8ae626ea33de97a128556f27548ec7d110f9d20b5f35bc7cf185f3ffff5b6e93504cb7dd442023a0ee49
+  data.tar.gz: a2770670c0a9ef6d84b04746882f138a4d2b7a7422370582c502d8ae5f7b2af169ac756bd95a4fe143cdf2c50b5fbb8b7160b3db93b0939646733af34c40d914

data/.travis.yml

@@ -8,7 +8,7 @@ rvm:
   - 2.2
   - 2.3.0
   - 2.3.1
-  - jruby
+  - jruby-9.0.0.0
   - rbx-2
 
 # Ensure we don't build for *every* commit (doesn't apply to PR builds)

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

@@ -31,7 +31,7 @@ module Macmillan
             @user_id_method = user_id_method
             @cookie_key     = cookie_key
 
-            env[cookie_key] = user_uuid
+            env[cookie_key] = final_user_uuid
           end
 
           def response
@@ -51,28 +51,29 @@ module Macmillan
             request.env[user_env_key]
           end
 
-          def user_uuid
-            @user_uuid ||= begin
+          def final_user_uuid
+            @final_user_uuid ||= begin
                              if user
                                Digest::SHA1.hexdigest(user.public_send(user_id_method).to_s)
-                             elsif cookie_uuid
-                               cookie_uuid
+                             elsif uuid_from_cookies
+                               uuid_from_cookies
                              else
                                SecureRandom.uuid
                              end
                            end
           end
 
-          def cookie_uuid
+          def uuid_from_cookies
             request.cookies[cookie_key]
           end
 
           def store_cookie?
-            user_uuid != cookie_uuid
+            final_user_uuid != uuid_from_cookies
           end
 
           def save_cookie
-            response.set_cookie(cookie_key, { value: user_uuid, path: '/', expires: DateTime.now.next_year.to_time })
+            cookie_value = { value: final_user_uuid, path: '/', expires: DateTime.now.next_year.to_time }
+            response.set_cookie(cookie_key, cookie_value)
           end
 
           def clean_old_cookies

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

@@ -1,7 +1,8 @@
 require 'spec_helper'
 
 RSpec.describe Macmillan::Utils::Middleware::Uuid do
-  let(:app)             { ->(env) { [200, env, 'app'] } }
+  let(:app)             { ->(_env) { app_return } }
+  let(:app_return)      { [200, {}, ['app']] }
   let(:request)         { req_for('http://example.com') }
   let(:user)            { double(email: 'bob.flemming@cough.com', user_id: '12345') }
   let(:user_uuid)       { Digest::SHA1.hexdigest(user.user_id.to_s) }
@@ -20,8 +21,8 @@ RSpec.describe Macmillan::Utils::Middleware::Uuid do
       end
 
       it 'stores the user_uuid in the env' do
-        _status, headers, _body = subject.call(request.env)
-        expect(headers['user.uuid']).to eq(user_uuid)
+        expect(app).to receive(:call).with(hash_including('user.uuid' => user_uuid)).and_return(app_return)
+        _status, _headers, _body = subject.call(request.env)
       end
     end
 
@@ -45,8 +46,8 @@ RSpec.describe Macmillan::Utils::Middleware::Uuid do
 
     context 'who has not visited before' do
       it 'stores the auto-generated UUID in the env' do
-        _status, headers, _body = subject.call(request.env)
-        expect(headers['user.uuid']).to eq('wibble')
+        expect(app).to receive(:call).with(hash_including('user.uuid' => 'wibble')).and_return(app_return)
+        _status, _headers, _body = subject.call(request.env)
       end
 
       it 'sets the user_uuid cookie' do
@@ -61,8 +62,8 @@ RSpec.describe Macmillan::Utils::Middleware::Uuid do
       end
 
       it 'stores the user_uuid (from the cookie) in the env' do
-        _status, headers, _body = subject.call(request.env)
-        expect(headers['user.uuid']).to eq('qwerty')
+        expect(app).to receive(:call).with(hash_including('user.uuid' => 'qwerty')).and_return(app_return)
+        _status, _headers, _body = subject.call(request.env)
       end
 
       it 'does not try to replace the cookie' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: macmillan-utils
 version: !ruby/object:Gem::Version
-  version: 1.0.29
+  version: 1.0.30
 platform: ruby
 authors:
 - Springer Nature
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-18 00:00:00.000000000 Z
+date: 2016-08-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -303,4 +303,3 @@ test_files:
 - spec/lib/macmillan/utils/statsd_decorator_spec.rb
 - spec/lib/macmillan/utils/statsd_middleware_spec.rb
 - spec/spec_helper.rb
-has_rdoc: