openapi-ruby 3.5.0 → 3.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4fd91990e73c6bcd5fae00558bb63afd1c4999de976b16d542aa495ddf2ad6a4
-  data.tar.gz: 19391cec8179b314284b51afa6adc977849f75aa431a7ec54df70f29b9877e45
+  metadata.gz: 420f08f5a6cc99f77fc5ecd23c7e280a52b1bc930996ca637c2f61828822cc54
+  data.tar.gz: 831c0a52dd27d6ed1c60986b82d0e71ca271290ea5c22b40653698fd969895ae
 SHA512:
-  metadata.gz: e9384c41d176a5cdf12a8164a148e8ff0a853aa15c73b06efb4f32bc96d40aaa18d4667c93ab6db863bf12de8eac783308a232a99dad66f755b3e1141ad456e5
-  data.tar.gz: c6d8b92d8473ac2f2582632c93d1f5d72fc41645b3c34a0b88192530d0bd1808aef836ac99b8864a92a88cb0587a89f1b0cf867811190e2758fdb86900e25552
+  metadata.gz: 5e0c13aaa9b0d389f067224265cb11a358679228fafd7e864cefb4cb4a037b3b80b823b4d30050e7b667eb7849c509611490403e042e4f072b78a3af88526e60
+  data.tar.gz: d075ef796755e29033fee117fff4cb6a4177b30749afbd6a57993e9a47273d111cce9f7c672fb87c841af3107e150120dac59655c32652da19108ca60e017821

data/lib/openapi_ruby/core/document.rb

@@ -46,12 +46,12 @@ module OpenapiRuby
       end
 
       def to_json(*_args)
-        JSON.pretty_generate(@data)
+        JSON.pretty_generate(to_h)
       end
 
       def to_yaml
         require "yaml"
-        @data.to_yaml
+        to_h.to_yaml
       end
 
       def valid?

data/lib/openapi_ruby/generator/rake_task_support.rb

@@ -67,14 +67,40 @@ module OpenapiRuby
       # so the two test frameworks don't both register Rails lazy
       # hooks in the same process — only the DSL needs to be live for
       # schema generation.
+      #
+      # Each glob runs with its own framework's directory at the head
+      # of $LOAD_PATH so the typical `require "openapi_helper"` /
+      # `require "rails_helper"` / `require "test_helper"` resolves
+      # to the right file. Without this, both spec/ and test/ getting
+      # unshifted in one block leads to whichever was unshifted last
+      # winning every lookup — and the wrong helper getting loaded
+      # for the other side's files.
       def hybrid_script(pattern)
+        globs = pattern.split(",").map(&:strip)
+        spec_globs = globs.grep(%r{\bspec/})
+        test_globs = globs.grep(%r{\btest/})
+        other_globs = globs - spec_globs - test_globs
+
         <<~RUBY
           require "rspec/core"
           require "openapi_ruby/rspec"
           require "openapi_ruby/minitest"
-          $LOAD_PATH.unshift(File.expand_path("spec")) unless $LOAD_PATH.include?(File.expand_path("spec"))
-          $LOAD_PATH.unshift(File.expand_path("test")) unless $LOAD_PATH.include?(File.expand_path("test"))
-          #{glob_loads(pattern)}
+
+          load_with_path = lambda do |dir, glob|
+            path = File.expand_path(dir)
+            added = !$LOAD_PATH.include?(path)
+            $LOAD_PATH.unshift(path) if added
+            begin
+              Dir.glob(glob).sort.each { |f| require File.expand_path(f) }
+            ensure
+              $LOAD_PATH.delete(path) if added
+            end
+          end
+
+          #{spec_globs.map { |g| "load_with_path.call(\"spec\", #{g.inspect})" }.join("\n          ")}
+          #{test_globs.map { |g| "load_with_path.call(\"test\", #{g.inspect})" }.join("\n          ")}
+          #{other_globs.map { |g| %[Dir.glob(#{g.inspect}).sort.each { |f| require File.expand_path(f) }] }.join("\n          ")}
+
           OpenapiRuby::Generator::SchemaWriter.generate_all!
         RUBY
       end

data/lib/openapi_ruby/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module OpenapiRuby
-  VERSION = "3.5.0"
+  VERSION = "3.5.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: openapi-ruby
 version: !ruby/object:Gem::Version
-  version: 3.5.0
+  version: 3.5.1
 platform: ruby
 authors:
 - Morten Hartvig