timeliness 0.5.1 → 0.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8a3c28fd75e1bedf4e7679a8fd71b9484a5daadbf7dceea15d7f54fb7f5304c3
-  data.tar.gz: 3bc44bf2be43bba84c55ca5eb37f2ba97c8fa4051d10bd30477a307aab1605e9
+  metadata.gz: ed9d4a7bedb3b511ea9a907ccbf31b40903dd29fdd4d4c9aa3763e6827d02d2e
+  data.tar.gz: 6de9d02d5dfb2e96fb9899e190cf5dfbf75e29fffbe51a7c6b7c41e00fa5190e
 SHA512:
-  metadata.gz: 79b6996ca7dce5c043b0dfecf11c2d9cd1016ce5784d134576123f23de9ac8bdc2a4ce0905eda58949d31f03c79e89c37622bdd0e926e70a6e189af265eb5b24
-  data.tar.gz: 321feb85cf0177e55ed47e5a35026b85610ba8559ae03daca287f5d6bbcc5f1e4d287ae8212267e22049907adef252415b528def599efbaafecdd34bb7d8ad86
+  metadata.gz: a06066317124ddf6be084e604fb398824f5ffc4febbc33863ca42110c5cda782ccd5da8f0de11482f3a9aef6e16d33f29272777aa150a77f8eaa432db924124e
+  data.tar.gz: b2aba3bd75fe034df0cc867fa0d8e7aa69a895a74891ea2ce9f157ad691e437504553d195fd3a0aaa1c369c52548514f2d8360e62c2683125564ed4a93366374

data/CHANGELOG.rdoc

@@ -1,3 +1,9 @@
+= 0.5.2 - 2025-01-31
+* Reduce allocations through on the parse hot path 
+
+= 0.5.1 - 2025-01-07
+* Make frozen string compatible
+
 = 0.5.0 - 2024-12-02
 * Reduce allocations through some internal parsing changes
 * Changed parse method arg handling to simple using keyword args
@@ -13,12 +19,10 @@
 
 = 0.4.3 - 2019-06-16
 * Fixed `Timeliness.ambiguous_date_format` being used in new threads if custom value set
-* Moved all config from Timeliness to new Configuration class. Delegated all
-  old config methods to Timeliness.configuration instance.
+* Moved all config from Timeliness to new Configuration class. Delegated all old config methods to Timeliness.configuration instance.
 
 = 0.4.2 - 2019-06-15
-* Fixed thread safe issue that forced you to use one of the date format methods e.g. `use_euro_formats`
-  to initialize the format sets in each new thread. Now a new thread will default to the global default (main thread).
+* Fixed thread safe issue that forced you to use one of the date format methods e.g. `use_euro_formats` to initialize the format sets in each new thread. Now a new thread will default to the global default (main thread).
 * Add `Timeliness.ambiguous_date_format` config setting (:us or :euro) to control global default for date format sets.
 
 = 0.4.1 - 2019-06-11
@@ -27,8 +31,7 @@
 * Add 'zt' format token to support 'Z' (Zulu time) zone offset i.e. +00:00 or UTC
 
 = 0.4.0 - 2019-02-09
-* Add threadsafety for use_euro_formats & use_us_formats to allow runtime
-  switching (andruby, timdiggins)
+* Add threadsafety for use_euro_formats & use_us_formats to allow runtime switching (andruby, timdiggins)
 
 = 0.3.10 - 2019-02-06
 * Fixed file permissions in gem build

data/lib/timeliness/format.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Timeliness
   class Format
     include Helpers
@@ -11,7 +13,6 @@ module Timeliness
     end
 
     def compile!
-      @token_count = 0
       found_tokens, token_order = [], []
 
       format = format_string.dup
@@ -19,20 +20,16 @@ module Timeliness
 
       # Substitute tokens with numbered placeholder
       Definitions.sorted_token_keys.each do |token|
-        count = 0
         format.gsub!(token) do
           token_regexp_str, arg_key = Definitions.format_tokens[token]
-          token_index = found_tokens.size
 
-          if arg_key
+          if arg_key && found_tokens.rassoc(arg_key)
             raise CompilationFailed, "Token '#{token}' was found more than once in format '#{format_string}'. This has unexpected effects should be removed." if count > 0
-            count += 1
-
-            token_regexp_str = "(#{token_regexp_str})"
-            @token_count += 1
           end
+
           found_tokens << [ token_regexp_str, arg_key ]
 
+          token_index = found_tokens.size - 1
           "%<#{token_index}>"
         end
       end
@@ -40,11 +37,18 @@ module Timeliness
       # Replace placeholders with token regexps
       format.gsub!(/%<(\d+)>/) do
         token_regexp_str, arg_key = found_tokens[$1.to_i]
-        token_order << arg_key
-        token_regexp_str
+
+        if arg_key
+          token_order << arg_key
+          "(#{token_regexp_str})"
+        else
+          token_regexp_str
+        end
       end
 
-      define_process_method(token_order.compact)
+      @token_count = token_order.size
+
+      define_process_method(token_order)
       @regexp_string = format
       @regexp = Regexp.new("^(?>#{format})$")
       self

data/lib/timeliness/format_set.rb

@@ -31,12 +31,12 @@ module Timeliness
 
     def match(string, format_string=nil)
       format = single_format(format_string) if format_string
-      match_regexp = format && format.regexp || @regexp
+      match_regexp = format ? format.regexp : @regexp
 
-      match_regexp.match(string) do |match_data|
-        captures = match_data.captures                  # For a multi-format regexp there are lots of nils
-        index    = captures.find_index { |e| !e.nil? }  # Find the start of captures for matched format
-        values   = captures.values_at(index..(index+7))
+      if (match_data = match_regexp.match(string))
+        captures = match_data.captures # For a multi-format regexp there are lots of nils
+        index = captures.index { |e| !e.nil? } # Find the start of captures for matched format
+        values = captures[index, 8]
         format ||= @match_indexes[index]
         format.process(*values)
       end

data/lib/timeliness/helpers.rb

@@ -1,10 +1,17 @@
+# frozen_string_literal: true
+
 module Timeliness
   module Helpers
+    # Helper methods used in format component processing. See Definitions.
 
     def full_hour(hour, meridian)
       hour = hour.to_i
       return hour if meridian.nil?
-      if meridian.delete('.').downcase == 'am'
+
+      meridian.delete!('.')
+      meridian.downcase!
+
+      if meridian == 'am'
         raise(ArgumentError) if hour == 0 || hour > 12
         hour == 12 ? 0 : hour
       else
@@ -20,9 +27,9 @@ module Timeliness
       end
       year.to_i
     end
-    
+
     def month_index(month)
-      return month.to_i if month.to_i > 0 || /0+/ =~ month
+      return month.to_i if month.match?(/\d/)
       (month.length > 3 ? month_names : abbr_month_names).index { |str| month.casecmp?(str) }
     end
 
@@ -39,10 +46,8 @@ module Timeliness
     end
 
     def offset_in_seconds(offset)
-      sign = offset =~ /^-/ ? -1 : 1
-      parts = offset.scan(/\d\d/).map {|p| p.to_f }
-      parts[1] = parts[1].to_f / 60
-      (parts[0] + parts[1]) * sign * 3600
+      offset =~ /^([-+])?(\d{2}):?(\d{2})/
+      ($1 == '-' ? -1 : 1) * ($2.to_f * 3600 + $3.to_f * 60)
     end
 
     def i18n_loaded?

data/lib/timeliness/parser.rb

@@ -18,19 +18,20 @@ module Timeliness
 
         default_values_by_type(time_array, type, options) unless type == :datetime
 
-        make_time(time_array[0..7], options[:zone])
+        make_time(time_array, options[:zone])
       rescue NoMethodError => ex
         raise ex unless ex.message =~ /undefined method `(zone|use_zone|current)' for Time:Class/
         raise MissingTimezoneSupport, "ActiveSupport timezone support must be loaded to use timezones other than :utc and :local."
       end
 
       def make_time(time_array, zone_option=nil)
-        return nil unless fast_date_valid_with_fallback(*time_array[0..2])
+        return nil unless fast_date_valid_with_fallback(time_array[0], time_array[1], time_array[2])
 
         zone, offset = zone_and_offset(time_array[7]) if time_array[7]
 
         value = create_time_in_zone(time_array[0..6].compact, zone || zone_option)
         value = shift_time_to_zone(value, zone_option) if zone
+
         return nil unless value
 
         offset ? value + (value.utc_offset - offset) : value
@@ -74,9 +75,12 @@ module Timeliness
       def default_values_by_type(values, type, options)
         case type
         when :date
-          values[3..7] = nil
+          values.fill(nil, 3..7)
         when :time
-          values[0..2] = current_date(options)
+          current_date = current_date(options)
+          values[0] = current_date[0]
+          values[1] = current_date[1]
+          values[2] = current_date[2]
         when nil
           dummy_date = current_date(options)
           values[0] ||= dummy_date[0]

data/lib/timeliness/version.rb

@@ -1,3 +1,3 @@
 module Timeliness
-  VERSION = '0.5.1'.freeze
+  VERSION = '0.5.3'.freeze
 end

data/spec/timeliness/helpers_spec.rb

@@ -0,0 +1,116 @@
+describe Timeliness::Helpers do
+  include Timeliness::Helpers
+
+  describe "#full_hour" do
+    it "should convert a 12-hour clock AM time to 24-hour format correctly" do
+      expect(full_hour(12, 'am')).to eq 0
+      expect(full_hour(1, 'am')).to eq 1
+      expect(full_hour(10, 'am')).to eq 10
+    end
+
+    it "should convert a 12-hour clock PM time to 24-hour format correctly" do
+      expect(full_hour(12, 'pm')).to eq 12
+      expect(full_hour(1, 'pm')).to eq 13
+      expect(full_hour(10, 'pm')).to eq 22
+    end
+
+    it "should raise ArgumentError when given an hour of 0 with AM meridian" do
+      expect { full_hour(0, 'am') }.to raise_error(ArgumentError)
+    end
+
+    it "should raise ArgumentError when given an hour greater than 12 with AM meridian" do
+      expect { full_hour(13, 'am') }.to raise_error(ArgumentError)
+    end
+
+    it "should handle meridian strings with periods" do
+      expect(full_hour(10, 'A.M.')).to eq 10
+      expect(full_hour(10, 'P.M.')).to eq 22
+      expect(full_hour(12, 'A.M.')).to eq 0
+      expect(full_hour(12, 'P.M.')).to eq 12
+    end
+  end
+
+  describe "#unambiguous_year" do
+    before do
+      @original_threshold = Timeliness.configuration.ambiguous_year_threshold
+      Timeliness.configuration.ambiguous_year_threshold = 30
+      Timecop.freeze(Time.new(2023, 1, 1))
+    end
+
+    after do
+      Timeliness.configuration.ambiguous_year_threshold = @original_threshold
+      Timecop.return
+    end
+
+    it "should convert 2-digit years to 4-digit years based on the current century and ambiguous year threshold" do
+      # Current century (21st) for years below threshold
+      expect(unambiguous_year('29')).to eq 2029
+
+      # Previous century (20th) for years above or equal to threshold
+      expect(unambiguous_year('30')).to eq 1930
+      expect(unambiguous_year('99')).to eq 1999
+
+      # Should not modify years that are already 4-digits
+      expect(unambiguous_year('2023')).to eq 2023
+
+      # Should handle single digit years with padding
+      expect(unambiguous_year('7')).to eq 2007
+
+      # Should handle years at century boundaries
+      expect(unambiguous_year('00')).to eq 2000
+    end
+  end
+
+  describe "#month_index" do
+    before do
+      allow(self).to receive(:i18n_loaded?).and_return(false)
+    end
+
+    it "should correctly parse month names as month indices regardless of case" do
+      # Testing with full month names
+      expect(month_index("january")).to eq 1
+      expect(month_index("MARCH")).to eq 3
+      expect(month_index("DeCeMbEr")).to eq 12
+
+      # Testing with abbreviated month names
+      expect(month_index("jan")).to eq 1
+      expect(month_index("MAR")).to eq 3
+      expect(month_index("deC")).to eq 12
+
+      # Testing with numeric month
+      expect(month_index("7")).to eq 7
+    end
+  end
+
+  describe "#microseconds" do
+    it "should convert microsecond strings to integer microsecond values" do
+      expect(microseconds('0')).to eq 0
+      expect(microseconds('1')).to eq 100000
+      expect(microseconds('01')).to eq 10000
+      expect(microseconds('001')).to eq 1000
+      expect(microseconds('9')).to eq 900000
+      expect(microseconds('99')).to eq 990000
+      expect(microseconds('999')).to eq 999000
+      expect(microseconds('999999')).to eq 999999
+    end
+  end
+
+  describe "#offset_in_seconds" do
+    it "should calculate offset in seconds from timezone string formats" do
+      # Standard format with colon
+      expect(offset_in_seconds('+10:00')).to eq 36000
+      expect(offset_in_seconds('-05:30')).to eq -19800
+
+      # Format without colon
+      expect(offset_in_seconds('+1030')).to eq 37800
+      expect(offset_in_seconds('-0530')).to eq -19800
+
+      # Default positive sign when omitted
+      expect(offset_in_seconds('08:00')).to eq 28800
+
+      # Zero offset
+      expect(offset_in_seconds('+00:00')).to eq 0
+      expect(offset_in_seconds('-00:00')).to eq 0
+    end
+  end
+end

data/spec/timeliness/parser_spec.rb

@@ -2,7 +2,7 @@ describe Timeliness::Parser do
   def self.timezone_settings(zone: nil, output: nil)
     before do
       Time.zone = zone if zone
-      Timeliness.configuration.default_timezone = output if output 
+      Timeliness.configuration.default_timezone = output if output
     end
   end
 
@@ -82,23 +82,23 @@ describe Timeliness::Parser do
     end
 
     context "string with zone offset value" do
-      context "when current timezone is earler than string zone" do
+      context "when current timezone is later than string zone" do
         timezone_settings zone: 'Australia/Melbourne', output: :current
 
-        it 'should return value shifted by positive offset in default timezone' do
+        it 'should return value shifted by positive string offset in default timezone' do
           value = parse("2000-06-01T12:00:00+02:00")
           expect(value).to eq Time.zone.local(2000,6,1,20,0,0)
           expect(value.utc_offset).to eq 10.hours
         end
 
-        it 'should return value shifted by negative offset in default timezone' do
+        it 'should return value shifted by negative string offset in default timezone' do
           value = parse("2000-06-01T12:00:00-01:00")
           expect(value).to eq Time.zone.local(2000,6,1,23,0,0)
           expect(value.utc_offset).to eq 10.hours
         end
       end
 
-      context "when current timezone is later than string zone" do
+      context "when current timezone is earlier than string zone" do
         timezone_settings zone: 'America/Phoenix', output: :current
 
         it 'should return value shifted by positive offset in default timezone' do
@@ -146,7 +146,7 @@ describe Timeliness::Parser do
 
     context "string with zulu time abbreviation 'Z'" do
       timezone_settings zone: 'Australia/Melbourne'
-      
+
       it 'should return value using string zone adjusted to default :current timezone' do
         Timeliness.configuration.default_timezone = :current
 

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: timeliness
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.5.3
 platform: ruby
 authors:
 - Adam Meehan
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-01-07 00:00:00.000000000 Z
+date: 2025-05-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -164,6 +163,7 @@ files:
 - spec/timeliness/definitions_spec.rb
 - spec/timeliness/format_set_spec.rb
 - spec/timeliness/format_spec.rb
+- spec/timeliness/helpers_spec.rb
 - spec/timeliness/parser_spec.rb
 - spec/timeliness_helper.rb
 - timeliness.gemspec
@@ -176,7 +176,6 @@ metadata:
   changelog_uri: https://github.com/adzap/timeliness/blob/master/CHANGELOG.rdoc
   source_code_uri: https://github.com/adzap/timeliness
   wiki_uri: https://github.com/adzap/timeliness/wiki
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -191,8 +190,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.19
-signing_key:
+rubygems_version: 3.6.3
 specification_version: 4
 summary: Date/time parsing for the control freak.
 test_files: []