Skip to content

Commit b25cb81

Browse files
authored
Handle models with v[0-9] in name (#2002)
1 parent f498b71 commit b25cb81

3 files changed

Lines changed: 9 additions & 2 deletions

File tree

.generator/src/generator/templates/inflector.j2

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ require 'zeitwerk'
33
module {{ module_name }}
44
class {{ module_name }}Inflector < Zeitwerk::Inflector
55
def camelize(basename, abspath)
6-
model_name = "#{abspath.scan(/v[0-9]/).last}.#{basename}"
6+
model_name = "#{abspath.match(/datadog_api_client\/(v[0-9])\//)&.captures&.first}.#{basename}"
77
overrides[model_name] || basename.split('_').each(&:capitalize!).join
88
end
99

lib/datadog_api_client/inflector.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
module DatadogAPIClient
44
class DatadogAPIClientInflector < Zeitwerk::Inflector
55
def camelize(basename, abspath)
6-
model_name = "#{abspath.scan(/v[0-9]/).last}.#{basename}"
6+
model_name = "#{abspath.match(/datadog_api_client\/(v[0-9])\//)&.captures&.first}.#{basename}"
77
overrides[model_name] || basename.split('_').each(&:capitalize!).join
88
end
99

spec/zeitwerk_spec.rb

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
require 'spec_helper'
2+
3+
describe 'zeitwerk loader' do
4+
it "should load all files" do
5+
expect { Zeitwerk::Loader.eager_load_all }.not_to raise_error
6+
end
7+
end

0 commit comments

Comments
 (0)