type_validator 0.8.0 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 96d8db1bdc2cb03f7eddc41fb66025b36557fc83014845868a847b118f521d14
-  data.tar.gz: f1d2f58f64b062855ccb490332064b7b9a0f82162b1e0246d48eaa534a305961
+  metadata.gz: 98d8d425b5e4434e03c1f6bbe6dc6e2c5597faa6fd9479a28bfcf689c4e4797e
+  data.tar.gz: 7131ce004a821ad619a524cb13076c8f5011e5939b9990261a7eb6b617b62f69
 SHA512:
-  metadata.gz: 1f6812a3e4dda60eb1157b42aa5553b2b1b4edce6df26b261d85fecc27be4dbba1fd334dd9628a4a33a97f318ddbdffb48f9fd8ad35160b98087a3087a103661
-  data.tar.gz: 4cbd56e7a43b563f9482176e24060842386d58d59d893c918042fe4cbc0df1417b8cc88317176e0abecb6fcf7b8878975dc5a93962fb83d1f403e19b3a15a6e7
+  metadata.gz: a7cd464b044de2061659dea89ee3f2b832842908e08505d7335038f7a124e3393dca4cb4c3175df9d694ff6337e1ca25704c0937a3d5df8baadb3fa47d569c4c
+  data.tar.gz: 97e84add9774959d8dea83eb9156d5f62c8a64d3b053709cae35315f40832b2f5713fe59255ed51c1f3191f0e85be6d101cdc57fd5c3633093581b07db9eee86

data/lib/type_validator.rb

@@ -4,12 +4,9 @@ require 'active_model'
 
 class TypeValidator < ActiveModel::EachValidator
   def validate_each(record, attribute, value)
-    strategy = fetch_strategy(options)
-
-    raise Error::InvalidDefinition.new(attribute) unless strategy
-
     return if options[:allow_nil] && value.nil?
-    return unless error = strategy.invalid?(value, options)
+
+    return unless error = validate_type_of(attribute, value)
 
     raise TypeError, "#{attribute} #{error}" if options[:strict]
 
@@ -18,19 +15,60 @@ class TypeValidator < ActiveModel::EachValidator
 
   private
 
-    def fetch_strategy(options)
-      return ByKindOf if options.key?(:is_a) || options.key?(:kind_of)
-      return ByRespondTo if options.key?(:respond_to)
-      return ByKlass if options.key?(:klass)
-      return ByArrayOf if options.key?(:array_of)
-      return ByArrayWith if options.key?(:array_with)
+    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
+
+      raise Error::InvalidDefinition.new(attribute)
+    end
+
+    def validate_kind_of(value, expected)
+      types = Array(expected)
+
+      return if types.any? { |type| value.is_a?(type) }
+
+      "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)
+
+      "must respond to the method `#{method_name}`"
+    end
+
+    def validate_klass(value, klass)
+      require_a_class(value)
+      require_a_class(klass)
+
+      return if value == klass || value < klass
+
+      "must be the or a subclass of `#{klass.name}`"
+    end
+
+    def require_a_class(arg)
+      raise ArgumentError, "#{arg} must be a class" unless arg.is_a?(Class)
+    end
+
+    def validate_array_of(value, expected)
+      types = Array(expected)
+
+      return if value.is_a?(Array) && !value.empty? && value.all? { |value| types.any? { |type| value.is_a?(type) } }
+
+      "must be an array of: #{types.map { |klass| klass.name }.join(', ')}"
+    end
+
+    def validate_array_with(value, expected)
+      raise ArgumentError, "#{expected} must be an array" unless expected.is_a?(Array)
+
+      return if value.is_a?(Array) && !value.empty? && (value - expected).empty?
+
+      "must be an array with: #{expected.join(', ')}"
     end
 end
 
 require 'type_validator/version'
 require 'type_validator/error'
-require 'type_validator/by_klass'
-require 'type_validator/by_kind_of'
-require 'type_validator/by_array_of'
-require 'type_validator/by_array_with'
-require 'type_validator/by_respond_to'

data/lib/type_validator/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: type_validator
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.9.0
 platform: ruby
 authors:
 - Rodrigo Serradura
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-09-18 00:00:00.000000000 Z
+date: 2019-09-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -85,11 +85,6 @@ files:
 - bin/console
 - bin/setup
 - lib/type_validator.rb
-- lib/type_validator/by_array_of.rb
-- lib/type_validator/by_array_with.rb
-- lib/type_validator/by_kind_of.rb
-- lib/type_validator/by_klass.rb
-- lib/type_validator/by_respond_to.rb
 - lib/type_validator/error.rb
 - lib/type_validator/version.rb
 - test.sh

data/lib/type_validator/by_array_of.rb

@@ -1,15 +0,0 @@
-# frozen_string_literal: true
-
-require 'active_model'
-
-class TypeValidator
-  module ByArrayOf
-    def self.invalid?(value, options)
-      types = Array(options[:array_of])
-
-      return if value.is_a?(Array) && !value.empty? && value.all? { |value| types.any? { |type| value.is_a?(type) } }
-
-      "must be an array of: #{types.map { |klass| klass.name }.join(', ')}"
-    end
-  end
-end

data/lib/type_validator/by_array_with.rb

@@ -1,17 +0,0 @@
-# frozen_string_literal: true
-
-require 'active_model'
-
-class TypeValidator
-  module ByArrayWith
-    def self.invalid?(value, options)
-      expected = options[:array_with]
-
-      raise ArgumentError, "#{expected} must be an array" unless expected.is_a?(Array)
-
-      return if value.is_a?(Array) && !value.empty? && (value - expected).empty?
-
-      "must be an array with: #{expected.join(', ')}"
-    end
-  end
-end

data/lib/type_validator/by_kind_of.rb

@@ -1,15 +0,0 @@
-# frozen_string_literal: true
-
-require 'active_model'
-
-class TypeValidator
-  module ByKindOf
-    def self.invalid?(value, options)
-      types = Array(options[:is_a] || options[:kind_of])
-
-      return if types.any? { |type| value.is_a?(type) }
-
-      "must be a kind of: #{types.map { |klass| klass.name }.join(', ')}"
-    end
-  end
-end

data/lib/type_validator/by_klass.rb

@@ -1,22 +0,0 @@
-# frozen_string_literal: true
-
-require 'active_model'
-
-class TypeValidator
-  module ByKlass
-    def self.invalid?(value, options)
-      klass = options[:klass]
-
-      require_a_class(value)
-      require_a_class(klass)
-
-      return if value == klass || value < klass
-
-      "must be the or a subclass of `#{klass.name}`"
-    end
-
-    def self.require_a_class(arg)
-      raise ArgumentError, "#{arg} must be a class" unless arg.is_a?(Class)
-    end
-  end
-end

data/lib/type_validator/by_respond_to.rb

@@ -1,15 +0,0 @@
-# frozen_string_literal: true
-
-require 'active_model'
-
-class TypeValidator
-  module ByRespondTo
-    def self.invalid?(value, options)
-      method_name = options[:respond_to]
-
-      return if value.respond_to?(method_name)
-
-      "must respond to the method `#{method_name}`"
-    end
-  end
-end