geo_concerns 0.0.10 → 0.1.0

data/spec/services/geo_concerns/discovery/geoblacklight_document_spec.rb

@@ -5,6 +5,7 @@ describe GeoConcerns::Discovery::GeoblacklightDocument do
 
   describe '#to_hash' do
     before do
+      allow(subject).to receive(:rights).and_return('Public')
       allow(subject).to receive(:document_hash).and_return(document_hash)
     end
     context 'incomplete data' do

data/spec/services/geo_concerns/events_generator/geoblacklight_event_generator_spec.rb

@@ -0,0 +1,87 @@
+require 'spec_helper'
+
+RSpec.describe GeoConcerns::EventsGenerator::GeoblacklightEventGenerator do
+  subject { described_class.new(rabbit_connection) }
+  let(:rabbit_connection) { instance_double(GeoConcerns::RabbitMessagingClient, publish: true) }
+  let(:geo_concern) { FactoryGirl.build(:public_vector_work, attributes) }
+  let(:record) { GeoConcerns::VectorWorkShowPresenter.new(SolrDocument.new(geo_concern.to_solr), nil) }
+  let(:visibility) { Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_PUBLIC }
+  let(:coverage) { GeoConcerns::Coverage.new(43, -69, 42, -71) }
+  let(:attributes) { { id: 'geo-work-1',
+                       title: ['Geo Work'],
+                       coverage: coverage.to_s,
+                       description: ['geo work'],
+                       temporal: ['2011'] }
+  }
+  let(:refs) { { "http://schema.org/url" => "http://localhost:3000/concern/vector_works/geo-work-1" } }
+  let(:layer_modified) do
+    datetime = record.solr_document[:system_modified_dtsi]
+    datetime = DateTime.parse(datetime.to_s).utc
+    Rails::VERSION::MAJOR == 4 ? datetime.utc.xmlschema : datetime.utc.strftime('%FT%TZ')
+  end
+  let(:discovery_doc) { { "geoblacklight_version" => "1.0",
+                          "dc_identifier_s" => "geo-work-1",
+                          "layer_slug_s" => "your-institution-geo-work-1",
+                          "uuid" => "your-institution-geo-work-1",
+                          "dc_title_s" => record.title.first,
+                          "solr_geom" => "ENVELOPE(-71.0, -69.0, 43.0, 42.0)",
+                          "dct_provenance_s" => "Your Institution",
+                          "dc_rights_s" => "Public",
+                          "dc_description_s" => "geo work",
+                          "dct_temporal_sm" => ["2011"],
+                          "solr_year_i" => 2011,
+                          "layer_modified_dt" => layer_modified,
+                          "dct_references_s" => refs.to_json,
+                          "layer_geom_type_s" => "Mixed" }
+  }
+
+  before do
+    allow(record.solr_document).to receive(:visibility).and_return(visibility)
+    allow(record.request).to receive_messages(host_with_port: 'localhost:3000', protocol: 'http://')
+  end
+
+  describe "#record_created" do
+    it "publishes a persistent JSON message" do
+      geo_concern.save
+      expected_result = {
+        "id" => record.id,
+        "event" => "CREATED",
+        "exchange" => "geoblacklight",
+        "doc" => discovery_doc
+      }
+      subject.record_created(record)
+      expect(rabbit_connection).to have_received(:publish).with(expected_result.to_json)
+    end
+  end
+
+  describe "#record_deleted" do
+    it "publishes a persistent JSON message" do
+      geo_concern.save
+      geo_concern.destroy
+      expected_result = {
+        "id" => "your-institution-geo-work-1",
+        "event" => "DELETED",
+        "exchange" => "geoblacklight"
+      }
+
+      subject.record_deleted(record)
+      expect(rabbit_connection).to have_received(:publish).with(expected_result.to_json)
+    end
+  end
+
+  describe "#record_updated" do
+    let(:title) { ['New Geo Work'] }
+    it "publishes a persistent JSON message with new title" do
+      geo_concern.title = ["New Geo Work"]
+      geo_concern.save!
+      expected_result = {
+        "id" => record.id,
+        "event" => "UPDATED",
+        "exchange" => "geoblacklight",
+        "doc" => discovery_doc
+      }
+      subject.record_updated(record)
+      expect(rabbit_connection).to have_received(:publish).with(expected_result.to_json)
+    end
+  end
+end

data/spec/services/geo_concerns/events_generator/geoserver_event_generator_spec.rb

@@ -0,0 +1,40 @@
+require 'spec_helper'
+
+RSpec.describe GeoConcerns::EventsGenerator::GeoserverEventGenerator do
+  subject { described_class.new(rabbit_connection) }
+  let(:rabbit_connection) { instance_double(GeoConcerns::RabbitMessagingClient, publish: true) }
+  let(:file_set) { FactoryGirl.build(:vector_file) }
+  let(:visibility) { Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_PUBLIC }
+  let(:attributes) { { id: 'geo-work-1',
+                       title: ['Geo Work'],
+                       description: ['geo work'],
+                       temporal: ['2011'] }
+  }
+
+  describe "#derivatives_created" do
+    it "publishes a persistent JSON message" do
+      file_set.save
+      expected_result = {
+        "id" => file_set.id,
+        "event" => "CREATED",
+        "exchange" => "geoserver"
+      }
+      subject.derivatives_created(file_set)
+      expect(rabbit_connection).to have_received(:publish).with(expected_result.to_json)
+    end
+  end
+
+  describe "#record_updated" do
+    it "publishes a persistent JSON message with new title" do
+      file_set.title = ["New Geo Work"]
+      file_set.save!
+      expected_result = {
+        "id" => file_set.id,
+        "event" => "UPDATED",
+        "exchange" => "geoserver"
+      }
+      subject.record_updated(file_set)
+      expect(rabbit_connection).to have_received(:publish).with(expected_result.to_json)
+    end
+  end
+end

data/spec/services/geo_concerns/local_messaging_client_spec.rb

@@ -0,0 +1,35 @@
+require 'spec_helper'
+
+RSpec.describe GeoConcerns::LocalMessagingClient do
+  subject { described_class.new }
+  let(:config) { { 'events' => { 'exchange' => { 'geoblacklight' => 'gbl_events', 'geoserver' => 'geoserver_events' } } } }
+  let(:exchange) { 'geoblacklight' }
+  let(:message) { { exchange: exchange }.to_json }
+
+  describe "#publish" do
+    context 'with a geoblacklight exchange type' do
+      it 'calls the geoblacklight method' do
+        expect(GeoblacklightJob).to receive(:perform_later)
+        subject.publish(message)
+      end
+    end
+
+    context 'with a geoserver exchange type' do
+      let(:exchange) { 'geoserver' }
+
+      it 'calls the geoserver method' do
+        expect(DeliveryJob).to receive(:perform_later)
+        subject.publish(message)
+      end
+    end
+
+    context 'with an unknown exchange type' do
+      let(:exchange) { 'someexchange' }
+
+      it 'logs an error' do
+        expect(Rails.logger).to receive(:warn).with(/Unable to publish message/)
+        subject.publish(message)
+      end
+    end
+  end
+end

data/spec/services/geo_concerns/rabbit_messaging_client_spec.rb

@@ -0,0 +1,35 @@
+require 'spec_helper'
+
+RSpec.describe GeoConcerns::RabbitMessagingClient do
+  subject { described_class.new(url) }
+  let(:url) { "amqp://test.x.z.s:4000" }
+  let(:config) { { 'events' => { 'exchange' => { 'geoblacklight' => 'gbl_events', 'geoserver' => 'geoserver_events' } } } }
+  let(:exchange) { 'geoblacklight' }
+  let(:message) { { exchange: exchange }.to_json }
+  let(:channel) { instance_double(Bunny::Channel) }
+  let(:bunny_session) { instance_double(Bunny::Session, create_channel: channel) }
+
+  before do
+    allow(Messaging).to receive(:config).and_return(config)
+    allow(Bunny).to receive(:new).and_return(bunny_session)
+    allow(bunny_session).to receive(:start)
+  end
+
+  describe "#publish" do
+    context 'with a geoblacklight exchange type' do
+      it 'calls the geoblacklight method' do
+        expect(channel).to receive(:fanout).with('gbl_events', durable: true)
+        subject.publish(message)
+      end
+    end
+
+    context 'with a geoserver exchange type' do
+      let(:exchange) { 'geoserver' }
+
+      it 'calls the geoserver method' do
+        expect(channel).to receive(:fanout).with('geoserver_events', durable: true)
+        subject.publish(message)
+      end
+    end
+  end
+end

data/template.rb

@@ -1,5 +1,5 @@
 gem 'curation_concerns', '1.6.0'
-gem 'geo_concerns', '0.0.10'
+gem 'geo_concerns', '0.1.0'
 
 run 'bundle install'
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: geo_concerns
 version: !ruby/object:Gem::Version
-  version: 0.0.10
+  version: 0.1.0
 platform: ruby
 authors:
 - James Griffin
@@ -12,22 +12,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-16 00:00:00.000000000 Z
+date: 2016-11-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: curation_concerns
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.6.0
+        version: '1.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.6.0
+        version: '1.6'
 - !ruby/object:Gem::Dependency
   name: leaflet-rails
   requirement: !ruby/object:Gem::Requirement
@@ -43,47 +43,75 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0.7'
 - !ruby/object:Gem::Dependency
-  name: simple_mapnik
+  name: json-schema
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.2
+        version: 2.6.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.2
+        version: 2.6.2
 - !ruby/object:Gem::Dependency
-  name: json-schema
+  name: rgeoserver
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.6.2
+        version: 0.10.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.6.2
+        version: 0.10.0
 - !ruby/object:Gem::Dependency
-  name: rgeoserver
+  name: simpler-tiles
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.10.0
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.10.0
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: bunny
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: geoblacklight_messaging
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -155,7 +183,7 @@ dependencies:
         version: '1.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.0.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -165,7 +193,7 @@ dependencies:
         version: '1.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.0.1
 - !ruby/object:Gem::Dependency
   name: solr_wrapper
   requirement: !ruby/object:Gem::Requirement
@@ -339,6 +367,7 @@ files:
 - app/controllers/concerns/geo_concerns/file_sets_controller_behavior.rb
 - app/controllers/concerns/geo_concerns/geoblacklight_controller_behavior.rb
 - app/controllers/concerns/geo_concerns/image_works_controller_behavior.rb
+- app/controllers/concerns/geo_concerns/messenger_behavior.rb
 - app/controllers/concerns/geo_concerns/raster_works_controller_behavior.rb
 - app/controllers/concerns/geo_concerns/vector_works_controller_behavior.rb
 - app/forms/geo_concerns/basic_geo_metadata_form.rb
@@ -353,6 +382,7 @@ files:
 - app/helpers/geo_concerns/geo_works_helper.rb
 - app/helpers/geo_concerns/populate_metadata_helper.rb
 - app/jobs/delivery_job.rb
+- app/jobs/geoblacklight_job.rb
 - app/models/concerns/geo_concerns/ability.rb
 - app/models/concerns/geo_concerns/basic_geo_metadata.rb
 - app/models/concerns/geo_concerns/external_metadata_file_behavior.rb
@@ -380,18 +410,17 @@ files:
 - app/presenters/geo_concerns/vector_work_show_presenter.rb
 - app/processors/geo_concerns/processors/base_geo_processor.rb
 - app/processors/geo_concerns/processors/gdal.rb
-- app/processors/geo_concerns/processors/mapnik.rb
+- app/processors/geo_concerns/processors/image.rb
 - app/processors/geo_concerns/processors/ogr.rb
 - app/processors/geo_concerns/processors/raster.rb
 - app/processors/geo_concerns/processors/raster/aig.rb
 - app/processors/geo_concerns/processors/raster/base.rb
 - app/processors/geo_concerns/processors/raster/dem.rb
 - app/processors/geo_concerns/processors/raster/info.rb
-- app/processors/geo_concerns/processors/raster/processor.rb
+- app/processors/geo_concerns/processors/rendering.rb
 - app/processors/geo_concerns/processors/vector.rb
 - app/processors/geo_concerns/processors/vector/base.rb
 - app/processors/geo_concerns/processors/vector/info.rb
-- app/processors/geo_concerns/processors/vector/processor.rb
 - app/processors/geo_concerns/processors/vector/shapefile.rb
 - app/processors/geo_concerns/processors/zip.rb
 - app/renderers/geo_concerns/coverage_renderer.rb
@@ -415,9 +444,17 @@ files:
 - app/services/geo_concerns/discovery/document_builder/layer_info_builder.rb
 - app/services/geo_concerns/discovery/document_builder/references_builder.rb
 - app/services/geo_concerns/discovery/document_builder/spatial_builder.rb
+- app/services/geo_concerns/discovery/document_builder/wxs.rb
 - app/services/geo_concerns/discovery/geoblacklight_document.rb
+- app/services/geo_concerns/events_generator.rb
+- app/services/geo_concerns/events_generator/base_events_generator.rb
+- app/services/geo_concerns/events_generator/composite_generator.rb
+- app/services/geo_concerns/events_generator/geoblacklight_event_generator.rb
+- app/services/geo_concerns/events_generator/geoserver_event_generator.rb
 - app/services/geo_concerns/image_format_service.rb
+- app/services/geo_concerns/local_messaging_client.rb
 - app/services/geo_concerns/metadata_format_service.rb
+- app/services/geo_concerns/rabbit_messaging_client.rb
 - app/services/geo_concerns/raster_format_service.rb
 - app/services/geo_concerns/vector_format_service.rb
 - app/values/geo_concerns/coverage.rb
@@ -470,6 +507,7 @@ files:
 - config/fcrepo_wrapper_test.yml
 - config/routes.rb
 - config/solr_wrapper_test.yml
+- docker-compose-full.yml
 - docker-compose.yml
 - geo_concerns.gemspec
 - lib/generators/geo_concerns/install_generator.rb
@@ -480,9 +518,13 @@ files:
 - lib/generators/geo_concerns/templates/config/authorities/metadata_formats.yml
 - lib/generators/geo_concerns/templates/config/authorities/raster_formats.yml
 - lib/generators/geo_concerns/templates/config/authorities/vector_formats.yml
+- lib/generators/geo_concerns/templates/config/geoblacklight.yml
 - lib/generators/geo_concerns/templates/config/geoserver.yml
-- lib/generators/geo_concerns/templates/config/locales/geo_concerns.en.yml
-- lib/generators/geo_concerns/templates/config/mapnik.yml
+- lib/generators/geo_concerns/templates/config/initializers/geoblacklight_config.rb
+- lib/generators/geo_concerns/templates/config/initializers/messaging_config.rb
+- lib/generators/geo_concerns/templates/config/initializers/simpler_tiles.rb
+- lib/generators/geo_concerns/templates/config/messaging.yml
+- lib/generators/geo_concerns/templates/config/simpler_tiles.yml
 - lib/generators/geo_concerns/templates/controllers/curation_concerns/file_sets_controller.rb
 - lib/generators/geo_concerns/templates/controllers/curation_concerns/image_works_controller.rb
 - lib/generators/geo_concerns/templates/controllers/curation_concerns/raster_works_controller.rb
@@ -565,26 +607,32 @@ files:
 - spec/presenters/vector_work_show_presenter_spec.rb
 - spec/processors/geo_concerns/processors/base_geo_processor_spec.rb
 - spec/processors/geo_concerns/processors/gdal_spec.rb
-- spec/processors/geo_concerns/processors/mapnik_spec.rb
+- spec/processors/geo_concerns/processors/image_spec.rb
 - spec/processors/geo_concerns/processors/ogr_spec.rb
 - spec/processors/geo_concerns/processors/raster/aig_spec.rb
 - spec/processors/geo_concerns/processors/raster/base_spec.rb
 - spec/processors/geo_concerns/processors/raster/dem_spec.rb
 - spec/processors/geo_concerns/processors/raster/info_spec.rb
 - spec/processors/geo_concerns/processors/raster/processor_spec.rb
+- spec/processors/geo_concerns/processors/rendering_spec.rb
 - spec/processors/geo_concerns/processors/vector/base_spec.rb
 - spec/processors/geo_concerns/processors/vector/info_spec.rb
 - spec/processors/geo_concerns/processors/vector/processor_spec.rb
 - spec/processors/geo_concerns/processors/vector/shapefile_spec.rb
 - spec/processors/geo_concerns/processors/zip_spec.rb
 - spec/renderers/geo_concerns/coverage_renderer_spec.rb
-- spec/services/derivative_path_spec.rb
 - spec/services/geo_concerns/delivery/geoserver_spec.rb
 - spec/services/geo_concerns/delivery_service_spec.rb
+- spec/services/geo_concerns/derivative_path_spec.rb
 - spec/services/geo_concerns/discovery/abstract_document_spec.rb
+- spec/services/geo_concerns/discovery/document_builder/wxs_spec.rb
 - spec/services/geo_concerns/discovery/document_builder_spec.rb
 - spec/services/geo_concerns/discovery/geoblacklight_document_spec.rb
-- spec/services/raster_format_service_spec.rb
+- spec/services/geo_concerns/events_generator/geoblacklight_event_generator_spec.rb
+- spec/services/geo_concerns/events_generator/geoserver_event_generator_spec.rb
+- spec/services/geo_concerns/local_messaging_client_spec.rb
+- spec/services/geo_concerns/rabbit_messaging_client_spec.rb
+- spec/services/geo_concerns/raster_format_service_spec.rb
 - spec/spec_helper.rb
 - spec/support/backport_test.rb
 - spec/support/controllers/engine_helpers.rb
@@ -619,7 +667,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.6
+rubygems_version: 2.6.7
 signing_key: 
 specification_version: 4
 summary: Rails engine for Hydra Geo models. Built around Curation Concerns engine.
@@ -670,26 +718,32 @@ test_files:
 - spec/presenters/vector_work_show_presenter_spec.rb
 - spec/processors/geo_concerns/processors/base_geo_processor_spec.rb
 - spec/processors/geo_concerns/processors/gdal_spec.rb
-- spec/processors/geo_concerns/processors/mapnik_spec.rb
+- spec/processors/geo_concerns/processors/image_spec.rb
 - spec/processors/geo_concerns/processors/ogr_spec.rb
 - spec/processors/geo_concerns/processors/raster/aig_spec.rb
 - spec/processors/geo_concerns/processors/raster/base_spec.rb
 - spec/processors/geo_concerns/processors/raster/dem_spec.rb
 - spec/processors/geo_concerns/processors/raster/info_spec.rb
 - spec/processors/geo_concerns/processors/raster/processor_spec.rb
+- spec/processors/geo_concerns/processors/rendering_spec.rb
 - spec/processors/geo_concerns/processors/vector/base_spec.rb
 - spec/processors/geo_concerns/processors/vector/info_spec.rb
 - spec/processors/geo_concerns/processors/vector/processor_spec.rb
 - spec/processors/geo_concerns/processors/vector/shapefile_spec.rb
 - spec/processors/geo_concerns/processors/zip_spec.rb
 - spec/renderers/geo_concerns/coverage_renderer_spec.rb
-- spec/services/derivative_path_spec.rb
 - spec/services/geo_concerns/delivery/geoserver_spec.rb
 - spec/services/geo_concerns/delivery_service_spec.rb
+- spec/services/geo_concerns/derivative_path_spec.rb
 - spec/services/geo_concerns/discovery/abstract_document_spec.rb
+- spec/services/geo_concerns/discovery/document_builder/wxs_spec.rb
 - spec/services/geo_concerns/discovery/document_builder_spec.rb
 - spec/services/geo_concerns/discovery/geoblacklight_document_spec.rb
-- spec/services/raster_format_service_spec.rb
+- spec/services/geo_concerns/events_generator/geoblacklight_event_generator_spec.rb
+- spec/services/geo_concerns/events_generator/geoserver_event_generator_spec.rb
+- spec/services/geo_concerns/local_messaging_client_spec.rb
+- spec/services/geo_concerns/rabbit_messaging_client_spec.rb
+- spec/services/geo_concerns/raster_format_service_spec.rb
 - spec/spec_helper.rb
 - spec/support/backport_test.rb
 - spec/support/controllers/engine_helpers.rb