typ 0.0.6 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a726dc4e0d96b4f5bdad9858d10063bf818af3e5bd1293135acffa040bbde236
-  data.tar.gz: fbc8d499fb78954604a757593e2e46a9e2af7f5fba4102783d6011aa991a10f3
+  metadata.gz: 3292265f2d79043b1324f8221a43926863cb039233c48d5d989109fd712a9141
+  data.tar.gz: d81287849ec606b02f4710dcc9d86c822ad5f162fda839c23c5a84225fa91718
 SHA512:
-  metadata.gz: 2d3679f431008960d32befdaea22720e3a3cf49692c7a81f19463476b8cae6d67c8069d3920c1325a3c68d743058a348f2087295219f75bde0261bb780b95cdd
-  data.tar.gz: 20af3243c88900e428928f2c770cb661ee69835187fb0834f55d7be701ab3cfbf0f848b2a854f8998e42cd85291c4551da5b6eaf7ceb7946d63f71aadc823bfb
+  metadata.gz: 4f6fa03315316cf839a3560dfb10197879d673a88c42823ed55a8e4daecd3c66f09a3393fc33b9b240ef9fb9a142a617a46bf03d62ead3dc5b6de662d1b53495
+  data.tar.gz: eba82e7d4741e2f1b489f383b4ea0423b24348a218a1e858291e7855e472b3c07c9440bd84769bd63ff8e74f88a113ebbee19ce3ebee8eddbcbf65bddfede41f

data/lib/typ.rb

@@ -1,15 +1,80 @@
 module Typ
+  module ArrayPredicate
+    refine Array do
+      def predicate?
+        (size == 2) &&
+          (self[0].is_a?(Symbol) || self[1].is_a?(Symbol))
+      end
+    end
+  end
+
+  module ArrayToTest
+    refine Object do
+      def bad_assertion it, name
+        fail Typ::Error::BadAssertion.new(it, name)
+      end
+    end
+    
+    refine Array do
+      def to_test
+        type = self
+    
+        if type[0].is_a? Symbol
+          method, argument = type
+          -> it { it.send method, argument or bad_assertion(it, type) }
+        else
+          receiver, method = type
+          -> it { receiver.send method, it or bad_assertion(it, type) }
+        end
+      end
+    end
+  end
+
   module Gate
-    attr_reader :it
+    module DSLReaders
+      def dsl_method
+        self.class.dsl_method
+      end
+      
+      def dsl_literal
+        self.class.dsl_literal
+      end
+      
+      def dsl_key
+        self.class.dsl_key
+      end
+    end
+  
+    module New
+      def new
+        c = Class.new
+        c.include Gate
+        c.extend Singleton
+        c
+      end
+      
+    end
+  
+    module Singleton
+      attr_accessor :dsl_method, :dsl_literal, :dsl_key
+    end
+  
+    extend New
+    include DSLReaders
+    
+    attr_reader :it, :error
     
     def initialize it
       @it = it
-      check
+      @ok = begin
+              check
+            rescue => e
+              @error = e
+              false
+            end
     end
     
-    # Should set @ok to be true or false
     def check
-      @ok = self.class.check === it
     end
     
     def ok?
@@ -17,9 +82,12 @@ module Typ
     end
   end
 
+  using ArrayPredicate
+  using ArrayToTest
+  
   def self.included mod
     mod.extend DSL
-    mod.extend PatternMatching
+    mod.extend Singleton
   end
   
   include Gate
@@ -29,165 +97,168 @@ module Typ
   def check
     @gates = self.class.gates.map { |gate| gate.new it }
     @fails = gates.reject &:ok?
-    @ok = fails.empty?
+    fails.empty?
   end
 
   module DSL
-    def gates
-      @gates ||= []
-    end
-    
-    def is type
-      case type
-      when Array
-        gates << Is::Array.new(type)
-      when Class
-        if type.include? Typ
-          gates << type
-        else
-          fail "don't know how to create a Gate from #{type}"
+    class Gate
+      module CheckMethod
+        def augment_gate_with_check test
+          check = Module.new do
+            define_method :check do
+              test[it]
+            end
+          end
+        
+          gate.include check
         end
-      else
-        fail "don't know how to create a Gate from #{type}"
       end
-    end
     
-    def is_a type, params = {}
-      case type
-      when Module
-        gates << IsA.new(type, params)
-      else
-        fail "don't know how to create a Gate from #{type}"
-      end
-    end
-  end
-
-  module Is
-  
-    module Array
-      class Check
-        def initialize array
-          @array = array
-          @check = if array[0].is_a?(Symbol)
-            method, *arguments = array
-            -> it { it.send method, *arguments }
-          elsif array[1].is_a?(Symbol)
-            receiver, method = array
-            -> it { receiver.send method, it }
-          else
-            fail "not sure how to handle #{array} yet"
+      module TestFor
+        def test_for type
+          case type
+          when Symbol
+            -> it { it.send type or bad_assertion(it, type) }
+          when Array
+            type.predicate? ? type.to_test : (cannot_create_gate type)
+          when Class
+            type if type.include? Typ
           end
         end
-      
-        def === it
-          @check === it
-        end
-      
-        def to_a
-          @array
+        
+        def cannot_create_gate type
+          fail Typ::Error::CannotCreateGate.new(type)
         end
       end
-      
-      class << self
-        def new array
-          check = Check.new array
-      
-          gate = Class.new
-          gate.include self
-          gate.check = check
-          gate
-        end
+    
+      def initialize method, literal, **kwargs
+        @method, @literal, @kwargs = method, literal, kwargs
+        make
       end
       
-      def self.included gate
-        gate.extend Singleton
+      def gate
+        @gate ||= Typ::Gate.new
       end
       
-      module Singleton
-        attr_accessor :check
+      def make
       end
       
-      def to_a
-        self.class.check.to_a
-      end
+      include TestFor
+      include CheckMethod
       
-      include Gate
+      def enrich_gate
+        augment_gate_with_check @test
+        gate.dsl_method = @method
+        gate.dsl_literal = @literal
+        gate.dsl_key = @kwargs[:name]
+      end
+    end
+  
+    def gates
+      @gates ||= []
     end
-  end
-
-  module IsA
-    class << self
-      def new type, params = {}
-        type = Type.new type, params
     
-        gate = Class.new
-        gate.include self
-        gate.check = type
-        gate
-      end
+    def is literal
+      gates << Is.new(__method__, literal).gate
     end
     
-    def self.included gate
-      gate.extend Singleton
+    def is_a literal
+      gates << IsA.new(__method__, literal).gate
     end
     
-    module Singleton
-      attr_accessor :check
+    def its name, literal
+      gates << Its.new(__method__, literal, name: name).gate
     end
     
-    include Gate
+    def key name, literal
+      gates << Key.new(__method__, literal, name: name).gate
+    end
   
-    class Type
-      def initialize type, params = {}
-        @type, @params = type, params
-      
-        @param = params[:of]
-      
-        @check = if @params.empty?
-                   -> it { it.is_a? @type }
-                 else
-                   if @param
-                     check_Array
-                   else
-                     check_Hash
-                   end
-                 end
+    class FetchGate < Gate
+      def make
+        type_check = test_for @literal
+        @test = fetch_check >> type_check
+        enrich_gate
       end
       
-      def === it
-        @check === it
-      end
-      
-      def to_s
-        if @params.empty?
-          @type.to_s
+      def test_for literal
+        case literal
+        when Symbol
+          literal.end_with?(??) ? super : (super [:eql?, literal])
+        when Array
+          literal.predicate? ? literal.to_test : (super [:eql?, literal])
+        when Class
+          literal.include?(Typ) ? super : (super [:eql?, literal])
         else
-          "#{@type}, #{@params}"
+          super [:eql?, literal]
         end
       end
+    end
+  
+    class Is < Gate
+      def make
+        @test = test_for @literal
       
-      private
-        def check_Array
-          -> it {
-            it.is_a?(@type) &&
-              it.all? { |element| element.is_a? @param }
-          }
-        end
-      
-        def check_Hash
-          key_type, value_type = @params.first
-          -> it {
-           it.is_a?(@type) &&
-             it.keys.all? {|k| k.is_a? key_type } &&
-             it.values.all? {|v| v.is_a? value_type }
-          }
+        if @test
+          if Class === @literal
+            @gate = @literal
+          else
+            enrich_gate
+          end
+        else
+          cannot_create_gate @literal
         end
+      end
+    end
+  
+    class IsA < Gate
+      def make
+        @test = test_for [:is_a?, @literal]
+        enrich_gate
+      end
+    end
+  
+    class Its < FetchGate
+      def fetch_check
+        @fetch_check ||= begin
+                           name = @kwargs[:name]
+                           -> it { it.send name }
+                         end
+      end
+    end
+  
+    class Key < FetchGate
+      def fetch_check
+        @fetch_check ||= begin
+                           name = @kwargs[:name]
+                           -> it { it[name] }
+                         end
+      end
     end
   end
 
-  module PatternMatching
-    def === it
+  class Error < StandardError
+  
+    class BadAssertion < self
+      def initialize it, method_name
+        message = "#{it.inspect} is #{method_name}"
+        super message
+      end
+    end
+  
+    class CannotCreateGate < self
+      def initialize object
+        message = "Don't know how to create a gate from #{object.inspect}:#{object.class}."
+        super message
+      end
+    end
+  end
+
+  module Singleton
+    def call it
       new(it).ok?
     end
+    
+    alias_method :===, :call
   end
 end

metadata

@@ -1,17 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: typ
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.1.1
 platform: ruby
 authors:
-- Anatoly Chernow
+- Anatoly Chernov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-03 00:00:00.000000000 Z
+date: 2023-08-07 00:00:00.000000000 Z
 dependencies: []
 description: 
-email: 
+email:
+- chertoly@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -35,9 +36,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.4.15
 signing_key: 
 specification_version: 4
-summary: A tool for defining and enforcing types of Ruby objects.
+summary: To type Ruby objects.
 test_files: []