Skip to content

Commit

Permalink
Remove presenter from Activity
Browse files Browse the repository at this point in the history
  • Loading branch information
ryanbriones committed Feb 14, 2012
1 parent f716077 commit e49b86a
Show file tree
Hide file tree
Showing 5 changed files with 38 additions and 38 deletions.
Expand Up @@ -2,7 +2,7 @@

module TimeBudget
module Presenters
class ActivityPresenter
class Activity
def initialize(activity)
@activity = activity
end
Expand Down
2 changes: 1 addition & 1 deletion lib/time_budget/presenters/day_presenter.rb
Expand Up @@ -9,7 +9,7 @@ class DayPresenter

def initialize(name, activities = [])
@name = name
@activities = activities.map { |a| ActivityPresenter.new(a) }
@activities = activities.map { |a| Activity.new(a) }
end

def has_time_available?
Expand Down
33 changes: 0 additions & 33 deletions spec/activity_presenter_spec.rb

This file was deleted.

33 changes: 33 additions & 0 deletions spec/activity_spec.rb
@@ -0,0 +1,33 @@
require_relative "../lib/time_budget/presenters/activity"

describe TimeBudget::Presenters::Activity do
it "delegates the title to the supplied activity" do
TimeBudget::Presenters::Activity.new(stub(title: "foo")).title.should == "foo"
end

it "delegates the duration to the supplied activity" do
TimeBudget::Presenters::Activity.new(stub(duration: 99)).duration.should == 99
end

it "displaying hours and minutes of the duration" do
TimeBudget::Presenters::Activity.new(stub(duration: (60*60)+(60*30))).hours_and_minutes.should == "1:30"
end

context "when displaying the duration" do
it "displays the hours of the duration" do
TimeBudget::Presenters::Activity.new(stub("activity", duration: (60*60*12)+(60*30))).hours.should == "12"
end

it "pads the hours with one zero if the value is a single digit" do
TimeBudget::Presenters::Activity.new(stub("activity", duration: (60*60)+(60*30))).hours.should == "01"
end

it "displays the minutes of the duration" do
TimeBudget::Presenters::Activity.new(stub("activity", duration: (60*60*12)+(60*30))).minutes.should == "30"
end

it "pads the minutes with one zero if the value is a single digit" do
TimeBudget::Presenters::Activity.new(stub("activity", duration: (60*60*12)+(60*2))).minutes.should == "02"
end
end
end
6 changes: 3 additions & 3 deletions spec/day_presenter_spec.rb
@@ -1,5 +1,5 @@
require_relative "../lib/time_budget/presenters/day_presenter"
require_relative "../lib/time_budget/presenters/activity_presenter"
require_relative "../lib/time_budget/presenters/activity"

describe TimeBudget::Presenters::DayPresenter do
it "displays the name of the day" do
Expand All @@ -18,10 +18,10 @@
day.activities.should == []
end

it "activities are wrapped in ActivityPresenters" do
it "activities are wrapped in Activitys" do
activity = stub("activity")
day = TimeBudget::Presenters::DayPresenter.new("Sunday", [activity])
day.activities.first.should be_instance_of(TimeBudget::Presenters::ActivityPresenter)
day.activities.first.should be_instance_of(TimeBudget::Presenters::Activity)
end

it "has time available if the sum of the activities duration is less than the duration of a day" do
Expand Down

0 comments on commit e49b86a

Please sign in to comment.