timeliness 0.4.4 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0b1224a95afa47942b2118db304f6b00f741748e129243fe277ccb45127b9804
-  data.tar.gz: 320e9633f0769274f57bcca370e1a839abf62039df963af1d4cb35757b9f03fc
+  metadata.gz: 23fc962cb22262464b617a95fc8690f5b94400ee5de69fc110166975bf59fd40
+  data.tar.gz: fead9e440fb74611873e5ab1a89747514072602d961f01a3c1d96c9d1b052610
 SHA512:
-  metadata.gz: 593b8a2649f97b485a94f205c2e500ca38c31d4db734d46962c4224f12df47fe6679a111d1a950e1794f46065a9e922eafbada8a8dc617ac68a250a1249fba1c
-  data.tar.gz: 3b8705a405281a0d4bb2c56f436a6e016bae0f83ed8f61700fc6553d37ed53614b85b56d818063bc4aaa5dc96360426e762da038ed30374473448c621a18e07b
+  metadata.gz: ee38a67400fbe0b4bb9141eb359f3c8462a0a1d61b8c21b4bed1e7cc655bb4ac91246894abd8a4a25f279d1cfd94c0ef0d03cda034f76cea14adef01af5dba6d
+  data.tar.gz: 7310005faf480be6392f5c7838d2ea4e0ad9391a6cedd77a1f65709c6c93963b11131ccc5b2c9ceafa5a5dc3efde90b30fe0b06b61bbe183b8911ede2019f3bf

data/.github/workflows/ci.yml

@@ -0,0 +1,23 @@
+name: CI
+
+on: [push, pull_request]
+
+jobs:
+  test:
+
+    runs-on: ubuntu-latest
+
+    strategy:
+      fail-fast: false
+      matrix:
+        ruby: ["2.5", "2.6", "2.7", "3.0", "3.1", ruby-head, jruby-9.2, jruby-9.3, jruby-head]
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: Set up Ruby
+      uses: ruby/setup-ruby@v1
+      with:
+        bundler-cache: true # 'bundle install' and cache gems
+        ruby-version: ${{ matrix.ruby }}
+    - name: Run tests
+      run: bundle exec rspec

data/.travis.yml

@@ -1,16 +1,19 @@
+dist: focal
+os: linux
 language: ruby
-before_install:
-  - gem install bundler
+before_install: gem install bundler
 cache: bundler
 
 rvm:
-  # - jruby
-  # - truffleruby
-  # - rbx-3
-  - "2.3.8"
-  - "2.4.5"
-  - "2.5.3"
-  - "2.6.1"
+  - "2.5.8"
+  - "2.6.6"
+  - "2.7.2"
+  - "3.0.0"
+  - ruby-head
+
+jobs:
+  allow_failures:
+    - rvm: ruby-head
 
 script: 'bundle exec rspec'
 

data/CHANGELOG.rdoc

@@ -1,3 +1,12 @@
+= 0.5.0 - 2024-12-02
+* Reduce allocations through some internal parsing changes
+* Changed parse method arg handling to simple using keyword args
+
+= 0.4.5 - 2023-01-19
+* Support case insensitive months
+* Migrated to Github Actions (@petergoldstein)
+* Various doc, spec, and gemspec fixes and updates (@tagliala)
+
 = 0.4.4 - 2019-08-06
 * Raise compilation error if token with capturing arg is used more than once in a format
 * Some small internal refactorings in format compilation
@@ -10,7 +19,7 @@
 = 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).
-* Add `Timeliness.ambiguous_date_format` config setting (:us or :euro) to control global default for date format sets. 
+* Add `Timeliness.ambiguous_date_format` config setting (:us or :euro) to control global default for date format sets.
 
 = 0.4.1 - 2019-06-11
 * Add format for ISO 8601 with usec and 'Z' UTC zone offset (jartek)
@@ -19,7 +28,7 @@
 
 = 0.4.0 - 2019-02-09
 * Add threadsafety for use_euro_formats & use_us_formats to allow runtime
-  switching (andruby, timdiggins) 
+  switching (andruby, timdiggins)
 
 = 0.3.10 - 2019-02-06
 * Fixed file permissions in gem build

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2010 Adam Meehan
+Copyright (c) 2010-2021 Adam Meehan
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.rdoc

@@ -1,7 +1,7 @@
 = Timeliness {<img src="https://travis-ci.org/adzap/timeliness.svg?branch=master" alt="Build Status" />}[https://travis-ci.org/adzap/timeliness]
 
-* Source:  http://github.com/adzap/timeliness
-* Bugs:    http://github.com/adzap/timeliness/issues
+* Source:  https://github.com/adzap/timeliness
+* Bugs:    https://github.com/adzap/timeliness/issues
 
 == Description
 
@@ -16,7 +16,7 @@ Date/time parser for Ruby with the following features:
 * Has no dependencies.
 * Works with Ruby MRI >= 2.2
 
-Extracted from the {validates_timeliness gem}[http://github.com/adzap/validates_timeliness], it has been rewritten cleaner and much faster. It's most suitable for when
+Extracted from the {validates_timeliness gem}[https://github.com/adzap/validates_timeliness], it has been rewritten cleaner and much faster. It's most suitable for when
 you need to control the parsing behaviour. It's faster than the Time/Date class parse methods, so it
 has general appeal.
 
@@ -51,14 +51,14 @@ ignored.
 
 === Specify the Current Date
 
-Notice a time only string will return with a date value. The date value can be configured globally 
+Notice a time only string will return with a date value. The date value can be configured globally
 with this setting:
 
   Timeliness.date_for_time_type = [2010, 1, 1]
 
 or using a lambda thats evaluated when parsed
 
-  Timeliness.date_for_time_type = lambda { Time.now } 
+  Timeliness.date_for_time_type = lambda { Time.now }
 
 It can also be specified with :now option:
 
@@ -143,7 +143,7 @@ You just need to add this line to an initializer or other application file:
 
 == Formats
 
-The gem has default formats included which can be easily added to using the format syntax. Also 
+The gem has default formats included which can be easily added to using the format syntax. Also
 formats can be easily removed so that they are no longer considered valid.
 
 Below are the default formats. If you think they are easy to read then you will be happy to know
@@ -228,7 +228,7 @@ Here is what each format token means:
 All other characters are considered literal. For the technically minded, these formats are compiled
 into a single regular expression
 
-To see all defined formats look at the {source code}[http://github.com/adzap/timeliness/tree/master/lib/timeliness/formats.rb].
+To see all defined formats look at the {source code}[https://github.com/adzap/timeliness/tree/master/lib/timeliness/formats.rb].
 
 
 == Settings
@@ -252,7 +252,7 @@ You can switch back to US formats with
 
 ==== Thread Safety
 
-The switching of formats is threadsafe (since v0.4.0), however for each new thread the format default will be 
+The switching of formats is threadsafe (since v0.4.0), however for each new thread the format default will be
 the gem default, being the US format. To control default for your app and each new thread, use the config
 
   Timeliness.ambiguous_date_format = :euro
@@ -301,7 +301,7 @@ Now you get:
 
 == Credits
 
-* Adam Meehan (adam.meehan@gmail.com, http://github.com/adzap)
+* Adam Meehan (adam.meehan@gmail.com, https://github.com/adzap)
 
 
 == License

data/Rakefile

@@ -15,10 +15,11 @@ end
 
 desc 'Generate documentation for plugin.'
 Rake::RDocTask.new(:rdoc) do |rdoc|
+  rdoc.main = 'README.rdoc'
   rdoc.rdoc_dir = 'rdoc'
   rdoc.title    = 'Timeliness'
-  rdoc.options << '--line-numbers' << '--inline-source'
-  rdoc.rdoc_files.include('README')
+  rdoc.options << '--line-numbers'
+  rdoc.rdoc_files.include('README.rdoc')
   rdoc.rdoc_files.include('lib/**/*.rb')
 end
 

data/lib/timeliness/definitions.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Timeliness
   module Definitions
 
@@ -80,7 +82,7 @@ module Timeliness
       'yyyy-mm-ddThh:nn:sszt', # ISO 8601 with 'Zulu time' (i.e. Z) UTC zone designator
       'yyyy-mm-ddThh:nn:ss.u', # ISO 8601 with usec
       'yyyy-mm-ddThh:nn:ss.uzo', # ISO 8601 with usec and offset
-      'yyyy-mm-ddThh:nn:ss.uzt', # ISO 8601 with usec and 'Zulu time' (i.e. Z) UTC zone designator 
+      'yyyy-mm-ddThh:nn:ss.uzt', # ISO 8601 with usec and 'Zulu time' (i.e. Z) UTC zone designator
       'yyyy-mm-dd hh:nn:ss zo', # Ruby time string in later versions
       'yyyy-mm-dd hh:nn:ss tz', # Ruby time string for UTC in later versions
     ]

data/lib/timeliness/format.rb

@@ -46,7 +46,7 @@ module Timeliness
 
       define_process_method(token_order.compact)
       @regexp_string = format
-      @regexp = Regexp.new("^(#{format})$")
+      @regexp = Regexp.new("^(?>#{format})$")
       self
     rescue => ex
       raise CompilationFailed, "The format '#{format_string}' failed to compile using regexp string #{format}. Error message: #{ex.inspect}"
@@ -63,7 +63,8 @@ module Timeliness
         position, code = Definitions.format_components[component]
         values[position] = code || "#{component}.to_i" if position
       end
-      instance_eval <<~DEF
+      components << '*_' # absorb any excess arguments not used by format
+      instance_eval <<-DEF
       def process(#{components.join(',')})
         [#{values.map { |i| i || 'nil' }.join(',')}]
       end

data/lib/timeliness/format_set.rb

@@ -20,8 +20,8 @@ module Timeliness
         format = Format.new(format_string).compile!
         @formats_hash[format_string] = format
         @match_indexes[index] = format
-        regexp_string = "#{regexp_string}(#{format.regexp_string})|"
-        index + format.token_count + 1 # add one for wrapper capture
+        regexp_string.concat("(?>#{format.regexp_string})|")
+        index + format.token_count
       }
       @regexp = %r[\A(?:#{regexp_string.chop})\z]
       self
@@ -31,17 +31,17 @@ module Timeliness
       format = single_format(format_string) if format_string
       match_regexp = format && format.regexp || @regexp
 
-      if match_data = match_regexp.match(string)
-        index    = match_data.captures.index(string)
-        start    = index + 1
-        values   = match_data.captures[start..(start+7)].compact
+      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))
         format ||= @match_indexes[index]
         format.process(*values)
       end
     end
 
     def single_format(format_string)
-       @formats_hash.fetch(format_string) { Format.new(format_string).compile! }
+      @formats_hash.fetch(format_string) { Format.new(format_string).compile! }
     end
   end
 end

data/lib/timeliness/helpers.rb

@@ -23,7 +23,7 @@ module Timeliness
     
     def month_index(month)
       return month.to_i if month.to_i > 0 || /0+/ =~ month
-      month.length > 3 ? month_names.index(month.capitalize) : abbr_month_names.index(month.capitalize)
+      (month.length > 3 ? month_names : abbr_month_names).index { |str| month.casecmp?(str) }
     end
 
     def month_names

data/lib/timeliness/parser.rb

@@ -4,11 +4,14 @@ module Timeliness
 
     class << self
 
-      def parse(value, *args)
+      def parse(value, type=nil, **options)
         return value if acts_like_temporal?(value)
         return nil unless parseable?(value)
 
-        type, options = type_and_options_from_args(args)
+        if type && !type.is_a?(Symbol)
+          options[:now] = type if type
+          type = nil
+        end
 
         time_array = _parse(value, type, options)
         return nil if time_array.nil?
@@ -40,7 +43,7 @@ module Timeliness
           Definitions.send("#{type}_format_set").match(string, options[:format])
         else
           values = nil
-          Definitions.format_sets(type, string).find {|set| values = set.match(string, options[:format]) }
+          Definitions.format_sets(type, string).any? { |set| values = set.match(string, options[:format]) }
           values
         end
       rescue
@@ -95,8 +98,10 @@ module Timeliness
 
       def current_time_in_zone(zone)
         case zone
-        when :utc, :local
-          Time.now.send("get#{zone}")
+        when :utc
+          Time.now.getutc
+        when :local
+          Time.now.getlocal
         when :current
           Time.current
         else
@@ -107,8 +112,10 @@ module Timeliness
       def shift_time_to_zone(time, zone=nil)
         zone ||= Timeliness.configuration.default_timezone
         case zone
-        when :utc, :local
-          time.send("get#{zone}")
+        when :utc
+          time.getutc
+        when  :local
+          time.getlocal
         when :current
           time.in_time_zone
         else

data/lib/timeliness/version.rb

@@ -1,3 +1,3 @@
 module Timeliness
-  VERSION = '0.4.4'
+  VERSION = '0.5.0'.freeze
 end

data/spec/timeliness/format_spec.rb

@@ -91,6 +91,26 @@ describe Timeliness::Format do
           expect(format.process('2', 'Enero', '2000')).to eq [2000,1,2,nil,nil,nil,nil,nil]
         end
 
+        context "with upper case month abbreviations" do
+          before(:all) do
+            I18n.backend.store_translations :es, date: { abbr_month_names: %w{ ~ ENE FEB MAR } }
+          end
+
+          it 'should parse abbreviated month for current locale case insensitively' do
+            expect(format_for('d-mmm-yyyy').process('01', 'mar', '2023')).to eq [2023,3,1,nil,nil,nil,nil,nil]
+          end
+        end
+
+        context "with upper case month names" do
+          before(:all) do
+            I18n.backend.store_translations :es, date: { month_names: %w{ ~ ENERO FEBRERO MARZO } }
+          end
+
+          it 'should parse full month for current locale case insensitively' do
+            expect(format_for('d-mmm-yyyy').process('01', 'mArZo', '2023')).to eq [2023,3,1,nil,nil,nil,nil,nil]
+          end
+        end
+
         after(:all) do
           I18n.locale = :en
         end

data/spec/timeliness/parser_spec.rb

@@ -6,7 +6,7 @@ describe Timeliness::Parser do
     end
   end
 
-  around(:all) do |example|
+  around do |example|
     current_zone = Time.zone
     example.call
     Time.zone = current_zone
@@ -104,13 +104,13 @@ describe Timeliness::Parser do
         it 'should return value shifted by positive offset in default timezone' do
           value = parse("2000-06-01T12:00:00+02:00")
           expect(value).to eq Time.zone.local(2000,6,1,3,0,0)
-          expect(value.utc_offset).to eq -7.hours
+          expect(value.utc_offset).to eq(-7.hours)
         end
 
         it 'should return value shifted by negative offset in default timezone' do
           value = parse("2000-06-01T12:00:00-01:00")
           expect(value).to eq Time.zone.local(2000,6,1,6,0,0)
-          expect(value.utc_offset).to eq -7.hours
+          expect(value.utc_offset).to eq(-7.hours)
         end
       end
     end

data/spec/timeliness_helper.rb

@@ -12,20 +12,20 @@ module TimelinessHelpers
     Timeliness::Definitions
   end
 
-  def parse(*args)
-    Timeliness::Parser.parse(*args)
+  def parse(value, type=nil, **args)
+    Timeliness::Parser.parse(value, type, **args)
   end
 
   def current_date(options={})
     Timeliness::Parser.send(:current_date, options)
   end
 
-  def should_parse(*args)
-    expect(Timeliness::Parser.parse(*args)).not_to be_nil
+  def should_parse(value, type=nil, **args)
+    expect(Timeliness::Parser.parse(value, type, **args)).not_to be_nil
   end
 
-  def should_not_parse(*args)
-    expect(Timeliness::Parser.parse(*args)).to be_nil
+  def should_not_parse(value, type=nil, **args)
+    expect(Timeliness::Parser.parse(value, type, **args)).to be_nil
   end
 end
 
@@ -38,4 +38,4 @@ RSpec.configure do |c|
   c.after do
     Timeliness.configuration = Timeliness::Configuration.new
   end
-end
+end

data/timeliness.gemspec

@@ -13,8 +13,6 @@ Gem::Specification.new do |s|
   s.description = %q{Fast date/time parser with customisable formats, timezone and I18n support.}
   s.license     = "MIT"
 
-  s.rubyforge_project = %q{timeliness}
-
   s.add_development_dependency 'activesupport', '>= 3.2'
   s.add_development_dependency 'tzinfo', '>= 0.3.31'
   s.add_development_dependency 'rspec', '~> 3.4'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: timeliness
 version: !ruby/object:Gem::Version
-  version: 0.4.4
+  version: 0.5.0
 platform: ruby
 authors:
 - Adam Meehan
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-01-23 00:00:00.000000000 Z
+date: 2024-12-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -88,6 +88,7 @@ extra_rdoc_files:
 - README.rdoc
 - CHANGELOG.rdoc
 files:
+- ".github/workflows/ci.yml"
 - ".travis.yml"
 - CHANGELOG.rdoc
 - LICENSE
@@ -116,7 +117,7 @@ homepage: http://github.com/adzap/timeliness
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -131,9 +132,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: timeliness
-rubygems_version: 2.7.6.2
-signing_key: 
+rubygems_version: 3.3.27
+signing_key:
 specification_version: 4
 summary: Date/time parsing for the control freak.
 test_files: []