typ 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a3d4190e37bd4aadc5b0d529256c441835cdf9f3673cbdb23a1d0b2e583926a7
-  data.tar.gz: edc5160b73a35c92c08d27ea5a13998f37e37f47838f4f986dc4c81d69045b72
+  metadata.gz: 3292265f2d79043b1324f8221a43926863cb039233c48d5d989109fd712a9141
+  data.tar.gz: d81287849ec606b02f4710dcc9d86c822ad5f162fda839c23c5a84225fa91718
 SHA512:
-  metadata.gz: 2994b127d25415c59392d1561c7b067bb578a1fc62c4e3936e0c74184222c40621af22003e2fd901ef17671d93eb2db2015eafd34f7450ece569f36066ebf615
-  data.tar.gz: 26a90c3294320ee43b78b2c1a4c8ad9939060910b3d5265b400a30889c7e8bff6dd67e1955fb888ad0e41fd0c48e6602ecca62c39b3e4fbbdbfa189e08014230
+  metadata.gz: 4f6fa03315316cf839a3560dfb10197879d673a88c42823ed55a8e4daecd3c66f09a3393fc33b9b240ef9fb9a142a617a46bf03d62ead3dc5b6de662d1b53495
+  data.tar.gz: eba82e7d4741e2f1b489f383b4ea0423b24348a218a1e858291e7855e472b3c07c9440bd84769bd63ff8e74f88a113ebbee19ce3ebee8eddbcbf65bddfede41f

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,10 @@ module Typ
       def dsl_literal
         self.class.dsl_literal
       end
+      
+      def dsl_key
+        self.class.dsl_key
+      end
     end
   
     module New
@@ -21,7 +56,7 @@ module Typ
     end
   
     module Singleton
-      attr_accessor :dsl_method, :dsl_literal
+      attr_accessor :dsl_method, :dsl_literal, :dsl_key
     end
   
     extend New
@@ -47,6 +82,9 @@ module Typ
     end
   end
 
+  using ArrayPredicate
+  using ArrayToTest
+  
   def self.included mod
     mod.extend DSL
     mod.extend Singleton
@@ -82,18 +120,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 +129,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 +150,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 +180,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 +241,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.1
 platform: ruby
 authors:
 - Anatoly Chernov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-08-01 00:00:00.000000000 Z
+date: 2023-08-07 00:00:00.000000000 Z
 dependencies: []
 description: 
 email: