adrian 1.3.2 → 1.3.3
Sign up to get free protection for your applications and to get access to all the features.
- data/lib/adrian/file_item.rb +1 -1
- data/lib/adrian/filters.rb +2 -2
- data/lib/adrian/version.rb +1 -1
- data/test/directory_queue_test.rb +6 -6
- data/test/file_item_test.rb +2 -2
- data/test/filters_test.rb +4 -4
- data/test/test_helper.rb +4 -1
- metadata +3 -25
data/lib/adrian/file_item.rb
CHANGED
data/lib/adrian/filters.rb
CHANGED
@@ -17,7 +17,7 @@ module Adrian
|
|
17
17
|
end
|
18
18
|
|
19
19
|
def allow?(item)
|
20
|
-
item.updated_at <= (Time.
|
20
|
+
item.updated_at <= (Time.now - duration)
|
21
21
|
end
|
22
22
|
|
23
23
|
def duration
|
@@ -39,7 +39,7 @@ module Adrian
|
|
39
39
|
end
|
40
40
|
|
41
41
|
def lock_expired?(item)
|
42
|
-
item.updated_at <= (Time.
|
42
|
+
item.updated_at <= (Time.now - duration)
|
43
43
|
end
|
44
44
|
|
45
45
|
def locked?(item)
|
data/lib/adrian/version.rb
CHANGED
@@ -58,11 +58,11 @@ describe Adrian::DirectoryQueue do
|
|
58
58
|
assert reserved_item
|
59
59
|
one_hour = 3_600
|
60
60
|
|
61
|
-
Time.stub(:
|
61
|
+
Time.stub(:now, reserved_item.updated_at + one_hour - 1) do
|
62
62
|
assert_equal nil, @q.pop
|
63
63
|
end
|
64
64
|
|
65
|
-
Time.stub(:
|
65
|
+
Time.stub(:now, reserved_item.updated_at + one_hour) do
|
66
66
|
assert_equal @item, @q.pop
|
67
67
|
end
|
68
68
|
|
@@ -70,9 +70,9 @@ describe Adrian::DirectoryQueue do
|
|
70
70
|
|
71
71
|
it 'touches the item' do
|
72
72
|
@q.push(@item)
|
73
|
-
now = Time.
|
73
|
+
now = Time.now + 100
|
74
74
|
item = nil
|
75
|
-
Time.stub(:
|
75
|
+
Time.stub(:now, now) { item = @q.pop }
|
76
76
|
|
77
77
|
assert_equal now.to_i, item.updated_at.to_i
|
78
78
|
end
|
@@ -111,8 +111,8 @@ describe Adrian::DirectoryQueue do
|
|
111
111
|
end
|
112
112
|
|
113
113
|
it 'touches the item' do
|
114
|
-
now = Time.
|
115
|
-
Time.stub(:
|
114
|
+
now = Time.now - 100
|
115
|
+
Time.stub(:now, now) { @q.push(@item) }
|
116
116
|
|
117
117
|
assert_equal now.to_i, @item.updated_at.to_i
|
118
118
|
end
|
data/test/file_item_test.rb
CHANGED
@@ -115,7 +115,7 @@ describe Adrian::FileItem do
|
|
115
115
|
|
116
116
|
it 'changes the update timestamp to the current time' do
|
117
117
|
now = Time.now - 100
|
118
|
-
Time.stub(:
|
118
|
+
Time.stub(:now, now) { @item.touch }
|
119
119
|
|
120
120
|
assert_equal now.to_i, @item.updated_at.to_i
|
121
121
|
end
|
@@ -124,7 +124,7 @@ describe Adrian::FileItem do
|
|
124
124
|
atime = File.atime(@item.path).to_i
|
125
125
|
|
126
126
|
now = (Time.now - 100)
|
127
|
-
Time.stub(:
|
127
|
+
Time.stub(:now, now) { @item.touch }
|
128
128
|
|
129
129
|
now.to_i.wont_equal atime
|
130
130
|
File.atime(@item.path).to_i.must_equal now.to_i
|
data/test/filters_test.rb
CHANGED
@@ -46,12 +46,12 @@ describe Adrian::Filters do
|
|
46
46
|
@filter = Adrian::Filters::Delay.new
|
47
47
|
@updatable_item = Adrian::QueueItem.new("hello")
|
48
48
|
@updatable_item.extend(Updatable)
|
49
|
-
@updatable_item.updated_at = Time.
|
49
|
+
@updatable_item.updated_at = Time.now
|
50
50
|
@fifteen_minutes = 900
|
51
51
|
end
|
52
52
|
|
53
53
|
it "allows items that have not been recently updated" do
|
54
|
-
Time.stub(:
|
54
|
+
Time.stub(:now, @updatable_item.updated_at + @fifteen_minutes) do
|
55
55
|
assert_equal true, @filter.allow?(@updatable_item)
|
56
56
|
end
|
57
57
|
end
|
@@ -82,13 +82,13 @@ describe Adrian::Filters do
|
|
82
82
|
end
|
83
83
|
|
84
84
|
it "allows items with an expired lock" do
|
85
|
-
@locked_item.stub(:updated_at, Time.
|
85
|
+
@locked_item.stub(:updated_at, Time.now - @one_hour) do
|
86
86
|
assert_equal true, @filter.allow?(@locked_item)
|
87
87
|
end
|
88
88
|
end
|
89
89
|
|
90
90
|
it "does not allow items with a fresh lock" do
|
91
|
-
@locked_item.stub(:updated_at, Time.
|
91
|
+
@locked_item.stub(:updated_at, Time.now) do
|
92
92
|
assert_equal false, @filter.allow?(@locked_item)
|
93
93
|
end
|
94
94
|
end
|
data/test/test_helper.rb
CHANGED
metadata
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: adrian
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 1.3.
|
4
|
+
version: 1.3.3
|
5
5
|
prerelease:
|
6
6
|
platform: ruby
|
7
7
|
authors:
|
@@ -10,7 +10,7 @@ authors:
|
|
10
10
|
autorequire:
|
11
11
|
bindir: bin
|
12
12
|
cert_chain: []
|
13
|
-
date: 2012-
|
13
|
+
date: 2012-11-29 00:00:00.000000000 Z
|
14
14
|
dependencies:
|
15
15
|
- !ruby/object:Gem::Dependency
|
16
16
|
name: rake
|
@@ -44,22 +44,6 @@ dependencies:
|
|
44
44
|
- - ! '>='
|
45
45
|
- !ruby/object:Gem::Version
|
46
46
|
version: '0'
|
47
|
-
- !ruby/object:Gem::Dependency
|
48
|
-
name: debugger
|
49
|
-
requirement: !ruby/object:Gem::Requirement
|
50
|
-
none: false
|
51
|
-
requirements:
|
52
|
-
- - ! '>='
|
53
|
-
- !ruby/object:Gem::Version
|
54
|
-
version: '0'
|
55
|
-
type: :development
|
56
|
-
prerelease: false
|
57
|
-
version_requirements: !ruby/object:Gem::Requirement
|
58
|
-
none: false
|
59
|
-
requirements:
|
60
|
-
- - ! '>='
|
61
|
-
- !ruby/object:Gem::Version
|
62
|
-
version: '0'
|
63
47
|
- !ruby/object:Gem::Dependency
|
64
48
|
name: girl_friday
|
65
49
|
requirement: !ruby/object:Gem::Requirement
|
@@ -123,21 +107,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
|
|
123
107
|
- - ! '>='
|
124
108
|
- !ruby/object:Gem::Version
|
125
109
|
version: '0'
|
126
|
-
segments:
|
127
|
-
- 0
|
128
|
-
hash: -3817287856901021378
|
129
110
|
required_rubygems_version: !ruby/object:Gem::Requirement
|
130
111
|
none: false
|
131
112
|
requirements:
|
132
113
|
- - ! '>='
|
133
114
|
- !ruby/object:Gem::Version
|
134
115
|
version: '0'
|
135
|
-
segments:
|
136
|
-
- 0
|
137
|
-
hash: -3817287856901021378
|
138
116
|
requirements: []
|
139
117
|
rubyforge_project:
|
140
|
-
rubygems_version: 1.8.
|
118
|
+
rubygems_version: 1.8.21
|
141
119
|
signing_key:
|
142
120
|
specification_version: 3
|
143
121
|
summary: Adrian does not do any real work, but is really good at delegating it
|