typ-formatter 0.1.0 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 184d40fcdfb55dc0bf05cfafdde28da8c87fb5d45c60c4e46066ca48a4715cb5
-  data.tar.gz: 3a3d99f9e72ebeabfd455d4c7e306b078e316022beb9039f2ab550dd75f829d4
+  metadata.gz: 13b522d7882ac57e1b82d09342f3bf0a8422a61b274d74fd29737fbcf60d0a82
+  data.tar.gz: 7047a7cc861058201e488d232d3ec07ef397ab9f4b968d5e090ee61d66b4628b
 SHA512:
-  metadata.gz: 323e9f6524bf55e6ba67eb4df399acf42d623d4599ffe861cce11d3f85a6d6386e378916513a7d1fc136977beecf1d63cf53c94733e703dc695baf59b5582613
-  data.tar.gz: 2571250e8ac0879d1b889373757e1712d75d236f3e1140a19beb7df62f2067f6f4b3a9e76492c147bd5bf92b600201438cad79e2710e2e248a2d929829bffcb0
+  metadata.gz: fb7ea2ae8dc7c4c1de4c0481a0a740a3c982c31820617f7820abfc658271e0a882e9feae2f3caef6039cd9e9cfa8944fda4e7cc3dc9cfbb710b9536ae6301a58
+  data.tar.gz: a626757747049127ff9f2cb4dcc4e333dcf1b47681ab2bccd9d7f10fa11843a923619d56f11936c5595f10bc9a437961f6ef9df397750e235e44f00cf6973c0c

data/lib/typ/formatter.rb

@@ -3,12 +3,45 @@ module Typ
     module FormatGate
       class Formatter
         def initialize gate
-          @string = format gate
+          @gate = gate
+          @string = format
         end
         
+        attr_reader :gate
+        
         def to_s
           @string
         end
+        
+        def head
+          @head ||= if gate.dsl_key
+                      "#{gate.dsl_method} #{gate.dsl_key.inspect} #{gate.dsl_literal.inspect}"
+                    else
+                      "#{gate.dsl_method} #{gate.dsl_literal}"
+                    end
+        end
+        
+        def actual
+        end
+        
+        def format
+          if gate.ok?
+            Rainbow(head).green
+          else
+            error = gate.error
+            string = case error
+            when Typ::Error::BadAssertion
+              actual_type = "got #{actual.class}".indent 2
+              actual_value = actual.ai.indent 4
+        
+              actual_type + "\n" + actual_value
+            else
+              (error.class.to_s.indent 2) + ":\n" + (error.to_s.indent 4)
+            end
+        
+            Rainbow(head).red + "\n" + string
+          end
+        end
       end
     
       module ToPascalCase
@@ -29,12 +62,12 @@ module Typ
         else
           FormatGate
             .const_get(gate.dsl_method.to_pascal_case)
-            .new(gate).to_s
+            .new(gate)
         end
       end
     
       class Is < Formatter
-        def format gate
+        def format
           literal = gate.dsl_literal
         
           case literal
@@ -46,7 +79,7 @@ module Typ
       end
     
       class IsA < Formatter
-        def format gate
+        def format
           string = "is_a #{gate.dsl_literal}"
         
           if gate.ok?
@@ -56,17 +89,29 @@ module Typ
           end
         end
       end
+    
+      class Its < Formatter
+        def actual
+          gate.it.send gate.dsl_key
+        end
+      end
+    
+      class Key < Formatter
+        def actual
+          gate.it[gate.dsl_key]
+        end
+      end
     end
   
     require 'string/indent'
     require 'rainbow'
     
     def initialize typ
-      k = typ.class
+      n = typ.name
       @string = if typ.ok?
-                  Rainbow(k).green
+                  Rainbow(n).green
                 else
-                  Rainbow(k).red + "\n" + format_gates_of(typ).indent(2)
+                  Rainbow(n).red + "\n" + format_gates_of(typ).indent(2)
                 end
     end
     

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: typ-formatter
 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:
 - !ruby/object:Gem::Dependency
   name: typ
@@ -16,56 +16,56 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.0
+        version: 0.1.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.0
+        version: 0.1.2
 - !ruby/object:Gem::Dependency
   name: rainbow
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.1.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.1.1
 - !ruby/object:Gem::Dependency
   name: string-indent
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.0.1
 - !ruby/object:Gem::Dependency
   name: awesome_print
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.9.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.9.2
 description: 
 email:
 - chertoly@gmail.com