gitlab_chronic_duration 0.11.0 → 0.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 90ed911722678aa8c57973bd8cf733877d32bd06b0e313764502100bd0e36bf7
-  data.tar.gz: 5a5afd28caceefa29332d8774a161b811a1340344fdff23a33cd33f7d91aaaea
+  metadata.gz: fd977f94bc4ee464a30cfacd01d6253b80257a12954999177ceea000d5062e3c
+  data.tar.gz: df6259ba488ea8602b07fde675dda671a4c935e66fba40e394ac7dc958010a1c
 SHA512:
-  metadata.gz: '085d3ef7649df9ff93e215b41cea7d77739c415c9295f201a5e005da90c52309d395459bf0543512e729c0feb73a4520d4123d7250191888212f6c12f7f2c0d8'
-  data.tar.gz: 374eaf5cfee394c835a28bad82214de21a921a4cbc11a99f58844e43b7f240c804f757b941294924927a7b88a33e3925a44c86e6f8defc893c0533e00bc969e2
+  metadata.gz: 820338929f8edee97de15fcdc6a3de01f5ea02ab327628c48805f3b02fa4a5a05d168fd75f63843873f3ce078369bdbd2d731fbffa7db0052fcc99765e42b85a
+  data.tar.gz: deac822896c3f81c5f776fa1375ed6e23aad9ee27213b1192e863502f9419d56fba805a30f7c276707353dd98a97a8d4e3bd937a8ebf683e87e2a8731a75783b

data/lib/chronic_duration/version.rb

@@ -1,3 +1,3 @@
 module ChronicDuration
-  VERSION = '0.11.0'.freeze
+  VERSION = '0.12.0'.freeze
 end

data/lib/gitlab_chronic_duration.rb

@@ -46,8 +46,7 @@ module ChronicDuration
   # return an integer (or float, if fractions of a
   # second are input)
   def parse(string, opts = {})
-    use_complete_matcher = opts.fetch(:use_complete_matcher, false)
-    result = calculate_from_words(cleanup(string, use_complete_matcher), opts)
+    result = calculate_from_words(cleanup(string), opts)
     (!opts[:keep_zero] and result == 0) ? nil : result
   end
 
@@ -189,9 +188,9 @@ private
     val
   end
 
-  def cleanup(string, use_complete_matcher = false)
+  def cleanup(string)
     res = string.downcase
-    res = filter_by_type(Numerizer.numerize(res), use_complete_matcher)
+    res = filter_by_type(Numerizer.numerize(res))
     res = res.gsub(float_matcher) {|n| " #{n} "}.squeeze(' ').strip
     res = filter_through_white_list(res)
   end
@@ -223,11 +222,10 @@ private
   end
 
   # Parse 3:41:59 and return 3 hours 41 minutes 59 seconds
-  def filter_by_type(string, use_complete_matcher = false)
+  def filter_by_type(string)
     chrono_units_list = duration_units_list.reject {|v| v == "weeks"}
-    matcher = use_complete_matcher ? time_matcher : /#{float_matcher}(:#{float_matcher})+/
 
-    if string.gsub(' ', '') =~ matcher
+    if string.gsub(' ', '') =~ time_matcher
       res = []
       string.gsub(' ', '').split(':').reverse.each_with_index do |v,k|
         return unless chrono_units_list[k]

data/spec/lib/chronic_duration_spec.rb

@@ -271,20 +271,10 @@ describe ChronicDuration do
 
     @exemplars.each do |seconds, format_spec|
       format_spec.each do |format, _|
-        context 'when using the legacy time matcher' do
-          it "outputs a duration for #{seconds} that parses back to the same thing when using the #{format} format" do
-            expect(ChronicDuration.parse(
-              ChronicDuration.output(seconds, format: format, use_complete_matcher: false)
-            )).to eq(seconds)
-          end
-        end
-
-        context 'when using the new time matcher' do
-          it "outputs a duration for #{seconds} that parses back to the same thing when using the #{format} format" do
-            expect(ChronicDuration.parse(
-              ChronicDuration.output(seconds, format: format, use_complete_matcher: true)
-            )).to eq(seconds)
-          end
+        it "outputs a duration for #{seconds} that parses back to the same thing when using the #{format} format" do
+          expect(ChronicDuration.parse(
+            ChronicDuration.output(seconds, format: format, use_complete_matcher: true)
+          )).to eq(seconds)
         end
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gitlab_chronic_duration
 version: !ruby/object:Gem::Version
-  version: 0.11.0
+  version: 0.12.0
 platform: ruby
 authors:
 - hpoydar
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-08-29 00:00:00.000000000 Z
+date: 2023-09-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: numerizer