super_auth 0.1.5 → 0.2.0

data/lib/super_auth/user.rb

@@ -30,16 +30,16 @@ class SuperAuth::User < Sequel::Model(:super_auth_users)
 
     def with_roles
       with_edges.join(SuperAuth::Role.from(SuperAuth::Role.trees).as(:roles), id: :role_id).select(
-        Sequel[:users][:id].as(:id),
-        Sequel[:users][:id].as(:user_id),
+        Sequel[:super_auth_users][:id].as(:id),
+        Sequel[:super_auth_users][:id].as(:user_id),
         Sequel[:roles][:id].as(:role_id),
-        Sequel[:users][:name].as(:user_name),
+        Sequel[:super_auth_users][:name].as(:user_name),
         Sequel[:roles][:name].as(:role_name),
-        Sequel[:edges][:id].as(:edge_id),
-        Sequel[:edges][:permission_id].as(:edge_permission_id),
-        Sequel[:edges][:group_id].as(:edge_group_id),
-        Sequel[:edges][:user_id].as(:edge_user_id),
-        Sequel[:edges][:role_id].as(:edge_role_id),
+        Sequel[:super_auth_edges][:id].as(:edge_id),
+        Sequel[:super_auth_edges][:permission_id].as(:edge_permission_id),
+        Sequel[:super_auth_edges][:group_id].as(:edge_group_id),
+        Sequel[:super_auth_edges][:user_id].as(:edge_user_id),
+        Sequel[:super_auth_edges][:role_id].as(:edge_role_id),
         Sequel[:roles][:role_path],
         Sequel[:roles][:role_name_path],
         Sequel[:roles][:parent_id]

data/lib/super_auth/version.rb

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 module SuperAuth
-  VERSION = "0.1.5"
+  VERSION = "0.2.0"
 end

data/lib/super_auth.rb

@@ -1,17 +1,5 @@
-# frozen_string_literal: true
-
 require_relative "super_auth/version"
-
-if defined? SuperAuth::AUTOLOADERS
-  require 'zeitwerk'
-  SuperAuth::AUTOLOADERS << Zeitwerk::Loader.for_gem.tap do |loader|
-    loader.ignore("#{__dir__}/basic_loader.rb")
-    loader.setup
-  end
-  require "sequel"
-else
-  require 'basic_loader'
-end
+require "sequel"
 
 module SuperAuth
   class Error < StandardError; end
@@ -20,29 +8,20 @@ module SuperAuth
     yield self if block_given?
   end
 
-  def self.set_db
-    logger =
-      if defined?(Rails) && ENV["SUPER_AUTH_LOG_LEVEL"] == "debug"
-        Rails.logger
-      elsif ENV["SUPER_AUTH_LOG_LEVEL"] == "debug"
-        require "logger"
-        logger = Logger.new(STDOUT)
-      else
-        nil
-      end
-
-    if !ENV['SUPER_AUTH_DATABASE_URL'].nil? && !ENV['SUPER_AUTH_DATABASE_URL'].empty?
-      SuperAuth.db = Sequel.connect(ENV['SUPER_AUTH_DATABASE_URL'], logger: logger)
-    else
-      puts "ENV SUPER_AUTH_DATABASE_URL not set, using sqlite."
-      SuperAuth.db = Sequel.sqlite(logger: logger, database: "./tmp/test.db")
-      install_migrations
-    end
-    Sequel::Model.default_association_options = {:class_namespace=>'SuperAuth'}
+  def self.load
+    require "super_auth/authorization"
+    require "super_auth/edge"
+    require "super_auth/nestable"
+    require "super_auth/group"
+    require "super_auth/permission"
+    require "super_auth/railtie"
+    require "super_auth/resource"
+    require "super_auth/role"
+    require "super_auth/user"
+    require "super_auth/active_record" if defined?(ActiveRecord::Base)
   end
 
   def self.install_migrations
-    require "sequel"
     Sequel.extension :migration
     require "pathname"
     path = Pathname.new(__FILE__).parent.parent.join("db", "migrate")
@@ -51,7 +30,6 @@ module SuperAuth
 
   def self.uninstall_migrations
     require "sequel"
-    set_db
     Sequel.extension :migration
     require "pathname"
 
@@ -64,19 +42,73 @@ module SuperAuth
   end
 
   def self.current_user=(user)
-    @current_user = user
+    Thread.current[:super_auth_current_user] = user
   end
 
   def self.current_user
-    @current_user
+    Thread.current[:super_auth_current_user]
   end
 
-  def self.db=(db)
-    @db = db
+  def self.db
+    return @db if !@db.nil?
+
+    if !Gem::Specification.find_all_by_name("activerecord").empty?
+      require "active_record"
+      extensions = Gem::Specification.find_all_by_name("sequel-activerecord_connection").any? ? { extensions: :activerecord_connection } : {}
+
+      if extensions.empty?
+        warn "[SuperAuth] WARNING: Found ActiveRecord but could not find the gem 'sequel-activerecord_connection' installed. SuperAuth may not always work as expected."
+      end
+
+      begin
+        ::ActiveRecord::Base.establish_connection
+      rescue ActiveRecord::AdapterNotSpecified
+        if defined?(Rails) && !Rails.env.local?
+          raise Error, "SuperAuth could not find a database configuration. " \
+            "Please configure ActiveRecord or set SUPER_AUTH_DATABASE_URL."
+        end
+        warn "[SuperAuth] WARNING: No database configured. Falling back to in-memory SQLite. " \
+          "All authorization data will be lost on restart."
+        ::ActiveRecord::Base.establish_connection(adapter: "sqlite3", database: ":memory:")
+      end
+
+      case ::ActiveRecord::Base.adapter_class.to_s
+      when "ActiveRecord::ConnectionAdapters::SQLite3Adapter"
+        SuperAuth.db = Sequel.sqlite(**extensions)
+      when "ActiveRecord::ConnectionAdapters::PostgreSQLAdapter"
+        SuperAuth.db = Sequel.postgres(**extensions)
+      when "ActiveRecord::ConnectionAdapters::Mysql2Adapter"
+        SuperAuth.db = Sequel.mysql2(**extensions)
+      else
+        warn "[SuperAuth] WARNING: Unknown adapter: #{::ActiveRecord::Base.adapter_class}"
+      end
+    else
+      logger =
+      if defined?(Rails) && ENV["SUPER_AUTH_LOG_LEVEL"] == "debug"
+        { logger: Rails.logger }
+      elsif ENV["SUPER_AUTH_LOG_LEVEL"] == "debug"
+        require "logger"
+        { logger: Logger.new(STDOUT) }
+      else
+        {} # no logger
+      end
+
+      if !ENV['SUPER_AUTH_DATABASE_URL'].nil? && !ENV['SUPER_AUTH_DATABASE_URL'].empty?
+        SuperAuth.db = Sequel.connect(ENV['SUPER_AUTH_DATABASE_URL'], **logger)
+      else
+        if defined?(Rails) && !Rails.env.local?
+          raise Error, "SuperAuth could not find a database configuration. " \
+            "Please set SUPER_AUTH_DATABASE_URL or configure ActiveRecord."
+        end
+        warn "[SuperAuth] WARNING: SUPER_AUTH_DATABASE_URL not set. Falling back to in-memory SQLite. " \
+          "All authorization data will be lost on restart."
+        SuperAuth.db = Sequel.sqlite(**logger)
+      end
+    end
   end
 
-  def self.db
-    @db
+  def self.db=(db)
+    @db = db
   end
 end