current_session 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 13ac22af37f6aa5545fb02c46c729473b043b67c4073c9b481015c422c7d5927
-  data.tar.gz: c2bd6c1da99e69a41ecadf263f2c0219633d45da7cb723476d4fb8904c8344ee
+  metadata.gz: fe0094c715e9d1a1152a795e0edd0583434cabcc1d955a8fc5c6e2c2202c0e85
+  data.tar.gz: 0d7af31d9cb4f1762c15e6b1a288b2c4c6226dcb153e8709b6e2321ee7007585
 SHA512:
-  metadata.gz: 1e193a8e670f0f684dc509193b0d1ada1f092551b312cc3032527520e8c1957c413a2bd77c2637556498b5f898b49974839d4752e1d09792dda68a73e357cc5f
-  data.tar.gz: 4cd6ca157c873142fc4c43c9a14c2a16e7f8487364d94c116204e7aca36d9b005c5f05d44e80aa3264885363d08e74271d4d442c786d7359fd44c01ee47225d3
+  metadata.gz: 41197858ae7dcd61d71a593332ca369ed9526fa0711e3c2b992d2eadaac55df763f800e105d01a67e254043c67ee3673d169be6e5ee889a51797acdfc8b9d962
+  data.tar.gz: 6b907dce8ee28afb0a6988cf5384912a732bb56f7ad8f85543cadd02b108c83f15108a6b6ef0593e9c6a86861114ba6aac0e0b053ce2d9cda3bae61469f3acd5

data/Gemfile

@@ -9,4 +9,6 @@ gem "rake", "~> 13.0"
 
 gem "rspec", "~> 3.0"
 
-gem "rubocop", "~> 1.7"
+gem "rubocop"
+gem "rubocop-performance"
+gem "rubocop-rspec"

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    current_session (0.1.4)
+    current_session (0.1.6)
       activesupport (>= 6.0.0)
 
 GEM
@@ -40,7 +40,7 @@ GEM
       coderay (~> 1.1)
       method_source (~> 1.0)
     rack (3.0.0)
-    rack-protection (3.0.1)
+    rack-protection (3.0.2)
       rack
     rainbow (3.1.1)
     rake (13.0.6)
@@ -59,18 +59,23 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.11.0)
     rspec-support (3.11.1)
-    rubocop (1.36.0)
+    rubocop (1.37.0)
       json (~> 2.3)
       parallel (~> 1.10)
       parser (>= 3.1.2.1)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
       rexml (>= 3.2.5, < 4.0)
-      rubocop-ast (>= 1.20.1, < 2.0)
+      rubocop-ast (>= 1.22.0, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 3.0)
-    rubocop-ast (1.21.0)
+    rubocop-ast (1.23.0)
       parser (>= 3.1.1.0)
+    rubocop-performance (1.15.0)
+      rubocop (>= 1.7.0, < 2.0)
+      rubocop-ast (>= 0.4.0)
+    rubocop-rspec (2.13.2)
+      rubocop (~> 1.33)
     ruby-progressbar (1.11.0)
     simplecov (0.21.2)
       docile (~> 1.1)
@@ -78,13 +83,15 @@ GEM
       simplecov_json_formatter (~> 0.1)
     simplecov-html (0.12.3)
     simplecov_json_formatter (0.1.4)
-    sqlite3 (1.5.1-arm64-darwin)
+    sqlite3 (1.5.3-arm64-darwin)
+    sqlite3 (1.5.3-x86_64-linux)
     tzinfo (2.0.5)
       concurrent-ruby (~> 1.0)
     unicode-display_width (2.3.0)
 
 PLATFORMS
   arm64-darwin-20
+  x86_64-linux
 
 DEPENDENCIES
   activerecord
@@ -94,7 +101,9 @@ DEPENDENCIES
   pry
   rake (~> 13.0)
   rspec (~> 3.0)
-  rubocop (~> 1.7)
+  rubocop
+  rubocop-performance
+  rubocop-rspec
   simplecov
   sqlite3
 

data/lib/current_session/auth_method.rb

@@ -7,12 +7,14 @@ module CurrentSession
   class AuthMethod
     class_attribute :user_class
 
+    # only exist users
     class FindBy < self
       def call(&block)
         find_by_auth.try(&block)
       end
     end
 
+    # admit new users
     class FindOrCreateBy < self
       def call(&block)
         find_or_create_by_auth.try(&block)

data/lib/current_session/interface.rb

@@ -12,9 +12,7 @@ module CurrentSession
       end
 
       def update(request)
-        session_repository(request).try do |repository|
-          repository.find { |user| self.current_user = user }
-        end
+        session_repository(request).find_by_token { |user| self.current_user = user }
         self
       end
 
@@ -28,10 +26,7 @@ module CurrentSession
 
       def destroy(request)
         self.current_user = nil
-        session_repository(request).try do |repository|
-          repository.destroy
-          repository.delete_session_token
-        end
+        session_repository(request).delete_session_token
       end
 
       private

data/lib/current_session/session_method.rb

@@ -17,30 +17,51 @@ module CurrentSession
     end
     attr_reader :current_time, :request, :user_class, :session_token_class
 
-    def key
-      @key ||= CurrentSession.key(user_class)
-    end
-
-    def session_token
-      @session_token ||= request.session[key]
-    end
-
-    def new_session_token
-      SecureRandom.urlsafe_base64(64)
+    def find_by_token(&block)
+      try_session_token { find(&block) }
     end
 
     def delete_session_token
-      request.session.delete(key)
+      try_session_token do
+        request.session.delete(key)
+        destroy
+      end
     end
 
     def update_session_token(user)
-      request.session[key] = create(user)
+      create(user) { |value| request.session[key] = value }
     end
 
-    def try
-      session_token.presence.try do |_|
+    protected
+
+    def try_session_token
+      session_token.presence.try do
         yield self
       end
     end
+
+    def find
+      fail NotImplementedError, "You must implement #{self.class}##{__method__}"
+    end
+
+    def create(user, &block)
+      fail NotImplementedError, "You must implement #{self.class}##{__method__}"
+    end
+
+    def destroy
+      fail NotImplementedError, "You must implement #{self.class}##{__method__}"
+    end
+
+    def key
+      @key ||= CurrentSession.key(user_class)
+    end
+
+    def session_token
+      @session_token ||= request.session[key]
+    end
+
+    def new_session_token
+      SecureRandom.urlsafe_base64(64)
+    end
   end
 end

data/lib/current_session/session_methods/active_record_session.rb

@@ -16,9 +16,16 @@ module CurrentSession
       def create(user)
         session_token_class.create(user_id: user.id, value: new_session_token) do |record|
           update(record)
-        end.value
+          yield record.value
+        end
+      end
+
+      def destroy
+        session_token_class.find_by(value: session_token)&.destroy
       end
 
+      private
+
       def update(token)
         token.update(
           last_request_at: current_time,
@@ -26,10 +33,6 @@ module CurrentSession
           last_request_user_agent: request.user_agent
         )
       end
-
-      def destroy
-        session_token_class.find_by(value: session_token)&.destroy
-      end
     end
   end
 end

data/lib/current_session/session_methods/env_session.rb

@@ -11,7 +11,7 @@ module CurrentSession
         Module.new do
           define_method(:current_user) { user_class.find(current_user_id) }
 
-          def try
+          def try_session_token
             yield self
           end
 

data/lib/current_session/session_methods/uid_session.rb

@@ -11,7 +11,7 @@ module CurrentSession
       end
 
       def create(user)
-        user.uid
+        yield user.uid
       end
 
       def destroy

data/lib/current_session/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module CurrentSession
-  VERSION = "0.1.5"
+  VERSION = "0.1.6"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: current_session
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - Masa (Aileron inc)
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-10-21 00:00:00.000000000 Z
+date: 2022-10-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport