thecore_auth_commons 2.2.9 → 2.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d2f4551c74847a97b20746c7d6fe8f506c0487bb66130ccf2f538861a4b3b540
-  data.tar.gz: b51b6195a574ce071def2bfa57cedc89ccd6ec956856ffd10ad06d7637486f60
+  metadata.gz: ef336ba07dfb2b7045b03c7c6ddd046cc57f9494563917a728877f9ee2830191
+  data.tar.gz: e71c6255f11bca1c7c625e0eaf150d5ece5a38104285be9d15f3b7a95fdd3b3c
 SHA512:
-  metadata.gz: d7a8de8a9f649e48038ef88298be54ee30cf0b0e88f7bc13d5ff9aee32a13173635e27f33525a1d07e9a757705ba8ce2f6df088cdbff11268553cb9896722532
-  data.tar.gz: 227d2a0a72f2c21703946f979d9cad4196b12d3c45c2fdb4af82b3d1e63a45b537e5e287c1af83b991f39f2fee503fbe4dbba267e4dd49925fa0fecf08908789
+  metadata.gz: a5d025b7c10645755d7e550da428eff612e2fb8e671eeef0c0f711d725b7086312b63053e5880d75ec897ce82e177a56c6090786b9ba53b1cedd8f039f459c6a
+  data.tar.gz: 037a7431dd095a9cd2452847aab62e08d7d7e34a643a1bb2b49870ff01d81dbbcef64ad740c08efab5e8c27abe7741c1dd1ca979a72816903763baf7a5395010

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

@@ -37,7 +37,6 @@ class User < ApplicationRecord
   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,27 @@
+puts "Loading ThecoreAuthCommons seeds"
+email = ENV["ADMIN_EMAIL"].presence || "admin@example.com"
+psswd = ENV["ADMIN_PASSWORD"].presence || "changeme"
+
+unless User.where(admin: true).exists?
+    u = User.find_or_initialize_by(email: email)
+    u.username = "Administrator"
+    u.password = u.password_confirmation = psswd
+    u.admin = true
+    u.save(validate: false)
+end
+
+@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 = "#{`git describe --tags $(git rev-list --tags --max-count=1)`}"
+  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.9
+  version: 2.3.4
 platform: ruby
 authors:
 - Gabriele Tassoni
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-11-03 00:00:00.000000000 Z
+date: 2021-03-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -16,20 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 6.0.2
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 6.0.2.1
+        version: '6.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 6.0.2
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 6.0.2.1
+        version: '6.0'
 - !ruby/object:Gem::Dependency
   name: devise
   requirement: !ruby/object:Gem::Requirement
@@ -114,13 +108,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