type_validator 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6df3ff4224d400cec89fbe541cf3a90f0002869218b593f83f1545a35c83644a
-  data.tar.gz: 5e3d0d583f647332a92b5dd9c5475f7dc4af7d550bf542b62a3a74e523fca7ca
+  metadata.gz: '0219719c84dc08533f5acc5f67021eb3a0d997c6babb5416858040ef38676664'
+  data.tar.gz: d5547e5c033dcfcf088d792a58909d16d954738429aaae5e8defc94189cebbcd
 SHA512:
-  metadata.gz: 62ce5550ce7fb0aaed5ae4e291a92401bfe9bbb14539b8dfb58aeb473ef0332a7af8ad9e1efe6be9b4bfc8948d41b112c7428f8da08365b09a033209fe0814d2
-  data.tar.gz: 411aa1da14f27a316ba42e257ce15095c88c8c020ba2e3ab79fef5225d5af60c3fa7fc140ee8c80cadae54921f95d30492132ae96ced88ea9495d1f9ccedb7c5
+  metadata.gz: 40b7e79d54d1e52fe90029df692d0ade0fc087f589e24ba1a67fd7d02858e1d319675a123e051ef2c32fb66c4556e698e0b79ec62f804863a895aa84976e3ded
+  data.tar.gz: faa022b0c23d701e94297d35e64d5580d3855edc86cde215bed126c0a3b3bd6aacc3f3c975854addd1305b704d1faf8d4653f393c81648174ec710742c5954d0

data/lib/type_validator/error.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+require 'active_model'
+
+class TypeValidator
+  module Error
+    class InvalidDefinition < ArgumentError
+      OPTIONS = 'Options to define one: `:is_a` or `:kind_of`'.freeze
+
+      def initialize(attribute)
+        super "invalid type definition for :#{attribute} attribute. #{OPTIONS}"
+      end
+
+      private_constant :OPTIONS
+    end
+  end
+end

data/lib/type_validator/kind_of.rb

@@ -0,0 +1,17 @@
+
+# frozen_string_literal: true
+
+require 'active_model'
+
+class TypeValidator
+  class KindOf
+    def self.invalid?(record, attribute, value, options)
+      types = Array(options[:is_a] || options[:kind_of])
+      allow_nil = options[:allow_nil]
+
+      return if (allow_nil && value.nil?) || 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/version.rb

@@ -1,3 +1,5 @@
 # frozen_string_literal: true
 
-TYPE_VALIDATOR_VERSION = '0.1.0'
+class TypeValidator
+  VERSION = '0.2.0'
+end

data/lib/type_validator.rb

@@ -2,29 +2,24 @@
 
 require 'active_model'
 
-require 'type_validator/version'
-
 class TypeValidator < ActiveModel::EachValidator
-  VERSION = TYPE_VALIDATOR_VERSION
-
-  INVALID_DEFINITION = ArgumentError.new(
-    'invalid type definition. Options to define one: `:is_a` or `:kind_of`'
-  )
-
   def validate_each(record, attribute, value)
-    types = Array(options[:is_a] || options[:kind_of]).flatten
-    allow_nil = options[:allow_nil]
+    strategy = fetch_strategy(options)
 
-    raise INVALID_DEFINITION if types.empty?
+    raise Error::InvalidDefinition.new(attribute) unless strategy
 
-    return if (allow_nil && value.nil?) || types.any? { |type| value.is_a?(type) }
+    return unless error = strategy.invalid?(record, attribute, value, options)
 
-    message = "must be a kind of: #{types.map(&:name).join(', ')}"
+    raise TypeError, "#{attribute} #{error}" if options[:strict]
 
-    if options[:strict]
-      raise TypeError, "#{attribute} #{message}"
-    else
-      record.errors.add(attribute, message)
-    end
+    record.errors.add(attribute, error)
+  end
+
+  def fetch_strategy(options)
+    KindOf if options.key?(:is_a) || options.key?(:kind_of)
   end
 end
+
+require 'type_validator/error'
+require 'type_validator/kind_of'
+require 'type_validator/version'

data/type_validator.gemspec

@@ -1,16 +1,17 @@
 
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'type_validator/version'
 
 Gem::Specification.new do |spec|
   spec.name          = 'type_validator'
-  spec.version       = TYPE_VALIDATOR_VERSION
+  spec.version       = File.readlines(File.join('.', 'lib', 'type_validator', 'version.rb'))
+                           .find { |line| line =~ /VERSION/ }
+                           .strip[/(\d\.?){3}/]
   spec.authors       = ['Rodrigo Serradura']
   spec.email         = ['rodrigo.serradura@gmail.com']
 
-  spec.summary       = %q{Adds type validation for ActiveModel.}
-  spec.description   = %q{Adds type validation for ActiveModel.}
+  spec.summary       = %q{Adds type validation for classes with ActiveModel::Validations.}
+  spec.description   = %q{Adds type validation for classes with ActiveModel::Validations.}
   spec.homepage      = 'https://github.com/serradura/type_validator'
   spec.license       = 'MIT'
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: type_validator
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Rodrigo Serradura
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-09-16 00:00:00.000000000 Z
+date: 2019-09-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -66,7 +66,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '5.0'
-description: Adds type validation for ActiveModel.
+description: Adds type validation for classes with ActiveModel::Validations.
 email:
 - rodrigo.serradura@gmail.com
 executables: []
@@ -84,6 +84,8 @@ files:
 - bin/console
 - bin/setup
 - lib/type_validator.rb
+- lib/type_validator/error.rb
+- lib/type_validator/kind_of.rb
 - lib/type_validator/version.rb
 - test.sh
 - type_validator.gemspec
@@ -111,5 +113,5 @@ requirements: []
 rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
-summary: Adds type validation for ActiveModel.
+summary: Adds type validation for classes with ActiveModel::Validations.
 test_files: []