current_session 0.1.6 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fe0094c715e9d1a1152a795e0edd0583434cabcc1d955a8fc5c6e2c2202c0e85
-  data.tar.gz: 0d7af31d9cb4f1762c15e6b1a288b2c4c6226dcb153e8709b6e2321ee7007585
+  metadata.gz: e4f6fa40db922d5e32838fd4a9f4d2062db17e3dda91d0a82ad0bc50a0671c4a
+  data.tar.gz: dcda75e76492ff205ca2554b4c75031b52dbe3cfd020f54fa6f2e4aa82d80e8b
 SHA512:
-  metadata.gz: 41197858ae7dcd61d71a593332ca369ed9526fa0711e3c2b992d2eadaac55df763f800e105d01a67e254043c67ee3673d169be6e5ee889a51797acdfc8b9d962
-  data.tar.gz: 6b907dce8ee28afb0a6988cf5384912a732bb56f7ad8f85543cadd02b108c83f15108a6b6ef0593e9c6a86861114ba6aac0e0b053ce2d9cda3bae61469f3acd5
+  metadata.gz: c6e1ad045546518209cfc24a7347f001eb0c60b9ac2d3bf452286e5a030a42096f1b26275c4af0402b742be4c6d5a337c3f92ede20b8aab01cb8011ac4875ef4
+  data.tar.gz: f8a397e1ebceedc0f3f1074053f2e1395dddcf2de7499f9c05b37711cc15e329e9d27478260c0435474fea6f840c4cead1796a4f1696dc8aa6d36216da4d1421

data/.rubocop.yml

@@ -17,7 +17,7 @@ Style/StringLiteralsInInterpolation:
   EnforcedStyle: double_quotes
 
 Layout/LineLength:
-  Max: 120
+  Max: 125
   Exclude:
     - current_session.gemspec
 

data/Gemfile

@@ -5,9 +5,9 @@ source "https://rubygems.org"
 # Specify your gem's dependencies in current_user_omniauth.gemspec
 gemspec
 
-gem "rake", "~> 13.0"
+gem "rake"
 
-gem "rspec", "~> 3.0"
+gem "rspec"
 
 gem "rubocop"
 gem "rubocop-performance"

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    current_session (0.1.6)
+    current_session (0.1.7)
       activesupport (>= 6.0.0)
 
 GEM
@@ -26,7 +26,7 @@ GEM
     hashie (5.0.0)
     i18n (1.12.0)
       concurrent-ruby (~> 1.0)
-    json (2.6.2)
+    json (2.6.3)
     method_source (1.0.0)
     minitest (5.16.3)
     omniauth (2.1.0)
@@ -34,47 +34,47 @@ GEM
       rack (>= 2.2.3)
       rack-protection
     parallel (1.22.1)
-    parser (3.1.2.1)
+    parser (3.1.3.0)
       ast (~> 2.4.1)
     pry (0.14.1)
       coderay (~> 1.1)
       method_source (~> 1.0)
-    rack (3.0.0)
-    rack-protection (3.0.2)
+    rack (3.0.2)
+    rack-protection (3.0.5)
       rack
     rainbow (3.1.1)
     rake (13.0.6)
-    regexp_parser (2.6.0)
+    regexp_parser (2.6.1)
     rexml (3.2.5)
-    rspec (3.11.0)
-      rspec-core (~> 3.11.0)
-      rspec-expectations (~> 3.11.0)
-      rspec-mocks (~> 3.11.0)
-    rspec-core (3.11.0)
-      rspec-support (~> 3.11.0)
-    rspec-expectations (3.11.1)
+    rspec (3.12.0)
+      rspec-core (~> 3.12.0)
+      rspec-expectations (~> 3.12.0)
+      rspec-mocks (~> 3.12.0)
+    rspec-core (3.12.0)
+      rspec-support (~> 3.12.0)
+    rspec-expectations (3.12.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.11.0)
-    rspec-mocks (3.11.1)
+      rspec-support (~> 3.12.0)
+    rspec-mocks (3.12.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.11.0)
-    rspec-support (3.11.1)
-    rubocop (1.37.0)
+      rspec-support (~> 3.12.0)
+    rspec-support (3.12.0)
+    rubocop (1.41.1)
       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.22.0, < 2.0)
+      rubocop-ast (>= 1.23.0, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 3.0)
-    rubocop-ast (1.23.0)
+    rubocop-ast (1.24.0)
       parser (>= 3.1.1.0)
-    rubocop-performance (1.15.0)
+    rubocop-performance (1.15.1)
       rubocop (>= 1.7.0, < 2.0)
       rubocop-ast (>= 0.4.0)
-    rubocop-rspec (2.13.2)
+    rubocop-rspec (2.16.0)
       rubocop (~> 1.33)
     ruby-progressbar (1.11.0)
     simplecov (0.21.2)
@@ -83,14 +83,15 @@ GEM
       simplecov_json_formatter (~> 0.1)
     simplecov-html (0.12.3)
     simplecov_json_formatter (0.1.4)
-    sqlite3 (1.5.3-arm64-darwin)
-    sqlite3 (1.5.3-x86_64-linux)
+    sqlite3 (1.5.4-arm64-darwin)
+    sqlite3 (1.5.4-x86_64-linux)
     tzinfo (2.0.5)
       concurrent-ruby (~> 1.0)
     unicode-display_width (2.3.0)
 
 PLATFORMS
   arm64-darwin-20
+  arm64-darwin-21
   x86_64-linux
 
 DEPENDENCIES
@@ -99,8 +100,8 @@ DEPENDENCIES
   ffaker
   omniauth
   pry
-  rake (~> 13.0)
-  rspec (~> 3.0)
+  rake
+  rspec
   rubocop
   rubocop-performance
   rubocop-rspec

data/lib/current_session/auth_method.rb

@@ -2,36 +2,11 @@
 
 module CurrentSession
   #
-  # Base class for providing auth methods
+  # auth method
   #
   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
+    def self.new_class(methods)
+      Class.new(self) { include methods }
     end
 
     def initialize(request)
@@ -42,5 +17,12 @@ module CurrentSession
     def auth
       request.env["omniauth.auth"]
     end
+
+    #
+    # @return User
+    #
+    def connect
+      fail NotImplementedError, "You must implement #{self.class}##{__method__}"
+    end
   end
 end

data/lib/current_session/base.rb

@@ -6,48 +6,7 @@ module CurrentSession
   #
   class Base < ActiveSupport::CurrentAttributes
     include CurrentSession::Interface
+    include CurrentSession::Dsl
     attribute :current_user
-
-    class << self
-      attr_accessor :session_token_class
-      attr_reader :user_class
-
-      def user_class=(user_class)
-        @user_class = user_class
-        @auth_class.user_class = user_class if @auth_class
-      end
-
-      def current_time(_)
-        Time.current
-      end
-
-      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_class = CurrentSession::SessionMethod.new_session_class(session_methods)
-        else
-          @session_methods
-        end
-      end
-
-      def auth_methods=(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 = CurrentSession::AuthMethod.new_auth_class(auth_methods)
-          @auth_class.user_class = user_class
-        else
-          @auth_methods
-        end
-      end
-    end
   end
 end

data/lib/current_session/dsl.rb

@@ -0,0 +1,35 @@
+# frozen_string_literal: true
+
+module CurrentSession
+  #
+  # configuration dsl
+  #
+  module Dsl
+    extend ActiveSupport::Concern
+    class_methods do
+      def session_methods=(session_method)
+        @session_methods = CurrentSession::SessionMethod.new_class(session_method)
+      end
+
+      def session_methods(&block)
+        if block
+          @session_methods = CurrentSession::SessionMethod.new_class(Module.new(&block))
+        else
+          @session_methods
+        end
+      end
+
+      def auth_methods=(auth_method)
+        @auth_methods = CurrentSession::AuthMethod.new_class(auth_method)
+      end
+
+      def auth_methods(&block)
+        if block
+          @auth_methods = CurrentSession::AuthMethod.new_class(Module.new(&block))
+        else
+          @auth_methods
+        end
+      end
+    end
+  end
+end

data/lib/current_session/interface.rb

@@ -12,32 +12,17 @@ module CurrentSession
       end
 
       def update(request)
-        session_repository(request).find_by_token { |user| self.current_user = user }
+        self.current_user = @session_methods.new(request).find
         self
       end
 
       def create(request)
-        auth = @auth_class.new(request)
-        auth.call do |user|
-          auth.update(user)
-          session_repository(request).update_session_token(user)
-        end
+        self.current_user = @auth_methods.new(request).connect
+        @session_methods.new(request).create(current_user)
       end
 
       def destroy(request)
-        self.current_user = nil
-        session_repository(request).delete_session_token
-      end
-
-      private
-
-      def session_repository(request)
-        @session_class.new(
-          request: request,
-          user_class: user_class,
-          session_token_class: session_token_class,
-          current_time: current_time(request)
-        )
+        @session_methods.new(request).destroy
       end
     end
   end

data/lib/current_session/session_method.rb

@@ -2,49 +2,36 @@
 
 module CurrentSession
   #
-  # Base class for processing to get session_token from request.session
+  # session Method
   #
   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
+    def self.new_class(methods)
+      Class.new(self) do
+        include methods
       end
     end
 
-    def update_session_token(user)
-      create(user) { |value| request.session[key] = value }
+    def self.define(&block)
+      Module.new do
+        define_method(:find, &block)
+        define_method(:create) {}
+        define_method(:destroy) {}
+      end
     end
 
-    protected
-
-    def try_session_token
-      session_token.presence.try do
-        yield self
-      end
+    def initialize(request)
+      @request = request
     end
+    attr_reader :request
 
+    #
+    # @return User
+    #
     def find
       fail NotImplementedError, "You must implement #{self.class}##{__method__}"
     end
 
-    def create(user, &block)
+    def create(user)
       fail NotImplementedError, "You must implement #{self.class}##{__method__}"
     end
 
@@ -52,16 +39,8 @@ module CurrentSession
       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)
+      SecureRandom.urlsafe_base64(128)
     end
   end
 end

data/lib/current_session/version.rb

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

data/lib/current_session.rb

@@ -9,12 +9,12 @@ require "active_support"
 module CurrentSession
   extend ActiveSupport::Autoload
   autoload :Base
+  autoload :Dsl
   autoload :Interface
   autoload :AuthMethod
   autoload :SessionMethod
-  autoload :SessionMethods
 
-  def self.key(user_class)
-    "session_#{user_class.name.underscore.parameterize(separator: "_")}_key"
+  def self.key(namespace)
+    "session_#{namespace.name.underscore.parameterize(separator: "_")}_key"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: current_session
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.8
 platform: ruby
 authors:
 - Masa (Aileron inc)
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-10-23 00:00:00.000000000 Z
+date: 2022-12-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -148,12 +148,9 @@ files:
 - lib/current_session.rb
 - lib/current_session/auth_method.rb
 - lib/current_session/base.rb
+- lib/current_session/dsl.rb
 - lib/current_session/interface.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
-- lib/current_session/session_methods/uid_session.rb
 - lib/current_session/version.rb
 homepage: https://github.com/aileron-inc/current_session
 licenses:
@@ -175,7 +172,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.22
+rubygems_version: 3.3.26
 signing_key:
 specification_version: 4
 summary: Library for current_user using ActiveSupport::CurrentAttributes

data/lib/current_session/session_methods/active_record_session.rb

@@ -1,38 +0,0 @@
-# frozen_string_literal: true
-
-module CurrentSession
-  module SessionMethods
-    #
-    # Implementation of session tokens for DB management
-    #
-    module ActiveRecordSession
-      def find
-        session_token_class.find_by(value: session_token).try do |record|
-          update(record)
-          yield record.user
-        end
-      end
-
-      def create(user)
-        session_token_class.create(user_id: user.id, value: new_session_token) do |record|
-          update(record)
-          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,
-          last_request_ip: request.remote_ip,
-          last_request_user_agent: request.user_agent
-        )
-      end
-    end
-  end
-end

data/lib/current_session/session_methods/env_session.rb

@@ -1,32 +0,0 @@
-# frozen_string_literal: true
-
-module CurrentSession
-  module SessionMethods
-    #
-    # repository to return the user specified by the environment variable
-    #
-    module EnvSession
-      # rubocop:disable Metrics/MethodLength
-      def self.build(current_user_id)
-        Module.new do
-          define_method(:current_user) { user_class.find(current_user_id) }
-
-          def try_session_token
-            yield self
-          end
-
-          def find
-            yield current_user
-          end
-
-          def create(_)
-          end
-
-          def destroy
-          end
-        end
-      end
-      # rubocop:enable Metrics/MethodLength
-    end
-  end
-end

data/lib/current_session/session_methods/uid_session.rb

@@ -1,21 +0,0 @@
-# frozen_string_literal: true
-
-module CurrentSession
-  module SessionMethods
-    #
-    # Implementation of using UIDs as session tokens
-    #
-    module UidSession
-      def find(&block)
-        user_class.find_by(uid: session_token).try(&block)
-      end
-
-      def create(user)
-        yield user.uid
-      end
-
-      def destroy
-      end
-    end
-  end
-end

data/lib/current_session/session_methods.rb

@@ -1,13 +0,0 @@
-# frozen_string_literal: true
-
-#
-# Reference implementation of session_methods
-#
-module CurrentSession
-  module SessionMethods
-    extend ActiveSupport::Autoload
-    autoload :UidSession
-    autoload :EnvSession
-    autoload :ActiveRecordSession
-  end
-end