timing 0.1.1 → 0.1.2

data/lib/timing/natural_time_language.treetop

@@ -2,7 +2,12 @@ module Timing
   grammar NaturalTimeLanguage
 
     rule expression
-      space* moment:moment space* zone_offset:zone_offset? space* <Expression>
+      space* moment:moment space* zone_info:zone_info? space* <Expression>
+    end
+
+    rule zone_info
+      zone_offset /
+      zone_name
     end
 
     rule moment
@@ -209,6 +214,10 @@ module Timing
       [+-] [\d]2..2 ':'? [\d]2..2 <ZoneOffset>
     end
 
+    rule zone_name
+      'utc' <ZoneName>
+    end
+
     rule hour_minute_second
       [\d]2..2 ':' [\d]2..2 (':' [\d]2..2)? <HourMinuteSecond> /
       'beginning' <HourMinuteSecond> /

data/lib/timing/natural_time_language_interpreters.rb

@@ -25,7 +25,7 @@ module Timing
 
     class Expression < Treetop::Runtime::SyntaxNode
       def evaluate
-        moment.evaluate zone_offset.empty? ? nil : zone_offset.value
+        moment.evaluate zone_info.empty? ? nil : zone_info.value
       end
     end
 
@@ -105,17 +105,19 @@ module Timing
 
     class YearMonthDay < Treetop::Runtime::SyntaxNode
       def evaluate(zone_offset)
+        now = TimeInZone.now zone_offset
         yyyy = year.value
         mm = month.value.to_s.rjust(2, '0')
         dd = day.value.to_s.rjust(2, '0')
-        TimeInZone.parse "#{yyyy}-#{mm}-#{dd} 00:00:00 #{zone_offset}"
+        TimeInZone.parse "#{yyyy}-#{mm}-#{dd} 00:00:00 #{now.zone_offset}"
       end
     end
 
     class MomentAtTime < Treetop::Runtime::SyntaxNode
       def evaluate(zone_offset)
+        now = TimeInZone.now zone_offset
         date = moment.evaluate zone_offset
-        TimeInZone.parse "#{date.strftime('%F')} #{time.value} #{date.zone_offset}"
+        TimeInZone.parse "#{date.strftime('%F')} #{time.value} #{now.zone_offset}"
       end
     end
 
@@ -132,7 +134,8 @@ module Timing
     
     class Timestamp < Treetop::Runtime::SyntaxNode
       def evaluate(zone_offset)
-        TimeInZone.parse "#{text_value}#{zone_offset}"
+        now = TimeInZone.now zone_offset
+        TimeInZone.parse "#{text_value}#{now.zone_offset}"
       end
     end
 
@@ -306,6 +309,14 @@ module Timing
       end
     end
 
+    class ZoneName < Treetop::Runtime::SyntaxNode
+      def value
+        if text_value.downcase == 'utc'
+          '+0000'
+        end
+      end
+    end
+
     class HourMinuteSecond < Treetop::Runtime::SyntaxNode
       def value
         if text_value.downcase == 'beginning'

data/lib/timing/version.rb

@@ -1,3 +1,3 @@
 module Timing
-  VERSION = '0.1.1'
+  VERSION = '0.1.2'
 end

data/timing.gemspec

@@ -27,7 +27,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'minitest', '~> 5.0'
   spec.add_development_dependency 'minitest-colorin', '~> 0.1'
   spec.add_development_dependency 'minitest-line', '~> 0.6'
-  spec.add_development_dependency 'simplecov', '~> 0.12'
+  spec.add_development_dependency 'simplecov', '~> 0.16'
   spec.add_development_dependency 'coveralls', '~> 0.8'
   spec.add_development_dependency 'pry-nav', '~> 0.2'
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: timing
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Gabriel Naiman
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-23 00:00:00.000000000 Z
+date: 2018-12-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: treetop
@@ -114,14 +114,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.12'
+        version: '0.16'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.12'
+        version: '0.16'
 - !ruby/object:Gem::Dependency
   name: coveralls
   requirement: !ruby/object:Gem::Requirement