swaggard 4.1.0 → 4.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 28d2106f9e0d61087b74c97d99c4e3e6c848b9bee4afa7fb6a828db0466cb134
-  data.tar.gz: 668252d84bbdc87a23ed4191cc5baae2c2c7dfbe2b06cb794d8a7fe947cbf70c
+  metadata.gz: 0f81d2b18d49097affa50030384f9ba3ca7a53ddd363952f2496bf77496eee5d
+  data.tar.gz: fc112e57ff31fcf3a699543054c97d4a3204113acfca9014c9133d0a5acd5ee3
 SHA512:
-  metadata.gz: fbc1a171bbb0b3eaf2d285e4eebb9e3b2d76196745865afb727de157be519be9604d12af0745c9d2a7d73a5b52f0916230e98372bbc94af67159552cf72302dc
-  data.tar.gz: a648d45fc2cffc78502e548ccafcfbc2ff4ece0bccee7a75b3d4827cffab98d1672304bca5d63bcd1b94f1f0dc4d7a8cd373faea5adf61ca356f4f553928493c
+  metadata.gz: 503363ed15e0b78f38e56cee37a40c5ff06810be7b7cfd6886aa1fa6eedd9dd2724e00f3ae4f756c03995ef832e16ab146fd4bd9e700a7c8de57e0ab8fbcc846
+  data.tar.gz: 3459ce52d39b49c4d12036a4cd1fa01f019b08ba5572d66cd619909369487e9109a1cdd84caf223c7ca93df01f2e03636dd18ade95bf7a8cd544b77c3128170d

data/lib/swaggard/api_definition.rb

@@ -66,7 +66,9 @@ module Swaggard
     def format_path(path)
       return path unless Swaggard.configuration.exclude_base_path_from_paths
 
-      path.gsub(Swaggard.configuration.api_base_path, '')
+      base_path = Swaggard.configuration.api_base_path
+
+      path.sub(/\A#{Regexp.escape(base_path)}/, '')
     end
 
     def build_components

data/lib/swaggard/version.rb

@@ -1,3 +1,3 @@
 module Swaggard
-  VERSION = '4.1.0'
+  VERSION = '4.1.1'
 end

data/spec/swaggard/api_definition_spec.rb

@@ -0,0 +1,48 @@
+require 'spec_helper'
+
+describe Swaggard::ApiDefinition do
+  describe '#format_path' do
+    subject(:formatted) { described_class.new.send(:format_path, path) }
+
+    let(:original_base_path) { Swaggard.configuration.api_base_path }
+    let(:original_exclude)   { Swaggard.configuration.exclude_base_path_from_paths }
+
+    before do
+      original_base_path
+      original_exclude
+      Swaggard.configuration.api_base_path = '/api'
+      Swaggard.configuration.exclude_base_path_from_paths = true
+    end
+
+    after do
+      Swaggard.configuration.api_base_path = original_base_path
+      Swaggard.configuration.exclude_base_path_from_paths = original_exclude
+    end
+
+    context 'when the base path also appears inside a later path segment' do
+      let(:path) { '/api/partner/api_keys' }
+
+      it 'strips only the leading base path, not every occurrence' do
+        expect(formatted).to eq('/partner/api_keys')
+      end
+    end
+
+    context 'with a path that only contains the leading base path' do
+      let(:path) { '/api/partner/products' }
+
+      it 'strips the leading base path' do
+        expect(formatted).to eq('/partner/products')
+      end
+    end
+
+    context 'when exclude_base_path_from_paths is disabled' do
+      let(:path) { '/api/partner/api_keys' }
+
+      before { Swaggard.configuration.exclude_base_path_from_paths = false }
+
+      it 'returns the path unchanged' do
+        expect(formatted).to eq('/api/partner/api_keys')
+      end
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: swaggard
 version: !ruby/object:Gem::Version
-  version: 4.1.0
+  version: 4.1.1
 platform: ruby
 authors:
 - Adrian Gomez
@@ -162,6 +162,7 @@ files:
 - spec/integration/openapi_spec.rb
 - spec/integration/swaggard_spec.rb
 - spec/spec_helper.rb
+- spec/swaggard/api_definition_spec.rb
 - spec/swaggard/parsers/property_spec.rb
 - spec/swaggard/swagger/definition_spec.rb
 - spec/swaggard/swagger/parameters/body_spec.rb
@@ -203,6 +204,7 @@ test_files:
 - spec/integration/openapi_spec.rb
 - spec/integration/swaggard_spec.rb
 - spec/spec_helper.rb
+- spec/swaggard/api_definition_spec.rb
 - spec/swaggard/parsers/property_spec.rb
 - spec/swaggard/swagger/definition_spec.rb
 - spec/swaggard/swagger/parameters/body_spec.rb