commons_yellowme 0.12.0 → 0.15.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 176fc50a7143d11e3ad6c7f2ec42c30cb3a08537ad93bb2c5c3274eaab29cf86
-  data.tar.gz: 625ceba15ebb3fedae9c00fb6a2289952e83c21d43942d8e3c42f8c8897e21ad
+  metadata.gz: d79985617cba32b33138c8436f656da439a49a01edb041982449e0ac4d59cffc
+  data.tar.gz: 97b8f3428026c1e89eedad0c4d80ad626805098ec2bf260d73f47916e1a9cb3c
 SHA512:
-  metadata.gz: b9b1f51d10f3ff7976ee0d78f829700345a3e0681bb72cc7ea0f127f6a11d749db565728208ced72a868a5caed7cda4e49f6fced625d254dad2554af2b9de664
-  data.tar.gz: a6589d26c77d5c44575dcdc6df79ff774fdb09b5c2d2bec2909bf62c35aba4bbb10a1c2813821c1f3804b6a1cfe993135028ca0a2b5b9e39765b57847edf83fc
+  metadata.gz: 05621d09bb7a699c797f8edb87362a046769ca960855ded4f6323d6d61ae8c1b3e49ab34489e494ac8371387fa4bc02c3e02c7550ca5bea2b9e9f73300da25ad
+  data.tar.gz: b008246db762536c3dadd45db51023eb9db7edfe30acf69225db58b15529290a49e727585964fe23f7feb59a163b8bf24c5cbdbef09ac157643d1a6b9fa3278e

data/.gitignore

@@ -9,6 +9,7 @@
 /test/tmp/
 /test/version_tmp/
 /tmp/
+.vscode
 
 # Used by dotenv library to load environment variables.
 # .env

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    commons_yellowme (0.11.2)
+    commons_yellowme (0.13.0)
       active_model_serializers (~> 0.10.10)
       dry-validation
       json (~> 2.0)
@@ -78,7 +78,7 @@ GEM
     dry-equalizer (0.3.0)
     dry-inflector (0.2.0)
     dry-initializer (3.0.3)
-    dry-logic (1.0.5)
+    dry-logic (1.0.6)
       concurrent-ruby (~> 1.0)
       dry-core (~> 0.2)
       dry-equalizer (~> 0.2)
@@ -90,7 +90,7 @@ GEM
       dry-initializer (~> 3.0)
       dry-logic (~> 1.0)
       dry-types (~> 1.2)
-    dry-types (1.2.2)
+    dry-types (1.3.0)
       concurrent-ruby (~> 1.0)
       dry-container (~> 0.3)
       dry-core (~> 0.4, >= 0.4.4)
@@ -215,4 +215,4 @@ DEPENDENCIES
   sqlite3
 
 BUNDLED WITH
-   2.0.2
+   2.1.4

data/commons.gemspec

@@ -20,7 +20,7 @@ Gem::Specification.new do |spec|
   spec.test_files  = `git ls-files -- {test,spec,features}/*`.split("\n")
 
 
-  spec.add_dependency "rails", "~> 5.2"
+  spec.add_dependency "rails", "~> 6.0"
   spec.add_dependency 'json', '~> 2.0'
   spec.add_dependency "active_model_serializers", "~> 0.10.10"
   spec.add_dependency "strip_attributes"

data/lib/commons.rb

@@ -24,7 +24,7 @@ require 'commons/services/concerns/callable'
 
 # models
 require 'commons/concerns/attributes/sex'
-require 'commons/concerns/extensions/deleted'
+require 'commons/concerns/extensions/soft_deleted'
 require 'commons/concerns/guard/capitalizable'
 require 'commons/concerns/validations/undestroyable'
 

data/lib/commons/concerns/extensions/soft_deleted.rb

@@ -0,0 +1,34 @@
+module Commons
+  module Concerns
+    module Extensions
+      module SoftDeleted
+        extend ActiveSupport::Concern
+
+        included do
+          before_validation :check_not_deleted, on: [:update]
+
+          def deleted?
+            raise ActiveModel::MissingAttributeError unless has_required_fields?
+            self.deleted_at.present?
+          end
+
+          def self.default_scope
+            raise ActiveModel::MissingAttributeError unless has_attribute?(:deleted_at)
+            where(deleted_at: nil)
+          end
+        end
+
+        private
+
+        def check_not_deleted
+          raise ActiveModel::MissingAttributeError unless has_required_fields?
+          raise ActiveRecord::RecordInvalid if self.deleted_at_in_database.present?
+        end
+
+        def has_required_fields?
+          self.has_attribute?(:deleted_at)
+        end
+      end
+    end
+  end
+end

data/lib/commons/formatter/regex_constants.rb

@@ -4,8 +4,8 @@ module Commons
       PROPER_NOUN = /\A\p{L}[\p{L}'\.\-]*( [\p{L}'\.\-]+)*\z/u
       CURP = /\A([A-Z][AEIOUX][A-Z]{2}\d{2}(?:0[1-9]|1[0-2])(?:0[1-9]|[12]\d|3[01])[HM](?:AS|B[CS]|C[CLMSH]|D[FG]|G[TR]|HG|JC|M[CNS]|N[ETL]|OC|PL|Q[TR]|S[PLR]|T[CSL]|VZ|YN|ZS)[B-DF-HJ-NP-TV-Z]{3}[A-Z\d])(\d)\z/
       RFC = /\A([A-ZÑ\x26]{3,4}(\d{2})(0[1-9]|1[0-2])(0[1-9]|[12]\d|3[0-1])([A-Z0-9]){2}([A0-9]))?\z/i
-      ELECTOR_KEY = /\A[A-Z]{6}\d{2}(?:0[1-9]|1[0-2])(?:0[1-9]|[12]\d|3[01])\d{2}[A-Z]\d{3}\z/
-      MX_MONEY = /\A-?\d{1,12}(\.\d{0,6})?\z/
+      ELECTOR_KEY = /\A(?:[A-Z][B-DF-HJ-NP-TV-Z]){3}\d{2}(?:0[1-9]|1[0-2])(?:0[1-9]|[12]\d|3[01])(?:0[1-9]|[12]\d|3[0-2]|99)[A-Z]\d{3}\z/
+      MONEY = /\A[+-]?\d+(\.\d{1,6})?\z/
     end
   end
 end

data/lib/commons/repositories/base_repository.rb

@@ -4,54 +4,47 @@ module Commons
       include Singleton
 
       #
-      # Método que devuelve todos los objetos
+      # Método que devuelve todos los objetos activos
       #
-      # @return [Object,nil]
+      # @return [Arrat<Object>, nil]
       #
-      def all
-        @db_client.all
-      end
+      delegate :all, to: :@db_client
 
       #
       # Método que devuelve todos los objetos que no han sido eliminados
       #
       # @return [Object,nil]
       #
-      def kept
-        raise ActiveModel::MissingAttributeError unless @db_client.column_names.include? "deleted_at"
-
-        @db_client.where(deleted_at: nil)
-      end
+      delegate :where, to: :@db_client
+      alias_method :query, :where
 
       #
       # Método que devuelve todos los objetos que han sido eliminados
       #
-      # @return [Object,nil]
+      # @return [Object, nil]
       #
       def deleted
-        raise ActiveModel::MissingAttributeError unless @db_client.column_names.include? "deleted_at"
+        raise ActiveModel::MissingAttributeError unless @db_client.include? Commons::Concerns::Extensions::SoftDeleted
 
-        @db_client.where.not(deleted_at: nil)
+        @db_client.unscoped.where.not(deleted_at: nil)
       end
 
       #
       # Método que devuelve el objeto según su ID
       #
-      # @return [Object,nil]
+      # @return [Object, nil]
       #
-      def find(id)
-        @db_client.find(id)
-      end
+      delegate :find, to: :@db_client
 
       #
       # Método que devuelve el objeto según su ID
       #
       # @return [Object,nil]
       #
-      def find_kept(id)
-        raise ActiveModel::MissingAttributeError unless @db_client.column_names.include? "deleted_at"
+      def find_deleted(id)
+        raise ActiveModel::MissingAttributeError unless @db_client.include? Commons::Concerns::Extensions::SoftDeleted
 
-        @db_client.find_by!(id: id, deleted_at: nil)
+        @db_client.unscoped.where(id: id).where.not(deleted_at: nil).first
       end
 
       #
@@ -59,22 +52,17 @@ module Commons
       #
       # @return [Object,nil]
       #
-      def find_by(params)
-        @db_client.find_by(params)
-      end
+      delegate :find_by, to: :@db_client
 
       #
       # Método que devuelve el objeto según parámetros
       #
       # @return [Object,nil]
       #
-      def find_kept_by(params)
-        raise ActiveModel::MissingAttributeError unless @db_client.column_names.include? "deleted_at"
+      def find_deleted_by(params)
+        raise ActiveModel::MissingAttributeError unless @db_client.include? Commons::Concerns::Extensions::SoftDeleted
 
-        @db_client.find_by(
-          deleted_at: nil,
-          **params
-        )
+        @db_client.unscoped.where.not(deleted_at: nil).where(**params).first
       end
 
       #
@@ -84,9 +72,7 @@ module Commons
       #
       # @raise [ActiveRecord::RecordNotFound]
       #
-      def find_by!(params)
-        @db_client.find_by!(params)
-      end
+      delegate :find_by!, to: :@db_client
 
       #
       # Método que devuelve el objeto según parámetros
@@ -95,13 +81,10 @@ module Commons
       #
       # @raise [ActiveRecord::RecordNotFound]
       #
-      def find_kept_by!(params)
-        raise ActiveModel::MissingAttributeError unless @db_client.column_names.include? "deleted_at"
+      def find_deleted_by!(params)
+        raise ActiveModel::MissingAttributeError unless @db_client.include? Commons::Concerns::Extensions::SoftDeleted
 
-        @db_client.find_by!(
-          deleted_at: nil,
-          **params
-        )
+        @db_client.unscoped.where.not(deleted_at: nil).where(**params).first!
       end
 
       #
@@ -115,9 +98,10 @@ module Commons
       # @raise [ActiveRecord::RecordNotSaved]
       #
       def create!(object)
-        raise ArgumentError unless object.is_a? @db_client
+        raise ArgumentError unless object.is_a?(@db_client)
+        raise ActiveRecord::RecordInvalid.new(object) unless object.valid?
 
-        object.save!
+        save_object(object)
       end
 
       #
@@ -143,10 +127,7 @@ module Commons
       #
       # @raises [ActiveRecord::RecordInvalid]
       #
-      def find_or_create_by!(params, &block)
-        object = @db_client.find_by(params) || @db_client.create!(params, &block)
-        object
-      end
+      delegate :find_or_create_by!, to: :@db_client
 
       #
       # Método que realiza una busqueda de la primer entrada,
@@ -174,7 +155,13 @@ module Commons
       # @raise [ActiveRecord::RecordNotSaved]
       #
       def update!(object)
-        create!(object)
+        if !object.is_a?(@db_client) || object.id.blank?
+          raise ArgumentError
+        end
+
+        raise ActiveRecord::RecordInvalid.new(object) unless object.valid?
+
+        save_object(object)
       end
 
       #
@@ -203,25 +190,43 @@ module Commons
       # @raises [ActiveRecord::RecordInvalid]
       # @raises [ActiveModel::MissingAttributeError]
       #
-      def soft_delete!(id)
-        raise ActiveModel::MissingAttributeError unless @db_client.column_names.include? "deleted_at"
-
-        object = @db_client.find_by!(id: id, deleted_at: nil)
-        object.update!(deleted_at: Time.current)
-
-        object
+      def destroy!(object)
+        if @db_client.include? Commons::Concerns::Extensions::SoftDeleted
+          soft_delete!(object)
+        else
+          hard_delete!(object)
+        end
       end
 
-      private
+      protected
 
       def initialize
-        @db_client ||= class_object
+        @db_client = class_object
       end
 
       def class_object
         model_name = self.class.to_s.gsub("Repository", "")
         Object.const_get model_name
       end
+
+      private
+
+      def save_object(object)
+        object.save
+      end
+
+      def soft_delete!(object)
+        raise ActiveModel::MissingAttributeError unless @db_client.column_names.include?("deleted_at")
+        object.update!(deleted_at: Time.current)
+
+        object
+      end
+
+      def hard_delete!(object)
+        object.destroy!
+
+        object
+      end
     end
   end
 end

data/lib/commons/services/concerns/callable.rb

@@ -5,8 +5,13 @@ module Commons
         extend ActiveSupport::Concern
 
         class_methods do
-          def call(*args)
-            new(*args).call
+          def call(*args, **kwargs)
+            # This approach allows thge class initializer to use regular arguments,
+            # named argumets or the mix of both.
+            # This at the same time allows the usage of Dry::Initializer
+            # https://dry-rb.org/gems/dry-initializer/3.0/
+            # And perhaps this can eventually be a defualt part of Callable Module
+            new(*args, **kwargs).call
           end
         end
       end

data/lib/commons/version.rb

@@ -1,3 +1,3 @@
 module Commons
-  VERSION = '0.12.0'
+  VERSION = '0.15.0'.freeze
 end

data/spec/commons/concerns/extensions/deleted_spec.rb

@@ -1,4 +1,4 @@
-RSpec.describe Commons::Concerns::Extensions::Deleted do
+RSpec.describe Commons::Concerns::Extensions::SoftDeleted do
   let(:user) { create(:user) }
 
   subject do
@@ -18,7 +18,7 @@ RSpec.describe Commons::Concerns::Extensions::Deleted do
     it 'when deleted user' do
       # given
       user = subject
-      user = UserRepository.instance.soft_delete!(user.id)
+      user = UserRepository.instance.destroy!(user)
       # do
       expect(user.deleted?).to eq true
     end
@@ -26,17 +26,15 @@ RSpec.describe Commons::Concerns::Extensions::Deleted do
     it 'when deleted user denies save' do
       # given
       user = subject
-      user = UserRepository.instance.soft_delete!(user.id)
+      user = UserRepository.instance.destroy!(user)
       user.name = Faker::Name.first_name
       # do
       expect{ user.save }.to raise_error(ActiveRecord::RecordInvalid)
     end
 
-    it 'when model is not deletable' do
-      # given
-      employee = Employee.new
+    it 'when model is not soft_deletable' do
       # do
-      expect{ employee.deleted? }.to raise_error(ActiveModel::MissingAttributeError)
+      expect{ Employee.new }.to raise_error(ActiveModel::MissingAttributeError)
     end
   end
 end

data/spec/commons/formatter/regex_constants_spec.rb

@@ -39,7 +39,7 @@ RSpec.describe Commons::Formatter::RegexConstants do
     end
   end
 
-  describe 'CRUP' do
+  describe 'CURP' do
     context 'works when valid' do
       curp_list = [
         'BEML920313HMCLNS09',
@@ -99,4 +99,67 @@ RSpec.describe Commons::Formatter::RegexConstants do
       end
     end
   end
+
+  describe 'ELECTOR_KEY' do
+    context 'works when valid' do
+      elector_list = [
+        'PXMXJX94021709H000',
+        'OXSXJX96062909H000',
+      ]
+      elector_list.each do |k|
+        it "for clave #{k}" do
+          expect(k =~ Commons::Formatter::RegexConstants::ELECTOR_KEY).to be >= 0
+        end
+      end
+    end
+
+    context 'fail when not valid' do
+      elector_list = [
+        'xxxx',
+        '11111',
+        'XAXX000000HXXYYY00'
+      ]
+      elector_list.each do |k|
+        it "for clave #{k}" do
+          expect(k =~ Commons::Formatter::RegexConstants::ELECTOR_KEY).to be_falsey
+        end
+      end
+    end
+  end
+
+  describe 'MONEY' do
+    context 'works when valid' do
+      number_list = [
+        '10.00',
+        '1',
+        '-1.0',
+        '+1.0',
+        '0.000001',
+        '10000.000',
+        '99999999999999999999999999999999999999',
+        '99999999999999999999999999999999999999.999999',
+        '0',
+      ]
+      number_list.each do |number|
+        it "for number #{number}" do
+          expect(number =~ Commons::Formatter::RegexConstants::MONEY).to be >= 0
+        end
+      end
+    end
+
+    context 'fail when not valid' do
+      number_list = [
+        '',
+        ' 0.0 ',
+        '0.0000001',
+        '$0.00',
+        '.1'
+      ]
+      number_list.each do |number|
+        it "for number #{number}" do
+          expect(number =~ Commons::Formatter::RegexConstants::MONEY).to be_falsey
+        end
+      end
+    end
+  end
 end

data/spec/commons/repositories/base_repository_spec.rb

@@ -1,4 +1,4 @@
-RSpec.describe 'Commons::Repositories::BaseRepository' do
+RSpec.describe Commons::Repositories::BaseRepository do
   let(:user) { create(:user) }
   let(:valid_params) do
     {
@@ -17,13 +17,13 @@ RSpec.describe 'Commons::Repositories::BaseRepository' do
         }
         deleted_users_amount.times {
           user = UserRepository.instance.create_from_params!(**valid_params.to_h.symbolize_keys)
-          UserRepository.instance.soft_delete!(user.id)
+          UserRepository.instance.destroy!(user)
         }
       end
       subject { UserRepository.instance.all }
 
       it do
-        expect(subject.count).to eq users_amount + deleted_users_amount
+        expect(subject.count).to eq users_amount
         expect(subject.first).to be_an_instance_of User
       end
     end
@@ -33,7 +33,7 @@ RSpec.describe 'Commons::Repositories::BaseRepository' do
     end
   end
 
-  describe 'kept' do
+  describe 'query' do
     context 'when data exists' do
       let(:users_amount) { 10 }
       let(:deleted_users_amount) { 5 }
@@ -43,10 +43,11 @@ RSpec.describe 'Commons::Repositories::BaseRepository' do
         }
         deleted_users_amount.times {
           user = UserRepository.instance.create_from_params!(**valid_params.to_h.symbolize_keys)
-          UserRepository.instance.soft_delete!(user.id)
+          UserRepository.instance.destroy!(user)
         }
       end
-      subject { UserRepository.instance.kept }
+
+      subject { UserRepository.instance.query.not(name: nil) }
 
       it do
         expect(subject.count).to eq users_amount
@@ -58,11 +59,13 @@ RSpec.describe 'Commons::Repositories::BaseRepository' do
       before do
         deleted_users_amount.times {
           user = UserRepository.instance.create_from_params!(**valid_params.to_h.symbolize_keys)
-          UserRepository.instance.soft_delete!(user.id)
+          UserRepository.instance.destroy!(user)
         }
       end
 
-      it { expect(UserRepository.instance.kept).to be_empty }
+      subject { UserRepository.instance.query.not(name: nil) }
+
+      it { expect(subject).to be_empty }
     end
   end
 
@@ -76,7 +79,7 @@ RSpec.describe 'Commons::Repositories::BaseRepository' do
         }
         deleted_users_amount.times {
           user = UserRepository.instance.create_from_params!(**valid_params.to_h.symbolize_keys)
-          UserRepository.instance.soft_delete!(user.id)
+          UserRepository.instance.destroy!(user)
         }
       end
       subject { UserRepository.instance.deleted }
@@ -114,30 +117,27 @@ RSpec.describe 'Commons::Repositories::BaseRepository' do
     end
   end
 
-  describe 'find_kept' do
+  describe 'find_deleted' do
     context 'by a valid id' do
-      subject { UserRepository.instance.find_kept(user.id) }
+      subject { UserRepository.instance.find_deleted(user.id) }
 
-      it { is_expected.to be_an_instance_of User }
+      it { is_expected.to be_nil }
     end
 
     context 'by non-existent id' do
-      it do
-        expect do
-          UserRepository.instance.find_kept('my totally non-existent id')
-        end.to raise_error(ActiveRecord::RecordNotFound)
-      end
+      subject { UserRepository.instance.find_deleted('my totally non-existent id') }
+
+      it { is_expected.to be_nil }
     end
 
     context 'by previously deleted user' do
       before do
-        UserRepository.instance.soft_delete!(user.id)
+        UserRepository.instance.destroy!(user)
       end
-      subject { UserRepository.instance.find_kept(user.id) }
 
-      it do
-        expect{ subject }.to raise_error(ActiveRecord::RecordNotFound)
-      end
+      subject { UserRepository.instance.find_deleted(user.id) }
+
+      it { is_expected.to be_an_instance_of User }
     end
   end
 
@@ -153,22 +153,27 @@ RSpec.describe 'Commons::Repositories::BaseRepository' do
     end
   end
 
-  describe 'find_kept_by' do
+  describe 'find_deleted_by' do
     context 'by a valid id' do
-      subject { UserRepository.instance.find_kept_by(id: user.id) }
+      subject { UserRepository.instance.find_deleted_by(id: user.id) }
 
-      it { is_expected.to be_an_instance_of User }
+      it { is_expected.to be_falsey }
     end
 
     context 'by non-existent id' do
-      it { expect(UserRepository.instance.find_kept_by(id: 'my totally non-existent id')).to be_falsey }
+      subject { UserRepository.instance.find_deleted_by(id: 'my totally non-existent id') }
+
+      it { is_expected.to be_falsey }
     end
 
     context 'by previously deleted user' do
       before do
-        UserRepository.instance.soft_delete!(user.id)
+        UserRepository.instance.destroy!(user)
       end
-      it { expect(UserRepository.instance.find_kept_by(id: 'my totally non-existent id')).to be_falsey }
+
+      subject { UserRepository.instance.find_deleted_by(id: user.id) }
+
+      it { is_expected.to be_an_instance_of User }
     end
   end
 
@@ -190,34 +195,31 @@ RSpec.describe 'Commons::Repositories::BaseRepository' do
     end
   end
 
-  describe 'find_kept_by!' do
-    context 'by a valid id!' do
-      subject { UserRepository.instance.find_kept_by!(id: user.id) }
+  describe 'find_deleted_by!' do
+    context 'by a valid active id' do
+      subject { UserRepository.instance.find_deleted_by!(id: user.id) }
 
-      it { is_expected.to be_an_instance_of User }
+      it do
+        expect { subject }.to raise_error(ActiveRecord::RecordNotFound)
+      end
     end
 
     context 'by non-existent id!' do
+      subject { UserRepository.instance.find_deleted_by!(id: 'my totally non-existent id') }
+
       it do
-        expect do
-          UserRepository.instance.find_kept_by!(
-            id: 'my totally non-existent id'
-          )
-        end.to raise_error(ActiveRecord::RecordNotFound)
+        expect { subject }.to raise_error(ActiveRecord::RecordNotFound)
       end
     end
 
     context 'by previously deleted user' do
       before do
-        UserRepository.instance.soft_delete!(user.id)
-      end
-      it do
-        expect do
-          UserRepository.instance.find_kept_by!(
-            id: 'my totally non-existent id'
-          )
-        end.to raise_error(ActiveRecord::RecordNotFound)
+        UserRepository.instance.destroy!(user)
       end
+
+      subject { UserRepository.instance.find_deleted_by!(id: user.id) }
+
+      it { is_expected.to be_an_instance_of User }
     end
   end
 
@@ -345,12 +347,12 @@ RSpec.describe 'Commons::Repositories::BaseRepository' do
     end
 
     describe 'fails when' do
-      context 'is not a user' do
-        let(:employee) { build(:employee) }
+      context 'is not a employee' do
+        let(:user) { build(:user) }
 
         it do
           expect do
-            UserRepository.instance.create!(employee)
+            EmployeeRepository.instance.create!(user)
           end.to raise_error(ArgumentError)
         end
       end
@@ -400,11 +402,21 @@ RSpec.describe 'Commons::Repositories::BaseRepository' do
 
     describe 'fails when' do
       context 'is not a user' do
-        let(:employee) { create(:employee) }
+        let(:user) { create(:user) }
+
+        it do
+          expect do
+            EmployeeRepository.instance.update!(user)
+          end.to raise_error(ArgumentError)
+        end
+      end
+
+      context 'is not a previously saved' do
+        let(:user) { build(:user) }
 
         it do
           expect do
-            UserRepository.instance.update!(employee)
+            UserRepository.instance.update!(user)
           end.to raise_error(ArgumentError)
         end
       end
@@ -473,7 +485,7 @@ RSpec.describe 'Commons::Repositories::BaseRepository' do
       context 'using a valid user' do
         let(:user) { create(:user) }
 
-        subject { UserRepository.instance.soft_delete!(user.id) }
+        subject { UserRepository.instance.destroy!(user) }
 
         it { expect(subject.deleted_at).not_to be nil }
       end
@@ -485,7 +497,7 @@ RSpec.describe 'Commons::Repositories::BaseRepository' do
 
         it do
           expect do
-            EmployeeRepository.instance.soft_delete!(employee.id)
+            EmployeeRepository.instance.destroy!(employee)
           end.to raise_error(ActiveModel::MissingAttributeError)
         end
       end
@@ -495,8 +507,8 @@ RSpec.describe 'Commons::Repositories::BaseRepository' do
 
         it do
           expect do
-            UserRepository.instance.soft_delete!(user)
-          end.to raise_error(ActiveRecord::RecordNotFound)
+            UserRepository.instance.destroy!(user)
+          end.to raise_error(ActiveRecord::RecordInvalid)
         end
       end
     end

data/spec/dummy/app/models/employee.rb

@@ -1,3 +1,3 @@
 class Employee < ApplicationRecord
-  include Commons::Concerns::Extensions::Deleted
+  include Commons::Concerns::Extensions::SoftDeleted
 end

data/spec/dummy/app/models/user.rb

@@ -1,6 +1,6 @@
 class User < ApplicationRecord
   include Commons::Concerns::Attributes::Sex
-  include Commons::Concerns::Extensions::Deleted
+  include Commons::Concerns::Extensions::SoftDeleted
   include Commons::Concerns::Guard::Capitalizable
   include Commons::Concerns::Validations::Undestroyable
 

data/spec/spec_helper.rb

@@ -48,6 +48,10 @@ RSpec.configure do |config|
   # triggering implicit auto-inclusion in groups with matching metadata.
   config.shared_context_metadata_behavior = :apply_to_host_groups
 
+  # This setting enables warnings. It's recommended, but in some cases may
+  # be too noisy due to issues in dependencies.
+  config.warnings = true
+
 # The settings below are suggested to provide a good initial experience
 # with RSpec, but feel free to customize to your heart's content.
 =begin

metadata

@@ -1,11 +1,11 @@
 --- !ruby/object:Gem::Specification
 name: commons_yellowme
 version: !ruby/object:Gem::Version
-  version: 0.12.0
+  version: 0.15.0
 platform: ruby
 authors:
 - Yellowme
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
 date: 2019-12-10 00:00:00.000000000 Z
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.2'
+        version: '6.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.2'
+        version: '6.0'
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
@@ -198,7 +198,7 @@ files:
 - lib/commons/authentication/authenticate_by_jwt.rb
 - lib/commons/authentication/json_web_token.rb
 - lib/commons/concerns/attributes/sex.rb
-- lib/commons/concerns/extensions/deleted.rb
+- lib/commons/concerns/extensions/soft_deleted.rb
 - lib/commons/concerns/guard/capitalizable.rb
 - lib/commons/concerns/validations/undestroyable.rb
 - lib/commons/config.rb
@@ -353,7 +353,7 @@ homepage: https://github.com/yellowme/commons-rails
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -368,9 +368,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
-signing_key: 
+rubygems_version: 3.1.2
+signing_key:
 specification_version: 4
 summary: Commons is Yellowme's Rails APIs utilities gem
 test_files:

data/lib/commons/concerns/extensions/deleted.rb

@@ -1,25 +0,0 @@
-module Commons
-  module Concerns
-    module Extensions
-      module Deleted
-        extend ActiveSupport::Concern
-
-        included do
-          before_validation :check_not_deleted, on: [:update]
-
-          def deleted?
-            raise ActiveModel::MissingAttributeError unless self.has_attribute?(:deleted_at)
-            self.deleted_at.present?
-          end
-        end
-
-        private
-
-        def check_not_deleted
-          raise ActiveModel::MissingAttributeError unless self.has_attribute?(:deleted_at)
-          raise ActiveRecord::RecordInvalid if self.deleted_at_in_database.present?
-        end
-      end
-    end
-  end
-end