pangel-chronic 0.3.0.3 → 0.3.10

data/lib/chronic/repeaters/repeater_day_name.rb

@@ -1,53 +1,51 @@
-require 'date'
 class Chronic::RepeaterDayName < Chronic::Repeater #:nodoc:
-	DAY_SECONDS = 86400 # (24 * 60 * 60)
-
-	def initialize(type)
-		super
-		@current_date = nil
-	end
-
-	def next(pointer)
-		super
-
-		direction = pointer == :future ? 1 : -1
-
-		unless @current_date
-			@current_date = DateTime.new(y=@now.year, m=@now.month, d=@now.day)
-			@current_date += direction
-			day_num = symbol_to_number(@type)
-
-			while @current_date.wday != day_num
-				@current_date += direction
-			end
-		else
-			@current_date += direction * 7
-		end
-		next_date = @current_date.succ
-		Chronic::Span.new(Chronic.time_class.local(@current_date.year, @current_date.month, @current_date.day),
-				  Chronic.time_class.local(next_date.year, next_date.month, next_date.day))
-	end
-
-
-	def this(pointer = :future)
-		super
-
-		pointer = :future if pointer == :none
-		self.next(pointer)
-	end
-
-	def width
-		DAY_SECONDS
-	end
-
-	def to_s
-		super << '-dayname-' << @type.to_s
-	end
-
-	private
-
-	def symbol_to_number(sym)
-		lookup = {:sunday => 0, :monday => 1, :tuesday => 2, :wednesday => 3, :thursday => 4, :friday => 5, :saturday => 6}
-		lookup[sym] || raise("Invalid symbol specified")
-	end
-end
+  DAY_SECONDS = 86400 # (24 * 60 * 60)
+  
+  def initialize(type)
+    super
+    @current_day_start = nil
+  end
+  
+  def next(pointer)
+    super
+    
+    direction = pointer == :future ? 1 : -1
+    
+    if !@current_day_start
+      @current_day_start = Time.construct(@now.year, @now.month, @now.day)
+      @current_day_start += direction * DAY_SECONDS
+
+      day_num = symbol_to_number(@type)
+      
+      while @current_day_start.wday != day_num
+        @current_day_start += direction * DAY_SECONDS
+      end
+    else
+      @current_day_start += direction * 7 * DAY_SECONDS
+    end
+    
+    Chronic::Span.new(@current_day_start, @current_day_start + DAY_SECONDS)
+  end
+  
+  def this(pointer = :future)
+    super
+    
+    pointer = :future if pointer == :none
+    self.next(pointer)
+  end
+  
+  def width
+    DAY_SECONDS
+  end
+  
+  def to_s
+    super << '-dayname-' << @type.to_s
+  end
+  
+  private
+  
+  def symbol_to_number(sym)
+    lookup = {:sunday => 0, :monday => 1, :tuesday => 2, :wednesday => 3, :thursday => 4, :friday => 5, :saturday => 6}
+    lookup[sym] || raise("Invalid symbol specified")
+  end
+end

data/lib/chronic/repeaters/repeater_day_portion.rb

@@ -1,94 +1,94 @@
 class Chronic::RepeaterDayPortion < Chronic::Repeater #:nodoc:
-	@@morning = (6 * 60 * 60)..(12 * 60 * 60) # 6am-12am
-	@@afternoon = (13 * 60 * 60)..(17 * 60 * 60) # 1pm-5pm
-	@@evening = (17 * 60 * 60)..(20 * 60 * 60) # 5pm-8pm
-	@@night = (20 * 60 * 60)..(24 * 60 * 60) # 8pm-12pm
-
-	def initialize(type)
-		super
-		@current_span = nil
-
-		if type.kind_of? Integer
-			@range = (@type * 60 * 60)..((@type + 12) * 60 * 60)
-		else
-			lookup = {:am => 0..(12 * 60 * 60 - 1),
-				:pm => (12 * 60 * 60)..(24 * 60 * 60 - 1),
-				:morning => @@morning,
-				:afternoon => @@afternoon,
-				:evening => @@evening,
-				:night => @@night}
-			@range = lookup[type]
-			lookup[type] || raise("Invalid type '#{type}' for RepeaterDayPortion")
-		end
-		@range || raise("Range should have been set by now")
-	end
-
-	def next(pointer)
-		super
-
-		full_day = 60 * 60 * 24
-
-		if !@current_span
-			now_seconds = @now - Time.construct(@now.year, @now.month, @now.day)
-			if now_seconds < @range.begin
-				case pointer
-				when :future
-					range_start = Time.construct(@now.year, @now.month, @now.day) + @range.begin
-				when :past
-					range_start = Time.construct(@now.year, @now.month, @now.day) - full_day + @range.begin
-				end
-			elsif now_seconds > @range.end
-				case pointer
-				when :future
-					range_start = Time.construct(@now.year, @now.month, @now.day) + full_day + @range.begin
-				when :past
-					range_start = Time.construct(@now.year, @now.month, @now.day) + @range.begin
-				end
-			else
-				case pointer
-				when :future
-					range_start = Time.construct(@now.year, @now.month, @now.day) + full_day + @range.begin
-				when :past
-					range_start = Time.construct(@now.year, @now.month, @now.day) - full_day + @range.begin
-				end
-			end
-
-			@current_span = Chronic::Span.new(range_start, range_start + (@range.end - @range.begin))
-		else
-			case pointer
-			when :future
-				@current_span += full_day
-			when :past
-				@current_span -= full_day
-			end
-		end
-	end
-
-	def this(context = :future)
-		super
-
-		range_start = Time.construct(@now.year, @now.month, @now.day) + @range.begin
-		@current_span = Chronic::Span.new(range_start, range_start + (@range.end - @range.begin))
-	end
-
-	def offset(span, amount, pointer)
-		@now = span.begin
-		portion_span = self.next(pointer)
-		direction = pointer == :future ? 1 : -1
-		portion_span + (direction * (amount - 1) * Chronic::RepeaterDay::DAY_SECONDS)
-	end
-
-	def width
-		@range || raise("Range has not been set")
-		return @current_span.width if @current_span
-		if @type.kind_of? Integer
-			return (12 * 60 * 60)
-		else
-			@range.end - @range.begin
-		end
-	end
-
-	def to_s
-		super << '-dayportion-' << @type.to_s
-	end
-end
+  @@morning = (6 * 60 * 60)..(12 * 60 * 60) # 6am-12am
+  @@afternoon = (13 * 60 * 60)..(17 * 60 * 60) # 1pm-5pm
+  @@evening = (17 * 60 * 60)..(20 * 60 * 60) # 5pm-8pm
+  @@night = (20 * 60 * 60)..(24 * 60 * 60) # 8pm-12pm
+  
+  def initialize(type)
+    super
+    @current_span = nil
+    
+    if type.kind_of? Integer
+      @range = (@type * 60 * 60)..((@type + 12) * 60 * 60)
+    else
+      lookup = {:am => 0..(12 * 60 * 60 - 1),
+                :pm => (12 * 60 * 60)..(24 * 60 * 60 - 1),
+                :morning => @@morning,
+                :afternoon => @@afternoon,
+                :evening => @@evening,
+                :night => @@night}
+      @range = lookup[type]
+      lookup[type] || raise("Invalid type '#{type}' for RepeaterDayPortion")
+    end
+    @range || raise("Range should have been set by now")
+  end
+  
+  def next(pointer)
+    super
+    
+    full_day = 60 * 60 * 24
+    
+    if !@current_span
+      now_seconds = @now - Time.construct(@now.year, @now.month, @now.day)
+      if now_seconds < @range.begin
+        case pointer
+        when :future
+          range_start = Time.construct(@now.year, @now.month, @now.day) + @range.begin
+        when :past
+          range_start = Time.construct(@now.year, @now.month, @now.day) - full_day + @range.begin
+        end
+      elsif now_seconds > @range.end
+        case pointer
+        when :future
+          range_start = Time.construct(@now.year, @now.month, @now.day) + full_day + @range.begin
+        when :past
+          range_start = Time.construct(@now.year, @now.month, @now.day) + @range.begin
+        end
+      else
+        case pointer
+        when :future
+          range_start = Time.construct(@now.year, @now.month, @now.day) + full_day + @range.begin
+        when :past
+          range_start = Time.construct(@now.year, @now.month, @now.day) - full_day + @range.begin
+        end
+      end
+      
+      @current_span = Chronic::Span.new(range_start, range_start + (@range.end - @range.begin))
+    else
+      case pointer
+      when :future
+        @current_span += full_day
+      when :past
+        @current_span -= full_day
+      end
+    end
+  end
+  
+  def this(context = :future)
+    super
+    
+    range_start = Time.construct(@now.year, @now.month, @now.day) + @range.begin
+    @current_span = Chronic::Span.new(range_start, range_start + (@range.end - @range.begin))
+  end
+  
+  def offset(span, amount, pointer)
+    @now = span.begin
+    portion_span = self.next(pointer)
+    direction = pointer == :future ? 1 : -1
+    portion_span + (direction * (amount - 1) * Chronic::RepeaterDay::DAY_SECONDS)
+  end
+  
+  def width
+    @range || raise("Range has not been set")
+    return @current_span.width if @current_span
+    if @type.kind_of? Integer
+      return (12 * 60 * 60)
+    else
+      @range.end - @range.begin
+    end
+  end
+  
+  def to_s
+    super << '-dayportion-' << @type.to_s
+  end
+end

data/lib/chronic/repeaters/repeater_fortnight.rb

@@ -1,70 +1,70 @@
 class Chronic::RepeaterFortnight < Chronic::Repeater #:nodoc:
-	FORTNIGHT_SECONDS = 1_209_600 # (14 * 24 * 60 * 60)
+  FORTNIGHT_SECONDS = 1_209_600 # (14 * 24 * 60 * 60)
 
-	def initialize(type)
-		super
-		@current_fortnight_start = nil
-	end
+  def initialize(type)
+    super
+    @current_fortnight_start = nil
+  end
 
-	def next(pointer)
-		super
+  def next(pointer)
+    super
+    
+    if !@current_fortnight_start
+      case pointer
+      when :future
+        sunday_repeater = Chronic::RepeaterDayName.new(:sunday)
+        sunday_repeater.start = @now
+        next_sunday_span = sunday_repeater.next(:future)
+        @current_fortnight_start = next_sunday_span.begin
+      when :past
+        sunday_repeater = Chronic::RepeaterDayName.new(:sunday)
+        sunday_repeater.start = (@now + Chronic::RepeaterDay::DAY_SECONDS)
+        2.times { sunday_repeater.next(:past) }
+        last_sunday_span = sunday_repeater.next(:past)
+        @current_fortnight_start = last_sunday_span.begin
+      end
+    else
+      direction = pointer == :future ? 1 : -1
+      @current_fortnight_start += direction * FORTNIGHT_SECONDS
+    end
+    
+    Chronic::Span.new(@current_fortnight_start, @current_fortnight_start + FORTNIGHT_SECONDS)
+  end
+  
+  def this(pointer = :future)
+    super
+    
+    pointer = :future if pointer == :none
+    
+    case pointer
+    when :future
+      this_fortnight_start = Time.construct(@now.year, @now.month, @now.day, @now.hour) + Chronic::RepeaterHour::HOUR_SECONDS
+      sunday_repeater = Chronic::RepeaterDayName.new(:sunday)
+      sunday_repeater.start = @now
+      sunday_repeater.this(:future)
+      this_sunday_span = sunday_repeater.this(:future)
+      this_fortnight_end = this_sunday_span.begin
+      Chronic::Span.new(this_fortnight_start, this_fortnight_end)
+    when :past
+      this_fortnight_end = Time.construct(@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_fortnight_start = last_sunday_span.begin
+      Chronic::Span.new(this_fortnight_start, this_fortnight_end)
+    end
+  end
+  
+  def offset(span, amount, pointer)
+    direction = pointer == :future ? 1 : -1
+    span + direction * amount * FORTNIGHT_SECONDS
+  end
 
-		if !@current_fortnight_start
-			case pointer
-			when :future
-				sunday_repeater = Chronic::RepeaterDayName.new(:sunday)
-				sunday_repeater.start = @now
-				next_sunday_span = sunday_repeater.next(:future)
-				@current_fortnight_start = next_sunday_span.begin
-			when :past
-				sunday_repeater = Chronic::RepeaterDayName.new(:sunday)
-				sunday_repeater.start = (@now + Chronic::RepeaterDay::DAY_SECONDS)
-				2.times { sunday_repeater.next(:past) }
-				last_sunday_span = sunday_repeater.next(:past)
-				@current_fortnight_start = last_sunday_span.begin
-			end
-		else
-			direction = pointer == :future ? 1 : -1
-			@current_fortnight_start += direction * FORTNIGHT_SECONDS
-		end
-
-		Chronic::Span.new(@current_fortnight_start, @current_fortnight_start + FORTNIGHT_SECONDS)
-	end
-
-	def this(pointer = :future)
-		super
-
-		pointer = :future if pointer == :none
-
-		case pointer
-		when :future
-			this_fortnight_start = Time.construct(@now.year, @now.month, @now.day, @now.hour) + Chronic::RepeaterHour::HOUR_SECONDS
-			sunday_repeater = Chronic::RepeaterDayName.new(:sunday)
-			sunday_repeater.start = @now
-			sunday_repeater.this(:future)
-			this_sunday_span = sunday_repeater.this(:future)
-			this_fortnight_end = this_sunday_span.begin
-			Chronic::Span.new(this_fortnight_start, this_fortnight_end)
-		when :past
-			this_fortnight_end = Time.construct(@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_fortnight_start = last_sunday_span.begin
-			Chronic::Span.new(this_fortnight_start, this_fortnight_end)
-		end
-	end
-
-	def offset(span, amount, pointer)
-		direction = pointer == :future ? 1 : -1
-		span + direction * amount * FORTNIGHT_SECONDS
-	end
-
-	def width
-		FORTNIGHT_SECONDS
-	end
-
-	def to_s
-		super << '-fortnight'
-	end
-end
+  def width
+    FORTNIGHT_SECONDS
+  end
+  
+  def to_s
+    super << '-fortnight'
+  end
+end

data/lib/chronic/repeaters/repeater_hour.rb

@@ -1,58 +1,57 @@
 class Chronic::RepeaterHour < Chronic::Repeater #:nodoc:
-	HOUR_SECONDS = 3600 # 60 * 60
-
-	def initialize(type)
-		super
-		@current_hour_start = nil
-	end
-
-	def next(pointer)
-		super
-
-		if !@current_hour_start
-			case pointer
-			when :future
-				@current_hour_start = Time.construct(@now.year, @now.month, @now.day, @now.hour + 1)
-			when :past
-				@current_hour_start = Time.construct(@now.year, @now.month, @now.day, @now.hour - 1)
-			end
-		else
-			direction = pointer == :future ? 1 : -1
-			@current_hour_start += direction * HOUR_SECONDS
-		end
-
-		Chronic::Span.new(@current_hour_start, @current_hour_start + HOUR_SECONDS)
-	end
-
-	def this(pointer = :future)
-		super
-
-		case pointer
-		when :future
-			hour_start = Time.construct(@now.year, @now.month, @now.day, @now.hour, @now.min + 1)
-			hour_end = Time.construct(@now.year, @now.month, @now.day, @now.hour + 1)
-		when :past
-			hour_start = Time.construct(@now.year, @now.month, @now.day, @now.hour)
-			hour_end = Time.construct(@now.year, @now.month, @now.day, @now.hour, @now.min)
-		when :none
-			hour_start = Time.construct(@now.year, @now.month, @now.day, @now.hour)
-			hour_end = hour_start + HOUR_SECONDS
-		end
-
-		Chronic::Span.new(hour_start, hour_end)
-	end
-
-	def offset(span, amount, pointer)
-		direction = pointer == :future ? 1 : -1
-		p [span, amount, pointer] if Chronic.debug
-		span + direction * amount * HOUR_SECONDS
-	end
-
-	def width
-		HOUR_SECONDS
-	end
-
-	def to_s
-		super << '-hour'
-	end
-end
+  HOUR_SECONDS = 3600 # 60 * 60
+
+  def initialize(type)
+    super
+    @current_hour_start = nil
+  end
+
+  def next(pointer)
+    super
+    
+    if !@current_hour_start
+      case pointer
+      when :future
+        @current_hour_start = Time.construct(@now.year, @now.month, @now.day, @now.hour + 1)
+      when :past
+        @current_hour_start = Time.construct(@now.year, @now.month, @now.day, @now.hour - 1)
+      end
+    else
+      direction = pointer == :future ? 1 : -1
+      @current_hour_start += direction * HOUR_SECONDS
+    end
+    
+    Chronic::Span.new(@current_hour_start, @current_hour_start + HOUR_SECONDS)
+  end
+  
+  def this(pointer = :future)
+    super
+    
+    case pointer
+    when :future
+      hour_start = Time.construct(@now.year, @now.month, @now.day, @now.hour, @now.min + 1)
+      hour_end = Time.construct(@now.year, @now.month, @now.day, @now.hour + 1)
+    when :past
+      hour_start = Time.construct(@now.year, @now.month, @now.day, @now.hour)
+      hour_end = Time.construct(@now.year, @now.month, @now.day, @now.hour, @now.min)
+    when :none
+      hour_start = Time.construct(@now.year, @now.month, @now.day, @now.hour)
+      hour_end = hour_begin + HOUR_SECONDS
+    end
+    
+    Chronic::Span.new(hour_start, hour_end)
+  end
+  
+  def offset(span, amount, pointer)
+    direction = pointer == :future ? 1 : -1
+    span + direction * amount * HOUR_SECONDS
+  end
+  
+  def width
+    HOUR_SECONDS
+  end
+  
+  def to_s
+    super << '-hour'
+  end
+end