timeframe 0.0.10 → 0.0.11
Sign up to get free protection for your applications and to get access to all the features.
- data/lib/timeframe.rb +6 -12
- data/lib/timeframe/version.rb +1 -1
- data/spec/timeframe_spec.rb +1 -1
- metadata +51 -60
data/lib/timeframe.rb
CHANGED
@@ -75,17 +75,6 @@ class Timeframe
|
|
75
75
|
(to - from).to_i
|
76
76
|
end
|
77
77
|
|
78
|
-
# Returns a string representation of the timeframe
|
79
|
-
def to_s
|
80
|
-
if (from.year == to.year - 1) and [from.day, from.month, to.day, to.month].uniq == [1]
|
81
|
-
from.year.to_s
|
82
|
-
elsif from.year == to.year and from.day == 1 and to.day == 1 and to.month - from.month == 1
|
83
|
-
"#{Date::MONTHNAMES[from.month]} #{from.year}"
|
84
|
-
else
|
85
|
-
"the period from #{from.strftime('%d %B')} to #{to.yesterday.strftime('%d %B %Y')}"
|
86
|
-
end
|
87
|
-
end
|
88
|
-
|
89
78
|
# Returns true when a Date or other Timeframe is included in this Timeframe
|
90
79
|
def include?(obj)
|
91
80
|
# puts "checking to see if #{date} is between #{from} and #{to}" if Emitter::DEBUG
|
@@ -257,11 +246,16 @@ class Timeframe
|
|
257
246
|
to_param
|
258
247
|
end
|
259
248
|
|
260
|
-
#
|
249
|
+
# An ISO 8601 "time interval" like YYYY-MM-DD/YYYY-MM-DD
|
261
250
|
def to_param
|
262
251
|
"#{from}/#{to}"
|
263
252
|
end
|
264
253
|
|
254
|
+
# The String representation is equivalent to its ISO 8601 form
|
255
|
+
def to_s
|
256
|
+
to_param
|
257
|
+
end
|
258
|
+
|
265
259
|
class << self
|
266
260
|
def make_dates(from, to) # :nodoc:
|
267
261
|
return from.to_date, to.to_date
|
data/lib/timeframe/version.rb
CHANGED
data/spec/timeframe_spec.rb
CHANGED
@@ -275,7 +275,7 @@ describe Timeframe do
|
|
275
275
|
|
276
276
|
describe '#to_s' do
|
277
277
|
it 'should not only look at month numbers when describing multi-year timeframes' do
|
278
|
-
Timeframe.multiyear(Date.parse('2008-01-01'), Date.parse('2010-01-01')).to_s.should == "
|
278
|
+
Timeframe.multiyear(Date.parse('2008-01-01'), Date.parse('2010-01-01')).to_s.should == "2008-01-01/2010-01-01"
|
279
279
|
end
|
280
280
|
end
|
281
281
|
end
|
metadata
CHANGED
@@ -1,74 +1,69 @@
|
|
1
|
-
--- !ruby/object:Gem::Specification
|
1
|
+
--- !ruby/object:Gem::Specification
|
2
2
|
name: timeframe
|
3
|
-
version: !ruby/object:Gem::Version
|
3
|
+
version: !ruby/object:Gem::Version
|
4
|
+
version: 0.0.11
|
4
5
|
prerelease:
|
5
|
-
version: 0.0.10
|
6
6
|
platform: ruby
|
7
|
-
authors:
|
7
|
+
authors:
|
8
8
|
- Andy Rossmeissl
|
9
9
|
- Seamus Abshere
|
10
10
|
- Derek Kastner
|
11
11
|
autorequire:
|
12
12
|
bindir: bin
|
13
13
|
cert_chain: []
|
14
|
-
|
15
|
-
|
16
|
-
|
17
|
-
dependencies:
|
18
|
-
- !ruby/object:Gem::Dependency
|
14
|
+
date: 2011-07-05 00:00:00.000000000Z
|
15
|
+
dependencies:
|
16
|
+
- !ruby/object:Gem::Dependency
|
19
17
|
name: rspec
|
20
|
-
|
21
|
-
requirement: &id001 !ruby/object:Gem::Requirement
|
18
|
+
requirement: &2162728480 !ruby/object:Gem::Requirement
|
22
19
|
none: false
|
23
|
-
requirements:
|
20
|
+
requirements:
|
24
21
|
- - ~>
|
25
|
-
- !ruby/object:Gem::Version
|
26
|
-
version:
|
22
|
+
- !ruby/object:Gem::Version
|
23
|
+
version: '1'
|
27
24
|
type: :development
|
28
|
-
version_requirements: *id001
|
29
|
-
- !ruby/object:Gem::Dependency
|
30
|
-
name: home_run
|
31
25
|
prerelease: false
|
32
|
-
|
26
|
+
version_requirements: *2162728480
|
27
|
+
- !ruby/object:Gem::Dependency
|
28
|
+
name: home_run
|
29
|
+
requirement: &2162728060 !ruby/object:Gem::Requirement
|
33
30
|
none: false
|
34
|
-
requirements:
|
35
|
-
- -
|
36
|
-
- !ruby/object:Gem::Version
|
37
|
-
version:
|
31
|
+
requirements:
|
32
|
+
- - ! '>='
|
33
|
+
- !ruby/object:Gem::Version
|
34
|
+
version: '0'
|
38
35
|
type: :development
|
39
|
-
version_requirements: *id002
|
40
|
-
- !ruby/object:Gem::Dependency
|
41
|
-
name: activesupport
|
42
36
|
prerelease: false
|
43
|
-
|
37
|
+
version_requirements: *2162728060
|
38
|
+
- !ruby/object:Gem::Dependency
|
39
|
+
name: activesupport
|
40
|
+
requirement: &2162727520 !ruby/object:Gem::Requirement
|
44
41
|
none: false
|
45
|
-
requirements:
|
46
|
-
- -
|
47
|
-
- !ruby/object:Gem::Version
|
42
|
+
requirements:
|
43
|
+
- - ! '>='
|
44
|
+
- !ruby/object:Gem::Version
|
48
45
|
version: 2.3.5
|
49
46
|
type: :runtime
|
50
|
-
version_requirements: *id003
|
51
|
-
- !ruby/object:Gem::Dependency
|
52
|
-
name: i18n
|
53
47
|
prerelease: false
|
54
|
-
|
48
|
+
version_requirements: *2162727520
|
49
|
+
- !ruby/object:Gem::Dependency
|
50
|
+
name: i18n
|
51
|
+
requirement: &2162727100 !ruby/object:Gem::Requirement
|
55
52
|
none: false
|
56
|
-
requirements:
|
57
|
-
- -
|
58
|
-
- !ruby/object:Gem::Version
|
59
|
-
version:
|
53
|
+
requirements:
|
54
|
+
- - ! '>='
|
55
|
+
- !ruby/object:Gem::Version
|
56
|
+
version: '0'
|
60
57
|
type: :runtime
|
61
|
-
|
58
|
+
prerelease: false
|
59
|
+
version_requirements: *2162727100
|
62
60
|
description: A Ruby class for describing and interacting with timeframes.
|
63
|
-
email:
|
61
|
+
email:
|
64
62
|
- andy@rossmeissl.net
|
65
63
|
executables: []
|
66
|
-
|
67
64
|
extensions: []
|
68
|
-
|
69
65
|
extra_rdoc_files: []
|
70
|
-
|
71
|
-
files:
|
66
|
+
files:
|
72
67
|
- .document
|
73
68
|
- .gitignore
|
74
69
|
- Gemfile
|
@@ -81,35 +76,31 @@ files:
|
|
81
76
|
- spec/spec_helper.rb
|
82
77
|
- spec/timeframe_spec.rb
|
83
78
|
- timeframe.gemspec
|
84
|
-
has_rdoc: true
|
85
79
|
homepage: http://github.com/rossmeissl/timeframe
|
86
80
|
licenses: []
|
87
|
-
|
88
81
|
post_install_message:
|
89
82
|
rdoc_options: []
|
90
|
-
|
91
|
-
require_paths:
|
83
|
+
require_paths:
|
92
84
|
- lib
|
93
|
-
required_ruby_version: !ruby/object:Gem::Requirement
|
85
|
+
required_ruby_version: !ruby/object:Gem::Requirement
|
94
86
|
none: false
|
95
|
-
requirements:
|
96
|
-
- -
|
97
|
-
- !ruby/object:Gem::Version
|
98
|
-
version:
|
99
|
-
required_rubygems_version: !ruby/object:Gem::Requirement
|
87
|
+
requirements:
|
88
|
+
- - ! '>='
|
89
|
+
- !ruby/object:Gem::Version
|
90
|
+
version: '0'
|
91
|
+
required_rubygems_version: !ruby/object:Gem::Requirement
|
100
92
|
none: false
|
101
|
-
requirements:
|
102
|
-
- -
|
103
|
-
- !ruby/object:Gem::Version
|
104
|
-
version:
|
93
|
+
requirements:
|
94
|
+
- - ! '>='
|
95
|
+
- !ruby/object:Gem::Version
|
96
|
+
version: '0'
|
105
97
|
requirements: []
|
106
|
-
|
107
98
|
rubyforge_project: timeframe
|
108
|
-
rubygems_version: 1.
|
99
|
+
rubygems_version: 1.8.5
|
109
100
|
signing_key:
|
110
101
|
specification_version: 3
|
111
102
|
summary: Date intervals
|
112
|
-
test_files:
|
103
|
+
test_files:
|
113
104
|
- spec/spec.opts
|
114
105
|
- spec/spec_helper.rb
|
115
106
|
- spec/timeframe_spec.rb
|