pangel-chronic 0.3.0.3 → 0.3.10

data/lib/chronic/repeaters/repeater_season_name.rb

@@ -1,45 +1,45 @@
 require 'chronic/repeaters/repeater_season.rb'
 
 class Chronic::RepeaterSeasonName < Chronic::RepeaterSeason #:nodoc:
-	SEASON_SECONDS = 7_862_400 # 91 * 24 * 60 * 60
-	DAY_SECONDS = 86_400 # (24 * 60 * 60)
-
-	def next(pointer)
-		direction = pointer == :future ? 1 : -1
-		find_next_season_span(direction, @type)
-	end
-
-	def this(pointer = :future)
-		# super
-
-		direction = pointer == :future ? 1 : -1
-
-		today = Time.construct(@now.year, @now.month, @now.day)
-		goal_ssn_start = today + direction * num_seconds_til_start(@type, direction)
-		goal_ssn_end = today + direction * num_seconds_til_end(@type, direction)
-		curr_ssn = find_current_season(@now.to_minidate)
-		case pointer
-		when :past
-			this_ssn_start = goal_ssn_start
-			this_ssn_end = (curr_ssn == @type) ? today : goal_ssn_end
-		when :future
-			this_ssn_start = (curr_ssn == @type) ? today + Chronic::RepeaterDay::DAY_SECONDS : goal_ssn_start
-			this_ssn_end = goal_ssn_end
-		when :none
-			this_ssn_start = goal_ssn_start
-			this_ssn_end = goal_ssn_end
-		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 * Chronic::RepeaterYear::YEAR_SECONDS
-	end
-
-end
+  SEASON_SECONDS = 7_862_400 # 91 * 24 * 60 * 60
+  DAY_SECONDS = 86_400 # (24 * 60 * 60)
+  
+  def next(pointer)
+    direction = pointer == :future ? 1 : -1
+    find_next_season_span(direction, @type)
+  end
+  
+  def this(pointer = :future)
+    # super
+    
+    direction = pointer == :future ? 1 : -1
+
+    today = Time.construct(@now.year, @now.month, @now.day)
+    goal_ssn_start = today + direction * num_seconds_til_start(@type, direction)
+    goal_ssn_end = today + direction * num_seconds_til_end(@type, direction)
+    curr_ssn = find_current_season(@now.to_minidate)
+    case pointer
+    when :past
+      this_ssn_start = goal_ssn_start
+      this_ssn_end = (curr_ssn == @type) ? today : goal_ssn_end
+    when :future
+      this_ssn_start = (curr_ssn == @type) ? today + Chronic::RepeaterDay::DAY_SECONDS : goal_ssn_start
+      this_ssn_end = goal_ssn_end
+    when :none
+      this_ssn_start = goal_ssn_start
+      this_ssn_end = goal_ssn_end
+    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 * Chronic::RepeaterYear::YEAR_SECONDS
+  end
+
+end

data/lib/chronic/repeaters/repeater_second.rb

@@ -1,41 +1,41 @@
 class Chronic::RepeaterSecond < Chronic::Repeater #:nodoc:
-	SECOND_SECONDS = 1 # haha, awesome
-
-	def initialize(type)
-		super
-		@second_start = nil
-	end
-
-	def next(pointer = :future)
-		super
-
-		direction = pointer == :future ? 1 : -1
-
-		if !@second_start
-			@second_start = @now + (direction * SECOND_SECONDS)
-		else
-			@second_start += SECOND_SECONDS * direction
-		end
-
-		Chronic::Span.new(@second_start, @second_start + SECOND_SECONDS)
-	end
-
-	def this(pointer = :future)
-		super
-
-		Chronic::Span.new(@now, @now + 1)
-	end
-
-	def offset(span, amount, pointer)
-		direction = pointer == :future ? 1 : -1
-		span + direction * amount * SECOND_SECONDS
-	end
-
-	def width
-		SECOND_SECONDS
-	end
-
-	def to_s
-		super << '-second'
-	end
-end
+  SECOND_SECONDS = 1 # haha, awesome
+
+  def initialize(type)
+    super
+    @second_start = nil
+  end
+
+  def next(pointer = :future)
+    super
+    
+    direction = pointer == :future ? 1 : -1
+    
+    if !@second_start
+      @second_start = @now + (direction * SECOND_SECONDS)
+    else
+      @second_start += SECOND_SECONDS * direction
+    end
+    
+    Chronic::Span.new(@second_start, @second_start + SECOND_SECONDS)
+  end
+  
+  def this(pointer = :future)
+    super
+    
+    Chronic::Span.new(@now, @now + 1)
+  end
+  
+  def offset(span, amount, pointer)
+    direction = pointer == :future ? 1 : -1
+    span + direction * amount * SECOND_SECONDS
+  end
+  
+  def width
+    SECOND_SECONDS
+  end
+  
+  def to_s
+    super << '-second'
+  end
+end

data/lib/chronic/repeaters/repeater_time.rb

@@ -1,124 +1,125 @@
 class Chronic::RepeaterTime < Chronic::Repeater #:nodoc:
-	class Tick #:nodoc:
-		attr_accessor :time
-
-		def initialize(time, ambiguous = false)
-			@time = time
-			@ambiguous = ambiguous
-		end
-
-		def ambiguous?
-			@ambiguous
-		end
-
-		def *(other)
-			Tick.new(@time * other, @ambiguous)
-		end
-
-		def to_f
-			@time.to_f
-		end
-
-		def to_s
-			@time.to_s + (@ambiguous ? '?' : '')
-		end
-	end
-
-	def initialize(time, options = {})
-		@current_time = nil
-		t = time.gsub(/\:/, '')
-
-		@type =
-			case t.size
-			when 1..2
-				hours = t.to_i
-				hours == 12 ? Tick.new(0 * 60 * 60, true) : Tick.new(hours * 60 * 60, true)
-			when 3
-				Tick.new((t[0..0].to_i * 60 * 60) + (t[1..2].to_i * 60), true)
-			when 4
-				ambiguous = time =~ /:/ && t[0..0].to_i != 0 && t[0..1].to_i <= 12
-				hours = t[0..1].to_i
-				hours == 12 ? Tick.new(0 * 60 * 60 + t[2..3].to_i * 60, ambiguous) : Tick.new(hours * 60 * 60 + t[2..3].to_i * 60, ambiguous)
-			when 5
-				Tick.new(t[0..0].to_i * 60 * 60 + t[1..2].to_i * 60 + t[3..4].to_i, true)
-			when 6
-				ambiguous = time =~ /:/ && t[0..0].to_i != 0 && t[0..1].to_i <= 12
-				hours = t[0..1].to_i
-				hours == 12 ? Tick.new(0 * 60 * 60 + t[2..3].to_i * 60 + t[4..5].to_i, ambiguous) : Tick.new(hours * 60 * 60 + t[2..3].to_i * 60 + t[4..5].to_i, ambiguous)
-			else
-				raise("Time cannot exceed six digits")
-			end
-	end
-
-	# Return the next past or future Span for the time that this Repeater represents
-	#   pointer - Symbol representing which temporal direction to fetch the next day
-	#             must be either :past or :future
-	def next(pointer)
-		super
-
-		half_day = 60 * 60 * 12
-		full_day = 60 * 60 * 24
-
-		first = false
-
-		unless @current_time
-			first = true
-			midnight = Chronic.time_class.local(@now.year, @now.month, @now.day)
-
-			yesterday_midnight = midnight - full_day
-			tomorrow_midnight = midnight + full_day
-
-			offset_fix = midnight.gmt_offset - tomorrow_midnight.gmt_offset
-			tomorrow_midnight += offset_fix
-
-			catch :done do
-				if pointer == :future
-					if @type.ambiguous?
-						[midnight + @type + offset_fix, midnight + half_day + @type + offset_fix, tomorrow_midnight + @type].each do |t|
-							(@current_time = t; throw :done) if t >= @now
-						end
-					else
-						[midnight + @type + offset_fix, tomorrow_midnight + @type].each do |t|
-							(@current_time = t; throw :done) if t >= @now
-						end
-					end
-				else # pointer == :past
-					if @type.ambiguous?
-						[midnight + half_day + @type + offset_fix, midnight + @type + offset_fix, yesterday_midnight + @type + half_day].each do |t|
-							(@current_time = t; throw :done) if t <= @now
-						end
-					else
-						[midnight + @type + offset_fix, yesterday_midnight + @type].each do |t|
-							(@current_time = t; throw :done) if t <= @now
-						end
-					end
-				end
-			end
-
-			@current_time || raise("Current time cannot be nil at this point")
-		end
-
-		unless first
-			increment = @type.ambiguous? ? half_day : full_day
-			@current_time += pointer == :future ? increment : -increment
-		end
-
-		Chronic::Span.new(@current_time, @current_time + width)
-	end
-
-	def this(context = :future)
-		super
-
-		context = :future if context == :none
-
-		self.next(context)
-	end
-
-	def width
-		1
-	end
-
-	def to_s
-		super << '-time-' << @type.to_s
-	end
-end
+  class Tick #:nodoc:
+    attr_accessor :time
+    
+    def initialize(time, ambiguous = false)
+      @time = time
+      @ambiguous = ambiguous
+    end
+    
+    def ambiguous?
+      @ambiguous
+    end
+    
+    def *(other)
+      Tick.new(@time * other, @ambiguous)
+    end
+    
+    def to_f
+      @time.to_f
+    end
+    
+    def to_s
+      @time.to_s + (@ambiguous ? '?' : '')
+    end
+      
+  end
+  
+  def initialize(time, options = {})
+    @current_time = nil
+    t = time.gsub(/\:/, '')
+    
+    @type = 
+    case t.size
+      when 1..2
+        hours = t.to_i
+        hours == 12 ? Tick.new(0 * 60 * 60, true) : Tick.new(hours * 60 * 60, true)
+      when 3
+        Tick.new((t[0..0].to_i * 60 * 60) + (t[1..2].to_i * 60), true)
+      when 4
+        ambiguous = time =~ /:/ && t[0..0].to_i != 0 && t[0..1].to_i <= 12
+        hours = t[0..1].to_i
+        (hours == 12 && time =~ /:/) ? Tick.new(0 * 60 * 60 + t[2..3].to_i * 60, ambiguous) : Tick.new(hours * 60 * 60 + t[2..3].to_i * 60, ambiguous)
+      when 5
+        Tick.new(t[0..0].to_i * 60 * 60 + t[1..2].to_i * 60 + t[3..4].to_i, true)
+      when 6
+        ambiguous = time =~ /:/ && t[0..0].to_i != 0 && t[0..1].to_i <= 12
+        hours = t[0..1].to_i
+        hours == 12 ? Tick.new(0 * 60 * 60 + t[2..3].to_i * 60 + t[4..5].to_i, ambiguous) : Tick.new(hours * 60 * 60 + t[2..3].to_i * 60 + t[4..5].to_i, ambiguous)
+      else
+        raise("Time cannot exceed six digits")
+    end
+  end
+  
+  # Return the next past or future Span for the time that this Repeater represents
+  #   pointer - Symbol representing which temporal direction to fetch the next day
+  #             must be either :past or :future
+  def next(pointer)
+    super
+    
+    half_day = 60 * 60 * 12
+    full_day = 60 * 60 * 24
+    
+    first = false
+    
+    unless @current_time
+      first = true
+      midnight = Chronic.time_class.local(@now.year, @now.month, @now.day)
+      
+      yesterday_midnight = midnight - full_day
+      tomorrow_midnight = midnight + full_day
+
+      offset_fix = midnight.gmt_offset - tomorrow_midnight.gmt_offset
+      tomorrow_midnight += offset_fix
+      
+      catch :done do
+        if pointer == :future
+          if @type.ambiguous?
+            [midnight + @type.time + offset_fix, midnight + half_day + @type.time + offset_fix, tomorrow_midnight + @type.time].each do |t|
+              (@current_time = t; throw :done) if t >= @now
+            end
+          else
+            [midnight + @type.time + offset_fix, tomorrow_midnight + @type.time].each do |t|
+              (@current_time = t; throw :done) if t >= @now
+            end
+          end
+        else # pointer == :past
+          if @type.ambiguous?
+            [midnight + half_day + @type.time + offset_fix, midnight + @type.time + offset_fix, yesterday_midnight + @type.time + half_day].each do |t|
+              (@current_time = t; throw :done) if t <= @now
+            end
+          else
+            [midnight + @type.time + offset_fix, yesterday_midnight + @type.time].each do |t|
+              (@current_time = t; throw :done) if t <= @now
+            end
+          end
+        end
+      end
+      
+      @current_time || raise("Current time cannot be nil at this point")
+    end
+    
+    unless first
+      increment = @type.ambiguous? ? half_day : full_day
+      @current_time += pointer == :future ? increment : -increment
+    end
+    
+    Chronic::Span.new(@current_time, @current_time + width)
+  end
+  
+  def this(context = :future)
+    super
+    
+    context = :future if context == :none
+    
+    self.next(context)
+  end
+  
+  def width
+    1
+  end
+  
+  def to_s
+    super << '-time-' << @type.to_s
+  end
+end

data/lib/chronic/repeaters/repeater_week.rb

@@ -1,73 +1,73 @@
 class Chronic::RepeaterWeek < Chronic::Repeater #:nodoc:
-	WEEK_SECONDS = 604800 # (7 * 24 * 60 * 60)
+  WEEK_SECONDS = 604800 # (7 * 24 * 60 * 60)
 
-	def initialize(type)
-		super
-		@current_week_start = nil
-	end
+  def initialize(type)
+    super
+    @current_week_start = nil
+  end
 
-	def next(pointer)
-		super
-
-		if !@current_week_start
-			case pointer
-			when :future
-				sunday_repeater = Chronic::RepeaterDayName.new(:sunday)
-				sunday_repeater.start = @now
-				next_sunday_span = sunday_repeater.next(:future)
-				@current_week_start = next_sunday_span.begin
-			when :past
-				sunday_repeater = Chronic::RepeaterDayName.new(:sunday)
-				sunday_repeater.start = (@now + Chronic::RepeaterDay::DAY_SECONDS)
-				sunday_repeater.next(:past)
-				last_sunday_span = sunday_repeater.next(:past)
-				@current_week_start = last_sunday_span.begin
-			end
-		else
-			direction = pointer == :future ? 1 : -1
-			@current_week_start += direction * WEEK_SECONDS
-		end
-
-		Chronic::Span.new(@current_week_start, @current_week_start + WEEK_SECONDS)
-	end
-
-	def this(pointer = :future)
-		super
-
-		case pointer
-		when :future
-			this_week_start = Chronic.time_class.local(@now.year, @now.month, @now.day, @now.hour) + Chronic::RepeaterHour::HOUR_SECONDS
-			sunday_repeater = Chronic::RepeaterDayName.new(:sunday)
-			sunday_repeater.start = @now
-			this_sunday_span = sunday_repeater.this(:future)
-			this_week_end = this_sunday_span.begin
-			Chronic::Span.new(this_week_start, this_week_end)
-		when :past
-			this_week_end = Chronic.time_class.local(@now.year, @now.month, @now.day, @now.hour)
-			sunday_repeater = Chronic::RepeaterDayName.new(:sunday)
-			sunday_repeater.start = @now
-			last_sunday_span = sunday_repeater.next(:past)
-			this_week_start = last_sunday_span.begin
-			Chronic::Span.new(this_week_start, this_week_end)
-		when :none
-			sunday_repeater = Chronic::RepeaterDayName.new(:sunday)
-			sunday_repeater.start = @now
-			last_sunday_span = sunday_repeater.next(:past)
-			this_week_start = last_sunday_span.begin
-			Chronic::Span.new(this_week_start, this_week_start + WEEK_SECONDS)
-		end
-	end
-
-	def offset(span, amount, pointer)
-		direction = pointer == :future ? 1 : -1
-		span + direction * amount * WEEK_SECONDS
-	end
-
-	def width
-		WEEK_SECONDS
-	end
-
-	def to_s
-		super << '-week'
-	end
-end
+  def next(pointer)
+    super
+    
+    if !@current_week_start
+      case pointer
+      when :future
+        sunday_repeater = Chronic::RepeaterDayName.new(:sunday)
+        sunday_repeater.start = @now
+        next_sunday_span = sunday_repeater.next(:future)
+        @current_week_start = next_sunday_span.begin
+      when :past
+        sunday_repeater = Chronic::RepeaterDayName.new(:sunday)
+        sunday_repeater.start = (@now + Chronic::RepeaterDay::DAY_SECONDS)
+        sunday_repeater.next(:past)
+        last_sunday_span = sunday_repeater.next(:past)
+        @current_week_start = last_sunday_span.begin
+      end
+    else
+      direction = pointer == :future ? 1 : -1
+      @current_week_start += direction * WEEK_SECONDS
+    end
+    
+    Chronic::Span.new(@current_week_start, @current_week_start + WEEK_SECONDS)
+  end
+  
+  def this(pointer = :future)
+    super
+    
+    case pointer
+    when :future
+      this_week_start = Chronic.time_class.local(@now.year, @now.month, @now.day, @now.hour) + Chronic::RepeaterHour::HOUR_SECONDS
+      sunday_repeater = Chronic::RepeaterDayName.new(:sunday)
+      sunday_repeater.start = @now
+      this_sunday_span = sunday_repeater.this(:future)
+      this_week_end = this_sunday_span.begin
+      Chronic::Span.new(this_week_start, this_week_end)
+    when :past
+      this_week_end = Chronic.time_class.local(@now.year, @now.month, @now.day, @now.hour)
+      sunday_repeater = Chronic::RepeaterDayName.new(:sunday)
+      sunday_repeater.start = @now
+      last_sunday_span = sunday_repeater.next(:past)
+      this_week_start = last_sunday_span.begin
+      Chronic::Span.new(this_week_start, this_week_end)
+    when :none
+      sunday_repeater = Chronic::RepeaterDayName.new(:sunday)
+      sunday_repeater.start = @now
+      last_sunday_span = sunday_repeater.next(:past)
+      this_week_start = last_sunday_span.begin
+      Chronic::Span.new(this_week_start, this_week_start + WEEK_SECONDS)
+    end
+  end
+  
+  def offset(span, amount, pointer)
+    direction = pointer == :future ? 1 : -1
+    span + direction * amount * WEEK_SECONDS
+  end
+  
+  def width
+    WEEK_SECONDS
+  end
+  
+  def to_s
+    super << '-week'
+  end
+end