current_session 0.1.2 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bc8d88a50edf84f089619f518ebcb2c0f35c1edbb12f05f346336315d4d644fc
-  data.tar.gz: fab046b1e5004c9c535bacf964b1c8856e3638b51501e9790fcc450b7e9efa40
+  metadata.gz: bc53442f7b800e43a4da8cc2690d72ba5466be6afce2b6d28fed7e3e62de9fea
+  data.tar.gz: 46364f6ee395e2e2734cb0784cf700793dafb022963960d7478a5397feac8bd0
 SHA512:
-  metadata.gz: 5497b4846b959a83e4cc4307ee5dec9fc543f2d250f734df83792cc02fa7290fa24897fae4bb8f50010bab1c8f5d110a5a4a4c1f60f839f20626b379ac1c53ff
-  data.tar.gz: e1c9db3b0bbd17629e9d35f7d2c830f3fe31f7330b6114353ccbe9d58836b0c9e9e8e0d006c7e21bc8c349f36d220baa54e01b7baf80e02ecad79e4e521dedc5
+  metadata.gz: 95c0d5af5fd5a896d277ccbb5955675ddaa04ee2caf52b41918c1aa1eae6cf0ca15d3c0cf781eddba225b3eef613a377054309347ddb3f1ae3e45b1f2002562f
+  data.tar.gz: f8e4b72b8bab60b40af08cf0a7fedcb8cc9613e7aab7a73a8d5d97b4fb7732ccccbd59c8a76890daed5b6382efe9f6e6c9a894fc99db18a9c7a316b99d9ed7b3

data/Gemfile.lock

@@ -1,18 +1,18 @@
 PATH
   remote: .
   specs:
-    current_session (0.1.0)
-      activesupport
+    current_session (0.1.4)
+      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/auth.rb

@@ -5,11 +5,12 @@ module CurrentSession
   # Base class for providing auth methods
   #
   class Auth
-    def initialize(request, user_class)
+    class_attribute :user_class
+
+    def initialize(request)
       @request = request
-      @user_class = user_class
     end
-    attr_reader :request, :user_class
+    attr_reader :request
 
     def auth
       request.env["omniauth.auth"]

data/lib/current_session/base.rb

@@ -10,7 +10,13 @@ module CurrentSession
     attribute :current_user
 
     class << self
-      attr_accessor :user_class, :session_token_class
+      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
@@ -21,9 +27,13 @@ module CurrentSession
       end
 
       def session_methods(&block)
-        session_methods = Module.new(&block)
-        const_set(:SessionMethods, session_methods)
-        @session_repository_class = Class.new(CurrentSession::Repository) { include session_methods }
+        if block
+          session_methods = Module.new(&block)
+          @session_repository_class = Class.new(CurrentSession::Repository) { include session_methods }
+          @session_methods = session_methods
+        else
+          @session_methods
+        end
       end
 
       def auth_methods=(auth_methods_module)
@@ -31,9 +41,14 @@ module CurrentSession
       end
 
       def auth_methods(&block)
-        auth_methods = Module.new(&block)
-        const_set(:AuthMethods, auth_methods)
-        @auth_class = Class.new(CurrentSession::Auth) { include auth_methods }
+        if block
+          auth_methods = Module.new(&block)
+          @auth_class = Class.new(CurrentSession::Auth) { include auth_methods }
+          @auth_class.user_class = user_class
+          @auth_methods = auth_methods
+        else
+          @auth_methods
+        end
       end
     end
   end

data/lib/current_session/interface.rb

@@ -19,7 +19,7 @@ module CurrentSession
       end
 
       def create(request)
-        auth = @auth_class.new(request, user_class)
+        auth = @auth_class.new(request)
         auth.find_or_create_by_auth.try do |user|
           auth.update(user)
           session_repository(request).update_session_token(user)

data/lib/current_session/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: current_session
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.4
 platform: ruby
 authors:
 - Masa (Aileron inc)
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-09-06 00:00:00.000000000 Z
+date: 2022-10-03 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