todo.txt 0.0.9 → 0.0.10
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/lib/todo/support/date.rb +7 -1
- data/lib/todo/version.rb +1 -1
- data/spec/todo/support/date_spec.rb +2 -0
- metadata +1 -1
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA1:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: b73a79ad8bdfdbbda3dc4b8d29ceba7604718776
|
|
4
|
+
data.tar.gz: 1c8a192e1b7dacc1f7b1659e44e267fa1b67870e
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 9223ca65610631dfb714456740a14db79338bdb29f400ea53c01607f7435baa459a42f657c4468d8b31c8c6f6fef2219c39b45031f6c472aa792f7d327ebdb3d
|
|
7
|
+
data.tar.gz: c90e74e557ea59514b8655cdb130c9da42d22e8e2e15a41997cb9a23b56a42cf8c10d771ff83af9fbda3198d4e2dc166688c6e7eb902835ed09cc0618e5bf6e3
|
data/lib/todo/support/date.rb
CHANGED
|
@@ -11,7 +11,7 @@ module Todo
|
|
|
11
11
|
|
|
12
12
|
SEP = '(?: |_|\-|\.)'
|
|
13
13
|
AGO = /^(\d+|#{NUMS.join('|')})#{SEP}(days?|weeks?|months?|years?)#{SEP}ago$/
|
|
14
|
-
LAST = /^last#{SEP}(#{MONTHS.join('|')}|#{WDAYS.join('|')})/
|
|
14
|
+
LAST = /^last#{SEP}(#{MONTHS.join('|')}|#{WDAYS.join('|')}|workday)/
|
|
15
15
|
DATE = /\d{4}-\d{2}-\d{2}/
|
|
16
16
|
|
|
17
17
|
attr_reader :date
|
|
@@ -54,6 +54,7 @@ module Todo
|
|
|
54
54
|
end
|
|
55
55
|
|
|
56
56
|
def last(str)
|
|
57
|
+
str = last_workday if str == 'workday'
|
|
57
58
|
key = str.to_s.downcase[0, 3].to_sym
|
|
58
59
|
last_wday(key) || last_month(key) || fail(MSGS[:unknown] % str)
|
|
59
60
|
end
|
|
@@ -88,6 +89,11 @@ module Todo
|
|
|
88
89
|
def singularize(str)
|
|
89
90
|
str.sub(/s$/, '')
|
|
90
91
|
end
|
|
92
|
+
|
|
93
|
+
def last_workday
|
|
94
|
+
num = ::Date.today.wday - 1
|
|
95
|
+
WDAYS[num == 0 || num == 6 ? 5 : num]
|
|
96
|
+
end
|
|
91
97
|
end
|
|
92
98
|
end
|
|
93
99
|
end
|
data/lib/todo/version.rb
CHANGED
|
@@ -21,4 +21,6 @@ describe Todo::Support::Date do
|
|
|
21
21
|
it { expect(date.format('last_friday')).to eq '2015-11-27' }
|
|
22
22
|
it { expect(date.format('last_sep')).to eq '2015-09-01' }
|
|
23
23
|
it { expect(date.format('last_december')).to eq '2014-12-01' }
|
|
24
|
+
|
|
25
|
+
it { expect(date.format('last workday')).to eq '2015-11-30' }
|
|
24
26
|
end
|