Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

handle case of specifying times without specifying dates #36

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 14 additions & 0 deletions lib/nickel/construct_interpreter.rb
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,8 @@ def run
occurrences_from_recurrences_and_optional_date_span
elsif found_wrappers_only
occurrences_from_wrappers_only
elsif found_times
occurrences_from_times
end
end

Expand Down Expand Up @@ -243,13 +245,25 @@ def found_dates
@dci.size > 0 && @dsci.size == 0 && @rci.size == 0
end

def found_times
# One or more time constructs, NO date spans, NO recurrence,
# possible wrappers, possible time constructs, possible time spans
@tci.size > 0 && @dci.size == 0 && @dsci.size == 0 && @rci.size == 0
end

def occurrences_from_dates
@dci.each do |dindex|
occ_base = Occurrence.new(type: :single, start_date: @constructs[dindex].date)
create_occurrence_for_each_time_in_time_map(occ_base, dindex) { |occ| @occurrences << occ }
end
end

def occurrences_from_times
@tci.each do |index|
@occurrences << Occurrence.new(type: :single, start_time: @constructs[index].time)
end
end

def found_one_date_span
@dci.size == 0 && @dsci.size == 1 && @rci.size == 0
end
Expand Down
19 changes: 19 additions & 0 deletions spec/lib/nickel_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,25 @@
end
end

context "when the query is 'Yes, I can play at 9am'" do
let(:query) { 'Yes, I can play at 9am' }
let(:run_date) { Time.local(2014, 2, 26) }

describe '#message' do
it "is 'yes I can play'" do
expect(n.message).to eq 'yes I can play'
end
end

describe '#occurrences' do
it 'is single at 9:00am on unspecified date' do
expect(n.occurrences).to match_array [
Nickel::Occurrence.new(type: :single, start_time: Nickel::ZTime.new('9'))
]
end
end
end

context "when the query is 'wake up everyday at 11am'" do
let(:query) { 'wake up everyday at 11am' }
let(:run_date) { Time.local(2014, 2, 26) }
Expand Down