unidom-common-rspec 2.0 → 2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '08978e31550f24686da26c0a790887b6fe033aac165ec7db16bb4dcc5f56b1cb'
-  data.tar.gz: 78c99b4e6a005aa3313bc7c88ea88e32141ba4bd6d34981e6c90db7c9dd17328
+  metadata.gz: e73a57fee4cef81976cb6d387f8ee3b79c7f220533492971eed511233a545629
+  data.tar.gz: 9b1612de7e7f00f400326bec3b428fa870d52fd8c3eedd92272350f17236874e
 SHA512:
-  metadata.gz: '0902ba335e02cd60910258edbe8a89fc488205a5983b4d2084b4971c935b89c12250cab02baeb6c120d2f132ead3a75d095eda3c8356f02ffd8501da25a130c3'
-  data.tar.gz: f928fc097ae1207abda9b12f497c425e0f43b6068bf9fab9b450b92f7526050e2eced2efb949bf1657564860e8f46a6831e4149d38bc3dc89d789e4698cfe395
+  metadata.gz: 22e69f347d5638e3022e20111643ab5bd3a97d6a6af7749a5b949ffbe7f916c8d9a5956309e746b0bd048e944557c7863e2739804727a3b30312dc5a98d2c740
+  data.tar.gz: 6c42f4595da343f446ba97eec954eed80d689cd109ee43d456516b56e2a815426fb42077835612ae2b4efdc74616fe672debdb319fcf60ca20f13bb8bde15da0

data/CHANGELOG.md

@@ -82,3 +82,7 @@
 ## v2.0
 
 1. Improved the Scope shared examples for Ruby 3.0
+
+## v2.0.1
+
+1. Improved the compatibility of Validates Numericality shared examples and Each Validator shared examples

data/ROADMAP.md

@@ -82,3 +82,7 @@
 ## v2.0
 
 1. Improve the Scope shared examples for Ruby 3.0
+
+## v2.0.1
+
+1. Improve the compatibility of Validates Numericality shared examples and Each Validator shared examples

data/lib/unidom/common/rspec/each_validator_shared_examples.rb

@@ -1,11 +1,17 @@
 shared_examples 'ActiveModel::EachValidator' do |valid_values, invalid_values|
 
   mock_model_class_name = "#{described_class.name}MockModel"
-  mock_model_namespace  = mock_model_class_name.deconstantize.constantize
-  mock_model_name       = mock_model_class_name.demodulize
-  validator_name        = described_class.to_s.underscore.chomp('_validator').to_sym
+  if mock_model_class_name.deconstantize.present?
+    mock_model_namespace  = mock_model_class_name.deconstantize.constantize
+    mock_model_name       = mock_model_class_name.demodulize
+  else
+    mock_model_namespace = Object
+    mock_model_name      = mock_model_class_name
+  end
+
   mock_model_namespace.const_set mock_model_name, Class.new
-  class_instance        = mock_model_namespace.const_get mock_model_name
+  class_instance = mock_model_namespace.const_get mock_model_name
+  validator_name = described_class.to_s.underscore.chomp('_validator').to_sym
 
   class_instance.class_eval do
     include       ActiveModel::Model

data/lib/unidom/common/rspec/validates_numericality_shared_examples.rb

@@ -1,8 +1,8 @@
 shared_examples 'validates numericality' do |model_attributes, attribute_name, options|
 
   attribute_name      = attribute_name.to_sym
-  presence_validator  = described_class.validators.select { |v| v.is_a?(ActiveRecord::Validations::PresenceValidator)&&v.attributes.include?(attribute_name) }.first
-  excluded_validators = described_class.validators.select { |v| v.attributes.include?(attribute_name)&&![ ActiveRecord::Validations::PresenceValidator, ActiveModel::Validations::NumericalityValidator ].include?(v.class) }
+  presence_validator  = described_class.validators.select { |v| (v.is_a?(ActiveModel::Validations::PresenceValidator)||v.is_a?(ActiveRecord::Validations::PresenceValidator))&&v.attributes.include?(attribute_name) }.first
+  excluded_validators = described_class.validators.select { |v| v.attributes.include?(attribute_name)&&![ ActiveRecord::Validations::PresenceValidator, ActiveRecord::Validations::NumericalityValidator, ActiveModel::Validations::PresenceValidator, ActiveModel::Validations::NumericalityValidator ].include?(v.class) }
 
   if excluded_validators.present?
     raise ArgumentError.new("The validators on the #{attribute_name.inspect} attribute must be PresenceValidator or NumericalityValidator. The excluded validator#{excluded_validators.size>1 ? 's are' : ' is'}: #{excluded_validators.inspect}.")

data/lib/unidom/common/rspec/version.rb

@@ -1,7 +1,7 @@
 module Unidom
   module Common
     module RSpec
-      VERSION = '2.0'
+      VERSION = '2.0.1'
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: unidom-common-rspec
 version: !ruby/object:Gem::Version
-  version: '2.0'
+  version: 2.0.1
 platform: ruby
 authors:
 - Topbit Du
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-08-01 00:00:00.000000000 Z
+date: 2021-08-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec-rails