commons_yellowme 0.11.1 → 0.16.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8647af0312b7a12912e0aa7d1dcf10c2a810b17badfadb626cb4e7f548ae3832
-  data.tar.gz: a9794e7a96deb33df33d15e2e2b641fa900efcf93ed14661909ae7bd3caf63a9
+  metadata.gz: 01eed218ec93ea2954c70f437a2d49752454ae223f7f47bb55d86c04dbe53802
+  data.tar.gz: d927cbb2467677e3f3882d01fb647ee184af466034926ab5c3b161f262a6c754
 SHA512:
-  metadata.gz: c1c7895faba91c9758b80ab388f3f3966068c8c7758cf8ec84dcf79181f80773d9b83cefd923c70e0b578a4047812e3d52703a310c1c72a3de9c77b0e52b39a0
-  data.tar.gz: af4f866a77d8fa9295b1add9157c2dc3fdce233f9abb6cec8a30cab999292a83756077c8ae312fda1be8748eccd5c3b051f27d24bf0edca983a72521f3869938
+  metadata.gz: 6cc0ce43aeb45e4ac3bc7fc8844a59f27e0df53a93f11330d7388879692b93746402d2b0850db67c50b4ee794482d20beaf7bf070be1c8085206fea3108476a8
+  data.tar.gz: d30a9c84bf4c7a6155d9fdb273723049fb757caf04510f353ff67099f9b560c271a3de6754aa4e03500ddd9df78eebbecb83ffc71539d1eff4cb8d842bd0bd63

data/.gitignore

@@ -1,3 +1,56 @@
+*.gem
+*.rbc
+/.config
+/coverage/
+/InstalledFiles
+/pkg/
+/spec/reports/
+/spec/examples.txt
+/test/tmp/
+/test/version_tmp/
+/tmp/
+.vscode
+
+# Used by dotenv library to load environment variables.
+# .env
+
+## Specific to RubyMotion:
+.dat*
+.repl_history
+build/
+*.bridgesupport
+build-iPhoneOS/
+build-iPhoneSimulator/
+
+## Specific to RubyMotion (use of CocoaPods):
+#
+# We recommend against adding the Pods directory to your .gitignore. However
+# you should judge for yourself, the pros and cons are mentioned at:
+# https://guides.cocoapods.org/using/using-cocoapods.html#should-i-check-the-pods-directory-into-source-control
+#
+# vendor/Pods/
+
+## Documentation cache and generated files:
+/.yardoc/
+/_yardoc/
+/doc/
+/rdoc/
+
+## Environment normalization:
+/.bundle/
+/vendor/bundle
+/lib/bundler/man/
+
+# for a library or gem, you might want to ignore these files since the code is
+# intended to run in multiple environments; otherwise, check them in:
+# Gemfile.lock
+# .ruby-version
+# .ruby-gemset
+
+# unless supporting rvm < 1.11.0 or doing something fancy, ignore this:
+.rvmrc
+.DS_Store
+
 .bundle/
 log/*.log
 pkg/
@@ -7,4 +60,3 @@ spec/dummy/db/*.sqlite3-*
 spec/dummy/log/*.log
 spec/dummy/storage/
 spec/dummy/tmp/
-coverage

data/Gemfile.lock

@@ -1,83 +1,70 @@
 PATH
   remote: .
   specs:
-    commons (0.10.3)
+    commons_yellowme (0.13.0)
       active_model_serializers (~> 0.10.10)
       dry-validation
-      json (~> 1.8)
+      json (~> 2.0)
       jwt
       phonelib (~> 0.6.29)
-      rails (~> 6.0.1)
+      rails (~> 5.2)
       strip_attributes
 
 GEM
   remote: https://rubygems.org/
   specs:
-    actioncable (6.0.2)
-      actionpack (= 6.0.2)
+    actioncable (5.2.4.1)
+      actionpack (= 5.2.4.1)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)
-    actionmailbox (6.0.2)
-      actionpack (= 6.0.2)
-      activejob (= 6.0.2)
-      activerecord (= 6.0.2)
-      activestorage (= 6.0.2)
-      activesupport (= 6.0.2)
-      mail (>= 2.7.1)
-    actionmailer (6.0.2)
-      actionpack (= 6.0.2)
-      actionview (= 6.0.2)
-      activejob (= 6.0.2)
+    actionmailer (5.2.4.1)
+      actionpack (= 5.2.4.1)
+      actionview (= 5.2.4.1)
+      activejob (= 5.2.4.1)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 2.0)
-    actionpack (6.0.2)
-      actionview (= 6.0.2)
-      activesupport (= 6.0.2)
-      rack (~> 2.0)
+    actionpack (5.2.4.1)
+      actionview (= 5.2.4.1)
+      activesupport (= 5.2.4.1)
+      rack (~> 2.0, >= 2.0.8)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
-      rails-html-sanitizer (~> 1.0, >= 1.2.0)
-    actiontext (6.0.2)
-      actionpack (= 6.0.2)
-      activerecord (= 6.0.2)
-      activestorage (= 6.0.2)
-      activesupport (= 6.0.2)
-      nokogiri (>= 1.8.5)
-    actionview (6.0.2)
-      activesupport (= 6.0.2)
+      rails-html-sanitizer (~> 1.0, >= 1.0.2)
+    actionview (5.2.4.1)
+      activesupport (= 5.2.4.1)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
-      rails-html-sanitizer (~> 1.1, >= 1.2.0)
+      rails-html-sanitizer (~> 1.0, >= 1.0.3)
     active_model_serializers (0.10.10)
       actionpack (>= 4.1, < 6.1)
       activemodel (>= 4.1, < 6.1)
       case_transform (>= 0.2)
       jsonapi-renderer (>= 0.1.1.beta1, < 0.3)
-    activejob (6.0.2)
-      activesupport (= 6.0.2)
+    activejob (5.2.4.1)
+      activesupport (= 5.2.4.1)
       globalid (>= 0.3.6)
-    activemodel (6.0.2)
-      activesupport (= 6.0.2)
-    activerecord (6.0.2)
-      activemodel (= 6.0.2)
-      activesupport (= 6.0.2)
-    activestorage (6.0.2)
-      actionpack (= 6.0.2)
-      activejob (= 6.0.2)
-      activerecord (= 6.0.2)
+    activemodel (5.2.4.1)
+      activesupport (= 5.2.4.1)
+    activerecord (5.2.4.1)
+      activemodel (= 5.2.4.1)
+      activesupport (= 5.2.4.1)
+      arel (>= 9.0)
+    activestorage (5.2.4.1)
+      actionpack (= 5.2.4.1)
+      activerecord (= 5.2.4.1)
       marcel (~> 0.3.1)
-    activesupport (6.0.2)
+    activesupport (5.2.4.1)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
-      zeitwerk (~> 2.2)
+    arel (9.0.0)
     builder (3.2.4)
     case_transform (0.2)
       activesupport
     concurrent-ruby (1.1.5)
-    crass (1.0.5)
+    crass (1.0.6)
     diff-lcs (1.3)
     docile (1.3.2)
     dry-configurable (0.9.0)
@@ -91,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)
@@ -103,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)
@@ -127,9 +114,9 @@ GEM
       i18n (>= 1.6, < 1.8)
     globalid (0.4.2)
       activesupport (>= 4.2.0)
-    i18n (1.7.0)
+    i18n (1.7.1)
       concurrent-ruby (~> 1.0)
-    json (1.8.6)
+    json (2.3.0)
     jsonapi-renderer (0.2.2)
     jwt (2.2.1)
     loofah (2.4.0)
@@ -143,40 +130,38 @@ GEM
     mimemagic (0.3.4)
     mini_mime (1.0.2)
     mini_portile2 (2.4.0)
-    minitest (5.13.0)
+    minitest (5.14.0)
     nio4r (2.5.2)
     nokogiri (1.10.7)
       mini_portile2 (~> 2.4.0)
     phonelib (0.6.41)
-    rack (2.0.7)
+    rack (2.1.2)
     rack-test (1.1.0)
       rack (>= 1.0, < 3)
-    rails (6.0.2)
-      actioncable (= 6.0.2)
-      actionmailbox (= 6.0.2)
-      actionmailer (= 6.0.2)
-      actionpack (= 6.0.2)
-      actiontext (= 6.0.2)
-      actionview (= 6.0.2)
-      activejob (= 6.0.2)
-      activemodel (= 6.0.2)
-      activerecord (= 6.0.2)
-      activestorage (= 6.0.2)
-      activesupport (= 6.0.2)
+    rails (5.2.4.1)
+      actioncable (= 5.2.4.1)
+      actionmailer (= 5.2.4.1)
+      actionpack (= 5.2.4.1)
+      actionview (= 5.2.4.1)
+      activejob (= 5.2.4.1)
+      activemodel (= 5.2.4.1)
+      activerecord (= 5.2.4.1)
+      activestorage (= 5.2.4.1)
+      activesupport (= 5.2.4.1)
       bundler (>= 1.3.0)
-      railties (= 6.0.2)
+      railties (= 5.2.4.1)
       sprockets-rails (>= 2.0.0)
     rails-dom-testing (2.0.3)
       activesupport (>= 4.2.0)
       nokogiri (>= 1.6)
     rails-html-sanitizer (1.3.0)
       loofah (~> 2.3)
-    railties (6.0.2)
-      actionpack (= 6.0.2)
-      activesupport (= 6.0.2)
+    railties (5.2.4.1)
+      actionpack (= 5.2.4.1)
+      activesupport (= 5.2.4.1)
       method_source
       rake (>= 0.8.7)
-      thor (>= 0.20.3, < 2.0)
+      thor (>= 0.19.0, < 2.0)
     rake (13.0.1)
     rspec-core (3.9.0)
       rspec-support (~> 3.9.0)
@@ -210,20 +195,19 @@ GEM
     sqlite3 (1.4.1)
     strip_attributes (1.9.0)
       activemodel (>= 3.0, < 7.0)
-    thor (1.0.0)
+    thor (1.0.1)
     thread_safe (0.3.6)
-    tzinfo (1.2.5)
+    tzinfo (1.2.6)
       thread_safe (~> 0.1)
     websocket-driver (0.7.1)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.4)
-    zeitwerk (2.2.2)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  commons!
+  commons_yellowme!
   factory_bot_rails (~> 5.1.1)
   faker
   rspec-rails
@@ -231,4 +215,4 @@ DEPENDENCIES
   sqlite3
 
 BUNDLED WITH
-   2.0.2
+   2.1.4

data/commons.gemspec

@@ -15,20 +15,13 @@ Gem::Specification.new do |spec|
   spec.homepage    = 'https://github.com/yellowme/commons-rails'
   spec.license      = 'MIT'
 
-  #spec.files = Dir["{app,config,db,lib}/**/*", "MIT-LICENSE", "Rakefile", "README.md"]
-  #spec.files       = [
-  #                     "lib/commons.rb",
-  #                     "spec/support/shared-examples/capitalizable.rb",
-  #                     "spec/support/shared-examples/undestroyable.rb",
-  #                     "spec/support/shared-examples/stripable.rb"
-  #                   ]
   spec.files       = `git ls-files`.split($/)
   spec.executables = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.test_files  = `git ls-files -- {test,spec,features}/*`.split("\n")
 
 
-  spec.add_dependency "rails", "~> 6.0.1"
-  spec.add_dependency 'json', '~> 1.8'
+  spec.add_dependency "rails", ">= 5.2"
+  spec.add_dependency 'json', '~> 2.0'
   spec.add_dependency "active_model_serializers", "~> 0.10.10"
   spec.add_dependency "strip_attributes"
   spec.add_dependency "jwt"

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,6 +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][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.11.1'
+  VERSION = '0.16.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/dummy/config/application.rb

@@ -19,7 +19,7 @@ require "commons"
 module Dummy
   class Application < Rails::Application
     # Initialize configuration defaults for originally generated Rails version.
-    config.load_defaults 6.0
+    config.load_defaults 5.2
 
     # Settings in config/environments/* take precedence over those specified here.
     # Application configuration can go into files in config/initializers

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.11.1
+  version: 0.16.0
 platform: ruby
 authors:
 - Yellowme
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
 date: 2019-12-10 00:00:00.000000000 Z
@@ -14,30 +14,30 @@ dependencies:
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 6.0.1
+        version: '5.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 6.0.1
+        version: '5.2'
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.8'
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.8'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: active_model_serializers
   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