Adapt specs to allow 3.4 style spaced hashes

Author: janlelis

CHANGELOG.md

@@ -1,3 +1,6 @@
+## 2.3.0 (unreleased)
+* Support Ruby 3.4 hash inspects (TODO)
+
 ## 2.2.2
 * Relax Ruby version requirement to allow 3.0
 
@@ -95,7 +98,7 @@
 * Fix stupid rescue bug (no more wirb crashes)
 
 ## 0.2.3 / 0.2.4
-* Support for rubygems-test <gem-testers.org>
+* Support for rubygems-test
 
 ## 0.2.2
 * Always return inspected string (even when errors happen) and endless-loop

spec/spec_helper.rb

@@ -80,3 +80,7 @@ def tokens
 OBJECT_ID = /0x[0-9a-f]+/
 
 def ws(obj) puts Wirb::Tokenizer.run(obj.inspect).map{|*x| x.inspect + ','}*$/ end
+
+def hash34?
+  RUBY_VERSION >= "3.4.0"
+end

spec/tokenizer_enumerator_spec.rb

@@ -55,12 +55,14 @@
         [:whitespace, " "],
         [:open_hash, "{"],
         [:number, "1"],
+        ([:whitespace, " "] if hash34?),
         [:refers, "=>"],
+        ([:whitespace, " "] if hash34?),
         [:number, "3"],
         [:close_hash, "}"],
         [:object_description, ":each"],
         [:close_object, ">"],
-      ]
+      ].compact
     end
 
     please do check({1=>3}.each.map)
@@ -75,14 +77,16 @@
         [:whitespace, " "],
         [:open_hash, "{"],
         [:number, "1"],
+        ([:whitespace, " "] if hash34?),
         [:refers, "=>"],
+        ([:whitespace, " "] if hash34?),
         [:number, "3"],
         [:close_hash, "}"],
         [:object_description, ":each"],
         [:close_object, ">"],
         [:object_description, RubyEngine.truffle? ? ":collect" : ":map"],
         [:close_object, ">"],
-      ]
+      ].compact
     end
 
     please do check [2,Set[{1=>2}],4].map
@@ -102,7 +106,9 @@
         [:open_set, "{"],
         [:open_hash, "{"],
         [:number, "1"],
+        ([:whitespace, " "] if hash34?),
         [:refers, "=>"],
+        ([:whitespace, " "] if hash34?),
         [:number, "2"],
         [:close_hash, "}"],
         [:close_set, "}"],
@@ -113,7 +119,7 @@
         [:close_array, "]"],
         [:object_description, ":map"],
         [:close_object, ">"],
-      ]
+      ].compact
     end
 
     please do check Wirb::Tokenizer.run('[2,3,4]')
@@ -131,7 +137,7 @@
         [:close_string, "\""],
         [:object_description, ")"],
         [:close_object, ">"],
-      ]
+      ].compact
     end
 
     please do check [{1=>2},Wirb::Tokenizer.run('2'),Set[2,3],[3,4],[5,6].each].map
@@ -143,7 +149,9 @@
         [:open_array, "["],
         [:open_hash, "{"],
         [:number, "1"],
+        ([:whitespace, " "] if hash34?),
         [:refers, "=>"],
+        ([:whitespace, " "] if hash34?),
         [:number, "2"],
         [:close_hash, "}"],
         [:comma, ","],
@@ -199,7 +207,7 @@
         [:close_array, "]"],
         [:object_description, ":map"],
         [:close_object, ">"],
-      ]
+      ].compact
     end
   else # is rbx
     please do check [2,3,4].each

spec/tokenizer_hash_spec.rb

@@ -7,10 +7,12 @@
     tokens.should == [
       [:open_hash, "{"],
       [:number, "1"],
+      ([:whitespace, " "] if hash34?),
       [:refers, "=>"],
+      ([:whitespace, " "] if hash34?),
       [:number, "2"],
       [:close_hash, "}"],
-    ]
+    ].compact
   end
 
   please do check({:hallo => {1=>Set[2,3,4]}})
@@ -21,7 +23,9 @@
       [:refers, "=>"],
       [:open_hash, "{"],
       [:number, "1"],
+      ([:whitespace, " "] if hash34?),
       [:refers, "=>"],
+      ([:whitespace, " "] if hash34?),
       [:open_object, "#<"],
       [:object_class, "Set"],
       [:object_description_prefix, ":"],
@@ -38,7 +42,7 @@
       [:close_object, ">"],
       [:close_hash, "}"],
       [:close_hash, "}"],
-    ]
+    ].compact
   end
 
   please do check( {1=>2, 3=>8, {} => {}} )
@@ -60,6 +64,12 @@
       [:refers, "=>"],
       [:whitespace, " "],
       [:whitespace, " "],
+      [:whitespace, " "],
+      [:whitespace, " "],
+      [:whitespace, " "],
+      [:whitespace, " "],
+      [:whitespace, " "],
+      [:whitespace, " "],
     ]
   end
 end

spec/tokenizer_nested_spec.rb

@@ -36,12 +36,16 @@
       [:open_hash, "{"],
       [:open_hash, "{"],
       [:number, "5"],
+      [:whitespace, " "],
       [:refers, "=>"],
+      [:whitespace, " "],
       [:open_string, "\""],
       [:string, "4"],
       [:close_string, "\""],
       [:close_hash, "}"],
+      [:whitespace, " "],
       [:refers, "=>"],
+      [:whitespace, " "],
       [:open_hash, "{"],
       [:open_object, "#<"],
       [:object_class, "Set"],
@@ -50,7 +54,9 @@
       [:open_set, "{"],
       [:close_set, "}"],
       [:close_object, ">"],
+      [:whitespace, " "],
       [:refers, "=>"],
+      [:whitespace, " "],
       [:open_object, "#<"],
       [:object_class, "Object"],
       [:object_description_prefix, ":"],

spec/tokenizer_set_spec.rb

@@ -48,6 +48,10 @@
        [:whitespace, " "],
        [:whitespace, " "],
        [:whitespace, " "],
-     ]
+       ([:whitespace, " "] if hash34?),
+       ([:whitespace, " "] if hash34?),
+       ([:whitespace, " "] if hash34?),
+       ([:whitespace, " "] if hash34?),
+     ].compact
    end
 end