kind 5.0.0 → 5.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8a58bdad80758ce4b68dd663984a2b505dc5bcc346861c8aa0da7826e458d71b
-  data.tar.gz: 4de72ab2b437c0743e28440ddf7a637a03ee290d03d484157202f2d967b4863c
+  metadata.gz: 0115f034c70fde8d181ffb42e0d2fddb0bb7376e84120d8f7017ce9708ccab53
+  data.tar.gz: 1e24f96749ad14ce29bf86314423be332a7a424ff9c562e7451d2ab0d08a7fef
 SHA512:
-  metadata.gz: 8ab61cb4339b6e979e505cf623b391ce9b946b853893b7e32ea734b6ff325ca007b8509b4c66669a90cfbdade64830843ed7ac0a2aeb30eb4324dca11d056c79
-  data.tar.gz: 04cc0c6f36ab19167de1b13cd484ccd00b576c13f1703ec42017c334e5c270b02e9d77d20f14346b74d2564837cf97024cc3bafc0dd7b7675c4ac8c0b42c5398
+  metadata.gz: 675a83c3e389538b39d75772b55b5f0ce179b2bedd3234ee973865312aa9bbe8e681350412597bca0ce3e7842878f27004139b88c2b8489c0c27f4d1cd6238fd
+  data.tar.gz: 03d5592c9bd8eaa9591aa7b914feae2ab60678ead26aba64f7f175c673e26a584c2d3fd32bec20fb868c28e101f96e0a2bcf5e14effb15148cb905b4ca8b548d

data/.travis.sh

@@ -19,12 +19,17 @@ function run_with_am_version_and_bundler {
   run_with_bundler "$2" "ACTIVEMODEL_VERSION=$1"
 }
 
+if [[ $RUBY_V =~ "ruby 2.[12]." ]]; then
+  run_with_bundler "$BUNDLER_V1"
+
+  run_with_am_version_and_bundler "3.2" "$BUNDLER_V1"
+fi
+
 RUBY_2_2345="ruby 2.[2345]."
 
 if [[ $RUBY_V =~ $RUBY_2_2345 ]]; then
   run_with_bundler "$BUNDLER_V1"
 
-  run_with_am_version_and_bundler "3.2" "$BUNDLER_V1"
   run_with_am_version_and_bundler "4.0" "$BUNDLER_V1"
   run_with_am_version_and_bundler "4.1" "$BUNDLER_V1"
   run_with_am_version_and_bundler "4.2" "$BUNDLER_V1"

data/.travis.yml

@@ -7,6 +7,7 @@ cache:
     - /home/travis/.rvm/
 
 rvm:
+  - 2.1.10
   - 2.2.2
   - 2.3.0
   - 2.4.0

data/CHANGELOG.md

@@ -3,66 +3,69 @@
 This project follows [semver 2.0.0](http://semver.org/spec/v2.0.0.html) and the recommendations of [keepachangelog.com](http://keepachangelog.com/).
 
 - [Unreleased](#unreleased)
+- [5.1.0 (2021-02-23)](#510-2021-02-23)
+  - [Added](#added)
+  - [Deprecated](#deprecated)
 - [5.0.0 (2021-02-22)](#500-2021-02-22)
   - [Breaking Changes](#breaking-changes)
   - [Removed](#removed)
 - [4.1.0 (2021-02-22)](#410-2021-02-22)
-  - [Added](#added)
-- [4.0.0 (2021-02-22)](#400-2021-02-22)
   - [Added](#added-1)
-  - [Deprecated](#deprecated)
+- [4.0.0 (2021-02-22)](#400-2021-02-22)
+  - [Added](#added-2)
+  - [Deprecated](#deprecated-1)
   - [Fixed](#fixed)
 - [3.1.0 (2020-07-08)](#310-2020-07-08)
-  - [Added](#added-2)
+  - [Added](#added-3)
 - [3.0.0 (2020-06-25)](#300-2020-06-25)
   - [Breaking Changes](#breaking-changes-1)
-  - [Added](#added-3)
-- [2.3.0 (2020-06-24)](#230-2020-06-24)
   - [Added](#added-4)
-- [2.2.0 (2020-06-23)](#220-2020-06-23)
+- [2.3.0 (2020-06-24)](#230-2020-06-24)
   - [Added](#added-5)
-- [2.1.0 (2020-05-12)](#210-2020-05-12)
+- [2.2.0 (2020-06-23)](#220-2020-06-23)
   - [Added](#added-6)
+- [2.1.0 (2020-05-12)](#210-2020-05-12)
+  - [Added](#added-7)
   - [Breaking Changes](#breaking-changes-2)
 - [2.0.0 (2020-05-07)](#200-2020-05-07)
-  - [Added](#added-7)
+  - [Added](#added-8)
   - [Breaking Changes](#breaking-changes-3)
   - [Removed](#removed-1)
 - [1.9.0 (2020-05-06)](#190-2020-05-06)
-  - [Added](#added-8)
-- [1.8.0 (2020-05-03)](#180-2020-05-03)
   - [Added](#added-9)
+- [1.8.0 (2020-05-03)](#180-2020-05-03)
+  - [Added](#added-10)
 - [1.7.0 (2020-05-03)](#170-2020-05-03)
   - [Fixed](#fixed-1)
 - [1.6.0 (2020-04-17)](#160-2020-04-17)
-  - [Added](#added-10)
+  - [Added](#added-11)
   - [Changes](#changes)
 - [1.5.0 (2020-04-12)](#150-2020-04-12)
-  - [Added](#added-11)
-- [1.4.0 (2020-04-12)](#140-2020-04-12)
   - [Added](#added-12)
-- [1.3.0 (2020-04-12)](#130-2020-04-12)
+- [1.4.0 (2020-04-12)](#140-2020-04-12)
   - [Added](#added-13)
-- [1.2.0 (2020-04-12)](#120-2020-04-12)
+- [1.3.0 (2020-04-12)](#130-2020-04-12)
   - [Added](#added-14)
-- [1.1.0 (2020-04-09)](#110-2020-04-09)
+- [1.2.0 (2020-04-12)](#120-2020-04-12)
   - [Added](#added-15)
+- [1.1.0 (2020-04-09)](#110-2020-04-09)
+  - [Added](#added-16)
   - [Fixed](#fixed-2)
 - [1.0.0 (2020-03-16)](#100-2020-03-16)
-  - [Added](#added-16)
-- [0.6.0 (2020-01-06)](#060-2020-01-06)
   - [Added](#added-17)
-- [0.5.0 (2020-01-04)](#050-2020-01-04)
+- [0.6.0 (2020-01-06)](#060-2020-01-06)
   - [Added](#added-18)
-- [0.4.0 (2020-01-03)](#040-2020-01-03)
+- [0.5.0 (2020-01-04)](#050-2020-01-04)
   - [Added](#added-19)
-- [0.3.0 (2020-01-03)](#030-2020-01-03)
+- [0.4.0 (2020-01-03)](#040-2020-01-03)
   - [Added](#added-20)
+- [0.3.0 (2020-01-03)](#030-2020-01-03)
+  - [Added](#added-21)
   - [Breaking Changes](#breaking-changes-4)
 - [0.2.0 (2020-01-02)](#020-2020-01-02)
-  - [Added](#added-21)
-- [0.1.0 (2019-12-26)](#010-2019-12-26)
   - [Added](#added-22)
+- [0.1.0 (2019-12-26)](#010-2019-12-26)
+  - [Added](#added-23)
 
 ## Unreleased
 
@@ -74,6 +77,17 @@ This project follows [semver 2.0.0](http://semver.org/spec/v2.0.0.html) and the
 ### Fixed
 -->
 
+5.1.0 (2021-02-23)
+------------------
+
+### Added
+
+* [#45](https://github.com/serradura/kind/pull/45) - Add support to Ruby `>= 2.1.0`.
+
+### Deprecated
+
+* [#45](https://github.com/serradura/kind/pull/45) - `kind/active_model/validation` is deprecated; use `kind/validator` instead.
+
 5.0.0 (2021-02-22)
 ------------------
 

data/Gemfile

@@ -18,24 +18,31 @@ activemodel = case activemodel_version
 
 simplecov_version =
   case RUBY_VERSION
-  when /\A2.[23]/ then '0.17.1'
+  when /\A2.[123]/ then '0.17.1'
   when /\A2.4/ then '~> 0.18.5'
   else '~> 0.19'
   end
 
+is_ruby_2_1 = RUBY_VERSION <= '2.2.0'
+
+minitest_version =
+  if activemodel_version
+    activemodel_version < '4.1' ? '~> 4.2' : '~> 5.0'
+  else
+    is_ruby_2_1 ? '~> 4.2' : '~> 5.0'
+  end
+
 group :test do
   if activemodel_version
     gem 'activesupport', activemodel, require: false
-    gem 'activemodel', activemodel, require: false
-    gem 'minitest', activemodel_version < '4.1' ? '~> 4.2' : '~> 5.0'
-  else
-    gem 'minitest', '~> 5.0'
+    gem 'activemodel'  , activemodel, require: false
   end
 
+  gem 'minitest' , minitest_version
   gem 'simplecov', simplecov_version, require: false
 end
 
-gem 'rake', '~> 13.0'
+gem 'rake', is_ruby_2_1 ? '~> 12.3' : '~> 13.0'
 
 # Specify your gem's dependencies in type_validator.gemspec
 gemspec

data/README.md

@@ -5,12 +5,16 @@
 </p>
 
 <p align="center">
-  <img src="https://img.shields.io/badge/ruby->%3D%202.2.0-ruby.svg?colorA=99004d&colorB=cc0066" alt="Ruby">
-
   <a href="https://rubygems.org/gems/kind">
     <img alt="Gem" src="https://img.shields.io/gem/v/kind.svg?style=flat-square">
   </a>
 
+  <img src="https://img.shields.io/badge/ruby%20%3E=%202.1.0,%20%3C%203.1-ruby.svg?colorA=99004d&colorB=cc0066" alt="Ruby">
+
+  <img src="https://img.shields.io/badge/rails%20%3E=%203.2.0,%20%3C%207-rails.svg?colorA=8B0000&colorB=FF0000" alt="Rails">
+
+  <br />
+
   <a href="https://travis-ci.com/serradura/kind">
     <img alt="Build Status" src="https://travis-ci.com/serradura/kind.svg?branch=master">
   </a>
@@ -35,7 +39,7 @@ One of the goals of this project is to do simple type checking like `"some strin
 Version    | Documentation
 ---------- | -------------
 unreleased | https://github.com/serradura/u-case/blob/main/README.md
-5.0.0      | https://github.com/serradura/u-case/blob/v5.x/README.md
+5.1.0      | https://github.com/serradura/u-case/blob/v5.x/README.md
 4.1.0      | https://github.com/serradura/u-case/blob/v4.x/README.md
 3.1.0      | https://github.com/serradura/u-case/blob/v3.x/README.md
 2.3.0      | https://github.com/serradura/u-case/blob/v2.x/README.md
@@ -117,7 +121,8 @@ unreleased | https://github.com/serradura/u-case/blob/main/README.md
 
 | u-case         | branch  | ruby     |  activemodel   |
 | -------------- | ------- | -------- | -------------- |
-| unreleased     | main    | >= 2.2.0 | >= 3.2, <= 6.1 |
+| unreleased     | main    | >= 2.1.0 | >= 3.2, <= 6.1 |
+| 5.1.0          | v5.x    | >= 2.1.0 | >= 3.2, <= 6.1 |
 | 4.1.0          | v4.x    | >= 2.2.0 | >= 3.2, <= 6.1 |
 | 3.1.0          | v3.x    | >= 2.2.0 | >= 3.2, <= 6.1 |
 | 2.3.0          | v2.x    | >= 2.2.0 | >= 3.2, <= 6.0 |
@@ -1470,10 +1475,10 @@ And to make use of it, you will need to do an explicitly require. e.g:
 
 ```ruby
 # In some Gemfile
-gem 'kind', require: 'kind/active_model/validation'
+gem 'kind', require: 'kind/validator'
 
 # In some .rb file
-require 'kind/active_model/validation'
+require 'kind/validator'
 ```
 
 [⬆️ &nbsp;Back to Top](#table-of-contents-)

data/kind.gemspec

@@ -10,7 +10,7 @@ Gem::Specification.new do |spec|
   spec.description   = %q{A simple type system (at runtime) for Ruby - free of dependencies.}
   spec.homepage      = 'https://github.com/serradura/kind'
   spec.license       = 'MIT'
-  spec.required_ruby_version = Gem::Requirement.new('>= 2.2.0')
+  spec.required_ruby_version = Gem::Requirement.new('>= 2.1.0')
 
   spec.metadata['homepage_uri'] = spec.homepage
   spec.metadata['source_code_uri'] = 'https://github.com/serradura/kind'

data/lib/kind.rb

@@ -3,21 +3,10 @@
 require 'set'
 require 'ostruct'
 
-require 'kind/version'
-require 'kind/core'
-
-require 'kind/error'
-require 'kind/empty'
-require 'kind/dig'
-require 'kind/try'
-require 'kind/presence'
-require 'kind/undefined'
-require 'kind/maybe'
-
-require 'kind/type_checker'
-require 'kind/type_checkers'
-
 module Kind
+  require 'kind/version'
+  require 'kind/core'
+
   extend self
 
   def is?(kind, arg)

data/lib/kind/active_model/validation.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
-require 'kind'
+warn '[DEPRECATION] "kind/active_model/validation" is deprecated; use "kind/validator" instead.' \
+    'It will be removed on next major release.'
+
 require 'kind/validator'
-require 'active_model'
-require 'active_model/validations'
-require_relative 'kind_validator'

data/lib/kind/core.rb

@@ -1,8 +1,15 @@
 # frozen_string_literal: true
 
-module Kind
-  module Core
-    require 'kind/core/kind'
-    require 'kind/core/undefined'
-  end
-end
+require 'kind/core/utils/kind'
+require 'kind/core/utils/undefined'
+
+require 'kind/core/error'
+require 'kind/core/empty'
+require 'kind/core/dig'
+require 'kind/core/try'
+require 'kind/core/presence'
+require 'kind/core/undefined'
+require 'kind/core/maybe'
+
+require 'kind/core/type_checker'
+require 'kind/core/type_checkers'

data/lib/kind/{maybe.rb → core/maybe.rb}

@@ -1,16 +1,14 @@
 # frozen_string_literal: true
 
-require 'kind/dig'
-
 module Kind
   module Maybe
-    extend self
+    require 'kind/core/maybe/result'
+    require 'kind/core/maybe/none'
+    require 'kind/core/maybe/some'
+    require 'kind/core/maybe/wrappable'
+    require 'kind/core/maybe/typed'
 
-    require 'kind/maybe/result'
-    require 'kind/maybe/none'
-    require 'kind/maybe/some'
-    require 'kind/maybe/wrappable'
-    require 'kind/maybe/typed'
+    extend self
 
     def new(value)
       (KIND.null?(value) ? None : Some)

data/lib/kind/{maybe → core/maybe}/none.rb

@@ -44,11 +44,11 @@ module Kind
     NONE_WITH_NIL_VALUE = None.new(nil)
     NONE_WITH_UNDEFINED_VALUE = None.new(Undefined)
 
-    def none
+    def self.none
       NONE_WITH_NIL_VALUE
     end
 
-    def __none__(value) # :nodoc:
+    def self.__none__(value) # :nodoc:
       None.new(value)
     end
 

data/lib/kind/{maybe → core/maybe}/some.rb

@@ -79,7 +79,7 @@ module Kind
 
     VALUE_CANT_BE_NONE = "value can't be nil or Kind::Undefined".freeze
 
-    def some(value)
+    def self.some(value)
       return Maybe::Some.new(value) if !KIND.null?(value)
 
       raise ArgumentError, VALUE_CANT_BE_NONE

data/lib/kind/{type_checker.rb → core/type_checker.rb}

@@ -33,7 +33,7 @@ module Kind
     def value?(value = UNDEFINED)
       return self === value if UNDEFINED != value
 
-      @__is_value ||= ->(ck) { ->(value) { ck === value } }.(self)
+      @__is_value ||= ->(tc) { ->(arg) { tc === arg } }.(self)
     end
 
     def value(arg, default:)

data/lib/kind/core/type_checkers.rb

@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+
+require 'kind/core/type_checkers/ruby/array'
+require 'kind/core/type_checkers/ruby/class'
+require 'kind/core/type_checkers/ruby/comparable'
+require 'kind/core/type_checkers/ruby/enumerable'
+require 'kind/core/type_checkers/ruby/enumerator'
+require 'kind/core/type_checkers/ruby/file'
+require 'kind/core/type_checkers/ruby/float'
+require 'kind/core/type_checkers/ruby/hash'
+require 'kind/core/type_checkers/ruby/integer'
+require 'kind/core/type_checkers/ruby/io'
+require 'kind/core/type_checkers/ruby/module'
+require 'kind/core/type_checkers/ruby/method'
+require 'kind/core/type_checkers/ruby/numeric'
+require 'kind/core/type_checkers/ruby/proc'
+require 'kind/core/type_checkers/ruby/queue'
+require 'kind/core/type_checkers/ruby/range'
+require 'kind/core/type_checkers/ruby/regexp'
+require 'kind/core/type_checkers/ruby/string'
+require 'kind/core/type_checkers/ruby/struct'
+require 'kind/core/type_checkers/ruby/symbol'
+require 'kind/core/type_checkers/ruby/time'
+
+require 'kind/core/type_checkers/stdlib/open_struct'
+require 'kind/core/type_checkers/stdlib/set'
+
+require 'kind/core/type_checkers/custom/boolean'
+require 'kind/core/type_checkers/custom/callable'
+require 'kind/core/type_checkers/custom/lambda'

data/lib/kind/core/undefined.rb

@@ -1,7 +1,29 @@
 # frozen_string_literal: true
-
 module Kind
-  UNDEFINED = Object.new.freeze
+  Undefined = Object.new.tap do |undefined|
+    def undefined.inspect
+      @inspect ||= 'Kind::Undefined'.freeze
+    end
+
+    def undefined.to_s
+      inspect
+    end
+
+    def undefined.clone
+      self
+    end
+
+    def undefined.dup
+      clone
+    end
+
+    def undefined.default(value, default)
+      return value if self != value
+
+      default.respond_to?(:call) ? default.call : default
+    end
 
-  private_constant :UNDEFINED
+    undefined.inspect
+    undefined.freeze
+  end
 end

data/lib/kind/core/utils/undefined.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+module Kind
+  UNDEFINED = Object.new.freeze
+
+  private_constant :UNDEFINED
+end

data/lib/kind/validator.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require 'kind'
+
 module Kind
   module Validator
     DEFAULT_STRATEGIES = ::Set.new(%w[instance_of kind_of]).freeze
@@ -38,3 +40,108 @@ module Kind
     end
   end
 end
+
+require 'active_model'
+require 'active_model/validations'
+
+class KindValidator < ActiveModel::EachValidator
+  def validate_each(record, attribute, value)
+    return if options[:allow_nil] && value.nil?
+
+    return unless error = call_validation_for(attribute, value)
+
+    raise Kind::Error.new("#{attribute} #{error}") if options[:strict]
+
+    record.errors.add(attribute, error)
+  end
+
+  private
+
+    def call_validation_for(attribute, value)
+      expected = options[:with] || options[:in]
+
+      return validate_with_default_strategy(expected, value) if expected
+
+      return kind_of(expected, value) if expected = options[:of]
+      return kind_is(expected, value) if expected = options[:is]
+      return respond_to(expected, value) if expected = options[:respond_to]
+      return instance_of(expected, value) if expected = options[:instance_of]
+      return array_with(expected, value) if expected = options[:array_with]
+      return array_of(expected, value) if expected = options[:array_of]
+
+      raise Kind::Validator::InvalidDefinition.new(attribute)
+    end
+
+    def validate_with_default_strategy(expected, value)
+      send(Kind::Validator.default_strategy, expected, value)
+    end
+
+    def kind_of(expected, value)
+      types = Array(expected)
+
+      return if types.any? { |type| type === value }
+
+      "must be a kind of: #{types.map { |type| type.name }.join(', ')}"
+    end
+
+    CLASS_OR_MODULE = 'Class/Module'.freeze
+
+    def kind_is(expected, value)
+      return kind_is_not(expected, value) unless expected.kind_of?(::Array)
+
+      result = expected.map { |kind| kind_is_not(kind, value) }.tap(&:compact!)
+
+      result.empty? || result.size < expected.size ? nil : result.join(', ')
+    end
+
+    def kind_is_not(expected, value)
+      case expected
+      when ::Class
+        return if expected == Kind::Class[value] || value < expected
+
+        "must be the class or a subclass of `#{expected.name}`"
+      when ::Module
+        return if value.kind_of?(Class) && value <= expected
+        return if expected == Kind.of_module_or_class(value) || value.kind_of?(expected)
+
+        "must include the `#{expected.name}` module"
+      else
+        raise Kind::Error.new(CLASS_OR_MODULE, expected)
+      end
+    end
+
+    def respond_to(expected, value)
+      method_names = Array(expected)
+
+      expected_methods = method_names.select { |method_name| !value.respond_to?(method_name) }
+      expected_methods.map! { |method_name| "`#{method_name}`" }
+
+      return if expected_methods.empty?
+
+      methods = expected_methods.size == 1 ? 'method' : 'methods'
+
+      "must respond to the #{methods}: #{expected_methods.join(', ')}"
+    end
+
+    def instance_of(expected, value)
+      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 array_with(expected, value)
+      return if value.kind_of?(::Array) && !value.empty? && (value - Kind::Array[expected]).empty?
+
+      "must be an array with: #{expected.join(', ')}"
+    end
+
+    def array_of(expected, value)
+      types = Array(expected)
+
+      return if value.kind_of?(::Array) && !value.empty? && value.all? { |val| types.any? { |type| type === val } }
+
+      "must be an array of: #{types.map { |klass| klass.name }.join(', ')}"
+    end
+end

data/lib/kind/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Kind
-  VERSION = '5.0.0'
+  VERSION = '5.1.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kind
 version: !ruby/object:Gem::Version
-  version: 5.0.0
+  version: 5.1.0
 platform: ruby
 authors:
 - Rodrigo Serradura
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-02-23 00:00:00.000000000 Z
+date: 2021-02-24 00:00:00.000000000 Z
 dependencies: []
 description: A simple type system (at runtime) for Ruby - free of dependencies.
 email:
@@ -31,52 +31,51 @@ files:
 - bin/setup
 - kind.gemspec
 - lib/kind.rb
-- lib/kind/active_model/kind_validator.rb
 - lib/kind/active_model/validation.rb
 - lib/kind/core.rb
-- lib/kind/core/kind.rb
+- lib/kind/core/dig.rb
+- lib/kind/core/empty.rb
+- lib/kind/core/empty/constant.rb
+- lib/kind/core/error.rb
+- lib/kind/core/maybe.rb
+- lib/kind/core/maybe/none.rb
+- lib/kind/core/maybe/result.rb
+- lib/kind/core/maybe/some.rb
+- lib/kind/core/maybe/typed.rb
+- lib/kind/core/maybe/wrappable.rb
+- lib/kind/core/presence.rb
+- lib/kind/core/try.rb
+- lib/kind/core/type_checker.rb
+- lib/kind/core/type_checkers.rb
+- lib/kind/core/type_checkers/custom/boolean.rb
+- lib/kind/core/type_checkers/custom/callable.rb
+- lib/kind/core/type_checkers/custom/lambda.rb
+- lib/kind/core/type_checkers/ruby/array.rb
+- lib/kind/core/type_checkers/ruby/class.rb
+- lib/kind/core/type_checkers/ruby/comparable.rb
+- lib/kind/core/type_checkers/ruby/enumerable.rb
+- lib/kind/core/type_checkers/ruby/enumerator.rb
+- lib/kind/core/type_checkers/ruby/file.rb
+- lib/kind/core/type_checkers/ruby/float.rb
+- lib/kind/core/type_checkers/ruby/hash.rb
+- lib/kind/core/type_checkers/ruby/integer.rb
+- lib/kind/core/type_checkers/ruby/io.rb
+- lib/kind/core/type_checkers/ruby/method.rb
+- lib/kind/core/type_checkers/ruby/module.rb
+- lib/kind/core/type_checkers/ruby/numeric.rb
+- lib/kind/core/type_checkers/ruby/proc.rb
+- lib/kind/core/type_checkers/ruby/queue.rb
+- lib/kind/core/type_checkers/ruby/range.rb
+- lib/kind/core/type_checkers/ruby/regexp.rb
+- lib/kind/core/type_checkers/ruby/string.rb
+- lib/kind/core/type_checkers/ruby/struct.rb
+- lib/kind/core/type_checkers/ruby/symbol.rb
+- lib/kind/core/type_checkers/ruby/time.rb
+- lib/kind/core/type_checkers/stdlib/open_struct.rb
+- lib/kind/core/type_checkers/stdlib/set.rb
 - lib/kind/core/undefined.rb
-- lib/kind/dig.rb
-- lib/kind/empty.rb
-- lib/kind/empty/constant.rb
-- lib/kind/error.rb
-- lib/kind/maybe.rb
-- lib/kind/maybe/none.rb
-- lib/kind/maybe/result.rb
-- lib/kind/maybe/some.rb
-- lib/kind/maybe/typed.rb
-- lib/kind/maybe/wrappable.rb
-- lib/kind/presence.rb
-- lib/kind/try.rb
-- lib/kind/type_checker.rb
-- lib/kind/type_checkers.rb
-- lib/kind/type_checkers/core/array.rb
-- lib/kind/type_checkers/core/class.rb
-- lib/kind/type_checkers/core/comparable.rb
-- lib/kind/type_checkers/core/enumerable.rb
-- lib/kind/type_checkers/core/enumerator.rb
-- lib/kind/type_checkers/core/file.rb
-- lib/kind/type_checkers/core/float.rb
-- lib/kind/type_checkers/core/hash.rb
-- lib/kind/type_checkers/core/integer.rb
-- lib/kind/type_checkers/core/io.rb
-- lib/kind/type_checkers/core/method.rb
-- lib/kind/type_checkers/core/module.rb
-- lib/kind/type_checkers/core/numeric.rb
-- lib/kind/type_checkers/core/proc.rb
-- lib/kind/type_checkers/core/queue.rb
-- lib/kind/type_checkers/core/range.rb
-- lib/kind/type_checkers/core/regexp.rb
-- lib/kind/type_checkers/core/string.rb
-- lib/kind/type_checkers/core/struct.rb
-- lib/kind/type_checkers/core/symbol.rb
-- lib/kind/type_checkers/core/time.rb
-- lib/kind/type_checkers/custom/boolean.rb
-- lib/kind/type_checkers/custom/callable.rb
-- lib/kind/type_checkers/custom/lambda.rb
-- lib/kind/type_checkers/stdlib/open_struct.rb
-- lib/kind/type_checkers/stdlib/set.rb
-- lib/kind/undefined.rb
+- lib/kind/core/utils/kind.rb
+- lib/kind/core/utils/undefined.rb
 - lib/kind/validator.rb
 - lib/kind/version.rb
 - test.sh
@@ -94,7 +93,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.2.0
+      version: 2.1.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="

data/lib/kind/active_model/kind_validator.rb

@@ -1,103 +0,0 @@
-# frozen_string_literal: true
-
-class KindValidator < ActiveModel::EachValidator
-  def validate_each(record, attribute, value)
-    return if options[:allow_nil] && value.nil?
-
-    return unless error = call_validation_for(attribute, value)
-
-    raise Kind::Error.new("#{attribute} #{error}") if options[:strict]
-
-    record.errors.add(attribute, error)
-  end
-
-  private
-
-    def call_validation_for(attribute, value)
-      expected = options[:with] || options[:in]
-
-      return validate_with_default_strategy(expected, value) if expected
-
-      return kind_of(expected, value) if expected = options[:of]
-      return kind_is(expected, value) if expected = options[:is]
-      return respond_to(expected, value) if expected = options[:respond_to]
-      return instance_of(expected, value) if expected = options[:instance_of]
-      return array_with(expected, value) if expected = options[:array_with]
-      return array_of(expected, value) if expected = options[:array_of]
-
-      raise Kind::Validator::InvalidDefinition.new(attribute)
-    end
-
-    def validate_with_default_strategy(expected, value)
-      send(Kind::Validator.default_strategy, expected, value)
-    end
-
-    def kind_of(expected, value)
-      types = Array(expected)
-
-      return if types.any? { |type| type === value }
-
-      "must be a kind of: #{types.map { |type| type.name }.join(', ')}"
-    end
-
-    CLASS_OR_MODULE = 'Class/Module'.freeze
-
-    def kind_is(expected, value)
-      return kind_is_not(expected, value) unless expected.kind_of?(::Array)
-
-      result = expected.map { |kind| kind_is_not(kind, value) }.tap(&:compact!)
-
-      result.empty? || result.size < expected.size ? nil : result.join(', ')
-    end
-
-    def kind_is_not(expected, value)
-      case expected
-      when ::Class
-        return if expected == Kind::Class[value] || value < expected
-
-        "must be the class or a subclass of `#{expected.name}`"
-      when ::Module
-        return if value.kind_of?(Class) && value <= expected
-        return if expected == Kind.of_module_or_class(value) || value.kind_of?(expected)
-
-        "must include the `#{expected.name}` module"
-      else
-        raise Kind::Error.new(CLASS_OR_MODULE, expected)
-      end
-    end
-
-    def respond_to(expected, value)
-      method_names = Array(expected)
-
-      expected_methods = method_names.select { |method_name| !value.respond_to?(method_name) }
-      expected_methods.map! { |method_name| "`#{method_name}`" }
-
-      return if expected_methods.empty?
-
-      methods = expected_methods.size == 1 ? 'method' : 'methods'
-
-      "must respond to the #{methods}: #{expected_methods.join(', ')}"
-    end
-
-    def instance_of(expected, value)
-      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 array_with(expected, value)
-      return if value.kind_of?(::Array) && !value.empty? && (value - Kind::Array[expected]).empty?
-
-      "must be an array with: #{expected.join(', ')}"
-    end
-
-    def array_of(expected, value)
-      types = Array(expected)
-
-      return if value.kind_of?(::Array) && !value.empty? && value.all? { |value| types.any? { |type| value.kind_of?(type) } }
-
-      "must be an array of: #{types.map { |klass| klass.name }.join(', ')}"
-    end
-end

data/lib/kind/type_checkers.rb

@@ -1,30 +0,0 @@
-# frozen_string_literal: true
-
-require 'kind/type_checkers/core/array'
-require 'kind/type_checkers/core/class'
-require 'kind/type_checkers/core/comparable'
-require 'kind/type_checkers/core/enumerable'
-require 'kind/type_checkers/core/enumerator'
-require 'kind/type_checkers/core/file'
-require 'kind/type_checkers/core/float'
-require 'kind/type_checkers/core/hash'
-require 'kind/type_checkers/core/integer'
-require 'kind/type_checkers/core/io'
-require 'kind/type_checkers/core/module'
-require 'kind/type_checkers/core/method'
-require 'kind/type_checkers/core/numeric'
-require 'kind/type_checkers/core/proc'
-require 'kind/type_checkers/core/queue'
-require 'kind/type_checkers/core/range'
-require 'kind/type_checkers/core/regexp'
-require 'kind/type_checkers/core/string'
-require 'kind/type_checkers/core/struct'
-require 'kind/type_checkers/core/symbol'
-require 'kind/type_checkers/core/time'
-
-require 'kind/type_checkers/stdlib/open_struct'
-require 'kind/type_checkers/stdlib/set'
-
-require 'kind/type_checkers/custom/boolean'
-require 'kind/type_checkers/custom/callable'
-require 'kind/type_checkers/custom/lambda'

data/lib/kind/undefined.rb

@@ -1,29 +0,0 @@
-# frozen_string_literal: true
-module Kind
-  Undefined = Object.new.tap do |undefined|
-    def undefined.inspect
-      @inspect ||= 'Kind::Undefined'.freeze
-    end
-
-    def undefined.to_s
-      inspect
-    end
-
-    def undefined.clone
-      self
-    end
-
-    def undefined.dup
-      clone
-    end
-
-    def undefined.default(value, default)
-      return value if self != value
-
-      default.respond_to?(:call) ? default.call : default
-    end
-
-    undefined.inspect
-    undefined.freeze
-  end
-end