current_session 0.1.3 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b1b39dda8338daaeb45ccebe39f01c23931d9387685619750a65c0a1acc7f6cb
-  data.tar.gz: 8214ca0c3d15c9d8cb27a963ba41e5e7cd71375c1e2d24ea616972b3beeed193
+  metadata.gz: 13ac22af37f6aa5545fb02c46c729473b043b67c4073c9b481015c422c7d5927
+  data.tar.gz: c2bd6c1da99e69a41ecadf263f2c0219633d45da7cb723476d4fb8904c8344ee
 SHA512:
-  metadata.gz: 0e1e74c3e85d3806e3d8235f396f67d5132a7ff3ba49bd384d3a0bb316073ec9d17bf3f546a92754c0beceb43b08740532ec75a4a25a32c8cc9f835fcec29f7f
-  data.tar.gz: 3c0f7bba4344ab4be82509930173accd0b76712ee07b3dbb8018f788a22304d467c27478aa9ca7691ebecb794f7783cf835cecf8b9ed90f6bcdb005cc8e2df2e
+  metadata.gz: 1e193a8e670f0f684dc509193b0d1ada1f092551b312cc3032527520e8c1957c413a2bd77c2637556498b5f898b49974839d4752e1d09792dda68a73e357cc5f
+  data.tar.gz: 4cd6ca157c873142fc4c43c9a14c2a16e7f8487364d94c116204e7aca36d9b005c5f05d44e80aa3264885363d08e74271d4d442c786d7359fd44c01ee47225d3

data/.rubocop.yml

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

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    current_session (0.1.3)
+    current_session (0.1.4)
       activesupport (>= 6.0.0)
 
 GEM

data/lib/current_session/auth_method.rb

@@ -0,0 +1,44 @@
+# frozen_string_literal: true
+
+module CurrentSession
+  #
+  # Base class for providing auth methods
+  #
+  class AuthMethod
+    class_attribute :user_class
+
+    class FindBy < self
+      def call(&block)
+        find_by_auth.try(&block)
+      end
+    end
+
+    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,39 +6,46 @@ module CurrentSession
   #
   class Base < ActiveSupport::CurrentAttributes
     include CurrentSession::Interface
-    include CurrentSession::RaiseNotImplementedError
     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
       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 = Module.new(&block)
+          @session_class = CurrentSession::SessionMethod.new_session_class(session_methods)
         else
-          @session_repository_class
+          @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
         else
-          @auth_class
+          @auth_methods
         end
       end
     end

data/lib/current_session/interface.rb

@@ -19,8 +19,8 @@ module CurrentSession
       end
 
       def create(request)
-        auth = @auth_class.new(request, user_class)
-        auth.find_or_create_by_auth.try do |user|
+        auth = @auth_class.new(request)
+        auth.call do |user|
           auth.update(user)
           session_repository(request).update_session_token(user)
         end
@@ -37,7 +37,7 @@ module CurrentSession
       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/{repository.rb → session_method.rb}

@@ -4,7 +4,11 @@ module CurrentSession
   #
   # Base class for processing to get session_token from request.session
   #
-  class Repository
+  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

data/lib/current_session/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module CurrentSession
-  VERSION = "0.1.3"
+  VERSION = "0.1.5"
 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.3
+  version: 0.1.5
 platform: ruby
 authors:
 - Masa (Aileron inc)
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-09-30 00:00:00.000000000 Z
+date: 2022-10-21 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,18 +0,0 @@
-# frozen_string_literal: true
-
-module CurrentSession
-  #
-  # Base class for providing auth methods
-  #
-  class Auth
-    def initialize(request, user_class)
-      @request = request
-      @user_class = user_class
-    end
-    attr_reader :request, :user_class
-
-    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