current_session 0.1.0 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bfc9528a535c2d5ddcae967b83b2efe2542e7973a2bc4195f526da630647340e
-  data.tar.gz: 3fea9daed229931366f300225eb74a511d301cb2779cc42ec381df3d0907e1b8
+  metadata.gz: b1b39dda8338daaeb45ccebe39f01c23931d9387685619750a65c0a1acc7f6cb
+  data.tar.gz: 8214ca0c3d15c9d8cb27a963ba41e5e7cd71375c1e2d24ea616972b3beeed193
 SHA512:
-  metadata.gz: edde5245826209571d82fa6cf0220fd19312c82a5950e2897360120b04088128fd31f5b285fe27f375d38e5f31c86acaf5745b8f782002fcef97452b3c50e689
-  data.tar.gz: bda6aa822015d94c24058ea5e5e8bfed2f72d0792928bf47cf0c6e342be61137039946361b796bd3bf7ebefacc7ef05bb708050edffda6e9684f53577a469935
+  metadata.gz: 0e1e74c3e85d3806e3d8235f396f67d5132a7ff3ba49bd384d3a0bb316073ec9d17bf3f546a92754c0beceb43b08740532ec75a4a25a32c8cc9f835fcec29f7f
+  data.tar.gz: 3c0f7bba4344ab4be82509930173accd0b76712ee07b3dbb8018f788a22304d467c27478aa9ca7691ebecb794f7783cf835cecf8b9ed90f6bcdb005cc8e2df2e

data/.rubocop.yml

@@ -1,3 +1,9 @@
+inherit_from: .rubocop_todo.yml
+
+require:
+  - rubocop-performance
+  - rubocop-rspec
+
 AllCops:
   TargetRubyVersion: 3.0
   NewCops: enable
@@ -23,3 +29,6 @@ Style/EmptyMethod:
 
 Lint/EmptyBlock:
   Enabled: false
+
+RSpec/MultipleExpectations:
+  Enabled: false

data/.rubocop_todo.yml

@@ -0,0 +1,12 @@
+# This configuration was generated by
+# `rubocop --auto-gen-config`
+# on 2022-09-06 00:54:54 UTC using RuboCop version 1.36.0.
+# The point is for the user to remove these configuration records
+# one by one as the offenses are removed from the code base.
+# Note that changes in the inspected code, or installation of new
+# versions of RuboCop, may require this file to be generated again.
+
+# Offense count: 10
+# Configuration parameters: AllowSubject.
+RSpec/MultipleMemoizedHelpers:
+  Max: 9

data/Gemfile.lock

@@ -1,18 +1,18 @@
 PATH
   remote: .
   specs:
-    current_session (0.1.0)
-      activesupport
+    current_session (0.1.3)
+      activesupport (>= 6.0.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activemodel (7.0.3.1)
-      activesupport (= 7.0.3.1)
-    activerecord (7.0.3.1)
-      activemodel (= 7.0.3.1)
-      activesupport (= 7.0.3.1)
-    activesupport (7.0.3.1)
+    activemodel (7.0.4)
+      activesupport (= 7.0.4)
+    activerecord (7.0.4)
+      activemodel (= 7.0.4)
+      activesupport (= 7.0.4)
+    activesupport (7.0.4)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
@@ -39,12 +39,12 @@ GEM
     pry (0.14.1)
       coderay (~> 1.1)
       method_source (~> 1.0)
-    rack (2.2.4)
-    rack-protection (2.2.2)
+    rack (3.0.0)
+    rack-protection (3.0.1)
       rack
     rainbow (3.1.1)
     rake (13.0.6)
-    regexp_parser (2.5.0)
+    regexp_parser (2.6.0)
     rexml (3.2.5)
     rspec (3.11.0)
       rspec-core (~> 3.11.0)
@@ -52,14 +52,14 @@ GEM
       rspec-mocks (~> 3.11.0)
     rspec-core (3.11.0)
       rspec-support (~> 3.11.0)
-    rspec-expectations (3.11.0)
+    rspec-expectations (3.11.1)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.11.0)
     rspec-mocks (3.11.1)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.11.0)
-    rspec-support (3.11.0)
-    rubocop (1.35.1)
+    rspec-support (3.11.1)
+    rubocop (1.36.0)
       json (~> 2.3)
       parallel (~> 1.10)
       parser (>= 3.1.2.1)
@@ -78,10 +78,10 @@ GEM
       simplecov_json_formatter (~> 0.1)
     simplecov-html (0.12.3)
     simplecov_json_formatter (0.1.4)
-    sqlite3 (1.4.4)
+    sqlite3 (1.5.1-arm64-darwin)
     tzinfo (2.0.5)
       concurrent-ruby (~> 1.0)
-    unicode-display_width (2.2.0)
+    unicode-display_width (2.3.0)
 
 PLATFORMS
   arm64-darwin-20

data/current_session.gemspec

@@ -27,8 +27,7 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{\Aexe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  # Uncomment to register a new dependency of your gem
-  spec.add_runtime_dependency "activesupport"
+  spec.add_runtime_dependency "activesupport", ">= 6.0.0"
 
   # For more information and examples about making a new gem, checkout our
   # guide at: https://bundler.io/guides/creating_gem.html

data/lib/current_session/base.rb

@@ -16,16 +16,30 @@ module CurrentSession
         Time.current
       end
 
-      def session_repository_class=(session_repository_class = nil)
-        @session_repository_class = session_repository_class
+      def session_methods=(session_methods_module)
+        @session_repository_class = Class.new(CurrentSession::Repository) { include session_methods_module }
       end
 
       def session_methods(&block)
-        @session_repository_class = Class.new(CurrentSession::Repository, &block)
+        if block
+          session_methods = Module.new(&block)
+          @session_repository_class = Class.new(CurrentSession::Repository) { include session_methods }
+        else
+          @session_repository_class
+        end
+      end
+
+      def auth_methods=(auth_methods_module)
+        @auth_class = Class.new(CurrentSession::Auth) { include auth_methods_module }
       end
 
       def auth_methods(&block)
-        @auth_class = Class.new(CurrentSession::Auth, &block)
+        if block
+          auth_methods = Module.new(&block)
+          @auth_class = Class.new(CurrentSession::Auth) { include auth_methods }
+        else
+          @auth_class
+        end
       end
     end
   end

data/lib/current_session/session_methods/active_record_session.rb

@@ -0,0 +1,35 @@
+# 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)
+        end.value
+      end
+
+      def update(token)
+        token.update(
+          last_request_at: current_time,
+          last_request_ip: request.remote_ip,
+          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

@@ -0,0 +1,32 @@
+# 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
+            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

@@ -0,0 +1,21 @@
+# 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)
+        user.uid
+      end
+
+      def destroy
+      end
+    end
+  end
+end

data/lib/current_session/session_methods.rb

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

data/lib/current_session/version.rb

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

data/lib/current_session.rb

@@ -3,6 +3,9 @@
 require_relative "current_session/version"
 require "active_support"
 
+#
+# current_session
+#
 module CurrentSession
   extend ActiveSupport::Autoload
   autoload :Base
@@ -10,10 +13,7 @@ module CurrentSession
   autoload :Auth
   autoload :Repository
   autoload :RaiseNotImplementedError
-
-  autoload :UidSession
-  autoload :EnvSession
-  autoload :ActiveRecordSession
+  autoload :SessionMethods
 
   def self.key(user_class)
     "session_#{user_class.name.underscore.parameterize(separator: "_")}_key"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: current_session
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.3
 platform: ruby
 authors:
 - Masa (Aileron inc)
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-09-01 00:00:00.000000000 Z
+date: 2022-09-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 6.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 6.0.0
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
@@ -134,6 +134,7 @@ files:
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"
+- ".rubocop_todo.yml"
 - CHANGELOG.md
 - CODE_OF_CONDUCT.md
 - Gemfile
@@ -145,14 +146,15 @@ files:
 - bin/setup
 - current_session.gemspec
 - lib/current_session.rb
-- lib/current_session/active_record_session.rb
 - lib/current_session/auth.rb
 - lib/current_session/base.rb
-- lib/current_session/env_session.rb
 - lib/current_session/interface.rb
 - lib/current_session/raise_not_implemented_error.rb
 - lib/current_session/repository.rb
-- lib/current_session/uid_session.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:

data/lib/current_session/active_record_session.rb

@@ -1,33 +0,0 @@
-# frozen_string_literal: true
-
-module CurrentSession
-  #
-  # Implementation of session tokens for DB management
-  #
-  class ActiveRecordSession < Repository
-    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)
-      end.value
-    end
-
-    def update(token)
-      token.update(
-        last_request_at: current_time,
-        last_request_ip: request.remote_ip,
-        last_request_user_agent: request.user_agent
-      )
-    end
-
-    def destroy
-      session_token_class.find_by(value: session_token)&.destroy
-    end
-  end
-end

data/lib/current_session/env_session.rb

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

data/lib/current_session/uid_session.rb

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