Skip to content

Commit

Permalink
put messaging into GeoConcerns namespace
Browse files Browse the repository at this point in the history
  • Loading branch information
eliotjordan committed Dec 1, 2016
1 parent 3dd0b96 commit d9bd6a8
Show file tree
Hide file tree
Showing 11 changed files with 49 additions and 46 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ def after_update_response
end

def messenger
@messenger ||= Messaging.messenger
@messenger ||= GeoConcerns::Messaging.messenger
end

def geo_concern
Expand Down
2 changes: 1 addition & 1 deletion app/models/concerns/geo_concerns/file_set/derivatives.rb
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ def derivative_path_factory
end

def messenger
@messenger ||= Messaging.messenger
@messenger ||= GeoConcerns::Messaging.messenger
end
end
end
Expand Down
4 changes: 2 additions & 2 deletions app/services/geo_concerns/events_generator.rb
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,11 @@ def generators
private

def geoblacklight_event_generator
GeoblacklightEventGenerator.new(Messaging.geoblacklight_client)
GeoblacklightEventGenerator.new(GeoConcerns::Messaging.geoblacklight_client)
end

def geoserver_event_generator
GeoserverEventGenerator.new(Messaging.geoserver_client)
GeoserverEventGenerator.new(GeoConcerns::Messaging.geoserver_client)
end
end
end
4 changes: 2 additions & 2 deletions app/services/geo_concerns/rabbit_messaging_client.rb
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,12 @@ def publish(message)
end

def geoblacklight
exchange_name = Messaging.config['events']['exchange']['geoblacklight']
exchange_name = GeoConcerns::Messaging.config['events']['exchange']['geoblacklight']
@exchange ||= channel.fanout(exchange_name, durable: true)
end

def geoserver
exchange_name = Messaging.config['events']['exchange']['geoserver']
exchange_name = GeoConcerns::Messaging.config['events']['exchange']['geoserver']
@exchange ||= channel.fanout(exchange_name, durable: true)
end

Expand Down
4 changes: 2 additions & 2 deletions lib/generators/geo_concerns/install_generator.rb
Original file line number Diff line number Diff line change
Expand Up @@ -74,8 +74,8 @@ def install_geoserver_config
end

def install_messaging_config
config_file_path = 'config/messaging.yml'
initializer_file_path = 'config/initializers/messaging_config.rb'
config_file_path = 'config/geo_concerns_messaging.yml'
initializer_file_path = 'config/initializers/geo_concerns_messaging_config.rb'
copy_file config_file_path, config_file_path
copy_file initializer_file_path, initializer_file_path
end
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
module GeoConcerns
module Messaging
def config
@config ||= config_yaml.with_indifferent_access
end

def messenger
GeoConcerns::EventsGenerator.new
end

def geoblacklight_client
local_client
end

def geoserver_client
local_client
end

private

def config_yaml
config_file = "#{Rails.root}/config/geo_concerns_messaging.yml"
YAML.load(ERB.new(File.read(config_file)).result)[Rails.env]
end

def local_client
GeoConcerns::LocalMessagingClient.new
end

def rabbit_client
GeoConcerns::RabbitMessagingClient.new(Messaging.config['events']['server'])
end

module_function :config, :config_yaml, :messenger, :local_client,
:rabbit_client, :geoblacklight_client, :geoserver_client
end
end

This file was deleted.

2 changes: 1 addition & 1 deletion spec/controllers/file_sets_controller_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@

before do
sign_in user
allow(Messaging).to receive(:messenger).and_return(messenger)
allow(GeoConcerns::Messaging).to receive(:messenger).and_return(messenger)
end

context 'after updating metadata' do
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
shared_examples 'a set of raster derivatives' do
let(:messenger) { instance_double(GeoConcerns::EventsGenerator) }
before do
allow(Messaging).to receive(:messenger).and_return(messenger)
allow(GeoConcerns::Messaging).to receive(:messenger).and_return(messenger)
expect(messenger).to receive(:derivatives_created).with(file_set)
end
it 'makes a thumbnail' do
Expand All @@ -26,7 +26,7 @@
shared_examples 'a set of vector derivatives' do
let(:messenger) { instance_double(GeoConcerns::EventsGenerator) }
before do
allow(Messaging).to receive(:messenger).and_return(messenger)
allow(GeoConcerns::Messaging).to receive(:messenger).and_return(messenger)
expect(messenger).to receive(:derivatives_created).with(file_set)
end
it 'makes a thumbnail' do
Expand Down
2 changes: 1 addition & 1 deletion spec/services/geo_concerns/rabbit_messaging_client_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
let(:bunny_session) { instance_double(Bunny::Session, create_channel: channel) }

before do
allow(Messaging).to receive(:config).and_return(config)
allow(GeoConcerns::Messaging).to receive(:config).and_return(config)
allow(Bunny).to receive(:new).and_return(bunny_session)
allow(bunny_session).to receive(:start)
end
Expand Down

0 comments on commit d9bd6a8

Please sign in to comment.