macmillan-utils 1.0.35 → 1.0.36

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0d1f96b3f99b5703f76145d41f69a05c60ee3c1f
-  data.tar.gz: 967a40968eae7dec441b728c23734649c4043693
+  metadata.gz: ada5b04c123cce12dd5738f9e8c7339f79e7f1c7
+  data.tar.gz: 667f44687ebeabbf21cd0c804224cc5c2638d3eb
 SHA512:
-  metadata.gz: 3c9bb4d6c825a9163fd017cf80bd18e7939861fbd58123245796efaf2aa472107d32c0fb9f3498ed57ecfa8ecf1a3d098fbcb5ac275a424dc2b8c16dd9179987
-  data.tar.gz: 534ded1eb08362626ae117699ca4ad1dc1beab50b08df9872d0a7459b6b5a0c33d48ff0abe6d3ad9d924654bedf86c957cb5e4f101abb9fda54fd3af0eecefa8
+  metadata.gz: 53d2a756311cf92365cb8aa7fd82095e75a0776acb53b4446ffbdf43a7fbf94ea775e4e37a6787ede43edd8d711d9f2103c5e41c85a3667832ad7ba4887dd71d
+  data.tar.gz: d94fd2774200ed45426e3b3d3ca5c9638fa257a97c17abbbb55b3a70938676421eedf9f10b55aa5e23f88194bf7859a7d27172dee254dd1022b0e2e5cc385c72

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

@@ -14,10 +14,10 @@ module Macmillan
         end
 
         def call(env)
-          request = Rack::Request.new(env)
+          @request = Rack::Request.new(env)
 
-          if cookies_accepted?(request)
-            redirect_back(request)
+          if cookies_accepted?(@request)
+            redirect_back(@request)
           else
             @app.call(env)
           end
@@ -26,9 +26,33 @@ module Macmillan
         private
 
         def cookies_accepted?(request)
-          request.post? &&
-            request.cookies[COOKIE] != 'accepted' &&
-            request.params['cookies'] == 'accepted'
+
+          debug_log("request.post? IS #{request.post?.inspect}")
+          debug_log("request.cookies[#{COOKIE}] IS #{request.cookies[COOKIE]}")
+          debug_log("request.params['cookies'] IS #{request.params['cookies']}")
+
+          unless request.post?
+            debug_log("request.post? means pass-thru")
+            return false
+          end
+          unless request.cookies[COOKIE] != 'accepted'
+            debug_log("request.cookies[#{COOKIE}] means passthru")
+            return false
+          end
+          unless request.params['cookies'] == 'accepted'
+            debug_log("request.params['cookies'] means passthru")
+            return false
+          end
+          debug_log("About to set the acceptance cookie and redirect")
+          true
+        end
+
+        def debug_log(msg)
+          logger.debug("[Macmillan::Utils::Middleware::CookieMessage] #{msg}")
+        end
+
+        def logger
+          @logger ||= @request.logger || NullLogger.new
         end
 
         def redirect_back(request)
@@ -65,6 +89,12 @@ module Macmillan
         def internal_redirect?(request, uri)
           request.host == uri.host && request.port == uri.port
         end
+
+        class NullLogger
+          def method_missing(*args)
+            nil
+          end
+        end
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: macmillan-utils
 version: !ruby/object:Gem::Version
-  version: 1.0.35
+  version: 1.0.36
 platform: ruby
 authors:
 - Springer Nature
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-31 00:00:00.000000000 Z
+date: 2017-02-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler