timeliness 0.5.1 → 0.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8a3c28fd75e1bedf4e7679a8fd71b9484a5daadbf7dceea15d7f54fb7f5304c3
-  data.tar.gz: 3bc44bf2be43bba84c55ca5eb37f2ba97c8fa4051d10bd30477a307aab1605e9
+  metadata.gz: 6fd0587977d3e4e37b368cb52cf19aa81f61f92bd476b5ee5b75ca077179797e
+  data.tar.gz: 69fb540b605ad50751253181acd7c391b9d72d43fb0337f7246a9197c90e2717
 SHA512:
-  metadata.gz: 79b6996ca7dce5c043b0dfecf11c2d9cd1016ce5784d134576123f23de9ac8bdc2a4ce0905eda58949d31f03c79e89c37622bdd0e926e70a6e189af265eb5b24
-  data.tar.gz: 321feb85cf0177e55ed47e5a35026b85610ba8559ae03daca287f5d6bbcc5f1e4d287ae8212267e22049907adef252415b528def599efbaafecdd34bb7d8ad86
+  metadata.gz: 34cefe7db667f7e4eee4440ac6806e866b38176bb47b0d006c71562031fdb47c4a6e29b111178ba05e8008553f7c64577d6300c6cf711fba277256e5fd7443f5
+  data.tar.gz: 52dfc42917b78c105ff1e70b9523444abbb5c6c03b11d58e03d95e598959edf9f16eef3e2e69cfa9a3bac1112c1697c8f553dedd078e7d0ddf5e9d54abf11e8c

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)
     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.2'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: timeliness
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.5.2
 platform: ruby
 authors:
 - Adam Meehan
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-01-07 00:00:00.000000000 Z
+date: 2025-01-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport