typ 0.1.0 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a3d4190e37bd4aadc5b0d529256c441835cdf9f3673cbdb23a1d0b2e583926a7
-  data.tar.gz: edc5160b73a35c92c08d27ea5a13998f37e37f47838f4f986dc4c81d69045b72
+  metadata.gz: 34eb85e4455df8349193687fe8d7d708e915721efcc504bbc9188a4a97a65bc5
+  data.tar.gz: 44d3854153877adff21b213dad11c0af9c36cb29b1923bf56311503dada4bad9
 SHA512:
-  metadata.gz: 2994b127d25415c59392d1561c7b067bb578a1fc62c4e3936e0c74184222c40621af22003e2fd901ef17671d93eb2db2015eafd34f7450ece569f36066ebf615
-  data.tar.gz: 26a90c3294320ee43b78b2c1a4c8ad9939060910b3d5265b400a30889c7e8bff6dd67e1955fb888ad0e41fd0c48e6602ecca62c39b3e4fbbdbfa189e08014230
+  metadata.gz: 7eadd0c1c59c745e12b348fa797e688e020ad2828162d61c5bc06799491c8caf76512b8f174a99260f880d63145b695accb1f967d7464088254738ca6de83a61
+  data.tar.gz: 909d72a5e223bf2b859c099362ec359aa014642c735425e2e16a7a744964bce0b8e55fe60953d6739d75e943e067b8737497c711d99a61c3c6029385020ab2d7

data/lib/typ.rb

@@ -1,4 +1,35 @@
 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
     module DSLReaders
       def dsl_method
@@ -8,6 +39,18 @@ module Typ
       def dsl_literal
         self.class.dsl_literal
       end
+      
+      def dsl_key
+        self.class.dsl_key
+      end
+    end
+  
+    module Name
+      attr_writer :name
+      
+      def name
+        @name ||= self.class.to_s
+      end
     end
   
     module New
@@ -21,10 +64,11 @@ module Typ
     end
   
     module Singleton
-      attr_accessor :dsl_method, :dsl_literal
+      attr_accessor :dsl_method, :dsl_literal, :dsl_key
     end
   
     extend New
+    include Name
     include DSLReaders
     
     attr_reader :it, :error
@@ -47,6 +91,9 @@ module Typ
     end
   end
 
+  using ArrayPredicate
+  using ArrayToTest
+  
   def self.included mod
     mod.extend DSL
     mod.extend Singleton
@@ -82,18 +129,7 @@ module Typ
           when Symbol
             -> it { it.send type or bad_assertion(it, type) }
           when Array
-            cannot_create_gate type unless type.size == 2
-            unless type[0].is_a?(Symbol) || type[1].is_a?(Symbol)
-              cannot_create_gate type
-            end
-        
-            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
+            type.predicate? ? type.to_test : (cannot_create_gate type)
           when Class
             type if type.include? Typ
           end
@@ -102,10 +138,6 @@ module Typ
         def cannot_create_gate type
           fail Typ::Error::CannotCreateGate.new(type)
         end
-        
-        def bad_assertion it, name
-          fail Typ::Error::BadAssertion.new(it, name)
-        end
       end
     
       def initialize method, literal, **kwargs
@@ -127,6 +159,7 @@ module Typ
         augment_gate_with_check @test
         gate.dsl_method = @method
         gate.dsl_literal = @literal
+        gate.dsl_key = @kwargs[:name]
       end
     end
   
@@ -156,6 +189,19 @@ module Typ
         @test = fetch_check >> type_check
         enrich_gate
       end
+      
+      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
+          super [:eql?, literal]
+        end
+      end
     end
   
     class Is < Gate
@@ -204,7 +250,7 @@ module Typ
   
     class BadAssertion < self
       def initialize it, method_name
-        message = "#{it} is #{method_name}"
+        message = "#{it.inspect} is #{method_name}"
         super message
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: typ
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.2
 platform: ruby
 authors:
 - Anatoly Chernov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-08-01 00:00:00.000000000 Z
+date: 2023-08-08 00:00:00.000000000 Z
 dependencies: []
 description: 
 email: