Fix warnings under 3.4

dry-rb · Jan 4, 2025 · 32e953f · 32e953f
1 parent 8a33f49
commit 32e953f
Show file tree

Hide file tree

Showing 4 changed files with 47 additions and 15 deletions.
diff --git a/Gemfile b/Gemfile
@@ -16,11 +16,13 @@ group :test do
   gem "dry-struct"
   gem "i18n", require: false
   gem "json-schema"
+  gem "ostruct"
   gem "transproc"
 end
 
 group :tools do
   gem "pry-byebug"
+  gem "readline"
   gem "redcarpet", platform: :mri
 end
 

diff --git a/spec/integration/result_spec.rb b/spec/integration/result_spec.rb
@@ -30,9 +30,15 @@
 
     describe "#inspect" do
       it "returns a string representation" do
-        expect(result.inspect).to eql(<<-STR.strip)
-          #<Dry::Schema::Result{:name=>"Jane"} errors={} path=[]>
-        STR
+        if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new("3.4.0")
+          expect(result.inspect).to eql(<<-STR.strip)
+            #<Dry::Schema::Result{name: "Jane"} errors={} path=[]>
+          STR
+        else
+          expect(result.inspect).to eql(<<-STR.strip)
+            #<Dry::Schema::Result{:name=>"Jane"} errors={} path=[]>
+          STR
+        end
       end
     end
 
@@ -60,9 +66,15 @@
 
     describe "#inspect" do
       it "returns a string representation" do
-        expect(result.inspect).to eql(<<-STR.strip)
-          #<Dry::Schema::Result{:name=>""} errors={:name=>["must be filled"]} path=[]>
-        STR
+        if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new("3.4.0")
+          expect(result.inspect).to eql(<<-STR.strip)
+            #<Dry::Schema::Result{name: ""} errors={name: ["must be filled"]} path=[]>
+          STR
+        else
+          expect(result.inspect).to eql(<<-STR.strip)
+            #<Dry::Schema::Result{:name=>""} errors={:name=>["must be filled"]} path=[]>
+          STR
+        end
       end
     end
 
@@ -81,9 +93,15 @@
 
       describe "#inspect" do
         it "returns a string representation" do
-          expect(result.at([:account, :name]).inspect).to eql(<<-STR.strip)
-            #<Dry::Schema::Result{:first=>"ojab"} errors={} path=[:account, :name]>
-          STR
+          if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new("3.4.0")
+            expect(result.at([:account, :name]).inspect).to eql(<<-STR.strip)
+              #<Dry::Schema::Result{first: "ojab"} errors={} path=[:account, :name]>
+            STR
+          else
+            expect(result.at([:account, :name]).inspect).to eql(<<-STR.strip)
+              #<Dry::Schema::Result{:first=>"ojab"} errors={} path=[:account, :name]>
+            STR
+          end
         end
       end
     end

diff --git a/spec/unit/dry/schema/key_map_spec.rb b/spec/unit/dry/schema/key_map_spec.rb
@@ -114,9 +114,15 @@
 
     describe "#inspect" do
       it "returns a string representation" do
-        expect(key_map.inspect).to eql(<<-STR.strip)
-          #<Dry::Schema::KeyMap[:id, :name, {:contact=>[:email, :phone]}]>
-        STR
+        if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new("3.4.0")
+          expect(key_map.inspect).to eql(<<-STR.strip)
+            #<Dry::Schema::KeyMap[:id, :name, {contact: [:email, :phone]}]>
+          STR
+        else
+          expect(key_map.inspect).to eql(<<-STR.strip)
+            #<Dry::Schema::KeyMap[:id, :name, {:contact=>[:email, :phone]}]>
+          STR
+        end
       end
     end
   end

diff --git a/spec/unit/dry/schema/params_spec.rb b/spec/unit/dry/schema/params_spec.rb
@@ -35,9 +35,15 @@ class Test::UserSchema < Dry::Schema::Params
     end
 
     it "returns a representation of a params object" do
-      expect(klass.new.inspect).to eql(<<~STR.strip)
-        #<Test::UserSchema keys=["name"] rules={:name=>"key?(:name) AND key[name](filled? AND str?)"}>
-      STR
+      if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new("3.4.0")
+        expect(klass.new.inspect).to eql(<<~STR.strip)
+          #<Test::UserSchema keys=["name"] rules={name: "key?(:name) AND key[name](filled? AND str?)"}>
+        STR
+      else
+        expect(klass.new.inspect).to eql(<<~STR.strip)
+          #<Test::UserSchema keys=["name"] rules={:name=>"key?(:name) AND key[name](filled? AND str?)"}>
+        STR
+      end
     end
 
     it "raises exception when definition is missing" do