timing 0.2.7 → 0.2.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 666ee7049eb29d589431eec63fbf54a6e79a75f4ff418e5a3fa13c54cea11ae5
-  data.tar.gz: 6e32f64a0c6568637090b038f9d0f30ba936925ede0bb6b18c1168c429e38f14
+  metadata.gz: 7957fd2301422e73b76369d0c7f077a70b39fe3c6ef4a040a8defdbc09902d96
+  data.tar.gz: af73b67fe136ffc4e9af07025f12cb44276101ad72ff452ece46c1515acce8bd
 SHA512:
-  metadata.gz: 0cd864c3df88c5bf92863df0becba24a1dd144797f317d529b2f10cdc880ab4fda53a64f0f664a2c4caf5f62c24419128edefacb75f255c0b2664cbaae26c75a
-  data.tar.gz: 20fb404748aa83b1bdd47e0d6c8e5565336d7c0007acaf885095a898a24208e333f6de3b348a68f15fc812e1a8189f3ab68b5da81fe7feded8eafc3681bc1fac
+  metadata.gz: 8d4dff8a47e6a7c87e0c7dc73dc3822fa870c03f7d6ed0f03f7b1c7ee6c12cf02e3208d4987060848b985bb0df28cff4d939698910f48284a578aa2bfa540cf1
+  data.tar.gz: b32a451bf8881941c55199574e7ee8469f952ed935e5c8879a386e4d0d76b696d6379b532cda8c211fc75a3a21966b1e29990707bfd15a7ecd5c3251deb0f351

data/.github/workflows/ci.yml

@@ -0,0 +1,26 @@
+name: CI
+
+on:
+  push:
+    branches: [ '**' ]
+  pull_request:
+    branches: [ '**' ]
+
+jobs:
+  test:
+
+    name: Tests
+    runs-on: ubuntu-22.04
+    strategy:
+      matrix:
+        ruby-version: ['2.3', '2.4', '2.5', '2.6', '2.7', '3.0', 'jruby-9.2.9.0']
+
+    steps:
+    - uses: actions/checkout@v3
+    - name: Set up Ruby
+      uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: ${{ matrix.ruby-version }}
+        bundler-cache: true
+    - name: Run tests
+      run: bundle exec rake

data/README.md

@@ -1,7 +1,7 @@
 # Timing
 
 [![Gem Version](https://badge.fury.io/rb/timing.svg)](https://rubygems.org/gems/timing)
-[![Build Status](https://travis-ci.org/gabynaiman/timing.svg?branch=master)](https://travis-ci.org/gabynaiman/timing)
+[![CI](https://github.com/gabynaiman/timing/actions/workflows/ci.yml/badge.svg)](https://github.com/gabynaiman/timing/actions/workflows/ci.yml)
 [![Coverage Status](https://coveralls.io/repos/github/gabynaiman/timing/badge.svg?branch=master)](https://coveralls.io/github/gabynaiman/timing?branch=master)
 [![Code Climate](https://codeclimate.com/github/gabynaiman/timing.svg)](https://codeclimate.com/github/gabynaiman/timing)
 

data/lib/timing/natural_time_language.rb

@@ -812,6 +812,9 @@ module Timing
     module Timestamp0
     end
 
+    module Timestamp1
+    end
+
     def _nt_timestamp
       start_index = index
       if node_cache[:timestamp].has_key?(index)
@@ -1047,6 +1050,53 @@ module Timing
                                 r21 = instantiate_node(SyntaxNode,input, i21...index, s21)
                               end
                               s0 << r21
+                              if r21
+                                i24, s24 = index, []
+                                if has_terminal?('.', false, index)
+                                  r25 = instantiate_node(SyntaxNode,input, index...(index + 1))
+                                  @index += 1
+                                else
+                                  terminal_parse_failure('.')
+                                  r25 = nil
+                                end
+                                s24 << r25
+                                if r25
+                                  s26, i26 = [], index
+                                  loop do
+                                    if has_terminal?('\G[\\d]', true, index)
+                                      r27 = true
+                                      @index += 1
+                                    else
+                                      r27 = nil
+                                    end
+                                    if r27
+                                      s26 << r27
+                                    else
+                                      break
+                                    end
+                                  end
+                                  if s26.empty?
+                                    @index = i26
+                                    r26 = nil
+                                  else
+                                    r26 = instantiate_node(SyntaxNode,input, i26...index, s26)
+                                  end
+                                  s24 << r26
+                                end
+                                if s24.last
+                                  r24 = instantiate_node(SyntaxNode,input, i24...index, s24)
+                                  r24.extend(Timestamp0)
+                                else
+                                  @index = i24
+                                  r24 = nil
+                                end
+                                if r24
+                                  r23 = r24
+                                else
+                                  r23 = instantiate_node(SyntaxNode,input, index...index)
+                                end
+                                s0 << r23
+                              end
                             end
                           end
                         end
@@ -1061,7 +1111,7 @@ module Timing
       end
       if s0.last
         r0 = instantiate_node(Timestamp,input, i0...index, s0)
-        r0.extend(Timestamp0)
+        r0.extend(Timestamp1)
       else
         @index = i0
         r0 = nil
@@ -2563,12 +2613,30 @@ module Timing
         return cached
       end
 
+      i0 = index
       if has_terminal?('utc', false, index)
-        r0 = instantiate_node(ZoneName,input, index...(index + 3))
+        r1 = instantiate_node(ZoneName,input, index...(index + 3))
         @index += 3
       else
         terminal_parse_failure('utc')
-        r0 = nil
+        r1 = nil
+      end
+      if r1
+        r0 = r1
+      else
+        if has_terminal?('z', false, index)
+          r2 = instantiate_node(ZoneName,input, index...(index + 1))
+          @index += 1
+        else
+          terminal_parse_failure('z')
+          r2 = nil
+        end
+        if r2
+          r0 = r2
+        else
+          @index = i0
+          r0 = nil
+        end
       end
 
       node_cache[:zone_name][start_index] = r0

data/lib/timing/natural_time_language.treetop

@@ -19,9 +19,9 @@ module Timing
     end
 
     rule date_moment
-      named_moment / 
-      last_next_day_name / 
-      day_month_name_year / 
+      named_moment /
+      last_next_day_name /
+      day_month_name_year /
       year_month_day /
       beginning_end_interval
     end
@@ -59,7 +59,7 @@ module Timing
     end
 
     rule timestamp
-      [\d]4..4 '-' [\d]2..2 '-' [\d]2..2 space* 't'? space* [\d]2..2 ':' [\d]2..2 ':' [\d]2..2 <Timestamp>
+      [\d]4..4 '-' [\d]2..2 '-' [\d]2..2 space* 't'? space* [\d]2..2 ':' [\d]2..2 ':' [\d]2..2 ('.' [\d]+)? <Timestamp>
     end
 
     rule now
@@ -115,12 +115,12 @@ module Timing
     end
 
     rule interval
-      second_interval / 
-      minute_interval / 
-      hour_interval / 
-      day_interval / 
-      week_interval / 
-      month_interval / 
+      second_interval /
+      minute_interval /
+      hour_interval /
+      day_interval /
+      week_interval /
+      month_interval /
       year_interval
     end
 
@@ -215,7 +215,8 @@ module Timing
     end
 
     rule zone_name
-      'utc' <ZoneName>
+      'utc' <ZoneName> /
+      'z' <ZoneName>
     end
 
     rule hour_minute_second

data/lib/timing/natural_time_language_interpreters.rb

@@ -310,8 +310,9 @@ module Timing
     end
 
     class ZoneName < Treetop::Runtime::SyntaxNode
+      UTC_VALUES = ['utc', 'z']
       def value
-        if text_value.downcase == 'utc'
+        if UTC_VALUES.include? text_value.downcase
           '+0000'
         end
       end

data/lib/timing/time_in_zone.rb

@@ -9,7 +9,7 @@ module Timing
     def_delegators :time_with_offset, :year, :month, :day, :hour, :min, :sec, :wday, :yday, :sunday?, :monday?, :tuesday?, :wednesday?, :thursday?, :friday?, :saturday?
 
     attr_reader :zone_offset
-    
+
     def initialize(time, zone_offset=nil)
       @time = time
       @zone_offset = build_zone_offset(zone_offset || time.utc_offset)
@@ -69,8 +69,9 @@ module Timing
       time_with_offset.strftime sanitized_format
     end
 
-    def iso8601
-      strftime "%FT%T#{zone_offset.iso8601}"
+    def iso8601(fraction_digits=0)
+      decimals = fraction_digits > 0 ? ".%#{fraction_digits}N" : ''
+      strftime "%FT%T#{decimals}#{zone_offset.iso8601}"
     end
 
     def as_json(*args)

data/lib/timing/version.rb

@@ -1,3 +1,3 @@
 module Timing
-  VERSION = '0.2.7'
+  VERSION = '0.2.9'
 end

data/timing.gemspec

@@ -22,7 +22,6 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'treetop', '~> 1.4.0'
   spec.add_dependency 'transparent_proxy', '~> 0.0', '>= 0.0.5'
 
-  spec.add_development_dependency 'bundler', '~> 1.12'
   spec.add_development_dependency 'rake', '~> 11.0'
   spec.add_development_dependency 'minitest', '~> 5.0', '< 5.11'
   spec.add_development_dependency 'minitest-colorin', '~> 0.1'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: timing
 version: !ruby/object:Gem::Version
-  version: 0.2.7
+  version: 0.2.9
 platform: ruby
 authors:
 - Gabriel Naiman
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-10-18 00:00:00.000000000 Z
+date: 2025-04-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: treetop
@@ -44,20 +44,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.0.5
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.12'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.12'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -170,10 +156,10 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".coveralls.yml"
+- ".github/workflows/ci.yml"
 - ".gitignore"
 - ".ruby-gemset"
 - ".ruby-version"
-- ".travis.yml"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -208,7 +194,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
+rubygems_version: 3.0.8
 signing_key: 
 specification_version: 4
 summary: Time utils

data/.travis.yml

@@ -1,25 +0,0 @@
-language: ruby
-
-rvm:
-  - 1.9.3
-  - 2.0
-  - 2.1
-  - 2.2
-  - 2.3.0
-  - 2.4.0
-  - 2.5.0
-  - 2.6.0
-  - jruby-1.7.25
-  - jruby-9.1.7.0
-  - ruby-head
-  - jruby-head
-
-matrix:
-  fast_finish: true
-  allow_failures:
-    - rvm: ruby-head
-    - rvm: jruby-head
-
-before_install:
-  - rvm all-gemsets do gem uninstall bundler -ax || true
-  - gem install bundler -v "< 2"