Skip to content

Commit 33697c5

Browse files
dgilperezgreysteil
authored andcommitted
un-memoize IceCube.to_s_time_format to allow changing locale in runtime; fix tests
1 parent 1865a78 commit 33697c5

File tree

4 files changed

+13
-10
lines changed

4 files changed

+13
-10
lines changed

lib/ice_cube.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ module Validations
7272
# Defines the format used by IceCube when printing out Schedule#to_s.
7373
# Defaults to '%B %e, %Y'
7474
def self.to_s_time_format
75-
@to_s_time_format ||= I18n.t("ice_cube.date.formats.default")
75+
I18n.t("ice_cube.date.formats.default")
7676
end
7777

7878
# Sets the format used by IceCube when printing out Schedule#to_s.

spec/examples/occurrence_spec.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
end
2929

3030
it "accepts a format option to comply with ActiveSupport" do
31-
require 'active_support/core_ext/time'
31+
# require 'active_support/core_ext/time'
3232
time_now = Time.current
3333
occurrence = Occurrence.new(time_now)
3434

spec/examples/schedule_spec.rb

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -457,8 +457,8 @@
457457
t0 = Time.utc(2013, 5, 18, 12, 34)
458458
schedule = IceCube::Schedule.new(t0)
459459
schedule.add_recurrence_rule IceCube::Rule.daily
460-
previous = schedule.previous_occurrence(t0 + 2 * ONE_DAY)
461-
previous.should == t0 + ONE_DAY
460+
previous = schedule.previous_occurrence(t0 + 2 * IceCube::ONE_DAY)
461+
previous.should == t0 + IceCube::ONE_DAY
462462
end
463463

464464
it 'returns nil given the start time' do
@@ -485,16 +485,16 @@
485485
t0 = Time.utc(2013, 5, 18, 12, 34)
486486
schedule = IceCube::Schedule.new(t0)
487487
schedule.add_recurrence_rule IceCube::Rule.daily
488-
previous = schedule.previous_occurrences(2, t0 + 3 * ONE_DAY)
489-
previous.should == [t0 + ONE_DAY, t0 + 2 * ONE_DAY]
488+
previous = schedule.previous_occurrences(2, t0 + 3 * IceCube::ONE_DAY)
489+
previous.should == [t0 + IceCube::ONE_DAY, t0 + 2 * IceCube::ONE_DAY]
490490
end
491491

492492
it 'limits the returned occurrences to a given count' do
493493
t0 = Time.utc(2013, 5, 18, 12, 34)
494494
schedule = IceCube::Schedule.new(t0)
495495
schedule.add_recurrence_rule IceCube::Rule.daily
496-
previous = schedule.previous_occurrences(999, t0 + 2 * ONE_DAY)
497-
previous.should == [t0, t0 + ONE_DAY]
496+
previous = schedule.previous_occurrences(999, t0 + 2 * IceCube::ONE_DAY)
497+
previous.should == [t0, t0 + IceCube::ONE_DAY]
498498
end
499499

500500
it 'returns empty array given the start time' do
@@ -531,7 +531,7 @@
531531
t1 = Time.utc(2013, 5, 31, 12, 34)
532532
schedule = IceCube::Schedule.new(t0)
533533
schedule.add_recurrence_rule IceCube::Rule.daily.until(t1 + 1)
534-
schedule.last(2).should == [t1 - ONE_DAY, t1]
534+
schedule.last(2).should == [t1 - IceCube::ONE_DAY, t1]
535535
end
536536

537537
it 'raises an error for a non-terminating schedule' do

spec/examples/to_s_ja_spec.rb

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
# -*- coding: utf-8 -*-
21
require File.dirname(__FILE__) + '/../spec_helper'
32

43
describe IceCube::Schedule, 'to_s' do
@@ -7,6 +6,10 @@
76
I18n.locale = :ja
87
end
98

9+
after :all do
10+
I18n.locale = :en
11+
end
12+
1013
it 'should represent its start time by default' do
1114
t0 = Time.local(2013, 2, 14)
1215
IceCube::Schedule.new(t0).to_s.should == '2013年02月14日'

0 commit comments

Comments
 (0)