super_auth 0.1.4 → 0.2.0

data/lib/super_auth/permission.rb

@@ -7,7 +7,7 @@ class SuperAuth::Permission < Sequel::Model(:super_auth_permissions)
     end
 
     def with_roles
-    with_edges.join(Role.from(Role.trees).as(:roles), id: :role_id).select(
+      with_edges.join(SuperAuth::Role.from(SuperAuth::Role.trees).as(:roles), id: :role_id).select(
         Sequel[:super_auth_permissions][:id].as(:id),
         Sequel[:super_auth_permissions][:id].as(:permission_id),
         Sequel[:roles][:id].as(:role_id),

data/lib/super_auth/railtie.rb

@@ -1,9 +1,39 @@
 module SuperAuth
+  if defined? Rails::Engine
+    class Engine < Rails::Engine
+      isolate_namespace SuperAuth
+
+      config.paths.add 'app/controllers', eager_load: true
+
+      # Use ActiveRecord migrations when in a Rails environment
+      if defined?(ActiveRecord)
+        config.paths['db/migrate'] = 'db/migrate_activerecord'
+      end
+    end
+  end
+
   if defined? Rails::Railtie
     class Railtie < Rails::Railtie
       rake_tasks do
         load "tasks/super_auth_tasks.rake"
       end
+
+      initializer "super_auth.initialize" do
+        if defined?(ActiveRecord) && defined?(ActiveRecord::Base)
+          SuperAuth.db
+          begin
+            SuperAuth.load
+          rescue Sequel::DatabaseError => e
+            # Tables don't exist yet (e.g., before migrations are run)
+            # This is OK - models will be loaded when needed
+            Rails.logger.debug "SuperAuth Sequel models not loaded: #{e.message}" if defined?(Rails.logger)
+          end
+          require "super_auth/active_record"
+        elsif defined?(Sequel) && Sequel.const_defined?("Model")
+          SuperAuth.db
+          SuperAuth.load
+        end
+      end
     end
   else
     class Railtie

data/lib/super_auth/role.rb

@@ -1,3 +1,4 @@
 class SuperAuth::Role < Sequel::Model(:super_auth_roles)
+  unrestrict_primary_key # For ActiveRecord
   include SuperAuth::Nestable
-end
+end

data/lib/super_auth/user.rb

@@ -1,5 +1,9 @@
 class SuperAuth::User < Sequel::Model(:super_auth_users)
   one_to_many :edges
+  one_to_many :resources
+
+  def system? = self.class.system == self
+  def self.system = find_or_create(name: "system")
 
   dataset_module do
     def with_edges
@@ -7,7 +11,7 @@ class SuperAuth::User < Sequel::Model(:super_auth_users)
     end
 
     def with_groups
-      with_edges.join(Group.from(Group.trees).as(:groups), id: :group_id).select(
+      with_edges.join(SuperAuth::Group.from(SuperAuth::Group.trees).as(:groups), id: :group_id).select(
         Sequel[:super_auth_users][:id].as(:id),
         Sequel[:super_auth_users][:id].as(:user_id),
         Sequel[:groups][:id].as(:group_id),
@@ -25,25 +29,21 @@ class SuperAuth::User < Sequel::Model(:super_auth_users)
     end
 
     def with_roles
-      with_edges.join(Role.from(Role.trees).as(:roles), id: :role_id).select(
-        Sequel[:users][:id].as(:id),
-        Sequel[:users][:id].as(:user_id),
+      with_edges.join(SuperAuth::Role.from(SuperAuth::Role.trees).as(:roles), id: :role_id).select(
+        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]
       )
     end
-
-    def with_roles_with_groups
-      with_groups_with_roles
-    end
   end
 end

data/lib/super_auth/version.rb

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

data/lib/super_auth.rb

@@ -1,41 +1,115 @@
-# frozen_string_literal: true
-
 require_relative "super_auth/version"
+require "sequel"
+
+module SuperAuth
+  class Error < StandardError; end
 
-if defined? SuperAuth::AUTOLOADERS
-  require 'zeitwerk'
-  SuperAuth::AUTOLOADERS << Zeitwerk::Loader.for_gem.tap do |loader|
-    loader.ignore("#{__dir__}/basic_loader.rb")
-    loader.setup
+  def self.setup
+    yield self if block_given?
   end
-end
 
-require 'sequel'
+  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
 
-ENV["SUPER_AUTH_LOG_LEVEL"] = 'debug'
-require 'logger'
-logger = Logger.new(STDOUT)
+  def self.install_migrations
+    Sequel.extension :migration
+    require "pathname"
+    path = Pathname.new(__FILE__).parent.parent.join("db", "migrate")
+    Sequel::Migrator.run(SuperAuth.db, path)
+  end
 
-Sequel::Model.plugin :timestamps, update_on_create: true
-if !ENV['SUPER_AUTH_DATABASE_URL'].nil? && !ENV['SUPER_AUTH_DATABASE_URL'].empty?
-  Sequel::Model.db = Sequel.connect(ENV['SUPER_AUTH_DATABASE_URL'], logger: logger)
-else
-  logger.warn "SUPER_AUTH_DATABASE_URL not set, using sqlite in memory database."
-  Sequel::Model.db = Sequel.sqlite(logger: logger)
-end
-Sequel::Model.default_association_options = {:class_namespace=>'SuperAuth'}
+  def self.uninstall_migrations
+    require "sequel"
+    Sequel.extension :migration
+    require "pathname"
 
-# I don't love this, but I don't know how to do it better
-unless Sequel::Model.db.table_exists?(:super_auth_edges)
-  Sequel.extension :migration
-  path = Pathname.new(__FILE__).parent.parent.join("db", "migrate")
-  Sequel::Migrator.run(Sequel::Model.db, path)
-end
-require 'basic_loader' unless defined?(SuperAuth::AUTOLOADERS)
+    path = Pathname.new(__FILE__).parent.parent.join("db", "migrate")
+    db = SuperAuth.db
 
+    Sequel::Migrator.run(db, path, target: 0)
+  rescue => e
+    raise Error, "Failed to uninstall migrations: #{e.message}"
+  end
 
-module SuperAuth
-  class Error < StandardError; end
+  def self.current_user=(user)
+    Thread.current[:super_auth_current_user] = user
+  end
+
+  def self.current_user
+    Thread.current[:super_auth_current_user]
+  end
+
+  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)
+    @db = db
+  end
 end
 
 require "super_auth/railtie" if defined?(Rails::Railtie)

data/lib/tasks/super_auth_tasks.rake

@@ -1,13 +1,14 @@
 namespace :super_auth do
   desc "Run the super_auth database migrations"
   task migrate: :environment do
-    # TODO: Make this work properly without auto applying migrations, which is silly
-    #
-    # raise "ENV variable SUPER_AUTH_DATABASE_URL is not set" if ENV['SUPER_AUTH_DATABASE_URL'].nil? || ENV['SUPER_AUTH_DATABASE_URL'].empty?
-    # Sequel::Model.db = Sequel.connect(ENV['SUPER_AUTH_DATABASE_URL'])
-    # Sequel.extension :migration
-    # binding.irb
-    # path = Pathname.new(__FILE__).parent.parent.join("db", "migrate")
-    # Sequel::Migrator.run(Sequel::Model.db, path)
+    raise "You must define SUPER_AUTH_DATABASE_URL in your environment for this to work" if ENV['SUPER_AUTH_DATABASE_URL'].nil? || ENV['SUPER_AUTH_DATABASE_URL'].empty?
+    SuperAuth.install_migrations
+    puts "Done"
+  end
+
+  task :rollback => :environment do
+    raise "You must define SUPER_AUTH_DATABASE_URL in your environment for this to work" if ENV['SUPER_AUTH_DATABASE_URL'].nil? || ENV['SUPER_AUTH_DATABASE_URL'].empty?
+    SuperAuth.uninstall_migrations
+    puts "Done"
   end
 end