geo_concerns 0.0.10 → 0.1.0

data/lib/generators/geo_concerns/templates/config/geoblacklight.yml

@@ -0,0 +1,12 @@
+defaults: &defaults
+  adapter: solr
+  url: <%= ENV['GEOBLACKLIGHT_SOLR_URL'] || "http://127.0.0.1:8983/solr/blacklight-core" %>
+    
+development:
+  <<: *defaults
+
+test:
+  <<: *defaults
+
+production:
+  <<: *defaults

data/lib/generators/geo_concerns/templates/config/geoserver.yml

@@ -11,6 +11,8 @@ geoserver:
     geowebcache_url: <%= ENV['PUBLIC_GEOSERVER_GWC_URL'] || "builtin" %>
     # Name of the workspace to save your data in
     workspace: <%= ENV['PUBLIC_GEOSERVER_WS'] || "public" %>
+    # Path on geoserver machine to mounted/mirrored derivates directory
+    derivatives_path: <%= ENV['PUBLIC_GEOSERVER_DERIVATIVES_PATH'] || "/opt/geoserver/data_dir/derivatives" %>
     restclient:
       # Set to false to disable or stdout, stderr, or filename
       logfile: stderr

data/lib/generators/geo_concerns/templates/config/initializers/geoblacklight_config.rb

@@ -0,0 +1,13 @@
+module Geoblacklight
+  def config
+    @config ||= config_yaml.with_indifferent_access
+  end
+
+  private
+
+    def config_yaml
+      YAML.load(ERB.new(File.read("#{Rails.root}/config/geoblacklight.yml")).result)[Rails.env]
+    end
+
+    module_function :config, :config_yaml
+end

data/lib/generators/geo_concerns/templates/config/initializers/messaging_config.rb

@@ -0,0 +1,34 @@
+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
+      YAML.load(ERB.new(File.read("#{Rails.root}/config/messaging.yml")).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

data/lib/generators/geo_concerns/templates/config/initializers/simpler_tiles.rb

@@ -0,0 +1,65 @@
+module SimplerTiles
+  class << self
+    def config
+      @config ||= Configuration.new
+    end
+  end
+
+  class Configuration
+    attr_reader :settings
+    attr_writer :bg_color,
+                :fill,
+                :stroke,
+                :weight,
+                :line_cap,
+                :line_join,
+                :radius
+
+    def initialize
+      @settings ||= File.exist?(config_file) ? YAML.load_file(config_file) : {}
+    end
+
+    def config_file
+      File.join(Rails.root, 'config/simpler_tiles.yml')
+    end
+
+    def to_h
+      {
+        'stroke' => stroke,
+        'line-cap' => line_cap,
+        'line-join' => line_join,
+        'weight' => weight,
+        'fill' => fill,
+        'radius' => radius
+      }
+    end
+
+    def bg_color
+      @bg_color ||= settings.fetch('bg_color', '#ffffff00')
+    end
+
+    def fill
+      @fill ||= settings.fetch('fill', '#e4e3ea')
+    end
+
+    def stroke
+      @stroke ||= settings.fetch('stroke', '#483d8b')
+    end
+
+    def weight
+      @weight ||= settings.fetch('weight', '0.3')
+    end
+
+    def line_cap
+      @line_cap ||= settings.fetch('line_cap', 'square')
+    end
+
+    def line_join
+      @line_join ||= settings.fetch('line_join', 'miter')
+    end
+
+    def radius
+      @radius ||= settings.fetch('radius', '2')
+    end
+  end
+end

data/lib/generators/geo_concerns/templates/config/messaging.yml

@@ -0,0 +1,15 @@
+defaults: &defaults
+  events:
+    server: <%= ENV['RABBIT_SERVER'] || 'amqp://localhost:5672' %>
+    exchange:
+      geoblacklight: 'gbl_events'
+      geoserver: 'geoserver_events'
+
+development:
+  <<: *defaults
+
+test:
+  <<: *defaults
+
+production:
+  <<: *defaults

data/lib/generators/geo_concerns/templates/config/simpler_tiles.yml

@@ -0,0 +1,24 @@
+# Background color
+# Use '#ffffff' for a solid white background.
+# Add two zeros to a six digit hex color code
+# for a png (does not work with jpeg) image
+# with a transparent background.
+bg_color: '#ffffff00' 
+
+# The fill color for each shape
+fill: '#e4e3ea' 
+
+# The stroke color for each line
+stroke: '#483d8b'
+
+# Width of line in pixels
+weight: '0.3'
+
+# How lines are ended, one of: "butt", "round", "square"
+line_cap: 'square'
+
+# How lines are joined together, one of: "miter", "round", "bevel"
+line_join: 'miter'
+
+# For point rendering only, the radius in pixels of the circle
+radius: '2'

data/lib/generators/geo_concerns/templates/controllers/curation_concerns/file_sets_controller.rb

@@ -2,5 +2,6 @@ module CurationConcerns
   class FileSetsController < ApplicationController
     include CurationConcerns::FileSetsControllerBehavior
     include GeoConcerns::FileSetsControllerBehavior
+    include GeoConcerns::MessengerBehavior
   end
 end

data/lib/generators/geo_concerns/templates/controllers/curation_concerns/image_works_controller.rb

@@ -2,5 +2,6 @@ class CurationConcerns::ImageWorksController < ApplicationController
   include CurationConcerns::CurationConcernController
   include GeoConcerns::ImageWorksControllerBehavior
   include GeoConcerns::GeoblacklightControllerBehavior
+  include GeoConcerns::MessengerBehavior
   self.curation_concern_type = ImageWork
 end

data/lib/generators/geo_concerns/templates/controllers/curation_concerns/raster_works_controller.rb

@@ -3,5 +3,6 @@ class CurationConcerns::RasterWorksController < ApplicationController
   include CurationConcerns::ParentContainer
   include GeoConcerns::RasterWorksControllerBehavior
   include GeoConcerns::GeoblacklightControllerBehavior
+  include GeoConcerns::MessengerBehavior
   self.curation_concern_type = RasterWork
 end

data/lib/generators/geo_concerns/templates/controllers/curation_concerns/vector_works_controller.rb

@@ -3,5 +3,6 @@ class CurationConcerns::VectorWorksController < ApplicationController
   include CurationConcerns::ParentContainer
   include GeoConcerns::VectorWorksControllerBehavior
   include GeoConcerns::GeoblacklightControllerBehavior
+  include GeoConcerns::MessengerBehavior
   self.curation_concern_type = VectorWork
 end

data/lib/geo_concerns/version.rb

@@ -1,3 +1,3 @@
 module GeoConcerns
-  VERSION = "0.0.10".freeze
+  VERSION = "0.1.0".freeze
 end

data/run-docker.sh

@@ -2,5 +2,15 @@
 docker-machine start
 eval $(docker-machine env)
 docker-compose up -d
-# forward geoserver ports in the background
+# forward geoserver docker port in the background
 docker-machine ssh default -f -N -L 8181:localhost:8181
+
+# redis
+# docker-machine ssh default -f -N -L 6379:localhost:6379
+
+# rabbitmq
+# docker-machine ssh default -f -N -L 5672:localhost:5672
+# docker-machine ssh default -f -N -L 15672:localhost:15672
+
+# geoblacklight
+# docker-machine ssh default -f -N -L 3001:localhost:3001

data/spec/controllers/file_sets_controller_spec.rb

@@ -2,6 +2,7 @@ require 'spec_helper'
 
 describe CurationConcerns::FileSetsController, type: :controller do
   let(:user) { FactoryGirl.create(:user) }
+  let(:parent) { FactoryGirl.build(:public_vector_work) }
 
   subject { described_class.new }
 
@@ -17,4 +18,53 @@ describe CurationConcerns::FileSetsController, type: :controller do
       subject.new
     end
   end
+
+  describe 'messaging' do
+    let(:messenger) { instance_double(GeoConcerns::EventsGenerator) }
+
+    before do
+      sign_in user
+      allow(Messaging).to receive(:messenger).and_return(messenger)
+    end
+
+    context 'after updating metadata' do
+      let!(:file_set) do
+        file_set = FileSet.create do |gf|
+          gf.apply_depositor_metadata(user)
+          gf.visibility = Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_PRIVATE
+        end
+        parent.ordered_members << file_set
+        parent.save
+        file_set
+      end
+
+      after do
+        file_set.destroy
+      end
+
+      it 'calls the record_updated messenger method' do
+        expect(messenger).to receive(:record_updated)
+        post :update, params: {
+          id: file_set,
+          file_set: { title: ['new_title'], keyword: [''], permissions_attributes: [{ type: 'person', name: 'archivist1', access: 'edit' }] }
+        }
+      end
+    end
+
+    context 'when destroying the file set' do
+      let(:file_set) do
+        file_set = FileSet.create! do |gf|
+          gf.apply_depositor_metadata(user)
+        end
+        parent.ordered_members << file_set
+        parent.save
+        file_set
+      end
+
+      it 'calls the record_deleted messenger method' do
+        expect(messenger).to receive(:record_deleted)
+        delete :destroy, params: { id: file_set }
+      end
+    end
+  end
 end

data/spec/jobs/delivery_job_spec.rb

@@ -2,16 +2,39 @@ require 'spec_helper'
 require 'uri'
 
 describe GeoConcerns::DeliveryJob do
-  let(:file_set) { double(FileSet, id: 'abc123') }
+  let(:message) { { 'id' => 'abcdefg', 'event' => 'CREATED', "exchange" => :geoserver } }
+  let(:content_url) { 'file:/somewhere-to-display-copy' }
+  let(:file_format) { 'application/zip; ogr-format="ESRI Shapefile"' }
+  let(:file_set) { instance_double(FileSet, derivative_url: content_url, geo_mime_type: file_format) }
 
-  context '#perform' do
-    context 'local file' do
-      let(:content_url) { 'file:/somewhere-to-display-copy' }
-      let(:service) { instance_double('GeoConcerns::DeliveryService') }
+  before do
+    allow(ActiveFedora::Base).to receive(:find).and_return(file_set)
+  end
+
+  describe '#perform' do
+    let(:service) { instance_double('GeoConcerns::DeliveryService') }
+    context 'local vector file' do
       it 'delegates to DeliveryService' do
         expect(GeoConcerns::DeliveryService).to receive(:new).with(file_set, URI(content_url).path).and_return(service)
         expect(service).to receive(:publish)
-        subject.perform(file_set, content_url)
+        subject.perform(message)
+      end
+    end
+
+    context 'local raster file' do
+      let(:file_format) { 'image/tiff; gdal-format=GTiff' }
+      it 'delegates to DeliveryService' do
+        expect(GeoConcerns::DeliveryService).to receive(:new).with(file_set, URI(content_url).path).and_return(service)
+        expect(service).to receive(:publish)
+        subject.perform(message)
+      end
+    end
+
+    context 'local image file' do
+      let(:file_format) { 'image/jpeg' }
+      it 'delegates to DeliveryService' do
+        expect(GeoConcerns::DeliveryService).not_to receive(:new)
+        expect { subject.perform(message) }.to raise_error(NotImplementedError, /Only supports vector/)
       end
     end
 
@@ -19,7 +42,7 @@ describe GeoConcerns::DeliveryJob do
       let(:content_url) { 'http://somewhere/to-display-copy' }
       it 'errors out' do
         expect(GeoConcerns::DeliveryService).not_to receive(:new)
-        expect { subject.perform(file_set, content_url) }.to raise_error(NotImplementedError, /Only supports file URLs/)
+        expect { subject.perform(message) }.to raise_error(NotImplementedError, /Only supports file URLs/)
       end
     end
   end

data/spec/models/concerns/geo_concerns/file_set/derivatives_spec.rb

@@ -1,8 +1,10 @@
 require 'spec_helper'
 
 shared_examples 'a set of raster derivatives' do
+  let(:messenger) { instance_double(GeoConcerns::EventsGenerator) }
   before do
-    expect(DeliveryJob).to receive(:perform_later).with(file_set, /file/)
+    allow(Messaging).to receive(:messenger).and_return(messenger)
+    expect(messenger).to receive(:derivatives_created).with(file_set)
   end
   it 'makes a thumbnail' do
     new_thumb = "#{Rails.root}/tmp/derivatives/#{file_set.id}/thumbnail.thumbnail"
@@ -22,8 +24,10 @@ shared_examples 'a set of raster derivatives' do
 end
 
 shared_examples 'a set of vector derivatives' do
+  let(:messenger) { instance_double(GeoConcerns::EventsGenerator) }
   before do
-    expect(DeliveryJob).to receive(:perform_later).with(file_set, /file/)
+    allow(Messaging).to receive(:messenger).and_return(messenger)
+    expect(messenger).to receive(:derivatives_created).with(file_set)
   end
   it 'makes a thumbnail' do
     new_thumb = "#{Rails.root}/tmp/derivatives/#{file_set.id}/thumbnail.thumbnail"
@@ -43,8 +47,10 @@ shared_examples 'a set of vector derivatives' do
 end
 
 shared_examples 'a set of image derivatives' do
+  let(:messenger) { instance_double(GeoConcerns::EventsGenerator) }
   before do
-    expect(DeliveryJob).not_to receive(:perform_later)
+    allow(Messaging).to receive(:messenger).and_return(messenger)
+    expect(messenger).to receive(:derivatives_created).with(file_set)
   end
   it 'makes a thumbnail' do
     new_thumb = "#{Rails.root}/tmp/derivatives/#{file_set.id}/thumbnail.thumbnail"

data/spec/models/solr_document_spec.rb

@@ -32,4 +32,10 @@ describe SolrDocument do
     subject { document.provenance }
     it { is_expected.to eq 'Your Institution' }
   end
+
+  describe "identifier" do
+    let(:attributes) { { Solrizer.solr_name('identifier') => ['identifier'] } }
+    subject { document.identifier }
+    it { is_expected.to match_array ['identifier'] }
+  end
 end

data/spec/processors/geo_concerns/processors/base_geo_processor_spec.rb

@@ -38,28 +38,6 @@ describe GeoConcerns::Processors::BaseGeoProcessor do
     end
   end
 
-  describe '#convert' do
-    let(:image) { double }
-
-    before do
-      allow(MiniMagick::Image).to receive(:open).and_return(image)
-    end
-
-    it 'transforms the image and saves it as a PNG' do
-      expect(image).to receive(:format).with('png')
-      expect(image).to receive(:combine_options)
-      expect(image).to receive(:write).with(output_file_png)
-      subject.class.convert(file_name, output_file_png, options)
-    end
-
-    it 'transforms the image and saves it as a JPG' do
-      expect(image).to receive(:format).with('jpg')
-      expect(image).to receive(:combine_options)
-      expect(image).to receive(:write).with(output_file_jpg)
-      subject.class.convert(file_name, output_file_jpg, options)
-    end
-  end
-
   describe '#temp_path' do
     it 'returns a path to a temporary file based on the input file' do
       expect(subject.class.temp_path(output_file))
@@ -105,6 +83,21 @@ describe GeoConcerns::Processors::BaseGeoProcessor do
     end
   end
 
+  describe '#id' do
+    context 'when directives hash has an id value' do
+      let(:directives) { { id: '123456' } }
+      it 'returns that value' do
+        expect(subject.id).to eq('123456')
+      end
+    end
+
+    context 'when directives hash does not have an id value' do
+      it 'returns nil' do
+        expect(subject.id).to be_nil
+      end
+    end
+  end
+
   describe '#basename' do
     it 'returns the base file name of the source file' do
       expect(subject.basename).to eq('geo')