thecore_auth_commons 2.2.6 → 2.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9e161c86e604e14243962d4919c383b3c975df439d6f8c1e181f2bd6f798117c
-  data.tar.gz: 7b8763c79554933ae5ce2c9d067ff2eb82aaf472fa5ffa0a702d2cfced6a2daf
+  metadata.gz: f7820a25717ab5c4d9ff19a5dea6e7ab02c54a497348eef6d27e53dc459204f4
+  data.tar.gz: 22775ef09abefa8bbe2cbdbff7dc3d3e48a097153bd3af1f73ab584d149e9dab
 SHA512:
-  metadata.gz: fc4279118d7e9a4f764c55a248d6244de35ef0394912b71797049055199a4b852fcb0aa26b57d384a5a23dd36f1196922678369ea216feb0f2c9a32e98f1b262
-  data.tar.gz: ea961d67ef847e7e72760b82f2cdd66d03698faa5ada8b5f8a7ff413fe746e614052dc757f7c7e4e10a9705d832c9e6a0eb2fbaaea320781228d5e41f6e76f8e
+  metadata.gz: cbf7e8777abfdbea0deee34773d812a1dca5adc48dfcb3a5bacda983f489c18cd0cff586c6dad777ed59a1b0ccca3988296bddb12c9262d03bd4a20b3a44e163
+  data.tar.gz: ade3d82b997977aa4710e89ee9d77fda100b4c9ea2de2c812898afaa774c9936634b4b3218e1ee05ab11c8624113eb9d0e494b38f2b93d4274ca4812144cb178

data/app/models/ability.rb

@@ -44,6 +44,6 @@ class Ability
     ::Permission.joins(roles: :users).where(users: {id: user.id}).order(:id).each do |permission|
       # E.g. can :manage, :all
       self.send(permission.predicate.name.to_sym, permission.action.name.to_sym, (permission.target.name.classify.constantize rescue permission.target.name.to_sym))
-    end
+    end unless user.blank?
   end
 end

data/app/models/user.rb

@@ -33,11 +33,10 @@ class User < ApplicationRecord
   end
   
   def has_role? role
-    roles.include? role
+    roles.include? role.to_s
   end
   
   def authenticate password
-    puts "PASSWORD: #{password}"
     self&.valid_password?(password) ? self : nil
   end
   

data/db/migrate/20200518082821_create_permissions.rb

@@ -1,32 +1,31 @@
 class CreatePermissions < ActiveRecord::Migration[6.0]
   def change
-    @values = {
-      predicates: %i[can cannot],
-      actions: %i[manage create read update destroy],
-      targets: ApplicationRecord.subclasses.map {|d| d.to_s.underscore}.to_a.unshift(:all)
-    }
-
-    def create_and_fill table
-      create_table table do |t|
-        t.string :name
-        t.bigint :lock_version
+    # Predicates
+    create_table :predicates do |t|
+      t.string :name
+      t.bigint :lock_version
 
-        t.timestamps
-      end
-      add_index table, :name, unique: true
-      model = table.to_s.classify.constantize
-      model.reset_column_information
-      model.upsert_all @values[table].map { |p| {name: p, created_at: Time.now, updated_at: Time.now} }, unique_by: [:name]
+      t.timestamps
     end
-
-    # Predicates
-    create_and_fill :predicates
+    add_index :predicates, :name, unique: true
     
     # Actions
-    create_and_fill :actions
+    create_table :actions do |t|
+      t.string :name
+      t.bigint :lock_version
+
+      t.timestamps
+    end
+    add_index :actions, :name, unique: true
     
     # Targets
-    create_and_fill :targets
+    create_table :targets do |t|
+      t.string :name
+      t.bigint :lock_version
+
+      t.timestamps
+    end
+    add_index :targets, :name, unique: true
 
     create_table :permissions do |t|
       t.references :predicate, null: false, foreign_key: true

data/db/seeds.rb

@@ -0,0 +1,26 @@
+puts "Loading ThecoreAuthCommons seeds"
+email = ENV["ADMIN_EMAIL"].presence || "admin@example.com"
+psswd = ENV["ADMIN_PASSWORD"].presence || "changeme"
+
+u = User.find_or_initialize_by(email: email)
+u.username = "Administrator"
+u.password = u.password_confirmation = psswd
+u.admin = true
+u.save(validate: false)
+
+
+@values = {
+    predicates: %i[can cannot],
+    actions: %i[manage create read update destroy],
+    targets: ApplicationRecord.subclasses.map {|d| d.to_s.underscore}.to_a.unshift(:all)
+}
+
+def fill table
+    model = table.to_s.classify.constantize
+    model.reset_column_information
+    model.upsert_all @values[table].map { |p| {name: p, created_at: Time.now, updated_at: Time.now} }, unique_by: [:name]
+end
+
+fill :predicates
+fill :actions
+fill :targets

data/lib/tasks/thecore_auth_commons_tasks.rake

@@ -2,3 +2,13 @@
 # task :thecore_auth_commons do
 #   # Task goes here
 # end
+namespace :thecore do
+    namespace :db do
+        desc "Load seeds from thecore engines seed files, it also runs rails db:seed as last action"
+        task seed: :environment do
+            Thecore::Base.thecore_engines.each { |engine| engine.send :load_seed }
+            Rake::Task["db:seed"].reenable
+            Rake::Task["db:seed"].invoke
+        end
+    end
+end

data/lib/thecore_auth_commons.rb

@@ -8,3 +8,12 @@ require "thecore_auth_commons/engine"
 module ThecoreAuthCommons
   # Your code goes here...
 end
+
+module Thecore
+  class Base
+    @@thecore_engines = []
+    def self.thecore_engines
+      @@thecore_engines
+    end
+  end
+end

data/lib/thecore_auth_commons/engine.rb

@@ -1,6 +1,11 @@
 module ThecoreAuthCommons
   class Engine < ::Rails::Engine
+    # https://stackoverflow.com/questions/12161376/rails-3-2-adding-seed-tasks-from-a-mountable-engine
+
     initializer 'thecore_auth_commons.add_to_migrations' do |app|
+      # Adds the list of Thecore Engines, so to manage seeds loading, i.e.:
+      # Thecore::Base.thecore_engines.each { |engine| engine.load_seed }
+      Thecore::Base.thecore_engines << self.class
       unless app.root.to_s.match root.to_s
         # APPEND TO MAIN APP MIGRATIONS FROM THIS GEM
         config.paths['db/migrate'].expanded.each do |expanded_path|

data/lib/thecore_auth_commons/version.rb

@@ -1,3 +1,3 @@
 module ThecoreAuthCommons
-  VERSION = '2.2.6'.freeze
+  VERSION = "#{`git describe --tags $(git rev-list --tags --max-count=1)`.chomp}"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: thecore_auth_commons
 version: !ruby/object:Gem::Version
-  version: 2.2.6
+  version: 2.3.2
 platform: ruby
 authors:
 - Gabriele Tassoni
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-05-22 00:00:00.000000000 Z
+date: 2021-03-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -114,13 +114,13 @@ files:
 - config/routes.rb
 - db/migrate/20200306143408_create_users.rb
 - db/migrate/20200306151046_add_admin_field_to_user.rb
-- db/migrate/20200306151541_add_first_admin_user.rb
 - db/migrate/20200306152740_create_roles.rb
 - db/migrate/20200306152816_create_role_users.rb
 - db/migrate/20200306153125_add_lock_version_to_user.rb
 - db/migrate/20200306153136_add_lock_version_to_role.rb
 - db/migrate/20200516215346_add_locked_to_user.rb
 - db/migrate/20200518082821_create_permissions.rb
+- db/seeds.rb
 - lib/abilities/thecore_auth_commons.rb
 - lib/tasks/thecore_auth_commons_tasks.rake
 - lib/thecore_auth_commons.rb

data/db/migrate/20200306151541_add_first_admin_user.rb

@@ -1,60 +0,0 @@
-class AddFirstAdminUser < ActiveRecord::Migration[6.0]
-  class User < ApplicationRecord
-    # Include default devise modules. Others available are:
-    # :confirmable, :lockable, :timeoutable, :trackable and :omniauthable
-    devise :database_authenticatable, :trackable, :validatable
-    # TODO: If it works, these must be added to another gem one which deal 
-    # more with sessions
-    # devise :database_authenticatable
-    # devise :rememberable
-    # devise :trackable
-    # devise :validatable
-    # devise :timeoutable, timeout_in: 30.minutes 
-    # REFERENCES
-    has_many :role_users, dependent: :destroy, inverse_of: :user
-    has_many :roles, through: :role_users, inverse_of: :users
-    # VALIDATIONS
-    validates :email, uniqueness: { case_sensitive: false }, presence: true, format: { with: /\A([^@\s]+)@((?:[-a-z0-9]+\.)+[a-z]{2,})\Z/i }
-    validates :password, presence: true, on: :create
-    validates :password_confirmation, presence: true, on: :create
-    validate :check_password_and_confirmation_equal
-    validates_each :admin do |record, attr, value|
-      # Don't want admin == false if the current user is the only admin
-      record.errors.add(attr, I18n.t("validation.errors.cannot_unadmin_last_admin")) if record.admin_changed? && record.admin_was == true && User.where(admin: true).count == 1
-    end
-  
-    def display_name
-      email
-    end
-  
-    def has_role? role
-      roles.include? role
-    end
-  
-    protected
-  
-    def check_password_and_confirmation_equal
-      errors.add(:password, I18n.t("validation.errors.password_and_confirm_must_be_the_same")) unless password == password_confirmation
-    end
-  end
-
-  def up
-    email = "admin@example.com"
-    User.reset_column_information
-    u=User.find_or_initialize_by(email: email)
-    psswd = SecureRandom.hex(5)
-    u.password = psswd
-    u.password_confirmation = psswd
-    u.admin = true
-    u.save!
-    puts "\nPlease find generated initial admin password in .passwords file."
-    File.open('.passwords', 'w') do |f|
-      f.write(psswd)
-    end
-  end
-
-  def down
-    email = "admin@example.com"
-    User.find_by(email: email).destroy
-  end
-end