diff --git a/Gemfile.lock b/Gemfile.lock index 605f5b1..493762a 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,35 +1,51 @@ PATH remote: . specs: - oas_parser (0.25.4) + oas_parser (0.25.4.pre.paywith.pre.2) activesupport (>= 4.0.0) addressable (~> 2.3) builder (~> 3.2.3) - deep_merge (~> 1.2.1) - hash-deep-merge - mustermann-contrib (~> 1.1.1) + mustermann-contrib (~> 2) nokogiri GEM remote: https://rubygems.org/ specs: - activesupport (6.1.3.1) - concurrent-ruby (~> 1.0, >= 1.0.2) + activesupport (8.0.2) + base64 + benchmark (>= 0.3) + bigdecimal + concurrent-ruby (~> 1.0, >= 1.3.1) + connection_pool (>= 2.2.5) + drb i18n (>= 1.6, < 2) + logger (>= 1.4.2) minitest (>= 5.1) - tzinfo (~> 2.0) - zeitwerk (~> 2.3) - addressable (2.8.0) - public_suffix (>= 2.0.2, < 5.0) + securerandom (>= 0.3) + tzinfo (~> 2.0, >= 2.0.5) + uri (>= 0.13.1) + addressable (2.8.7) + public_suffix (>= 2.0.2, < 7.0) + base64 (0.2.0) + benchmark (0.4.0) + bigdecimal (3.1.9) builder (3.2.4) - coderay (1.1.2) - concurrent-ruby (1.1.8) - deep_merge (1.2.1) - diff-lcs (1.3) + coderay (1.1.3) + concurrent-ruby (1.3.5) + connection_pool (2.5.0) + diff-lcs (1.6.0) docile (1.1.5) - ffi (1.9.25) - formatador (0.2.5) - guard (2.15.0) + drb (2.2.1) + ffi (1.17.1-aarch64-linux-gnu) + ffi (1.17.1-aarch64-linux-musl) + ffi (1.17.1-arm-linux-gnu) + ffi (1.17.1-arm-linux-musl) + ffi (1.17.1-arm64-darwin) + ffi (1.17.1-x86_64-darwin) + ffi (1.17.1-x86_64-linux-gnu) + ffi (1.17.1-x86_64-linux-musl) + formatador (1.1.0) + guard (2.17.0) formatador (>= 0.2.4) listen (>= 2.7, < 4.0) lumberjack (>= 1.0.12, < 2.0) @@ -43,70 +59,88 @@ GEM guard (~> 2.1) guard-compat (~> 1.1) rspec (>= 2.99.0, < 4.0) - hansi (0.2.0) - hash-deep-merge (0.1.1) - i18n (1.8.10) + hansi (0.2.1) + i18n (1.14.7) concurrent-ruby (~> 1.0) - json (2.3.1) - listen (3.1.5) - rb-fsevent (~> 0.9, >= 0.9.4) - rb-inotify (~> 0.9, >= 0.9.7) - ruby_dep (~> 1.2) - lumberjack (1.0.13) + json (2.10.2) + listen (3.9.0) + rb-fsevent (~> 0.10, >= 0.10.3) + rb-inotify (~> 0.9, >= 0.9.10) + logger (1.6.6) + lumberjack (1.2.10) method_source (0.9.2) - mini_portile2 (2.5.1) - minitest (5.14.4) - mustermann (1.1.1) + minitest (5.25.5) + mustermann (2.0.2) ruby2_keywords (~> 0.0.1) - mustermann-contrib (1.1.1) + mustermann-contrib (2.0.2) hansi (~> 0.2.0) - mustermann (= 1.1.1) + mustermann (= 2.0.2) nenv (0.3.0) - nokogiri (1.11.4) - mini_portile2 (~> 2.5.0) + nokogiri (1.18.5-aarch64-linux-gnu) racc (~> 1.4) - notiffany (0.1.1) + nokogiri (1.18.5-aarch64-linux-musl) + racc (~> 1.4) + nokogiri (1.18.5-arm-linux-gnu) + racc (~> 1.4) + nokogiri (1.18.5-arm-linux-musl) + racc (~> 1.4) + nokogiri (1.18.5-arm64-darwin) + racc (~> 1.4) + nokogiri (1.18.5-x86_64-darwin) + racc (~> 1.4) + nokogiri (1.18.5-x86_64-linux-gnu) + racc (~> 1.4) + nokogiri (1.18.5-x86_64-linux-musl) + racc (~> 1.4) + notiffany (0.1.3) nenv (~> 0.1) shellany (~> 0.0) pry (0.11.3) coderay (~> 1.1.0) method_source (~> 0.9.0) - public_suffix (4.0.6) - racc (1.5.2) - rake (13.0.1) - rb-fsevent (0.10.3) - rb-inotify (0.9.10) - ffi (>= 0.5.0, < 2) - rspec (3.8.0) - rspec-core (~> 3.8.0) - rspec-expectations (~> 3.8.0) - rspec-mocks (~> 3.8.0) + public_suffix (6.0.1) + racc (1.8.1) + rake (13.2.1) + rb-fsevent (0.11.2) + rb-inotify (0.11.1) + ffi (~> 1.0) + rspec (3.13.0) + rspec-core (~> 3.13.0) + rspec-expectations (~> 3.13.0) + rspec-mocks (~> 3.13.0) rspec-collection_matchers (1.1.3) rspec-expectations (>= 2.99.0.beta1) - rspec-core (3.8.0) - rspec-support (~> 3.8.0) - rspec-expectations (3.8.2) + rspec-core (3.13.3) + rspec-support (~> 3.13.0) + rspec-expectations (3.13.3) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.8.0) - rspec-mocks (3.8.0) + rspec-support (~> 3.13.0) + rspec-mocks (3.13.2) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.8.0) - rspec-support (3.8.0) - ruby2_keywords (0.0.4) - ruby_dep (1.5.0) + rspec-support (~> 3.13.0) + rspec-support (3.13.2) + ruby2_keywords (0.0.5) + securerandom (0.4.1) shellany (0.0.1) simplecov (0.15.1) docile (~> 1.1.0) json (>= 1.8, < 3) simplecov-html (~> 0.10.0) simplecov-html (0.10.2) - thor (0.20.3) - tzinfo (2.0.4) + thor (1.3.2) + tzinfo (2.0.6) concurrent-ruby (~> 1.0) - zeitwerk (2.4.2) + uri (1.0.3) PLATFORMS - ruby + aarch64-linux-gnu + aarch64-linux-musl + arm-linux-gnu + arm-linux-musl + arm64-darwin + x86_64-darwin + x86_64-linux-gnu + x86_64-linux-musl DEPENDENCIES bundler (~> 2.1) @@ -119,4 +153,4 @@ DEPENDENCIES simplecov (~> 0.15.1) BUNDLED WITH - 2.1.4 + 2.6.5 diff --git a/lib/oas_parser.rb b/lib/oas_parser.rb index 66fc615..c71368c 100644 --- a/lib/oas_parser.rb +++ b/lib/oas_parser.rb @@ -6,7 +6,6 @@ require 'nokogiri' require 'addressable/uri' -require 'deep_merge' require_relative 'oas_parser/path.rb' require_relative 'oas_parser/payload.rb' diff --git a/lib/oas_parser/version.rb b/lib/oas_parser/version.rb index 5bfecd6..ce052c5 100644 --- a/lib/oas_parser/version.rb +++ b/lib/oas_parser/version.rb @@ -1,3 +1,3 @@ module OasParser - VERSION = '0.25.4'.freeze + VERSION = '0.25.4-paywith-2'.freeze end diff --git a/oas_parser.gemspec b/oas_parser.gemspec index 505d140..970a285 100644 --- a/oas_parser.gemspec +++ b/oas_parser.gemspec @@ -21,12 +21,10 @@ Gem::Specification.new do |spec| spec.require_paths = ["lib"] spec.add_dependency "addressable", "~> 2.3" - spec.add_dependency "deep_merge", "~> 1.2.1" spec.add_dependency "activesupport", ">= 4.0.0" spec.add_dependency "builder", "~> 3.2.3" - spec.add_dependency "mustermann-contrib", "~> 1.1.1" + spec.add_dependency "mustermann-contrib", "~> 2" spec.add_dependency "nokogiri" - spec.add_dependency "hash-deep-merge" spec.add_development_dependency "bundler", "~> 2.1" spec.add_development_dependency "guard-rspec", "~> 4.7.3"