pangel-chronic 0.3.0.3 → 0.3.10

data/lib/chronic/repeaters/repeater_minute.rb

@@ -1,57 +1,57 @@
 class Chronic::RepeaterMinute < Chronic::Repeater #:nodoc:
-	MINUTE_SECONDS = 60
-
-	def initialize(type)
-		super
-		@current_minute_start = nil
-	end
-
-	def next(pointer = :future)
-		super
-
-		if !@current_minute_start
-			case pointer
-			when :future
-				@current_minute_start = Time.construct(@now.year, @now.month, @now.day, @now.hour, @now.min + 1)
-			when :past
-				@current_minute_start = Time.construct(@now.year, @now.month, @now.day, @now.hour, @now.min - 1)
-			end
-		else
-			direction = pointer == :future ? 1 : -1
-			@current_minute_start += direction * MINUTE_SECONDS
-		end
-
-		Chronic::Span.new(@current_minute_start, @current_minute_start + MINUTE_SECONDS)
-	end
-
-	def this(pointer = :future)
-		super
-
-		case pointer
-		when :future
-			minute_begin = @now
-			minute_end = Time.construct(@now.year, @now.month, @now.day, @now.hour, @now.min)
-		when :past
-			minute_begin = Time.construct(@now.year, @now.month, @now.day, @now.hour, @now.min)
-			minute_end = @now
-		when :none
-			minute_begin = Time.construct(@now.year, @now.month, @now.day, @now.hour, @now.min)
-			minute_end = Time.construct(@now.year, @now.month, @now.day, @now.hour, @now.min) + MINUTE_SECONDS
-		end
-
-		Chronic::Span.new(minute_begin, minute_end)
-	end
-
-	def offset(span, amount, pointer)
-		direction = pointer == :future ? 1 : -1
-		span + direction * amount * MINUTE_SECONDS
-	end
-
-	def width
-		MINUTE_SECONDS
-	end
-
-	def to_s
-		super << '-minute'
-	end
-end
+  MINUTE_SECONDS = 60
+
+  def initialize(type)
+    super
+    @current_minute_start = nil
+  end
+
+  def next(pointer = :future)
+    super
+    
+    if !@current_minute_start
+      case pointer
+      when :future
+        @current_minute_start = Time.construct(@now.year, @now.month, @now.day, @now.hour, @now.min + 1)
+      when :past
+        @current_minute_start = Time.construct(@now.year, @now.month, @now.day, @now.hour, @now.min - 1)
+      end
+    else
+      direction = pointer == :future ? 1 : -1
+      @current_minute_start += direction * MINUTE_SECONDS
+    end
+    
+    Chronic::Span.new(@current_minute_start, @current_minute_start + MINUTE_SECONDS)
+  end
+  
+  def this(pointer = :future)
+    super
+    
+    case pointer
+    when :future
+      minute_begin = @now
+      minute_end = Time.construct(@now.year, @now.month, @now.day, @now.hour, @now.min)
+    when :past
+      minute_begin = Time.construct(@now.year, @now.month, @now.day, @now.hour, @now.min)
+      minute_end = @now
+    when :none
+      minute_begin = Time.construct(@now.year, @now.month, @now.day, @now.hour, @now.min)
+      minute_end = Time.construct(@now.year, @now.month, @now.day, @now.hour, @now.min) + MINUTE_SECONDS
+    end
+    
+    Chronic::Span.new(minute_begin, minute_end)
+  end
+  
+  def offset(span, amount, pointer)
+    direction = pointer == :future ? 1 : -1
+    span + direction * amount * MINUTE_SECONDS
+  end
+  
+  def width
+    MINUTE_SECONDS
+  end
+  
+  def to_s
+    super << '-minute'
+  end
+end

data/lib/chronic/repeaters/repeater_month.rb

@@ -1,66 +1,75 @@
-class Chronic::RepeaterMonth < Chronic::Repeater #:nodoc:
-	MONTH_SECONDS = 2_592_000 # 30 * 24 * 60 * 60
-	YEAR_MONTHS = 12
-
-	def initialize(type)
-		super
-		@current_month_start = nil
-	end
-
-	def next(pointer)
-		super
-
-		if !@current_month_start
-			@current_month_start = offset_by(Time.construct(@now.year, @now.month), 1, pointer)
-		else
-			@current_month_start = offset_by(Time.construct(@current_month_start.year, @current_month_start.month), 1, pointer)
-		end
-
-		Chronic::Span.new(@current_month_start, Time.construct(@current_month_start.year, @current_month_start.month + 1))
-	end
-
-	def this(pointer = :future)
-		super
+require 'date'
 
-		case pointer
-		when :future
-			month_start = Time.construct(@now.year, @now.month, @now.day + 1)
-			month_end = self.offset_by(Time.construct(@now.year, @now.month), 1, :future)
-		when :past
-			month_start = Time.construct(@now.year, @now.month)
-			month_end = Time.construct(@now.year, @now.month, @now.day)
-		when :none
-			month_start = Time.construct(@now.year, @now.month)
-			month_end = self.offset_by(Time.construct(@now.year, @now.month), 1, :future)
-		end
-
-		Chronic::Span.new(month_start, month_end)
-	end
-
-	def offset(span, amount, pointer)
-		Chronic::Span.new(offset_by(span.begin, amount, pointer), offset_by(span.end, amount, pointer))
-	end
-
-	def offset_by(time, amount, pointer)
-		direction = pointer == :future ? 1 : -1
-
-		amount_years = direction * amount / YEAR_MONTHS
-		amount_months = direction * amount % YEAR_MONTHS
-
-		new_year = time.year + amount_years
-		new_month = time.month + amount_months
-		if new_month > YEAR_MONTHS
-			new_year += 1
-			new_month -= YEAR_MONTHS
-		end
-		Time.construct(new_year, new_month, time.day, time.hour, time.min, time.sec)
-	end
+class Chronic::RepeaterMonth < Chronic::Repeater #:nodoc:
+  MONTH_SECONDS = 2_592_000 # 30 * 24 * 60 * 60
+  YEAR_MONTHS = 12
 
-	def width
-		MONTH_SECONDS
-	end
+  def initialize(type)
+    super
+    @current_month_start = nil
+  end
 
-	def to_s
-		super << '-month'
-	end
+  def next(pointer)
+    super
+    
+    if !@current_month_start
+      @current_month_start = offset_by(Time.construct(@now.year, @now.month), 1, pointer)
+    else
+      @current_month_start = offset_by(Time.construct(@current_month_start.year, @current_month_start.month), 1, pointer)
+    end
+    
+    Chronic::Span.new(@current_month_start, Time.construct(@current_month_start.year, @current_month_start.month + 1))
+  end
+  
+  def this(pointer = :future)
+    super
+    
+    case pointer
+    when :future
+      month_start = Time.construct(@now.year, @now.month, @now.day + 1)
+      month_end = self.offset_by(Time.construct(@now.year, @now.month), 1, :future)
+    when :past
+      month_start = Time.construct(@now.year, @now.month)
+      month_end = Time.construct(@now.year, @now.month, @now.day)
+    when :none
+      month_start = Time.construct(@now.year, @now.month)
+      month_end = self.offset_by(Time.construct(@now.year, @now.month), 1, :future)
+    end
+    
+    Chronic::Span.new(month_start, month_end)
+  end
+  
+  def offset(span, amount, pointer)      
+    Chronic::Span.new(offset_by(span.begin, amount, pointer), offset_by(span.end, amount, pointer))
+  end
+  
+  def offset_by(time, amount, pointer) 
+    direction = pointer == :future ? 1 : -1
+    
+    amount_years = direction * amount / YEAR_MONTHS
+    amount_months = direction * amount % YEAR_MONTHS
+    
+    new_year = time.year + amount_years
+    new_month = time.month + amount_months
+    if new_month > YEAR_MONTHS
+      new_year += 1
+      new_month -= YEAR_MONTHS
+    end
+    
+    new_time = Time.construct(new_year, new_month, time.day, time.hour, time.min, time.sec)
+    if new_time.month > new_month
+      d = Date.new(new_year, new_month, -1)
+      Time.construct(new_year, d.month, d.day, time.hour, time.min, time.sec)
+    else
+      new_time
+    end
+  end
+  
+  def width
+    MONTH_SECONDS
+  end
+  
+  def to_s
+    super << '-month'
+  end
 end

data/lib/chronic/repeaters/repeater_month_name.rb

@@ -1,98 +1,98 @@
 class Chronic::RepeaterMonthName < Chronic::Repeater #:nodoc:
-	MONTH_SECONDS = 2_592_000 # 30 * 24 * 60 * 60
+  MONTH_SECONDS = 2_592_000 # 30 * 24 * 60 * 60
 
-	def initialize(type)
-		super
-		@current_month_begin = nil
-	end
+  def initialize(type)
+    super
+    @current_month_begin = nil
+  end
 
-	def next(pointer)
-		super
-
-		if !@current_month_begin
-			target_month = symbol_to_number(@type)
-			case pointer
-			when :future
-				if @now.month < target_month
-					@current_month_begin = Time.construct(@now.year, target_month)
-				elsif @now.month > target_month
-					@current_month_begin = Time.construct(@now.year + 1, target_month)
-				end
-			when :none
-				if @now.month <= target_month
-					@current_month_begin = Time.construct(@now.year, target_month)
-				elsif @now.month > target_month
-					@current_month_begin = Time.construct(@now.year + 1, target_month)
-				end
-			when :past
-				if @now.month > target_month
-					@current_month_begin = Time.construct(@now.year, target_month)
-				elsif @now.month < target_month
-					@current_month_begin = Time.construct(@now.year - 1, target_month)
-				end
-			end
-			@current_month_begin || raise("Current month should be set by now")
-		else
-			case pointer
-			when :future
-				@current_month_begin = Time.construct(@current_month_begin.year + 1, @current_month_begin.month)
-			when :past
-				@current_month_begin = Time.construct(@current_month_begin.year - 1, @current_month_begin.month)
-			end
-		end
-
-		cur_month_year = @current_month_begin.year
-		cur_month_month = @current_month_begin.month
-
-		if cur_month_month == 12
-			next_month_year = cur_month_year + 1
-			next_month_month = 1
-		else
-			next_month_year = cur_month_year
-			next_month_month = cur_month_month + 1
-		end
-
-		Chronic::Span.new(@current_month_begin, Time.construct(next_month_year, next_month_month))
-	end
-
-	def this(pointer = :future)
-		super
-
-		case pointer
-		when :past
-			self.next(pointer)
-		when :future, :none
-			self.next(:none)
-		end
-	end
-
-	def width
-		MONTH_SECONDS
-	end
-
-	def index
-		symbol_to_number(@type)
-	end
-
-	def to_s
-		super << '-monthname-' << @type.to_s
-	end
-
-	private
-
-	def symbol_to_number(sym)
-		lookup = {:january => 1,
-			:february => 2,
-			:march => 3,
-			:april => 4,
-			:may => 5,
-			:june => 6,
-			:july => 7,
-			:august => 8,
-			:september => 9,
-			:october => 10,
-			:november => 11,
-			:december => 12}
-		lookup[sym] || raise("Invalid symbol specified")
-	end
-end
+  def next(pointer)
+    super
+    
+    if !@current_month_begin
+      target_month = symbol_to_number(@type)
+      case pointer
+      when :future
+        if @now.month < target_month
+          @current_month_begin = Time.construct(@now.year, target_month)
+        elsif @now.month > target_month
+          @current_month_begin = Time.construct(@now.year + 1, target_month)
+        end
+      when :none
+        if @now.month <= target_month
+          @current_month_begin = Time.construct(@now.year, target_month)
+        elsif @now.month > target_month
+          @current_month_begin = Time.construct(@now.year + 1, target_month)
+        end
+      when :past
+        if @now.month > target_month
+          @current_month_begin = Time.construct(@now.year, target_month)
+        elsif @now.month < target_month
+          @current_month_begin = Time.construct(@now.year - 1, target_month)
+        end
+      end
+      @current_month_begin || raise("Current month should be set by now")
+    else
+      case pointer
+      when :future
+        @current_month_begin = Time.construct(@current_month_begin.year + 1, @current_month_begin.month)
+      when :past
+        @current_month_begin = Time.construct(@current_month_begin.year - 1, @current_month_begin.month)
+      end
+    end
+    
+    cur_month_year = @current_month_begin.year
+    cur_month_month = @current_month_begin.month
+    
+    if cur_month_month == 12
+      next_month_year = cur_month_year + 1
+      next_month_month = 1
+    else
+      next_month_year = cur_month_year
+      next_month_month = cur_month_month + 1
+    end
+      
+    Chronic::Span.new(@current_month_begin, Time.construct(next_month_year, next_month_month))
+  end
+  
+  def this(pointer = :future)
+    super
+    
+    case pointer
+    when :past
+      self.next(pointer)
+    when :future, :none
+      self.next(:none)
+    end
+  end
+  
+  def width
+    MONTH_SECONDS
+  end
+  
+  def index
+    symbol_to_number(@type)
+  end
+  
+  def to_s
+    super << '-monthname-' << @type.to_s
+  end
+  
+  private
+  
+  def symbol_to_number(sym)
+    lookup = {:january => 1,
+              :february => 2,
+              :march => 3,
+              :april => 4,
+              :may => 5,
+              :june => 6,
+              :july => 7,
+              :august => 8,
+              :september => 9,
+              :october => 10,
+              :november => 11,
+              :december => 12}
+    lookup[sym] || raise("Invalid symbol specified")
+  end
+end

data/lib/chronic/repeaters/repeater_season.rb

@@ -1,150 +1,150 @@
 class Time
-	def to_minidate
-		Chronic::MiniDate.new(self.month, self.day)
-	end
+  def to_minidate
+    MiniDate.new(self.month, self.day)
+  end
 end
 
-class Chronic::Season
-	attr_reader :start, :end
-
-	def initialize(myStart, myEnd)
-		@start = myStart
-		@end = myEnd
-	end
-
-	def self.find_next_season(season, pointer)
-		lookup = {:spring => 0, :summer => 1, :autumn => 2, :winter => 3}
-		next_season_num = (lookup[season]+1*pointer) % 4
-		lookup.invert[next_season_num]
-	end
-
-	def self.season_after(season); find_next_season(season, +1); end
-	def self.season_before(season); find_next_season(season, -1); end
+class Season
+  attr_reader :start, :end
+  
+  def initialize(myStart, myEnd)
+    @start = myStart
+    @end = myEnd
+  end
+  
+  def self.find_next_season(season, pointer)
+    lookup = {:spring => 0, :summer => 1, :autumn => 2, :winter => 3}
+    next_season_num = (lookup[season]+1*pointer) % 4
+    lookup.invert[next_season_num]
+  end
+  
+  def self.season_after(season); find_next_season(season, +1); end
+  def self.season_before(season); find_next_season(season, -1); end
 end
 
-class Chronic::MiniDate
-	attr_accessor :month, :day
-
-	def initialize(month, day)
-		@month = month
-		@day = day
-	end
-
-	def is_between?(md_start, md_end)
-		return true if (@month == md_start.month and @day >= md_start.day) ||
-			(@month == md_end.month and @day <= md_end.day)
-
-		i = md_start.month + 1
-		until i == md_end.month
-			return true if @month == i
-			i = (i+1) % 12
-		end
-
-		return false
-	end
-
-	def ==(other)
-		@month == other.month and day == other.day
-	end
+class MiniDate
+  attr_accessor :month, :day
+  
+  def initialize(month, day)
+    @month = month
+    @day = day
+  end
+  
+  def is_between?(md_start, md_end)
+    return true if (@month == md_start.month and @day >= md_start.day) ||
+                   (@month == md_end.month and @day <= md_end.day)
+    
+    i = md_start.month + 1
+    until i == md_end.month
+      return true if @month == i
+      i = (i+1) % 12
+    end
+    
+    return false
+  end
+  
+  def equals?(other)
+    @month == other.month and day == other.day
+  end
 end
 
 class Chronic::RepeaterSeason < Chronic::Repeater #:nodoc:
-	YEAR_SEASONS = 4
-	SEASON_SECONDS = 7_862_400 # 91 * 24 * 60 * 60
-	SEASONS = { :spring => Chronic::Season.new( Chronic::MiniDate.new(3,20), Chronic::MiniDate.new(6,20) ),
-		:summer => Chronic::Season.new( Chronic::MiniDate.new(6,21), Chronic::MiniDate.new(9,22) ),
-		:autumn => Chronic::Season.new( Chronic::MiniDate.new(9,23), Chronic::MiniDate.new(12,21) ),
-		:winter => Chronic::Season.new( Chronic::MiniDate.new(12,22), Chronic::MiniDate.new(3,19) ) }
-
-	def initialize(type)
-		super
-		@next_season_start = nil
-	end
-
-	def next(pointer)
-		super
-
-		direction = pointer == :future ? 1 : -1
-		next_season = Chronic::Season.find_next_season(find_current_season(@now.to_minidate), direction)
-
-		find_next_season_span(direction, next_season)
-	end
-
-	def this(pointer = :future)
-		super
-
-		direction = pointer == :future ? 1 : -1
-
-		today = Time.construct(@now.year, @now.month, @now.day)
-		this_ssn = find_current_season(@now.to_minidate)
-		case pointer
-		when :past
-			this_ssn_start = today + direction * num_seconds_til_start(this_ssn, direction)
-			this_ssn_end = today
-		when :future
-			this_ssn_start = today + Chronic::RepeaterDay::DAY_SECONDS
-			this_ssn_end = today + direction * num_seconds_til_end(this_ssn, direction)
-		when :none
-			this_ssn_start = today + direction * num_seconds_til_start(this_ssn, direction)
-			this_ssn_end = today + direction * num_seconds_til_end(this_ssn, direction)
-		end
-
-		Chronic::Span.new(this_ssn_start, this_ssn_end)
-	end
-
-	def offset(span, amount, pointer)
-		Chronic::Span.new(offset_by(span.begin, amount, pointer), offset_by(span.end, amount, pointer))
-	end
-
-	def offset_by(time, amount, pointer)
-		direction = pointer == :future ? 1 : -1
-		time + amount * direction * SEASON_SECONDS
-	end
-
-	def width
-		SEASON_SECONDS
-	end
-
-	def to_s
-		super << '-season'
-	end
-
-	private
-
-	def find_next_season_span(direction, next_season)
-		if !@next_season_start or !@next_season_end
-			@next_season_start = Time.construct(@now.year, @now.month, @now.day)
-			@next_season_end = Time.construct(@now.year, @now.month, @now.day)
-		end
-
-		@next_season_start += direction * num_seconds_til_start(next_season, direction)
-		@next_season_end += direction * num_seconds_til_end(next_season, direction)
-
-		Chronic::Span.new(@next_season_start, @next_season_end)
-	end
-
-	def find_current_season(md)
-		[:spring, :summer, :autumn, :winter].each do |season|
-			return season if md.is_between?(SEASONS[season].start, SEASONS[season].end)
-		end
-	end
-
-	def num_seconds_til(goal, direction)
-		start = Time.construct(@now.year, @now.month, @now.day)
-		seconds = 0
-
-		until (start + direction * seconds).to_minidate == goal
-			seconds += Chronic::RepeaterDay::DAY_SECONDS
-		end
-
-		seconds
-	end
-
-	def num_seconds_til_start(season_symbol, direction)
-		num_seconds_til(SEASONS[season_symbol].start, direction)
-	end
-
-	def num_seconds_til_end(season_symbol, direction)
-		num_seconds_til(SEASONS[season_symbol].end, direction)
-	end
-end
+  YEAR_SEASONS = 4
+  SEASON_SECONDS = 7_862_400 # 91 * 24 * 60 * 60
+  SEASONS = { :spring => Season.new( MiniDate.new(3,20),MiniDate.new(6,20) ),
+              :summer => Season.new( MiniDate.new(6,21),MiniDate.new(9,22) ),
+              :autumn => Season.new( MiniDate.new(9,23),MiniDate.new(12,21) ),
+              :winter => Season.new( MiniDate.new(12,22),MiniDate.new(3,19) ) }
+
+  def initialize(type)
+    super
+    @next_season_start = nil
+  end
+
+  def next(pointer)
+    super
+    
+    direction = pointer == :future ? 1 : -1
+    next_season = Season.find_next_season(find_current_season(@now.to_minidate), direction)
+
+    find_next_season_span(direction, next_season)
+  end
+  
+  def this(pointer = :future)
+    super
+    
+    direction = pointer == :future ? 1 : -1
+
+    today = Time.construct(@now.year, @now.month, @now.day)
+    this_ssn = find_current_season(@now.to_minidate)
+    case pointer
+    when :past
+      this_ssn_start = today + direction * num_seconds_til_start(this_ssn, direction)
+      this_ssn_end = today
+    when :future
+      this_ssn_start = today + Chronic::RepeaterDay::DAY_SECONDS
+      this_ssn_end = today + direction * num_seconds_til_end(this_ssn, direction)
+    when :none
+      this_ssn_start = today + direction * num_seconds_til_start(this_ssn, direction)
+      this_ssn_end = today + direction * num_seconds_til_end(this_ssn, direction)
+    end
+    
+    Chronic::Span.new(this_ssn_start, this_ssn_end)
+  end
+  
+  def offset(span, amount, pointer)
+    Chronic::Span.new(offset_by(span.begin, amount, pointer), offset_by(span.end, amount, pointer))
+  end
+  
+  def offset_by(time, amount, pointer) 
+    direction = pointer == :future ? 1 : -1
+    time + amount * direction * SEASON_SECONDS
+  end
+  
+  def width
+    SEASON_SECONDS
+  end
+  
+  def to_s
+    super << '-season'
+  end
+  
+  private
+  
+  def find_next_season_span(direction, next_season)
+    if !@next_season_start or !@next_season_end
+      @next_season_start = Time.construct(@now.year, @now.month, @now.day)
+      @next_season_end = Time.construct(@now.year, @now.month, @now.day)
+    end
+  
+    @next_season_start += direction * num_seconds_til_start(next_season, direction)
+    @next_season_end += direction * num_seconds_til_end(next_season, direction)
+    
+    Chronic::Span.new(@next_season_start, @next_season_end)
+  end
+  
+  def find_current_season(md)
+    [:spring, :summer, :autumn, :winter].each do |season|
+      return season if md.is_between?(SEASONS[season].start, SEASONS[season].end)
+    end
+  end
+  
+  def num_seconds_til(goal, direction)
+    start = Time.construct(@now.year, @now.month, @now.day)
+    seconds = 0
+    
+    until (start + direction * seconds).to_minidate.equals?(goal)
+      seconds += Chronic::RepeaterDay::DAY_SECONDS
+    end
+
+    seconds
+  end
+  
+  def num_seconds_til_start(season_symbol, direction)
+    num_seconds_til(SEASONS[season_symbol].start, direction)
+  end
+  
+  def num_seconds_til_end(season_symbol, direction)
+    num_seconds_til(SEASONS[season_symbol].end, direction)
+  end
+end