gitlab-chronic 0.10.4 → 0.10.5

data/test/test_repeater_week.rb

@@ -59,57 +59,4 @@ class TestRepeaterWeek < TestCase
     assert_equal Time.local(2006, 9, 6, 14, 0, 1), offset_span.end
   end
 
-  def test_next_future_starting_on_monday
-    weeks = Chronic::RepeaterWeek.new(:week, nil, :week_start => :monday)
-    weeks.start = @now
-
-    next_week = weeks.next(:future)
-    assert_equal Time.local(2006, 8, 21), next_week.begin
-    assert_equal Time.local(2006, 8, 28), next_week.end
-
-    next_next_week = weeks.next(:future)
-    assert_equal Time.local(2006, 8, 28), next_next_week.begin
-    assert_equal Time.local(2006, 9, 4), next_next_week.end
-  end
-
-  def test_next_past_starting_on_monday
-    weeks = Chronic::RepeaterWeek.new(:week, nil, :week_start => :monday)
-    weeks.start = @now
-
-    last_week = weeks.next(:past)
-    assert_equal Time.local(2006, 8, 7), last_week.begin
-    assert_equal Time.local(2006, 8, 14), last_week.end
-
-    last_last_week = weeks.next(:past)
-    assert_equal Time.local(2006, 7, 31), last_last_week.begin
-    assert_equal Time.local(2006, 8, 7), last_last_week.end
-  end
-
-  def test_this_future_starting_on_monday
-    weeks = Chronic::RepeaterWeek.new(:week, nil, :week_start => :monday)
-    weeks.start = @now
-
-    this_week = weeks.this(:future)
-    assert_equal Time.local(2006, 8, 16, 15), this_week.begin
-    assert_equal Time.local(2006, 8, 21), this_week.end
-  end
-
-  def test_this_past_starting_on_monday
-    weeks = Chronic::RepeaterWeek.new(:week, nil, :week_start => :monday)
-    weeks.start = @now
-
-    this_week = weeks.this(:past)
-    assert_equal Time.local(2006, 8, 14, 0), this_week.begin
-    assert_equal Time.local(2006, 8, 16, 14), this_week.end
-  end
-
-  def test_offset_starting_on_monday
-    weeks = Chronic::RepeaterWeek.new(:week, nil, :week_start => :monday)
-
-    span = Chronic::Span.new(@now, @now + 1)
-    offset_span = weeks.offset(span, 3, :future)
-
-    assert_equal Time.local(2006, 9, 6, 14), offset_span.begin
-    assert_equal Time.local(2006, 9, 6, 14, 0, 1), offset_span.end
-  end
 end

data/test/test_token.rb

@@ -22,10 +22,4 @@ class TestToken < TestCase
     assert_equal 'foo', token.word
   end
 
-  def test_token_inspect_doesnt_mutate_the_word
-    token = Chronic::Token.new('foo')
-    token.inspect
-    assert_equal 'foo', token.word
-  end
-
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gitlab-chronic
 version: !ruby/object:Gem::Version
-  version: 0.10.4
+  version: 0.10.5
 platform: ruby
 authors:
 - Tom Preston-Werner
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-11-24 00:00:00.000000000 Z
+date: 2019-11-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: numerizer
@@ -102,12 +102,15 @@ files:
 - Rakefile
 - chronic.gemspec
 - lib/chronic/date.rb
-- lib/chronic/definition.rb
-- lib/chronic/dictionary.rb
+- lib/chronic/grabber.rb
 - lib/chronic/handler.rb
 - lib/chronic/handlers.rb
 - lib/chronic/mini_date.rb
+- lib/chronic/numerizer.rb
+- lib/chronic/ordinal.rb
 - lib/chronic/parser.rb
+- lib/chronic/pointer.rb
+- lib/chronic/repeater.rb
 - lib/chronic/repeaters/repeater_day.rb
 - lib/chronic/repeaters/repeater_day_name.rb
 - lib/chronic/repeaters/repeater_day_portion.rb
@@ -116,8 +119,6 @@ files:
 - lib/chronic/repeaters/repeater_minute.rb
 - lib/chronic/repeaters/repeater_month.rb
 - lib/chronic/repeaters/repeater_month_name.rb
-- lib/chronic/repeaters/repeater_quarter.rb
-- lib/chronic/repeaters/repeater_quarter_name.rb
 - lib/chronic/repeaters/repeater_season.rb
 - lib/chronic/repeaters/repeater_season_name.rb
 - lib/chronic/repeaters/repeater_second.rb
@@ -126,20 +127,15 @@ files:
 - lib/chronic/repeaters/repeater_weekday.rb
 - lib/chronic/repeaters/repeater_weekend.rb
 - lib/chronic/repeaters/repeater_year.rb
+- 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/tags/grabber.rb
-- lib/chronic/tags/ordinal.rb
-- lib/chronic/tags/pointer.rb
-- lib/chronic/tags/repeater.rb
-- lib/chronic/tags/scalar.rb
-- lib/chronic/tags/separator.rb
-- lib/chronic/tags/sign.rb
-- lib/chronic/tags/time_zone.rb
 - lib/chronic/time.rb
+- lib/chronic/time_zone.rb
 - lib/chronic/token.rb
-- lib/chronic/tokenizer.rb
 - lib/chronic/version.rb
 - lib/gitlab-chronic.rb
 - test/helper.rb
@@ -147,6 +143,7 @@ files:
 - test/test_daylight_savings.rb
 - test/test_handler.rb
 - test/test_mini_date.rb
+- test/test_numerizer.rb
 - test/test_parsing.rb
 - test/test_repeater_day_name.rb
 - test/test_repeater_day_portion.rb
@@ -155,8 +152,6 @@ files:
 - test/test_repeater_minute.rb
 - test/test_repeater_month.rb
 - test/test_repeater_month_name.rb
-- test/test_repeater_quarter.rb
-- test/test_repeater_quarter_name.rb
 - test/test_repeater_season.rb
 - test/test_repeater_time.rb
 - test/test_repeater_week.rb
@@ -195,6 +190,7 @@ test_files:
 - test/test_daylight_savings.rb
 - test/test_handler.rb
 - test/test_mini_date.rb
+- test/test_numerizer.rb
 - test/test_parsing.rb
 - test/test_repeater_day_name.rb
 - test/test_repeater_day_portion.rb
@@ -203,8 +199,6 @@ test_files:
 - test/test_repeater_minute.rb
 - test/test_repeater_month.rb
 - test/test_repeater_month_name.rb
-- test/test_repeater_quarter.rb
-- test/test_repeater_quarter_name.rb
 - test/test_repeater_season.rb
 - test/test_repeater_time.rb
 - test/test_repeater_week.rb

data/lib/chronic/definition.rb

@@ -1,128 +0,0 @@
-require 'chronic/handlers'
-
-module Chronic
-  # SpanDefinitions subclasses return definitions constructed by Handler instances (see handler.rb)
-  # SpanDefinitions subclasses follow a <Type> + Definitions naming pattern
-  # Types of Definitions are collected in Dictionaries (see dictionary.rb)
-  class Definitions
-    attr_reader :options
-
-    def initialize(options = {})
-      @options = options
-    end
-
-    def definitions
-      raise "definitions are set in subclasses of #{self.class}"
-    end
-  end
-
-  class SpanDefinitions < Definitions
-    include Handlers
-  end
-
-  class TimeDefinitions < SpanDefinitions
-    def definitions
-      [
-        Handler.new([:repeater_time, :repeater_day_portion?], nil)
-      ]
-    end
-  end
-
-  class DateDefinitions < SpanDefinitions
-    def definitions
-      [
-        Handler.new([:repeater_day_name, :repeater_month_name, :scalar_day, :repeater_time, [:separator_slash?, :separator_dash?], :time_zone, :scalar_year], :handle_generic),
-        Handler.new([:repeater_day_name, :repeater_month_name, :scalar_day], :handle_rdn_rmn_sd),
-        Handler.new([:repeater_day_name, :repeater_month_name, :scalar_day, :scalar_year], :handle_rdn_rmn_sd_sy),
-        Handler.new([:repeater_day_name, :repeater_month_name, :ordinal_day], :handle_rdn_rmn_od),
-        Handler.new([:repeater_day_name, :repeater_month_name, :ordinal_day, :scalar_year], :handle_rdn_rmn_od_sy),
-        Handler.new([:repeater_day_name, :repeater_month_name, :scalar_day, :separator_at?, 'time?'], :handle_rdn_rmn_sd),
-        Handler.new([:repeater_day_name, :repeater_month_name, :ordinal_day, :separator_at?, 'time?'], :handle_rdn_rmn_od),
-        Handler.new([:repeater_day_name, :ordinal_day, :separator_at?, 'time?'], :handle_rdn_od),
-        Handler.new([:scalar_year, [:separator_slash, :separator_dash], :scalar_month, [:separator_slash, :separator_dash], :scalar_day, :repeater_time, :time_zone], :handle_generic),
-        Handler.new([:ordinal_day], :handle_generic),
-        Handler.new([:repeater_month_name, :scalar_day, :scalar_year], :handle_rmn_sd_sy),
-        Handler.new([:repeater_month_name, :ordinal_day, :scalar_year], :handle_rmn_od_sy),
-        Handler.new([:repeater_month_name, :scalar_day, :scalar_year, :separator_at?, 'time?'], :handle_rmn_sd_sy),
-        Handler.new([:repeater_month_name, :ordinal_day, :scalar_year, :separator_at?, 'time?'], :handle_rmn_od_sy),
-        Handler.new([:repeater_month_name, [:separator_slash?, :separator_dash?], :scalar_day, :separator_at?, 'time?'], :handle_rmn_sd),
-        Handler.new([:repeater_time, :repeater_day_portion?, :separator_on?, :repeater_month_name, :scalar_day], :handle_rmn_sd_on),
-        Handler.new([:repeater_month_name, :ordinal_day, :separator_at?, 'time?'], :handle_rmn_od),
-        Handler.new([:ordinal_day, :repeater_month_name, :scalar_year, :separator_at?, 'time?'], :handle_od_rmn_sy),
-        Handler.new([:ordinal_day, :repeater_month_name, :separator_at?, 'time?'], :handle_od_rmn),
-        Handler.new([:ordinal_day, :grabber?, :repeater_month, :separator_at?, 'time?'], :handle_od_rm),
-        Handler.new([:scalar_year, :repeater_month_name, :ordinal_day], :handle_sy_rmn_od),
-        Handler.new([:repeater_time, :repeater_day_portion?, :separator_on?, :repeater_month_name, :ordinal_day], :handle_rmn_od_on),
-        Handler.new([:repeater_month_name, :scalar_year], :handle_rmn_sy),
-        Handler.new([:repeater_quarter_name, :scalar_year], :handle_rqn_sy),
-        Handler.new([:scalar_year, :repeater_quarter_name], :handle_sy_rqn),
-        Handler.new([:scalar_day, :repeater_month_name, :scalar_year, :separator_at?, 'time?'], :handle_sd_rmn_sy),
-        Handler.new([:scalar_day, [:separator_slash?, :separator_dash?], :repeater_month_name, :separator_at?, 'time?'], :handle_sd_rmn),
-        Handler.new([:scalar_year, [:separator_slash, :separator_dash], :scalar_month, [:separator_slash, :separator_dash], :scalar_day, :separator_at?, 'time?'], :handle_sy_sm_sd),
-        Handler.new([:scalar_year, [:separator_slash, :separator_dash], :scalar_month], :handle_sy_sm),
-        Handler.new([:scalar_month, [:separator_slash, :separator_dash], :scalar_year], :handle_sm_sy),
-        Handler.new([:scalar_day, [:separator_slash, :separator_dash], :repeater_month_name, [:separator_slash, :separator_dash], :scalar_year, :repeater_time?], :handle_sm_rmn_sy),
-        Handler.new([:scalar_year, [:separator_slash, :separator_dash], :scalar_month, [:separator_slash, :separator_dash], :scalar?, :time_zone], :handle_generic),
-      ]
-    end
-  end
-
-  class AnchorDefinitions < SpanDefinitions
-    def definitions
-      [
-        Handler.new([:separator_on?, :grabber?, :repeater, :separator_at?, :repeater?, :repeater?], :handle_r),
-        Handler.new([:grabber?, :repeater, :repeater, :separator?, :repeater?, :repeater?], :handle_r),
-        Handler.new([:repeater, :grabber, :repeater], :handle_r_g_r)
-      ]
-    end
-  end
-
-  class ArrowDefinitions < SpanDefinitions
-    def definitions
-      [
-        Handler.new([:repeater_month_name, :scalar, :repeater, :pointer], :handle_rmn_s_r_p),
-        Handler.new([:scalar, :repeater, :pointer], :handle_s_r_p),
-        Handler.new([:scalar, :repeater, :separator_and?, :scalar, :repeater, :pointer, :separator_at?, 'anchor'], :handle_s_r_a_s_r_p_a),
-        Handler.new([:pointer, :scalar, :repeater], :handle_p_s_r),
-        Handler.new([:scalar, :repeater, :pointer, :separator_at?, 'anchor'], :handle_s_r_p_a)
-      ]
-    end
-  end
-
-  class NarrowDefinitions < SpanDefinitions
-    def definitions
-      [
-        Handler.new([:ordinal, :repeater, :separator_in, :repeater], :handle_o_r_s_r),
-        Handler.new([:ordinal, :repeater, :grabber, :repeater], :handle_o_r_g_r)
-      ]
-    end
-  end
-
-  class EndianDefinitions < SpanDefinitions
-    def definitions
-      prefered_endian
-    end
-
-    def prefered_endian
-      options[:endian_precedence] ||= [:middle, :little]
-
-      definitions = [
-        Handler.new([:scalar_month, [:separator_slash, :separator_dash], :scalar_day, [:separator_slash, :separator_dash], :scalar_year, :separator_at?, 'time?'], :handle_sm_sd_sy),
-        Handler.new([:scalar_month, [:separator_slash, :separator_dash], :scalar_day, :separator_at?, 'time?'], :handle_sm_sd),
-        Handler.new([:scalar_day, [:separator_slash, :separator_dash], :scalar_month, :separator_at?, 'time?'], :handle_sd_sm),
-        Handler.new([:scalar_day, [:separator_slash, :separator_dash], :scalar_month, [:separator_slash, :separator_dash], :scalar_year, :separator_at?, 'time?'], :handle_sd_sm_sy),
-        Handler.new([:scalar_day, :repeater_month_name, :scalar_year, :separator_at?, 'time?'], :handle_sd_rmn_sy)
-      ]
-
-      case endian = Array(options[:endian_precedence]).first
-      when :little
-        definitions.reverse
-      when :middle
-        definitions
-      else
-        raise ArgumentError, "Unknown endian option '#{endian}'"
-      end
-    end
-  end
-
-end

data/lib/chronic/dictionary.rb

@@ -1,36 +0,0 @@
-require 'chronic/definition'
-
-module Chronic
-  # A collection of definitions
-  class Dictionary
-    attr_reader :defined_items, :options
-
-    def initialize(options = {})
-      @options = options
-      @defined_items = []
-    end
-
-    # returns a hash of each word's Definitions
-    def definitions
-      defined_items.each_with_object({}) do |word, defs|
-        word_type = "#{word.capitalize.to_s + 'Definitions'}"
-        defs[word] = Chronic.const_get(word_type).new(options).definitions
-      end
-    end
-  end
-
-  class SpanDictionary < Dictionary
-    # Collection of SpanDefinitions
-    def initialize(options = {})
-      super
-      @defined_items = [:time,:date,:anchor,:arrow,:narrow,:endian]
-    end
-
-    # returns the definitions of a specific subclass of SpanDefinitions
-    # SpanDefinition#definitions returns an Hash of Handler instances
-    # arguments should come in as symbols
-    def [](handler_type=:symbol)
-      definitions[handler_type]
-    end
-  end
-end

data/lib/chronic/repeaters/repeater_quarter.rb

@@ -1,59 +0,0 @@
-module Chronic
-  class RepeaterQuarter < Repeater #:nodoc:
-    MONTHS_PER_QUARTER = 3
-    QUARTER_SECONDS = 7_776_000 # 3 * 30 * 24 * 60 * 60
-
-    def next(pointer)
-      @current_span ||= quarter(@now)
-      offset_quarter_amount = pointer == :future ? 1 : -1
-      @current_span = offset_quarter(@current_span.begin, offset_quarter_amount)
-    end
-
-    def this(*)
-      @current_span = quarter(@now)
-    end
-
-    def offset(span, amount, pointer)
-      direction = pointer == :future ? 1 : -1
-      offset_quarter(span.begin, amount * direction)
-    end
-
-    def width
-      @current_span ? @current_span.width : QUARTER_SECONDS
-    end
-
-    def to_s
-      super << '-quarter'
-    end
-
-    protected
-
-    def quarter_index(month)
-      (month - 1) / MONTHS_PER_QUARTER
-    end
-
-    def quarter(time)
-      year, month = time.year, time.month
-
-      quarter_index = quarter_index(month)
-      quarter_month_start = (quarter_index * MONTHS_PER_QUARTER) + 1
-      quarter_month_end = quarter_month_start + MONTHS_PER_QUARTER
-
-      quarter_start = Chronic.construct(year, quarter_month_start)
-      quarter_end = Chronic.construct(year, quarter_month_end)
-
-      Span.new(quarter_start, quarter_end)
-    end
-
-    def offset_quarter(time, amount)
-      new_month = time.month - 1
-      new_month = new_month + MONTHS_PER_QUARTER * amount
-      new_year = time.year + new_month / 12
-      new_month = new_month % 12 + 1
-
-      offset_time_basis = Chronic.construct(new_year, new_month)
-
-      quarter(offset_time_basis)
-    end
-  end
-end

data/lib/chronic/repeaters/repeater_quarter_name.rb

@@ -1,40 +0,0 @@
-module Chronic
-  class RepeaterQuarterName < RepeaterQuarter #:nodoc:
-    QUARTERS = {
-      :q1 => 0,
-      :q2 => 1,
-      :q3 => 2,
-      :q4 => 3
-    }
-
-    def next(pointer)
-      unless @current_span
-        @current_span = this(pointer)
-      else
-        year_offset = pointer == :future ? 1 : -1
-        new_year = @current_span.begin.year + year_offset
-        time_basis = Chronic.construct(new_year, @current_span.begin.month)
-        @current_span = quarter(time_basis)
-      end
-
-      @current_span
-    end
-
-    def this(pointer = :future)
-      current_quarter_index = quarter_index(@now.month)
-      target_quarter_index = QUARTERS[type]
-
-      year_basis_offset = case pointer
-      when :past then current_quarter_index > target_quarter_index ? 0 : -1
-      when :future then current_quarter_index < target_quarter_index ? 0 : 1
-      else 0
-      end
-
-      year_basis = @now.year + year_basis_offset
-      month_basis = (MONTHS_PER_QUARTER * target_quarter_index) + 1
-      time_basis = Chronic.construct(year_basis, month_basis)
-
-      @current_span = quarter(time_basis)
-    end
-  end
-end

data/lib/chronic/tags/separator.rb

@@ -1,123 +0,0 @@
-module Chronic
-  class Separator < Tag
-
-    # Scan an Array of Token objects and apply any necessary Separator
-    # 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|
-        token.tag scan_for(token, SeparatorComma, { ','.to_sym => :comma })
-        token.tag scan_for(token, SeparatorDot, { '.'.to_sym => :dot })
-        token.tag scan_for(token, SeparatorColon, { ':'.to_sym => :colon })
-        token.tag scan_for(token, SeparatorSpace, { ' '.to_sym => :space })
-        token.tag scan_for(token, SeparatorSlash, { '/'.to_sym => :slash })
-        token.tag scan_for(token, SeparatorDash, { :- => :dash })
-        token.tag scan_for(token, SeparatorAt, { /^(at|@)$/i => :at })
-        token.tag scan_for(token, SeparatorIn, { 'in' => :in })
-        token.tag scan_for(token, SeparatorOn, { 'on' => :on })
-        token.tag scan_for(token, SeparatorAnd, { 'and' => :and })
-        token.tag scan_for(token, SeparatorT, { :T => :T })
-        token.tag scan_for(token, SeparatorW, { :W => :W })
-        token.tag scan_for_quote(token)
-      end
-    end
-
-    # token - The Token object we want to scan.
-    #
-    # Returns a new SeparatorQuote object.
-    def self.scan_for_quote(token)
-      scan_for token, SeparatorQuote,
-      {
-        "'".to_sym => :single_quote,
-        '"'.to_sym => :double_quote
-      }
-    end
-
-    def to_s
-      'separator'
-    end
-  end
-
-  class SeparatorComma < Separator #:nodoc:
-    def to_s
-      super << '-comma'
-    end
-  end
-
-  class SeparatorDot < Separator #:nodoc:
-    def to_s
-      super << '-dot'
-    end
-  end
-
-  class SeparatorColon < Separator #:nodoc:
-    def to_s
-      super << '-colon'
-    end
-  end
-
-  class SeparatorSpace < Separator #:nodoc:
-    def to_s
-      super << '-space'
-    end
-  end
-
-  class SeparatorSlash < Separator #:nodoc:
-    def to_s
-      super << '-slash'
-    end
-  end
-
-  class SeparatorDash < Separator #:nodoc:
-    def to_s
-      super << '-dash'
-    end
-  end
-
-  class SeparatorQuote < Separator #:nodoc:
-    def to_s
-      super << '-quote-' << @type.to_s
-    end
-  end
-
-  class SeparatorAt < Separator #:nodoc:
-    def to_s
-      super << '-at'
-    end
-  end
-
-  class SeparatorIn < Separator #:nodoc:
-    def to_s
-      super << '-in'
-    end
-  end
-
-  class SeparatorOn < Separator #:nodoc:
-    def to_s
-      super << '-on'
-    end
-  end
-
-  class SeparatorAnd < Separator #:nodoc:
-    def to_s
-      super << '-and'
-    end
-  end
-
-  class SeparatorT < Separator #:nodoc:
-    def to_s
-      super << '-T'
-    end
-  end
-
-  class SeparatorW < Separator #:nodoc:
-    def to_s
-      super << '-W'
-    end
-  end
-
-end