type_validator 0.9.0 → 0.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 98d8d425b5e4434e03c1f6bbe6dc6e2c5597faa6fd9479a28bfcf689c4e4797e
-  data.tar.gz: 7131ce004a821ad619a524cb13076c8f5011e5939b9990261a7eb6b617b62f69
+  metadata.gz: c6d336fb78cd054bc714f18871e7fdf708526d29beb9c7d19ec6156f20e627e7
+  data.tar.gz: 2ae7196178b31af7ee65bdf7c545869a84c2895a6ca6e7064d486b84fd5817fb
 SHA512:
-  metadata.gz: a7cd464b044de2061659dea89ee3f2b832842908e08505d7335038f7a124e3393dca4cb4c3175df9d694ff6337e1ca25704c0937a3d5df8baadb3fa47d569c4c
-  data.tar.gz: 97e84add9774959d8dea83eb9156d5f62c8a64d3b053709cae35315f40832b2f5713fe59255ed51c1f3191f0e85be6d101cdc57fd5c3633093581b07db9eee86
+  metadata.gz: e867c62076ccf8355855e5b4e92753c6f7cc2121de1eb66a2c2474fcd650272072b1429c37428336efe0c579c35ce302c9224a8fec302bf763de4c1e14c3fdc2
+  data.tar.gz: 396af9fbb4eef0a2a2d0c51a43b23c6eedfe86cdf2a9ccc287d53e93ed3cedae51a0dee3711f5e6d55738cab7d26155b22bdee4938824caacba8a24e9dc69d0b

data/README.md

@@ -25,18 +25,34 @@ Or install it yourself as:
 
 Use one or all of the type validations into your models/classes:
 
+**[Object#instance_of?](https://ruby-doc.org/core-2.6.4/Object.html#method-i-instance_of-3F)**
+
+```ruby
+validates :name, type: { instance_of: String }
+
+# or use an array to verify if the attribute
+# is an instance of one of the classes
+
+validates :name, type: { instance_of: [String, Symbol] }
+```
+
+**[Object#kind_of?](https://ruby-doc.org/core-2.6.4/Object.html#method-i-kind_of-3F)**
+
 ```ruby
 validates :name, type: { is_a: String }
 # or
 validates :name, type: { kind_of: String }
 
-# Use an array to verify if the attribute is an instance of one of the classes
+# Use an array to verify if the attribute
+# is an instance of one of the classes
 
 validates :status, type: { is_a: [String, Symbol]}
 # or
 validates :status, type: { kind_of: [String, Symbol]}
 ```
 
+**[Object#respond_to?](https://ruby-doc.org/core-2.6.4/Object.html#method-i-respond_to-3F)**
+
 ```ruby
 validates :handler, type: { respond_to: :call }
 ```
@@ -50,13 +66,15 @@ validates :handler, type: { klass: Handler }
 ```ruby
 validates :account_types, type: { array_of: String }
 
-# or use an array to verify if the attribute is an instance of one of the classes
+# or use an array to verify if the attribute
+# is an instance of one of the classes
 
 validates :account_types, type: { array_of: [String, Symbol] }
 ```
 
 ```ruby
-# Verifies if the attribute value is an array with some or all the expected values.
+# Verifies if the attribute value
+# is an array with some or all the expected values.
 
 validates :account_types, type: { array_with: ['foo', 'bar'] }
 ```

data/lib/type_validator/error.rb

@@ -5,7 +5,7 @@ require 'active_model'
 class TypeValidator
   module Error
     class InvalidDefinition < ArgumentError
-      OPTIONS = 'Options to define one: `:is_a`/`:kind_of`, :respond_to, :klass, :array_of or :array_with'.freeze
+      OPTIONS = 'Options to define one: :instance_of, :is_a/:kind_of, :respond_to, :klass, :array_of or :array_with'.freeze
 
       def initialize(attribute)
         super "invalid type definition for :#{attribute} attribute. #{OPTIONS}"

data/lib/type_validator/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 class TypeValidator
-  VERSION = '0.9.0'
+  VERSION = '0.10.0'
 end

data/lib/type_validator.rb

@@ -16,16 +16,25 @@ class TypeValidator < ActiveModel::EachValidator
   private
 
     def validate_type_of(attribute, value)
-      if expected = options[:is_a]      ; return validate_kind_of(value, expected)   ; end
-      if expected = options[:kind_of]   ; return validate_kind_of(value, expected)   ; end
-      if expected = options[:respond_to]; return validate_respond_to(value, expected); end
-      if expected = options[:klass]     ; return validate_klass(value, expected)     ; end
-      if expected = options[:array_of]  ; return validate_array_of(value, expected)  ; end
-      if expected = options[:array_with]; return validate_array_with(value, expected); end
+      if expected = options[:instance_of]; return validate_instance_of(value, expected); end
+      if expected = options[:is_a]       ; return validate_kind_of(value, expected)    ; end
+      if expected = options[:kind_of]    ; return validate_kind_of(value, expected)    ; end
+      if expected = options[:klass]      ; return validate_klass(value, expected)      ; end
+      if expected = options[:respond_to] ; return validate_respond_to(value, expected) ; end
+      if expected = options[:array_of]   ; return validate_array_of(value, expected)   ; end
+      if expected = options[:array_with] ; return validate_array_with(value, expected) ; end
 
       raise Error::InvalidDefinition.new(attribute)
     end
 
+    def validate_instance_of(value, expected)
+      types = Array(expected)
+
+      return if types.any? { |type| value.instance_of?(type) }
+
+      "must be an instance of: #{types.map { |klass| klass.name }.join(', ')}"
+    end
+
     def validate_kind_of(value, expected)
       types = Array(expected)
 
@@ -34,10 +43,13 @@ class TypeValidator < ActiveModel::EachValidator
       "must be a kind of: #{types.map { |klass| klass.name }.join(', ')}"
     end
 
-    def validate_respond_to(value, method_name)
-      return if value.respond_to?(method_name)
+    def validate_klass(value, klass)
+      require_a_class(value)
+      require_a_class(klass)
 
-      "must respond to the method `#{method_name}`"
+      return if value == klass || value < klass
+
+      "must be the or a subclass of `#{klass.name}`"
     end
 
     def validate_klass(value, klass)
@@ -53,6 +65,12 @@ class TypeValidator < ActiveModel::EachValidator
       raise ArgumentError, "#{arg} must be a class" unless arg.is_a?(Class)
     end
 
+    def validate_respond_to(value, method_name)
+      return if value.respond_to?(method_name)
+
+      "must respond to the method `#{method_name}`"
+    end
+
     def validate_array_of(value, expected)
       types = Array(expected)
 

data/type_validator.gemspec

@@ -6,7 +6,7 @@ Gem::Specification.new do |spec|
   spec.name          = 'type_validator'
   spec.version       = File.readlines(File.join('.', 'lib', 'type_validator', 'version.rb'))
                            .find { |line| line =~ /VERSION/ }
-                           .strip[/(\d\.?){3}/]
+                           .strip[/(\d\d?\.?){3}/]
   spec.authors       = ['Rodrigo Serradura']
   spec.email         = ['rodrigo.serradura@gmail.com']
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: type_validator
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.10.0
 platform: ruby
 authors:
 - Rodrigo Serradura