kind 1.9.0 → 3.0.0

data/lib/kind.rb

@@ -4,12 +4,12 @@ require 'kind/version'
 
 require 'kind/empty'
 require 'kind/undefined'
+require 'kind/checker'
 require 'kind/maybe'
 
 require 'kind/error'
 require 'kind/of'
 require 'kind/is'
-require 'kind/checker'
 require 'kind/types'
 
 module Kind
@@ -18,35 +18,23 @@ module Kind
   private_constant :WRONG_NUMBER_OF_ARGUMENTS
 
   def self.is(expected = Undefined, object = Undefined)
-    return Is if expected == Undefined && object == Undefined
+    return Is if Undefined == expected && Undefined == object
 
-    return Kind::Is.(expected, object) if object != Undefined
+    return Kind::Is.(expected, object) if Undefined != object
 
     raise ArgumentError, WRONG_NUMBER_OF_ARGUMENTS
   end
 
-  MODULE_OR_CLASS = 'Module/Class'.freeze
-
-  private_constant :MODULE_OR_CLASS
-
   def self.of(kind = Undefined, object = Undefined)
-    return Of if kind == Undefined && object == Undefined
+    return Of if Undefined == kind && Undefined == object
 
-    return Kind::Of.(kind, object) if object != Undefined
+    return Kind::Of.(kind, object) if Undefined != object
 
-    __checkers__[kind] ||= begin
-      kind_name = kind.name
-
-      if Kind::Of.const_defined?(kind_name, false)
-        Kind::Of.const_get(kind_name)
-      else
-        Checker.new(Kind::Of.(Module, kind, MODULE_OR_CLASS))
-      end
-    end
+    Kind::Checker::Factory.create(kind)
   end
 
-  private_class_method def self.__checkers__
-    @__checkers__ ||= {}
+  def self.of?(kind, *args)
+    Kind.of(kind).instance?(*args)
   end
 
   # --------------------- #
@@ -55,20 +43,19 @@ module Kind
 
   module Is
     def self.Class(value)
-      value.is_a?(::Class)
+      value.kind_of?(::Class)
     end
 
     def self.Module(value)
-      value == ::Module || (value.is_a?(::Module) && !self.Class(value))
+      ::Module == value || (value.is_a?(::Module) && !self.Class(value))
     end
 
     def self.Boolean(value)
-      klass = Kind.of.Class(value)
-      klass <= TrueClass || klass <= FalseClass
+      Kind.of.Class(value) <= TrueClass || value <= FalseClass
     end
 
     def self.Callable(value)
-      value.respond_to?(:call) || (value.is_a?(Module) && value.public_instance_methods.include?(:call))
+      value.respond_to?(:call)
     end
   end
 
@@ -76,13 +63,13 @@ module Kind
     # -- Class
 
     def self.Class(object = Undefined)
-      return Class if object == Undefined
+      return Class if Undefined == object
 
       self.call(::Class, object)
     end
 
     const_set(:Class, ::Module.new do
-      extend Checkable
+      extend Checker::Protocol
 
       def self.__kind; ::Class; end
 
@@ -91,18 +78,26 @@ module Kind
       def self.__is_instance__(value); class?(value); end
     end)
 
+    def self.Class?(*args)
+      Kind::Of::Class.instance?(*args)
+    end
+
     # -- Module
 
     def self.Module(object = Undefined)
-      return Module if object == Undefined
+      return Module if Undefined == object
 
       self.call(::Module, object)
     end
 
     const_set(:Module, ::Module.new do
-      extend Checkable
+      extend Checker::Protocol
 
-      def self.__kind; ::Module; end
+      def self.__kind_undefined(value)
+        __kind_error(Kind::Undefined) if Kind::Undefined == value
+
+        yield
+      end
 
       def self.__kind_error(value)
         raise Kind::Error.new('Module'.freeze, value)
@@ -114,11 +109,7 @@ module Kind
         __kind_error(value)
       end
 
-      def self.__kind_undefined(value)
-        __kind_error(Kind::Undefined) if value == Kind::Undefined
-
-        yield
-      end
+      def self.__kind; ::Module; end
 
       def self.class?(value); Kind::Is.Module(value); end
 
@@ -128,7 +119,7 @@ module Kind
         if ::Kind::Maybe::Value.none?(default)
           __kind_undefined(value) { __kind_of(value) }
         else
-          return value if value != Kind::Undefined && instance?(value)
+          return value if Kind::Undefined != value && instance?(value)
 
           __kind_undefined(default) { __kind_of(default) }
         end
@@ -137,12 +128,16 @@ module Kind
       def self.__is_instance__(value); class?(value); end
     end)
 
+    def self.Module?(*args)
+      Kind::Of::Module.instance?(*args)
+    end
+
     # -- Boolean
 
     def self.Boolean(object = Undefined, options = Empty::HASH)
       default = options[:or]
 
-      return Kind::Of::Boolean if object == Undefined && default.nil?
+      return Kind::Of::Boolean if Undefined == object && default.nil?
 
       bool = object.nil? ? default : object
 
@@ -152,7 +147,7 @@ module Kind
     end
 
     const_set(:Boolean, ::Module.new do
-      extend Checkable
+      extend Checker::Protocol
 
       def self.__kind; [TrueClass, FalseClass].freeze; end
 
@@ -164,14 +159,14 @@ module Kind
         if ::Kind::Maybe::Value.none?(default)
           __kind_undefined(value) { Kind::Of::Boolean(value) }
         else
-          return value if value != Kind::Undefined && instance?(value)
+          return value if Kind::Undefined != value && instance?(value)
 
           __kind_undefined(default) { Kind::Of::Boolean(default) }
         end
       end
 
       def self.__kind_undefined(value)
-        if value == Kind::Undefined
+        if Kind::Undefined == value
           raise Kind::Error.new('Boolean'.freeze, Kind::Undefined)
         else
           yield
@@ -188,12 +183,16 @@ module Kind
       end
     end)
 
+    def self.Boolean?(*args)
+      Kind::Of::Boolean.instance?(*args)
+    end
+
     # -- Lambda
 
     def self.Lambda(object = Undefined, options = Empty::HASH)
       default = options[:or]
 
-      return Kind::Of::Lambda if object == Undefined && default.nil?
+      return Kind::Of::Lambda if Undefined == object && default.nil?
 
       func = object || default
 
@@ -203,7 +202,7 @@ module Kind
     end
 
     const_set(:Lambda, ::Module.new do
-      extend Checkable
+      extend Checker::Protocol
 
       def self.__kind; ::Proc; end
 
@@ -213,14 +212,14 @@ module Kind
         if ::Kind::Maybe::Value.none?(default)
           __kind_undefined(value) { Kind::Of::Lambda(value) }
         else
-          return value if value != Kind::Undefined && instance?(value)
+          return value if Kind::Undefined != value && instance?(value)
 
           __kind_undefined(default) { Kind::Of::Lambda(default) }
         end
       end
 
       def self.__kind_undefined(value)
-        if value == Kind::Undefined
+        if Kind::Undefined == value
           raise Kind::Error.new('Lambda'.freeze, Kind::Undefined)
         else
           yield
@@ -232,12 +231,16 @@ module Kind
       end
     end)
 
+    def self.Lambda?(*args)
+      Kind::Of::Lambda.instance?(*args)
+    end
+
     # -- Callable
 
     def self.Callable(object = Undefined, options = Empty::HASH)
       default = options[:or]
 
-      return Kind::Of::Callable if object == Undefined && default.nil?
+      return Kind::Of::Callable if Undefined == object && default.nil?
 
       callable = object || default
 
@@ -247,7 +250,7 @@ module Kind
     end
 
     const_set(:Callable, ::Module.new do
-      extend Checkable
+      extend Checker::Protocol
 
       def self.__kind; Object; end
 
@@ -261,14 +264,14 @@ module Kind
         if ::Kind::Maybe::Value.none?(default)
           __kind_undefined(value) { Kind::Of::Callable(value) }
         else
-          return value if value != Kind::Undefined && instance?(value)
+          return value if Kind::Undefined != value && instance?(value)
 
           __kind_undefined(default) { Kind::Of::Callable(default) }
         end
       end
 
       def self.__kind_undefined(value)
-        if value == Kind::Undefined
+        if Kind::Undefined == value
           raise Kind::Error.new('Callable'.freeze, Kind::Undefined)
         else
           yield
@@ -280,6 +283,10 @@ module Kind
       end
     end)
 
+    def self.Callable?(*args)
+      Kind::Of::Callable.instance?(*args)
+    end
+
     # ---------------------- #
     # Built-in type checkers #
     # ---------------------- #

data/lib/kind/active_model/kind_validator.rb

@@ -18,8 +18,8 @@ class KindValidator < ActiveModel::EachValidator
 
       return validate_with_default_strategy(expected, value) if expected
 
-      return kind_of(expected, value) if expected = options[:of] || options[:is_a]
-      return is_class(expected, value) if expected = options[:is] || options[:klass]
+      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]
@@ -32,26 +32,38 @@ class KindValidator < ActiveModel::EachValidator
       send(Kind::Validator.default_strategy, expected, value)
     end
 
-    def instance_of(expected, value)
+    def kind_of(expected, value)
       types = Array(expected)
 
-      return if types.any? { |type| value.instance_of?(type) }
+      return if types.any? { |type| value.kind_of?(type) }
 
-      "must be an instance of: #{types.map { |klass| klass.name }.join(', ')}"
+      "must be a kind of: #{types.map { |klass| klass.name }.join(', ')}"
     end
 
-    def kind_of(expected, value)
-      types = Array(expected)
+    CLASS_OR_MODULE = 'Class/Module'.freeze
 
-      return if types.any? { |type| value.is_a?(type) }
+    def kind_is(expected, value)
+      return kind_is_not(expected, value) unless expected.kind_of?(Array)
 
-      "must be a kind of: #{types.map { |klass| klass.name }.join(', ')}"
+      result = expected.map { |kind| kind_is_not(kind, value) }.compact
+
+      result.empty? || result.size < expected.size ? nil : result.join(', ')
     end
 
-    def is_class(klass, value)
-      return if Kind.of.Class(value) == Kind.of.Class(klass) || value < klass
+    def kind_is_not(expected, value)
+      case expected
+      when Class
+        return if expected == Kind.of.Class(value) || value < expected
 
-      "must be the class or a subclass of `#{klass.name}`"
+        "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(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(method_name, value)
@@ -60,17 +72,25 @@ class KindValidator < ActiveModel::EachValidator
       "must respond to the method `#{method_name}`"
     end
 
-    def array_of(expected, value)
+    def instance_of(expected, value)
       types = Array(expected)
 
-      return if value.is_a?(Array) && !value.empty? && value.all? { |value| types.any? { |type| value.is_a?(type) } }
+      return if types.any? { |type| value.instance_of?(type) }
 
-      "must be an array of: #{types.map { |klass| klass.name }.join(', ')}"
+      "must be an instance of: #{types.map { |klass| klass.name }.join(', ')}"
     end
 
     def array_with(expected, value)
-      return if value.is_a?(Array) && !value.empty? && (value - Kind.of.Array(expected)).empty?
+      return if value.kind_of?(Array) && !value.empty? && (value - Kind.of.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/checker.rb

@@ -1,70 +1,10 @@
 # frozen_string_literal: true
 
+require 'kind/checker/factory'
+require 'kind/checker/protocol'
 module Kind
-  module Checkable
-    def class?(value)
-      Kind::Is.__call__(__kind, value)
-    end
-
-    def instance(value, options = Empty::HASH)
-      default = options[:or]
-
-      return Kind::Of.(__kind, value) if ::Kind::Maybe::Value.none?(default)
-
-      value != Kind::Undefined && instance?(value) ? value : Kind::Of.(__kind, default)
-    end
-
-    def [](value, options = options = Empty::HASH)
-      instance(value, options)
-    end
-
-    def instance?(value = Kind::Undefined)
-      return __is_instance__(value) if value != Kind::Undefined
-
-      to_proc
-    end
-
-    def __is_instance__(value)
-      value.is_a?(__kind)
-    end
-
-    def to_proc
-      @to_proc ||=
-        -> checker { -> value { checker.__is_instance__(value) } }.call(self)
-    end
-
-    def or_nil(value)
-      return value if instance?(value)
-    end
-
-    def or_undefined(value)
-      or_nil(value) || Kind::Undefined
-    end
-
-    def as_maybe(value = Kind::Undefined)
-      return __as_maybe__(value) if value != Kind::Undefined
-
-      as_maybe_to_proc
-    end
-
-    def as_optional(value = Kind::Undefined)
-      as_maybe(value)
-    end
-
-    def __as_maybe__(value)
-      Kind::Maybe.new(or_nil(value))
-    end
-
-    def as_maybe_to_proc
-      @as_maybe_to_proc ||=
-        -> checker { -> value { checker.__as_maybe__(value) } }.call(self)
-    end
-  end
-
-  private_constant :Checkable
-
   class Checker
-    include Checkable
+    include Protocol
 
     attr_reader :__kind
 

data/lib/kind/checker/factory.rb

@@ -0,0 +1,35 @@
+# frozen_string_literal: true
+
+require 'singleton'
+
+module Kind
+  class Checker
+    class Factory
+      include Singleton
+
+      def self.create(kind)
+        instance.create(kind)
+      end
+
+      def initialize
+        @__checkers__ = {}
+      end
+
+      MODULE_OR_CLASS = 'Module/Class'.freeze
+
+      private_constant :MODULE_OR_CLASS
+
+      def create(kind)
+        @__checkers__[kind] ||= begin
+          kind_name = kind.name
+
+          if Kind::Of.const_defined?(kind_name, false)
+            Kind::Of.const_get(kind_name)
+          else
+            Kind::Checker.new(Kind::Of.(Module, kind, MODULE_OR_CLASS))
+          end
+        end
+      end
+    end
+  end
+end