lib/kind.rb in kind-4.1.0 vs lib/kind.rb in kind-5.0.0

@@ -15,72 +15,48 @@
 require 'kind/maybe'
 
 require 'kind/type_checker'
 require 'kind/type_checkers'
 
-require 'kind/deprecations/checker'
-require 'kind/deprecations/of'
-require 'kind/deprecations/is'
-require 'kind/deprecations/types'
-require 'kind/deprecations/built_in_type_checkers'
-
 module Kind
-  def self.is?(kind, arg)
+  extend self
+
+  def is?(kind, arg)
     KIND.is?(kind, arg)
   end
 
-  def self.of?(kind, *args)
+  alias is is?
+
+  def of?(kind, *args)
     KIND.of?(kind, args)
   end
 
-  def self.of_class?(value)
+  def of_class?(value)
     KIND.of_class?(value)
   end
 
-  def self.of_module?(value)
+  def of_module?(value)
     KIND.of_module?(value)
   end
 
-  def self.respond_to(value, *method_names)
+  def respond_to(value, *method_names)
     method_names.each { |method_name| KIND.respond_to!(method_name, value) }
 
     value
   end
 
-  def self.of_module_or_class(value)
+  def of_module_or_class(value)
     KIND.of_module_or_class!(value)
   end
 
-  def self.is(expected = UNDEFINED, object = UNDEFINED)
-    if UNDEFINED == expected && UNDEFINED == object
-      DEPRECATION.warn('`Kind.is` without args is deprecated. This behavior will be removed in %{version}')
-
-      return Is
-    end
-
-    return is?(expected, object) if UNDEFINED != object
-
-    WRONG_NUMBER_OF_ARGS.error!(given: 1, expected: 2)
+  def of(kind, object)
+    KIND.of!(kind, object)
   end
 
-  def self.of(kind = UNDEFINED, object = UNDEFINED)
-    if UNDEFINED == kind && UNDEFINED == object
-      DEPRECATION.warn('`Kind.of` without args is deprecated. This behavior will be removed in %{version}')
-
-      Of
-    elsif UNDEFINED != object
-      KIND.of!(kind, object)
-    else
-      DEPRECATION.warn_method_replacement('Kind.of(<Kind>)', 'Kind::Of(<Kind>)')
-
-      Checker::Factory.create(kind)
-    end
-  end
-
-  def self.value(kind, value, default:)
+  def value(kind, value, default:)
     KIND.value(kind, value, of(kind, default))
   end
 
-  def self.Of(kind, opt = Empty::HASH)
+  def Of(kind, opt = Empty::HASH)
     TypeChecker::Object.new(kind, opt)
   end
 end