current_session 0.1.4 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bc53442f7b800e43a4da8cc2690d72ba5466be6afce2b6d28fed7e3e62de9fea
-  data.tar.gz: 46364f6ee395e2e2734cb0784cf700793dafb022963960d7478a5397feac8bd0
+  metadata.gz: fe0094c715e9d1a1152a795e0edd0583434cabcc1d955a8fc5c6e2c2202c0e85
+  data.tar.gz: 0d7af31d9cb4f1762c15e6b1a288b2c4c6226dcb153e8709b6e2321ee7007585
 SHA512:
-  metadata.gz: 95c0d5af5fd5a896d277ccbb5955675ddaa04ee2caf52b41918c1aa1eae6cf0ca15d3c0cf781eddba225b3eef613a377054309347ddb3f1ae3e45b1f2002562f
-  data.tar.gz: f8e4b72b8bab60b40af08cf0a7fedcb8cc9613e7aab7a73a8d5d97b4fb7732ccccbd59c8a76890daed5b6382efe9f6e6c9a894fc99db18a9c7a316b99d9ed7b3
+  metadata.gz: 41197858ae7dcd61d71a593332ca369ed9526fa0711e3c2b992d2eadaac55df763f800e105d01a67e254043c67ee3673d169be6e5ee889a51797acdfc8b9d962
+  data.tar.gz: 6b907dce8ee28afb0a6988cf5384912a732bb56f7ad8f85543cadd02b108c83f15108a6b6ef0593e9c6a86861114ba6aac0e0b053ce2d9cda3bae61469f3acd5

data/.rubocop.yml

@@ -32,3 +32,6 @@ Lint/EmptyBlock:
 
 RSpec/MultipleExpectations:
   Enabled: false
+
+Style/SignalException:
+  EnforcedStyle: semantic

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

@@ -0,0 +1,46 @@
+# frozen_string_literal: true
+
+module CurrentSession
+  #
+  # Base class for providing auth methods
+  #
+  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)
+      end
+    end
+
+    def self.new_auth_class(auth_methods_module)
+      new_auth_class =
+        if auth_methods_module.method_defined?(:find_by_auth)
+          Class.new(CurrentSession::AuthMethod::FindBy) { include auth_methods_module }
+        elsif auth_methods_module.method_defined?(:find_or_create_by_auth)
+          Class.new(CurrentSession::AuthMethod::FindOrCreateBy) { include auth_methods_module }
+        else
+          fail NotImplementedError, "You must implement find_by_auth or find_or_create_by_auth"
+        end
+      new_auth_class.user_class = user_class
+      new_auth_class
+    end
+
+    def initialize(request)
+      @request = request
+    end
+    attr_reader :request
+
+    def auth
+      request.env["omniauth.auth"]
+    end
+  end
+end

data/lib/current_session/base.rb

@@ -6,7 +6,6 @@ module CurrentSession
   #
   class Base < ActiveSupport::CurrentAttributes
     include CurrentSession::Interface
-    include CurrentSession::RaiseNotImplementedError
     attribute :current_user
 
     class << self
@@ -22,30 +21,29 @@ module CurrentSession
         Time.current
       end
 
-      def session_methods=(session_methods_module)
-        @session_repository_class = Class.new(CurrentSession::Repository) { include session_methods_module }
+      def session_methods=(session_methods)
+        @session_methods = session_methods
+        @session_class = CurrentSession::SessionMethod.new_session_class(session_methods)
       end
 
       def session_methods(&block)
         if block
-          session_methods = Module.new(&block)
-          @session_repository_class = Class.new(CurrentSession::Repository) { include session_methods }
-          @session_methods = session_methods
+          @session_methods = Module.new(&block)
+          @session_class = CurrentSession::SessionMethod.new_session_class(session_methods)
         else
           @session_methods
         end
       end
 
       def auth_methods=(auth_methods_module)
-        @auth_class = Class.new(CurrentSession::Auth) { include auth_methods_module }
+        @auth_class = CurrentSession::AuthMethod.new_auth_class(auth_methods_module)
       end
 
       def auth_methods(&block)
         if block
-          auth_methods = Module.new(&block)
-          @auth_class = Class.new(CurrentSession::Auth) { include auth_methods }
+          @auth_methods = Module.new(&block)
+          @auth_class = CurrentSession::AuthMethod.new_auth_class(auth_methods)
           @auth_class.user_class = user_class
-          @auth_methods = auth_methods
         else
           @auth_methods
         end

data/lib/current_session/interface.rb

@@ -12,15 +12,13 @@ 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
 
       def create(request)
         auth = @auth_class.new(request)
-        auth.find_or_create_by_auth.try do |user|
+        auth.call do |user|
           auth.update(user)
           session_repository(request).update_session_token(user)
         end
@@ -28,16 +26,13 @@ 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
 
       def session_repository(request)
-        @session_repository_class.new(
+        @session_class.new(
           request: request,
           user_class: user_class,
           session_token_class: session_token_class,

data/lib/current_session/session_method.rb

@@ -0,0 +1,67 @@
+# frozen_string_literal: true
+
+module CurrentSession
+  #
+  # Base class for processing to get session_token from request.session
+  #
+  class SessionMethod
+    def self.new_session_class(session_methods)
+      Class.new(CurrentSession::SessionMethod) { include session_methods }
+    end
+
+    def initialize(current_time:, request:, user_class:, session_token_class:)
+      @current_time = current_time
+      @request = request
+      @user_class = user_class
+      @session_token_class = session_token_class
+    end
+    attr_reader :current_time, :request, :user_class, :session_token_class
+
+    def find_by_token(&block)
+      try_session_token { find(&block) }
+    end
+
+    def delete_session_token
+      try_session_token do
+        request.session.delete(key)
+        destroy
+      end
+    end
+
+    def update_session_token(user)
+      create(user) { |value| request.session[key] = value }
+    end
+
+    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.4"
+  VERSION = "0.1.6"
 end

data/lib/current_session.rb

@@ -10,9 +10,8 @@ module CurrentSession
   extend ActiveSupport::Autoload
   autoload :Base
   autoload :Interface
-  autoload :Auth
-  autoload :Repository
-  autoload :RaiseNotImplementedError
+  autoload :AuthMethod
+  autoload :SessionMethod
   autoload :SessionMethods
 
   def self.key(user_class)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: current_session
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.6
 platform: ruby
 authors:
 - Masa (Aileron inc)
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-10-03 00:00:00.000000000 Z
+date: 2022-10-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -146,11 +146,10 @@ files:
 - bin/setup
 - current_session.gemspec
 - lib/current_session.rb
-- lib/current_session/auth.rb
+- lib/current_session/auth_method.rb
 - lib/current_session/base.rb
 - lib/current_session/interface.rb
-- lib/current_session/raise_not_implemented_error.rb
-- lib/current_session/repository.rb
+- lib/current_session/session_method.rb
 - lib/current_session/session_methods.rb
 - lib/current_session/session_methods/active_record_session.rb
 - lib/current_session/session_methods/env_session.rb

data/lib/current_session/auth.rb

@@ -1,19 +0,0 @@
-# frozen_string_literal: true
-
-module CurrentSession
-  #
-  # Base class for providing auth methods
-  #
-  class Auth
-    class_attribute :user_class
-
-    def initialize(request)
-      @request = request
-    end
-    attr_reader :request
-
-    def auth
-      request.env["omniauth.auth"]
-    end
-  end
-end

data/lib/current_session/raise_not_implemented_error.rb

@@ -1,36 +0,0 @@
-# frozen_string_literal: true
-
-module CurrentSession
-  #
-  # Class for verifying whether it is implemented correctly
-  #
-  module RaiseNotImplementedError
-    extend ActiveSupport::Concern
-    class_methods do
-      def raise_not_implemented_error
-        raise_not_implemented_error_for_repository
-        raise_not_implemented_error_for_auth
-      end
-
-      private
-
-      # rubocop:disable Layout/LineLength
-      def raise_not_implemented_error_for_repository
-        raise NotImplementedError, "You must setting self.session_repository_class= or session_methods" unless @session_repository_class
-        raise NotImplementedError, "You must implement #{@session_repository_class}#find" unless @session_repository_class.method_defined? :find
-        raise NotImplementedError, "You must implement #{@session_repository_class}#destroy" unless @session_repository_class.method_defined? :destroy
-        raise NotImplementedError, "You must implement #{@session_repository_class}#destroy" unless @session_repository_class.method_defined? :destroy
-        raise NotImplementedError, "You must implement #{@session_repository_class}#create" unless @session_repository_class.method_defined? :create
-      end
-      # rubocop:enable Layout/LineLength
-
-      # rubocop:disable Layout/LineLength
-      def raise_not_implemented_error_for_auth
-        raise NotImplementedError, "You must setting self.auth_class= or auth_methods" unless @auth_class
-        raise NotImplementedError, "You must implement #{@auth_class}#find_or_create_by_auth" unless @auth_class.method_defined? :find_or_create_by_auth
-        raise NotImplementedError, "You must implement #{@auth_class}#update" unless @auth_class.method_defined? :update
-      end
-      # rubocop:enable Layout/LineLength
-    end
-  end
-end

data/lib/current_session/repository.rb

@@ -1,42 +0,0 @@
-# frozen_string_literal: true
-
-module CurrentSession
-  #
-  # Base class for processing to get session_token from request.session
-  #
-  class Repository
-    def initialize(current_time:, request:, user_class:, session_token_class:)
-      @current_time = current_time
-      @request = request
-      @user_class = user_class
-      @session_token_class = session_token_class
-    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)
-    end
-
-    def delete_session_token
-      request.session.delete(key)
-    end
-
-    def update_session_token(user)
-      request.session[key] = create(user)
-    end
-
-    def try
-      session_token.presence.try do |_|
-        yield self
-      end
-    end
-  end
-end