Skip to content

Commit

Permalink
Renamed rewind_to_monday -> beginning_of_workweek
Browse files Browse the repository at this point in the history
  • Loading branch information
dbrady committed Mar 14, 2012
1 parent 52eaf9d commit 1dfafaa
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
4 changes: 2 additions & 2 deletions lib/planner.rb
Expand Up @@ -44,7 +44,7 @@ class Planner
GRAPH_CELL_WIDTH=9

def self.draw(start_date, filename)
start_date = self.rewind_to_monday start_date
start_date = self.beginning_of_workweek start_date
pdf = generate_planner_pdf start_date
save_pdf pdf, filename
end
Expand All @@ -67,7 +67,7 @@ def self.open_file(filename, mode, &block)
end

# Returns first Monday on or before start_date
def self.rewind_to_monday(start_date)
def self.beginning_of_workweek(start_date)
delta = start_date.wday - 1
delta += 7 if delta < 0 # Sundays will advance the date by default
start_date -= delta
Expand Down
8 changes: 4 additions & 4 deletions spec/lib/planner_spec.rb
Expand Up @@ -11,17 +11,17 @@ def md5(string)
end

describe Planner do
describe ".rewind_to_monday" do
describe ".beginning_of_workweek" do
it "rewinds date to previous Monday" do
Planner.rewind_to_monday(Date.parse('2012-03-15')).should == Date.parse('2012-03-12')
Planner.beginning_of_workweek(Date.parse('2012-03-15')).should == Date.parse('2012-03-12')
end

it "does not rewind if given date is a Monday" do
Planner.rewind_to_monday(Date.parse('2012-03-12')).should == Date.parse('2012-03-12')
Planner.beginning_of_workweek(Date.parse('2012-03-12')).should == Date.parse('2012-03-12')
end

it "rewinds if given date is a Sunday" do
Planner.rewind_to_monday(Date.parse('2012-03-11')).should == Date.parse('2012-03-05')
Planner.beginning_of_workweek(Date.parse('2012-03-11')).should == Date.parse('2012-03-05')
end
end

Expand Down

0 comments on commit 1dfafaa

Please sign in to comment.