alephant-publisher-queue 2.1.4 → 2.2.0
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/Rakefile +1 -1
- data/alephant-publisher-queue.gemspec +2 -2
- data/lib/alephant/publisher/env.rb +1 -1
- data/lib/alephant/publisher/queue.rb +2 -2
- data/lib/alephant/publisher/queue/processor/base.rb +1 -1
- data/lib/alephant/publisher/queue/sqs_helper/archiver.rb +1 -1
- data/lib/alephant/publisher/queue/version.rb +1 -1
- data/lib/alephant/publisher/queue/writer.rb +5 -4
- data/spec/archiver_spec.rb +8 -8
- data/spec/publisher_spec.rb +3 -3
- data/spec/writer_spec.rb +7 -5
- metadata +6 -6
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: e4e4629b6edec4107606c37b56d4c20c041bc1e9
|
4
|
+
data.tar.gz: 9f96470b7492db9645d08a24c4ccf73a7a74bab0
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 20162a9089a2c093fa7e4636e7abee2927866b405218c0a23cfe013227419131982cd034c75b7e50e67fd378dc837dadff6efff5b374d20fb2c48bf1d2e88e39
|
7
|
+
data.tar.gz: 988aca2dc1c876ecfe9315e44699fd5d69701f7a03bd9b079a031b03d6048962fc9f174fa40cab834379636265003bf86b5636e641a1c6d8c54af4f8c3230967
|
data/Rakefile
CHANGED
@@ -31,9 +31,9 @@ Gem::Specification.new do |spec|
|
|
31
31
|
spec.add_runtime_dependency "aws-sdk", "~> 1.0"
|
32
32
|
spec.add_runtime_dependency "crimp"
|
33
33
|
spec.add_runtime_dependency "alephant-support"
|
34
|
-
spec.add_runtime_dependency "alephant-sequencer", "~>
|
34
|
+
spec.add_runtime_dependency "alephant-sequencer", "~> 3"
|
35
35
|
spec.add_runtime_dependency "alephant-cache"
|
36
36
|
spec.add_runtime_dependency "alephant-logger", "~> 3.1"
|
37
|
-
spec.add_runtime_dependency "alephant-lookup", "~>
|
37
|
+
spec.add_runtime_dependency "alephant-lookup", "~> 2"
|
38
38
|
spec.add_runtime_dependency "alephant-renderer"
|
39
39
|
end
|
@@ -32,7 +32,7 @@ module Alephant
|
|
32
32
|
aws_queue,
|
33
33
|
archiver,
|
34
34
|
opts.queue[:visibility_timeout] || VISIBILITY_TIMEOUT,
|
35
|
-
opts.queue[:receive_wait_time] || RECEIVE_WAIT_TIME
|
35
|
+
opts.queue[:receive_wait_time] || RECEIVE_WAIT_TIME
|
36
36
|
)
|
37
37
|
end
|
38
38
|
|
@@ -58,7 +58,7 @@ module Alephant
|
|
58
58
|
end
|
59
59
|
|
60
60
|
def whitelist_key(options, key)
|
61
|
-
options.
|
61
|
+
options.key?(key) && key != :log_validator
|
62
62
|
end
|
63
63
|
|
64
64
|
def archive_cache
|
@@ -97,9 +97,10 @@ module Alephant
|
|
97
97
|
def seq_for(id)
|
98
98
|
Sequencer.create(
|
99
99
|
config[:sequencer_table_name],
|
100
|
-
seq_key_from(id),
|
101
|
-
config[:sequence_id_path],
|
102
|
-
config[:keep_all_messages] == "true"
|
100
|
+
:id => seq_key_from(id),
|
101
|
+
:jsonpath => config[:sequence_id_path],
|
102
|
+
:keep_all => config[:keep_all_messages] == "true",
|
103
|
+
:config => config
|
103
104
|
)
|
104
105
|
end
|
105
106
|
|
@@ -130,7 +131,7 @@ module Alephant
|
|
130
131
|
end
|
131
132
|
|
132
133
|
def lookup
|
133
|
-
Lookup.create(config[:lookup_table_name])
|
134
|
+
Lookup.create(config[:lookup_table_name], config)
|
134
135
|
end
|
135
136
|
end
|
136
137
|
end
|
data/spec/archiver_spec.rb
CHANGED
@@ -1,11 +1,11 @@
|
|
1
1
|
require "spec_helper"
|
2
2
|
|
3
3
|
describe Alephant::Publisher::Queue::SQSHelper::Archiver do
|
4
|
-
let
|
5
|
-
let
|
6
|
-
let
|
7
|
-
let
|
8
|
-
let
|
4
|
+
let(:cache) { instance_double("Alephant::Cache", :put => nil) }
|
5
|
+
let(:queue) { instance_double("AWS::SQS::Queue", :url => nil) }
|
6
|
+
let(:msg_body) { { :Message => JSON.generate(msg_uri) } }
|
7
|
+
let(:msg_uri) { { :uri => "/content/asset/newsbeat" } }
|
8
|
+
let(:message) do
|
9
9
|
instance_double(
|
10
10
|
"AWS::SQS::ReceivedMessage",
|
11
11
|
:id => "id",
|
@@ -15,17 +15,17 @@ describe Alephant::Publisher::Queue::SQSHelper::Archiver do
|
|
15
15
|
)
|
16
16
|
end
|
17
17
|
|
18
|
-
let
|
18
|
+
let(:opts) do
|
19
19
|
{
|
20
20
|
:log_archive_message => true,
|
21
21
|
:async_store => false
|
22
22
|
}
|
23
23
|
end
|
24
24
|
|
25
|
-
let
|
25
|
+
let(:subject) { described_class.new(cache, opts) }
|
26
26
|
|
27
27
|
describe "#see" do
|
28
|
-
let
|
28
|
+
let(:time_now) { DateTime.parse("Feb 24 1981") }
|
29
29
|
|
30
30
|
context "calls cache put with the correct params" do
|
31
31
|
before(:each) do
|
data/spec/publisher_spec.rb
CHANGED
@@ -2,11 +2,11 @@ require "spec_helper"
|
|
2
2
|
|
3
3
|
describe Alephant::Publisher::Queue do
|
4
4
|
let(:options) { Alephant::Publisher::Queue::Options.new }
|
5
|
-
let(:queue) { double("AWS::SQS::Queue", :url => nil
|
5
|
+
let(:queue) { double("AWS::SQS::Queue", :url => nil) }
|
6
6
|
let(:client_double) { double("AWS::SQS", :queues => queue_double) }
|
7
|
-
let(:queue_double)
|
7
|
+
let(:queue_double) do
|
8
8
|
double("AWS::SQS::QueueCollection", :[] => queue, :url_for => nil)
|
9
|
-
|
9
|
+
end
|
10
10
|
|
11
11
|
before(:each) do
|
12
12
|
expect(AWS::SQS).to receive(:new).and_return(client_double)
|
data/spec/writer_spec.rb
CHANGED
@@ -9,7 +9,7 @@ describe Alephant::Publisher::Queue::Writer do
|
|
9
9
|
:s3_bucket_id => :s3_bucket_id,
|
10
10
|
:s3_object_path => :s3_object_path,
|
11
11
|
:sequence_id_path => "$.sequence",
|
12
|
-
:sequencer_table_name =>
|
12
|
+
:sequencer_table_name => "sequencer_table_name",
|
13
13
|
:view_path => :view_path
|
14
14
|
}
|
15
15
|
end
|
@@ -23,17 +23,19 @@ describe Alephant::Publisher::Queue::Writer do
|
|
23
23
|
opts[:s3_object_path]
|
24
24
|
)
|
25
25
|
|
26
|
-
|
27
26
|
allow_any_instance_of(
|
28
27
|
Alephant::Sequencer::SequenceTable
|
29
|
-
).to
|
30
|
-
|
28
|
+
).to receive_messages(
|
29
|
+
:create => nil,
|
30
|
+
:sequence_exists => nil
|
31
|
+
)
|
31
32
|
|
32
33
|
allow_any_instance_of(Alephant::Sequencer::Sequencer)
|
33
34
|
.to receive_messages(
|
34
35
|
:sequencer_id_from => nil,
|
35
36
|
:set_last_seen => nil,
|
36
|
-
:get_last_seen => nil
|
37
|
+
:get_last_seen => nil,
|
38
|
+
:exists? => nil
|
37
39
|
)
|
38
40
|
|
39
41
|
allow_any_instance_of(Alephant::Lookup::LookupTable)
|
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: alephant-publisher-queue
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 2.
|
4
|
+
version: 2.2.0
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- BBC News
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2016-03-
|
11
|
+
date: 2016-03-17 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
requirement: !ruby/object:Gem::Requirement
|
@@ -197,7 +197,7 @@ dependencies:
|
|
197
197
|
requirements:
|
198
198
|
- - ~>
|
199
199
|
- !ruby/object:Gem::Version
|
200
|
-
version: '
|
200
|
+
version: '3'
|
201
201
|
name: alephant-sequencer
|
202
202
|
prerelease: false
|
203
203
|
type: :runtime
|
@@ -205,7 +205,7 @@ dependencies:
|
|
205
205
|
requirements:
|
206
206
|
- - ~>
|
207
207
|
- !ruby/object:Gem::Version
|
208
|
-
version: '
|
208
|
+
version: '3'
|
209
209
|
- !ruby/object:Gem::Dependency
|
210
210
|
requirement: !ruby/object:Gem::Requirement
|
211
211
|
requirements:
|
@@ -239,7 +239,7 @@ dependencies:
|
|
239
239
|
requirements:
|
240
240
|
- - ~>
|
241
241
|
- !ruby/object:Gem::Version
|
242
|
-
version: '
|
242
|
+
version: '2'
|
243
243
|
name: alephant-lookup
|
244
244
|
prerelease: false
|
245
245
|
type: :runtime
|
@@ -247,7 +247,7 @@ dependencies:
|
|
247
247
|
requirements:
|
248
248
|
- - ~>
|
249
249
|
- !ruby/object:Gem::Version
|
250
|
-
version: '
|
250
|
+
version: '2'
|
251
251
|
- !ruby/object:Gem::Dependency
|
252
252
|
requirement: !ruby/object:Gem::Requirement
|
253
253
|
requirements:
|