chronic 0.9.1 → 0.10.0

data/lib/chronic/sign.rb

@@ -0,0 +1,49 @@
+module Chronic
+  class Sign < Tag
+
+    # Scan an Array of Token objects and apply any necessary Sign
+    # tags to each token.
+    #
+    # tokens - An Array of tokens to scan.
+    # options - The Hash of options specified in Chronic::parse.
+    #
+    # Returns an Array of tokens.
+    def self.scan(tokens, options)
+      tokens.each do |token|
+        if t = scan_for_plus(token) then token.tag(t); next end
+        if t = scan_for_minus(token) then token.tag(t); next end
+      end
+    end
+
+    # token - The Token object we want to scan.
+    #
+    # Returns a new SignPlus object.
+    def self.scan_for_plus(token)
+      scan_for token, SignPlus, { /^\+$/ => :plus }
+    end
+
+    # token - The Token object we want to scan.
+    #
+    # Returns a new SignMinus object.
+    def self.scan_for_minus(token)
+      scan_for token, SignMinus, { /^-$/ => :minus }
+    end
+
+    def to_s
+      'sign'
+    end
+  end
+
+  class SignPlus < Sign #:nodoc:
+    def to_s
+      super << '-plus'
+    end
+  end
+
+  class SignMinus < Sign #:nodoc:
+    def to_s
+      super << '-minus'
+    end
+  end
+
+end

data/lib/chronic/tag.rb

@@ -6,8 +6,9 @@ module Chronic
     attr_accessor :type
 
     # type - The Symbol type of this tag.
-    def initialize(type)
+    def initialize(type, options = {})
       @type = type
+      @options = options
     end
 
     # time - Set the start Time for this Tag.
@@ -18,13 +19,13 @@ module Chronic
     class << self
       private
 
-      def scan_for(token, klass, items={})
+      def scan_for(token, klass, items={}, options = {})
         case items
         when Regexp
-          return klass.new(token.word) if items =~ token.word
+          return klass.new(token.word, options) if items =~ token.word
         when Hash
           items.each do |item, symbol|
-            return klass.new(symbol) if item =~ token.word
+            return klass.new(symbol, options) if item =~ token.word
           end
         end
         nil

data/lib/chronic/time.rb

@@ -0,0 +1,40 @@
+module Chronic
+  class Time
+    HOUR_SECONDS = 3600 # 60 * 60
+    MINUTE_SECONDS = 60
+    SECOND_SECONDS = 1 # haha, awesome
+    SUBSECOND_SECONDS = 0.001
+
+    # Checks if given number could be hour
+    def self.could_be_hour?(hour)
+      hour >= 0 && hour <= 24
+    end
+
+    # Checks if given number could be minute
+    def self.could_be_minute?(minute)
+      minute >= 0 && minute <= 60
+    end
+
+    # Checks if given number could be second
+    def self.could_be_second?(second)
+      second >= 0 && second <= 60
+    end
+
+    # Checks if given number could be subsecond
+    def self.could_be_subsecond?(subsecond)
+      subsecond >= 0 && subsecond <= 999999
+    end
+
+    # normalize offset in seconds to offset as string +mm:ss or -mm:ss
+    def self.normalize_offset(offset)
+      return offset if offset.is_a?(String)
+      offset = Chronic.time_class.now.to_time.utc_offset unless offset # get current system's UTC offset if offset is nil
+      sign = '+'
+      sign = '-' if offset < 0
+      hours = (offset.abs / 3600).to_i.to_s.rjust(2,'0')
+      minutes = (offset.abs % 3600).to_s.rjust(2,'0')
+      sign + hours + minutes
+    end
+
+  end
+end

data/test/helper.rb

@@ -5,8 +5,8 @@ end
 
 require 'minitest/autorun'
 
-class TestCase < MiniTest::Unit::TestCase
+class TestCase < MiniTest::Test
   def self.test(name, &block)
     define_method("test_#{name.gsub(/\W/, '_')}", &block) if block
   end
-end
+end

data/test/test_chronic.rb

@@ -58,10 +58,10 @@ class TestChronic < TestCase
   def test_endian_definitions
     # middle, little
     endians = [
-      Chronic::Handler.new([:scalar_month, :separator_slash_or_dash, :scalar_day, :separator_slash_or_dash, :scalar_year, :separator_at?, 'time?'], :handle_sm_sd_sy),
-      Chronic::Handler.new([:scalar_month, :separator_slash_or_dash, :scalar_day, :separator_at?, 'time?'], :handle_sm_sd),
-      Chronic::Handler.new([:scalar_day, :separator_slash_or_dash, :scalar_month, :separator_at?, 'time?'], :handle_sd_sm),
-      Chronic::Handler.new([:scalar_day, :separator_slash_or_dash, :scalar_month, :separator_slash_or_dash, :scalar_year, :separator_at?, 'time?'], :handle_sd_sm_sy)
+      Chronic::Handler.new([:scalar_month, [:separator_slash, :separator_dash], :scalar_day, [:separator_slash, :separator_dash], :scalar_year, :separator_at?, 'time?'], :handle_sm_sd_sy),
+      Chronic::Handler.new([:scalar_month, [:separator_slash, :separator_dash], :scalar_day, :separator_at?, 'time?'], :handle_sm_sd),
+      Chronic::Handler.new([:scalar_day, [:separator_slash, :separator_dash], :scalar_month, :separator_at?, 'time?'], :handle_sd_sm),
+      Chronic::Handler.new([:scalar_day, [:separator_slash, :separator_dash], :scalar_month, [:separator_slash, :separator_dash], :scalar_year, :separator_at?, 'time?'], :handle_sd_sm_sy)
     ]
 
     assert_equal endians, Chronic::Parser.new.definitions[:endian]

data/test/test_handler.rb

@@ -105,4 +105,24 @@ class TestHandler < TestCase
     assert handler.match(tokens, definitions)
   end
 
+  def test_handler_class_7
+    handler = Chronic::Handler.new([[:separator_on, :separator_at], :scalar], :handler)
+
+    tokens = [Chronic::Token.new('at'),
+              Chronic::Token.new('14')]
+
+    tokens[0].tag(Chronic::SeparatorAt.new('at'))
+    tokens[1].tag(Chronic::Scalar.new(14))
+
+    assert handler.match(tokens, definitions)
+
+    tokens = [Chronic::Token.new('on'),
+              Chronic::Token.new('15')]
+
+    tokens[0].tag(Chronic::SeparatorOn.new('on'))
+    tokens[1].tag(Chronic::Scalar.new(15))
+
+    assert handler.match(tokens, definitions)
+  end
+
 end

data/test/test_parsing.rb

@@ -18,12 +18,25 @@ class TestParsing < TestCase
     time = Chronic.parse("2012-08-02T08:00:00-04:00")
     assert_equal Time.utc(2012, 8, 2, 12), time
 
+    time = Chronic.parse("2013-08-01T19:30:00.345-07:00")
+    time2 = Time.parse("2013-08-01 019:30:00.345-07:00")
+    assert_in_delta time, time2, 0.001
+
     time = Chronic.parse("2012-08-02T12:00:00Z")
     assert_equal Time.utc(2012, 8, 2, 12), time
 
     time = Chronic.parse("2012-01-03 01:00:00.100")
     time2 = Time.parse("2012-01-03 01:00:00.100")
-    assert_equal time, time2
+    assert_in_delta time, time2, 0.001
+
+    time = Chronic.parse("2012-01-03 01:00:00.234567")
+    time2 = Time.parse("2012-01-03 01:00:00.234567")
+    assert_in_delta time, time2, 0.000001
+
+    assert_nil Chronic.parse("1/1/32.1")
+
+    time = Chronic.parse("28th", {:guess => :begin})
+    assert_equal Time.new(Time.now.year, Time.now.month, 28), time
   end
 
   def test_handle_rmn_sd
@@ -59,6 +72,9 @@ class TestParsing < TestCase
 
     time = parse_now("may 28 at 5:32.19pm", :context => :past)
     assert_equal Time.local(2006, 5, 28, 17, 32, 19), time
+
+    time = parse_now("may 28 at 5:32:19.764")
+    assert_in_delta Time.local(2007, 5, 28, 17, 32, 19, 764000), time, 0.001
   end
 
   def test_handle_rmn_sd_on
@@ -166,6 +182,9 @@ class TestParsing < TestCase
 
     time = parse_now("2011-07-03 21:11:35 UTC")
     assert_equal 1309727495, time.to_i
+
+    time = parse_now("2011-07-03 21:11:35.362 UTC")
+    assert_in_delta 1309727495.362, time.to_f, 0.001
   end
 
   def test_handle_rmn_sd_sy
@@ -282,6 +301,9 @@ class TestParsing < TestCase
     # month day overflows
     time = parse_now("30/2/2000")
     assert_nil time
+
+    time = parse_now("2013-03-12 17:00", :context => :past)
+    assert_equal Time.local(2013, 3, 12, 17, 0, 0), time
   end
 
   def test_handle_sd_sm_sy
@@ -293,6 +315,15 @@ class TestParsing < TestCase
 
     time = parse_now("03/18/2012 09:26 pm")
     assert_equal Time.local(2012, 3, 18, 21, 26), time
+
+    time = parse_now("30.07.2013 16:34:22")
+    assert_equal Time.local(2013, 7, 30, 16, 34, 22), time
+
+    time = parse_now("09.08.2013")
+    assert_equal Time.local(2013, 8, 9, 12), time
+
+    time = parse_now("30-07-2013 21:53:49")
+    assert_equal Time.local(2013, 7, 30, 21, 53, 49), time
   end
 
   def test_handle_sy_sm_sd
@@ -317,9 +348,18 @@ class TestParsing < TestCase
     time = parse_now("2006-08-20 15:30.30")
     assert_equal Time.local(2006, 8, 20, 15, 30, 30), time
 
+    time = parse_now("2006-08-20 15:30:30:000536")
+    assert_in_delta Time.local(2006, 8, 20, 15, 30, 30, 536), time, 0.000001
+
     time = parse_now("1902-08-20")
     assert_equal Time.local(1902, 8, 20, 12, 0, 0), time
 
+    time = parse_now("2013.07.30 11:45:23")
+    assert_equal Time.local(2013, 7, 30, 11, 45, 23), time
+
+    time = parse_now("2013.08.09")
+    assert_equal Time.local(2013, 8, 9, 12, 0, 0), time
+
     # exif date time original
     time = parse_now("2012:05:25 22:06:50")
     assert_equal Time.local(2012, 5, 25, 22, 6, 50), time
@@ -367,8 +407,8 @@ class TestParsing < TestCase
     time = parse_now("2012-06")
     assert_equal Time.local(2012, 06, 16), time
 
-    time = parse_now("2013/11")
-    assert_equal Time.local(2013, 11, 16), time
+    time = parse_now("2013/12")
+    assert_equal Time.local(2013, 12, 16, 12, 0), time
   end
 
   def test_handle_r
@@ -383,6 +423,21 @@ class TestParsing < TestCase
 
     time = parse_now("01:00:00 PM")
     assert_equal Time.local(2006, 8, 16, 13), time
+
+    time = parse_now("today at 02:00:00", :hours24 => false)
+    assert_equal Time.local(2006, 8, 16, 14), time
+
+    time = parse_now("today at 02:00:00 AM", :hours24 => false)
+    assert_equal Time.local(2006, 8, 16, 2), time
+
+    time = parse_now("today at 3:00:00", :hours24 => true)
+    assert_equal Time.local(2006, 8, 16, 3), time
+
+    time = parse_now("today at 03:00:00", :hours24 => true)
+    assert_equal Time.local(2006, 8, 16, 3), time
+
+    time = parse_now("tomorrow at 4a.m.")
+    assert_equal Time.local(2006, 8, 17, 4), time
   end
 
   def test_handle_r_g_r
@@ -1149,6 +1204,20 @@ class TestParsing < TestCase
     assert_equal Time.local(2006, 12, 31, 12), time
   end
 
+  def test_handle_rdn_rmn_od_sy
+    time = parse_now("Thu Aug 10th 2005")
+    assert_equal Time.local(2005, 8, 10, 12), time
+
+    time = parse_now("Thursday July 31st 2005")
+    assert_equal Time.local(2005, 7, 31, 12), time
+
+    time = parse_now("Thursday December 31st 2005")
+    assert_equal Time.local(2005, 12, 31, 12), time
+
+    time = parse_now("Thursday December 30th 2005")
+    assert_equal Time.local(2005, 12, 30, 12), time
+  end
+
   def test_normalizing_day_portions
     assert_equal pre_normalize("8:00 pm February 11"), pre_normalize("8:00 p.m. February 11")
   end

data/test/test_repeater_time.rb

@@ -7,6 +7,12 @@ class TestRepeaterTime < TestCase
     @now = Time.local(2006, 8, 16, 14, 0, 0, 0)
   end
 
+  def test_generic
+    assert_raises(ArgumentError) do
+      Chronic::RepeaterTime.new('00:01:02:03:004')
+    end
+  end
+
   def test_next_future
     t = Chronic::RepeaterTime.new('4:00')
     t.start = @now
@@ -25,6 +31,12 @@ class TestRepeaterTime < TestCase
 
     assert_equal Time.local(2006, 8, 17, 4), t.next(:future).begin
     assert_equal Time.local(2006, 8, 18, 4), t.next(:future).begin
+
+    t = Chronic::RepeaterTime.new('0000')
+    t.start = @now
+
+    assert_equal Time.local(2006, 8, 17, 0), t.next(:future).begin
+    assert_equal Time.local(2006, 8, 18, 0), t.next(:future).begin
   end
 
   def test_next_past
@@ -39,6 +51,12 @@ class TestRepeaterTime < TestCase
 
     assert_equal Time.local(2006, 8, 16, 13), t.next(:past).begin
     assert_equal Time.local(2006, 8, 15, 13), t.next(:past).begin
+
+    t = Chronic::RepeaterTime.new('0:00.000')
+    t.start = @now
+
+    assert_equal Time.local(2006, 8, 16, 0), t.next(:past).begin
+    assert_equal Time.local(2006, 8, 15, 0), t.next(:past).begin
   end
 
   def test_type

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: chronic
 version: !ruby/object:Gem::Version
-  version: 0.9.1
+  version: 0.10.0
 platform: ruby
 authors:
 - Tom Preston-Werner
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-25 00:00:00.000000000 Z
+date: 2013-08-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -26,7 +26,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: minitest
+  name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
@@ -39,10 +39,24 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: minitest
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '5.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '5.0'
 description: Chronic is a natural language date/time parser written in pure Ruby.
 email:
 - tom@mojombo.com
-- lee@jarvis.co
+- ljjarvis@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files:
@@ -58,6 +72,7 @@ files:
 - Rakefile
 - chronic.gemspec
 - lib/chronic.rb
+- lib/chronic/date.rb
 - lib/chronic/grabber.rb
 - lib/chronic/handler.rb
 - lib/chronic/handlers.rb
@@ -86,8 +101,10 @@ files:
 - lib/chronic/scalar.rb
 - lib/chronic/season.rb
 - lib/chronic/separator.rb
+- lib/chronic/sign.rb
 - lib/chronic/span.rb
 - lib/chronic/tag.rb
+- lib/chronic/time.rb
 - lib/chronic/time_zone.rb
 - lib/chronic/token.rb
 - test/helper.rb
@@ -113,7 +130,8 @@ files:
 - test/test_span.rb
 - test/test_token.rb
 homepage: http://github.com/mojombo/chronic
-licenses: []
+licenses:
+- MIT
 metadata: {}
 post_install_message: 
 rdoc_options:
@@ -132,7 +150,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: chronic
-rubygems_version: 2.0.0
+rubygems_version: 2.0.2
 signing_key: 
 specification_version: 4
 summary: Natural language date/time parsing.