uinit-type 0.1.2 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fb64282929e802a3990850303298f7ef0d760a4ba0de2f76238c7fcdae78be34
-  data.tar.gz: 56b41392670ebf1a6d75821dc35566efebc76237bc7f40add95a042208b873d4
+  metadata.gz: 2c7881f9a5e13a64bcf4d2ccd9e330403bdd1da330b2794cb97fcb08a85682b2
+  data.tar.gz: 7612f19bf51686197479c68fe7022de018ef5dfad9fddce4159f6cb4a51df0da
 SHA512:
-  metadata.gz: 40959dc6b5d6eb837add87f3773d0b68bbb5763793454ec0a5efed2bb97a3a664e0fed858d35afc05b9729e32bc439ec59019c2cfca778a6bb2806d61ebedd36
-  data.tar.gz: cbc772cc6614ca3c8ad07293d3e0f0f50be232e6d7b85e35beeda0352a61b945fb9485e88f2e50bc16650f5b0a37c9b0bb0c15ce51437d243a06a019629ec830
+  metadata.gz: bf8e5041e730686dbaa48ed891d4363aa36c4d88515b9a263db7aed593d60fac3fd3601a672d961a6ab6be6674381ccca632848c82ca9bc18e6c918cffff352e
+  data.tar.gz: befcdcc0f310459d63b5bfe72cadcc8c9a94bc10898f1bd6de61839a7d82188dfe5f72adba38a3b3cd15dda28bbf21ad6cd30059b06295220b9ac9531a1536d7

data/lib/uinit/type/composition.rb

@@ -9,7 +9,7 @@ module Uinit
       def initialize(operand, compositions = [])
         super()
 
-        @operand = Type.from(operand)
+        @operand = ::Uinit::Type.from(operand)
         @compositions = compositions
       end
 
@@ -86,7 +86,7 @@ module Uinit
       private
 
       def add_composition(operator, operand)
-        compositions << [operator, Type.from(operand)]
+        compositions << [operator, ::Uinit::Type.from(operand)]
 
         self
       end

data/lib/uinit/type/context.rb

@@ -5,12 +5,12 @@ module Uinit
     module Context
       Nil = Const[nil].freeze
       Boolean = (Const[true] | Const[false]).freeze
-      Str = Instance[String].freeze
-      Int = Instance[Integer].freeze
-      Float = Instance[Float].freeze
-      Hsh = Instance[Hash].freeze
-      Arr = Instance[Array].freeze
-      Sym = Instance[Symbol].freeze
+      Str = TypeOf[String].freeze
+      Sym = TypeOf[Symbol].freeze
+      Int = TypeOf[Integer].freeze
+      Float = TypeOf[Float].freeze
+      Hsh = TypeOf[Hash].freeze
+      Arr = TypeOf[Array].freeze
 
       def array_of(type)
         ArrayOf.new(type)
@@ -40,15 +40,15 @@ module Uinit
         Impl.new(*, **)
       end
 
-      def instance(type)
-        Instance.new(type)
-      end
-
       def set_of(type) # rubocop:disable Naming/AccessorMethodName
         SetOf.new(type)
       end
 
-      def typeof(type)
+      def type(type = BasicObject)
+        Type.new(type)
+      end
+
+      def type_of(type)
         TypeOf.new(type)
       end
 

data/lib/uinit/type/generic.rb

@@ -6,7 +6,7 @@ module Uinit
       def initialize(type)
         super()
 
-        @type = Type.from(type)
+        @type = ::Uinit::Type.from(type)
       end
 
       attr_reader :type

data/lib/uinit/type/hash_of.rb

@@ -18,7 +18,7 @@ module Uinit
 
         @schema =
           schema.transform_values do |type|
-            Type.from(type)
+            ::Uinit::Type.from(type)
           end
 
         @strict = !!strict

data/lib/uinit/type/type.rb

@@ -0,0 +1,44 @@
+# frozen_string_literal: true
+
+module Uinit
+  module Type
+    class Type < Base
+      def self.from?(value)
+        value.is_a?(Class) || value.is_a?(Module)
+      end
+
+      def self.from(value)
+        new(value) if from?(value)
+      end
+
+      # TODO: Allow to pass Fn
+      def initialize(class_module)
+        super()
+
+        @class_module = class_module
+      end
+
+      attr_reader :class_module
+
+      def is?(value)
+        return false unless value.is_a?(Class) || value.is_a?(Module)
+
+        value.ancestors.include?(class_module)
+      end
+
+      def check!(value, depth)
+        unless value.is_a?(Class) || value.is_a?(Module)
+          type_error!("#{value.inspect} is not a Class or a Module", depth)
+        end
+
+        return value if value.ancestors.include?(class_module)
+
+        type_error!("#{value.inspect} does not extend or include or preprend #{class_module}", depth)
+      end
+
+      def inspect
+        "#{super}[#{class_module.inspect}]"
+      end
+    end
+  end
+end

data/lib/uinit/type/type_of.rb

@@ -3,37 +3,32 @@
 module Uinit
   module Type
     class TypeOf < Base
-      def self.from?(value)
-        value.is_a?(Class) || value.is_a?(Module)
+      def self.from?(class_module)
+        class_module.is_a?(::Class) || class_module.is_a?(::Module)
       end
 
-      def self.from(value)
-        new(value) if from?(value)
+      def self.from(class_module)
+        new(class_module) if from?(class_module)
       end
 
-      # TODO: Allow to pass Fn
       def initialize(class_module)
         super()
 
+        raise ArgumentError, 'class_module must be a Class or a Module' unless self.class.from?(class_module)
+
         @class_module = class_module
       end
 
       attr_reader :class_module
 
       def is?(value)
-        return false unless value.is_a?(Class) || value.is_a?(Module)
-
-        value.ancestors.include?(class_module)
+        value.is_a?(class_module)
       end
 
       def check!(value, depth)
-        unless value.is_a?(Class) || value.is_a?(Module)
-          type_error!("#{value.inspect} is not a Class or a Module", depth)
-        end
-
-        return value if value.ancestors.include?(class_module)
+        return value if is?(value)
 
-        type_error!("#{value.inspect} does not extend or include or preprend #{class_module}", depth)
+        type_error!("#{value.inspect} must be an instance of #{class_module}", depth)
       end
 
       def inspect

data/lib/uinit/type/version.rb

@@ -2,6 +2,6 @@
 
 module Uinit
   module Type
-    VERSION = '0.1.2'
+    VERSION = '0.1.4'
   end
 end

data/lib/uinit/type.rb

@@ -21,7 +21,7 @@ module Uinit
 
     def self.from(arg)
       klass =
-        [Base, Instance, ArrayOf, SetOf, HashOf, Check, TypeOf, Const].find do |type_class|
+        [Base, TypeOf, ArrayOf, SetOf, HashOf, Check, Type, Const].find do |type_class|
           type_class.from?(arg)
         end
 

data/uinit-type.gemspec

@@ -30,8 +30,8 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency 'bundler'
   spec.add_development_dependency 'pry'
+  spec.add_development_dependency 'rake'
   spec.add_development_dependency 'rspec'
   spec.add_development_dependency 'rubocop'
-  spec.add_development_dependency 'rake'
   spec.metadata['rubygems_mfa_required'] = 'true'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: uinit-type
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.4
 platform: ruby
 authors:
 - Kimoja
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-09-18 00:00:00.000000000 Z
+date: 2024-09-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: zeitwerk
@@ -53,7 +53,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -67,7 +67,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rubocop
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -81,7 +81,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -117,9 +117,9 @@ files:
 - lib/uinit/type/generic.rb
 - lib/uinit/type/hash_of.rb
 - lib/uinit/type/impl.rb
-- lib/uinit/type/instance.rb
 - lib/uinit/type/operators.rb
 - lib/uinit/type/set_of.rb
+- lib/uinit/type/type.rb
 - lib/uinit/type/type_of.rb
 - lib/uinit/type/version.rb
 - uinit-type.gemspec

data/lib/uinit/type/instance.rb

@@ -1,39 +0,0 @@
-# frozen_string_literal: true
-
-module Uinit
-  module Type
-    class Instance < Base
-      def self.from?(class_module)
-        class_module.is_a?(::Class) || class_module.is_a?(::Module)
-      end
-
-      def self.from(class_module)
-        new(class_module) if from?(class_module)
-      end
-
-      def initialize(class_module)
-        super()
-
-        raise ArgumentError, 'class_module must be a Class or a Module' unless self.class.from?(class_module)
-
-        @class_module = class_module
-      end
-
-      attr_reader :class_module
-
-      def is?(value)
-        value.is_a?(class_module)
-      end
-
-      def check!(value, depth)
-        return value if is?(value)
-
-        type_error!("#{value.inspect} must be an instance of #{class_module}", depth)
-      end
-
-      def inspect
-        "#{super}[#{class_module.inspect}]"
-      end
-    end
-  end
-end