big_session 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 994588f4941c7cc708c7eb25b6c83eeccd3152955e3383dd9091d5760e80c564
-  data.tar.gz: 89b653bd49cf3d7cb121edef8fdd7b4a813f95fa3533f1499c0140890dbfce33
+  metadata.gz: 5df74f239e196ec09817590c3618f7e5689c48e273e33b284f836fefd3f69318
+  data.tar.gz: 2d0b08359ab3d997e84900b6b7a960fefb3f8bedfba39de928c5b13d974cccc4
 SHA512:
-  metadata.gz: e861d9b437bb3ed1080ad04fdff2e58a5df8031a97a9d643efd1dd6ccd6fb2fc4759db98cfe8dedb21f33c397b6f97a48efaaeb418b554a7154be1f9cc8c14b0
-  data.tar.gz: bdd49cd22dd15c31a305423020abfd1663057e141fcfb8de76849756c909f8be7b27a3766b112bcf35f39ad69c75514ac831af94a4bcb4cbfe9c36c27eb2f414
+  metadata.gz: c4719aaa0e5404daa58fa3cf38be0d08ab92a1841ef2700e71480f4164d249bff464ce69a3e059a8bcce3e003b141e5827d01f8e86f245d8f1d26a364aa5b732
+  data.tar.gz: 771b9f7a1959a62a6610e07032d92cbd3a5ae8b87cf02d1bbcbd7af21c480047ce31069f46895afe31ee07798710e02b1237d9ad35ff303db7a033f33086f478

data/lib/big_session.rb

@@ -10,6 +10,6 @@ module BigSession
 
   BIG_SESSION_HEADER_NAME = 'X-Bigse-SessionID'
   BIG_SESSION_SIGNATURE_HEADER_NAME = 'X-Bigse-Sig'
-  THREAD_BIG_SESSION_ID_KEY = 'big_session_id'
+  THREAD_BIG_SESSION_CONTAINER_KEY = 'big_session_id'
   RAILS_SESSION_BIG_SESSION_ID_KEY = 'big_session_id'
 end

data/lib/big_session/rack_middleware.rb

@@ -20,32 +20,33 @@ module BigSession
     end
 
     def call(env)
+      session_id = retrieve_or_generate_session_id(env)
+      env['rack.session'][::BigSession::RAILS_SESSION_BIG_SESSION_ID_KEY] = session_id
+      SessionId.with_session_id(session_id) do
+        @app.call(env)
+      end
+    end
+
+    private
+
+    def retrieve_or_generate_session_id(env)
       header_session_id, header_signature = env.values_at(
         'HTTP_' + ::BigSession::BIG_SESSION_HEADER_NAME.upcase.gsub(/-/, '_'),
         'HTTP_' + ::BigSession::BIG_SESSION_SIGNATURE_HEADER_NAME
           .upcase.gsub(/-/, '_')
       )
 
-      if header_session_id
-        env['rack.session'][::BigSession::RAILS_SESSION_BIG_SESSION_ID_KEY] =
-          if @header_secret
-            validate_header_session_id(header_session_id, header_signature)
-          else
-            header_session_id
-          end
-
-        SessionId.set(env['rack.session'][::BigSession::RAILS_SESSION_BIG_SESSION_ID_KEY])
-      else
-        SessionId.set(env['rack.session'][::BigSession::RAILS_SESSION_BIG_SESSION_ID_KEY]) unless SessionId.current
-        env['rack.session'][::BigSession::RAILS_SESSION_BIG_SESSION_ID_KEY] = SessionId.current
-      end
+      return validate_header_session_id(header_session_id, header_signature) \
+        if header_session_id
 
-      @app.call(env)
+      SessionId.current ||
+        env['rack.session'][::BigSession::RAILS_SESSION_BIG_SESSION_ID_KEY] ||
+        SessionId.new_session_id
     end
 
-    private
-
     def validate_header_session_id(header_session_id, header_signature)
+      return header_session_id unless @header_secret
+
       digest = OpenSSL::HMAC.hexdigest('sha256', @header_secret, header_session_id)
       return header_session_id if digest == header_signature
 

data/lib/big_session/session_id.rb

@@ -6,20 +6,33 @@ module BigSession
   # SessionId object bridges an access from users to session id
   class SessionId
     class << self
+      def with_session_id(session_id, &_block)
+        container.push(session_id)
+        yield
+      ensure
+        container.pop
+      end
+
       def current
-        Thread.current[::BigSession::THREAD_BIG_SESSION_ID_KEY]
+        container.last
       end
 
+=begin
       def set(value = nil)
         Thread.current[::BigSession::THREAD_BIG_SESSION_ID_KEY] =
           value || new_session_id
       end
+=end
 
       def new_session_id
         SecureRandom.hex(16)
       end
+
+      def container
+        Thread.current[::BigSession::THREAD_BIG_SESSION_CONTAINER_KEY] ||= []
+      end
     end
 
-    private_class_method :new_session_id
+    private_class_method :container
   end
 end

data/lib/big_session/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module BigSession
-  VERSION = '0.1.0'
+  VERSION = '0.1.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: big_session
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Yuichiro Someya
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-10-25 00:00:00.000000000 Z
+date: 2019-11-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler