Extend supported values for Nginx::Size and Nginx::Time

Allow raw integers and add support for combination of multiple units.
voxpupuli · Jul 5, 2023 · 89496d2 · 89496d2
1 parent 92aa72c
commit 89496d2
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 6 deletions.
diff --git a/spec/type_aliases/size_spec.rb b/spec/type_aliases/size_spec.rb
@@ -7,11 +7,17 @@
   it { is_expected.to allow_value('1024K') }
   it { is_expected.to allow_value('1m') }
   it { is_expected.to allow_value('1M') }
+  it { is_expected.to allow_value(1) }
+  it { is_expected.to allow_value(1024) }
+  it { is_expected.to allow_value('1') }
+  it { is_expected.to allow_value('1024') }
 
   it { is_expected.not_to allow_value(:undef) }
-  it { is_expected.not_to allow_value(1) }
-  it { is_expected.not_to allow_value(1024) }
   it { is_expected.not_to allow_value('') }
+  it { is_expected.not_to allow_value(-1) }
+  it { is_expected.not_to allow_value(-1024) }
+  it { is_expected.not_to allow_value('-1') }
+  it { is_expected.not_to allow_value('-1024') }
   it { is_expected.not_to allow_value('0.1k') }
   it { is_expected.not_to allow_value('0.1K') }
   it { is_expected.not_to allow_value('0.1m') }

diff --git a/spec/type_aliases/time_spec.rb b/spec/type_aliases/time_spec.rb
@@ -10,10 +10,17 @@
   it { is_expected.to allow_value('1d') }
   it { is_expected.to allow_value('1M') }
   it { is_expected.to allow_value('1y') }
+  it { is_expected.to allow_value('1y 2M 3w 4d 5h 6m 7ms') }
+  it { is_expected.to allow_value(1) }
+  it { is_expected.to allow_value(10) }
+  it { is_expected.to allow_value('1') }
+  it { is_expected.to allow_value('10') }
 
   it { is_expected.not_to allow_value(:undef) }
-  it { is_expected.not_to allow_value(1) }
-  it { is_expected.not_to allow_value(10) }
+  it { is_expected.not_to allow_value(-1) }
+  it { is_expected.not_to allow_value(-10) }
+  it { is_expected.not_to allow_value('-1') }
+  it { is_expected.not_to allow_value('-10') }
   it { is_expected.not_to allow_value('') }
   it { is_expected.not_to allow_value('10S') }
   it { is_expected.not_to allow_value('10.0s') }

diff --git a/types/size.pp b/types/size.pp
@@ -1 +1,4 @@
-type Nginx::Size = Pattern[/^\d+[k|K|m|M]?$/]
+type Nginx::Size = Variant[
+  Integer[0],
+  Pattern[/\A\d+[k|K|m|M]?\z/],
+]
diff --git a/types/time.pp b/types/time.pp
@@ -1 +1,4 @@
-type Nginx::Time = Pattern[/^\d+(ms|s|m|h|d|w|M|y)?$/]
+type Nginx::Time = Variant[
+  Integer[0],
+  Pattern[/^(?!$)((\d+y *)?(\d+M *)?(\d+w *)?(\d+d *)?(\d+h *)?(\d+m *)?(\d+s *)?(\d+ms)?|\d+)$/],
+]