geo_concerns 0.0.7 → 0.0.8

data/spec/jobs/delivery_job_spec.rb

@@ -0,0 +1,25 @@
+require 'spec_helper'
+require 'uri'
+
+describe GeoConcerns::DeliveryJob do
+  let(:file_set) { double(FileSet, id: 'abc123') }
+
+  context '#perform' do
+    context 'local file' do
+      let(:content_url) { 'file:/somewhere-to-display-copy' }
+      it 'delegates to DeliveryService' do
+        dbl = double
+        expect(GeoConcerns::DeliveryService).to receive(:new).and_return(dbl)
+        expect(dbl).to receive(:publish).with(file_set.id, URI(content_url).path)
+        subject.perform(file_set, content_url)
+      end
+    end
+    context 'remote file' 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/)
+      end
+    end
+  end
+end

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

@@ -1,6 +1,9 @@
 require 'spec_helper'
 
 shared_examples 'a set of raster derivatives' do
+  before do
+    expect(DeliveryJob).to receive(:perform_later).with(file_set, /file/)
+  end
   it 'makes a thumbnail' do
     new_thumb = "#{Rails.root}/tmp/derivatives/#{file_set.id}/thumbnail.thumbnail"
     expect {
@@ -19,6 +22,9 @@ shared_examples 'a set of raster derivatives' do
 end
 
 shared_examples 'a set of vector derivatives' do
+  before do
+    expect(DeliveryJob).to receive(:perform_later).with(file_set, /file/)
+  end
   it 'makes a thumbnail' do
     new_thumb = "#{Rails.root}/tmp/derivatives/#{file_set.id}/thumbnail.thumbnail"
     expect {
@@ -37,6 +43,9 @@ shared_examples 'a set of vector derivatives' do
 end
 
 shared_examples 'a set of image derivatives' do
+  before do
+    expect(DeliveryJob).not_to receive(:perform_later)
+  end
   it 'makes a thumbnail' do
     new_thumb = "#{Rails.root}/tmp/derivatives/#{file_set.id}/thumbnail.thumbnail"
     expect {

data/spec/models/image_work_spec.rb

@@ -64,7 +64,7 @@ describe ImageWork do
       external_metadata_file = subject.metadata_files.first
       allow(external_metadata_file).to receive(:metadata_xml) { doc }
       allow(external_metadata_file).to receive(:geo_mime_type) { 'application/xml; schema=iso19139' }
-      subject.populate_metadata
+      subject.populate_metadata(external_metadata_file.id)
       expect(subject.title).to eq(['S_566_1914_clip.tif'])
     end
   end

data/spec/models/raster_work_spec.rb

@@ -115,7 +115,7 @@ describe RasterWork do
       external_metadata_file = subject.metadata_files.first
       allow(external_metadata_file).to receive(:metadata_xml).and_return(doc)
       allow(external_metadata_file).to receive(:geo_mime_type).and_return('application/xml; schema=iso19139')
-      subject.should_populate_metadata = 'true'
+      subject.should_populate_metadata = external_metadata_file.id
       expect(subject.title).to eq(['S_566_1914_clip.tif'])
     end
   end

data/spec/models/solr_document_spec.rb

@@ -28,8 +28,8 @@ describe SolrDocument do
   end
 
   describe "provenance" do
-    let(:attributes) { { Solrizer.solr_name('provenance') => 'one' } }
+    let(:attributes) { { Solrizer.solr_name('provenance') => ['unused'] } }
     subject { document.provenance }
-    it { is_expected.to eq 'one' }
+    it { is_expected.to eq 'Your Institution' }
   end
 end

data/spec/models/vector_work_spec.rb

@@ -102,12 +102,8 @@ describe VectorWork do
       external_metadata_file = subject.metadata_files.first
       allow(external_metadata_file).to receive(:metadata_xml) { doc }
       allow(external_metadata_file).to receive(:geo_mime_type) { 'application/xml; schema=iso19139' }
-      subject.populate_metadata
+      subject.populate_metadata(external_metadata_file.id)
       expect(subject.title).to eq(['S_566_1914_clip.tif'])
     end
-
-    it 'will fail if there are multiple metadata files' do
-      expect { FactoryGirl.create(:vector_work_with_metadata_files).extract_metadata }.to raise_error(NotImplementedError)
-    end
   end
 end

data/spec/presenters/raster_work_show_presenter_spec.rb

@@ -32,6 +32,28 @@ RSpec.describe GeoConcerns::RasterWorkShowPresenter do
     end
   end
 
+  describe "#parent_work_presenters" do
+    let(:obj) { FactoryGirl.create(:raster_work) }
+    let(:parent_work) { FactoryGirl.create(:image_work) }
+    let(:collection) { FactoryGirl.create(:collection) }
+    let(:attributes) { obj.to_solr }
+
+    subject { described_class.new(solr_document, ability) }
+
+    before do
+      parent_work.members << obj
+      parent_work.save!
+      collection.members << obj
+      collection.save!
+      obj.save!
+    end
+
+    it "filters out collections and only returns work presenters" do
+      expect(subject.parent_work_presenters.count).to eq 1
+      expect(subject.parent_work_presenters.first.model_name.name).to eq "ImageWork"
+    end
+  end
+
   describe "file presenters" do
     let(:obj) { FactoryGirl.create(:raster_work_with_files_and_metadata_files) }
     let(:attributes) { obj.to_solr }

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

@@ -21,7 +21,9 @@ describe GeoConcerns::Processors::BaseGeoProcessor do
   subject { TestProcessor.new }
 
   let(:directives) { { format: 'png', size: '200x400' } }
-  let(:output_file) { 'output/geo.png' }
+  let(:output_file_jpg) { 'output/geo.jpg' }
+  let(:output_file_png) { 'output/geo.png' }
+  let(:output_file) { output_file_png }
   let(:file_name) { 'files/geo.tif' }
   let(:options) { { output_size: '150 150' } }
 
@@ -43,18 +45,25 @@ describe GeoConcerns::Processors::BaseGeoProcessor do
       allow(MiniMagick::Image).to receive(:open).and_return(image)
     end
 
-    it 'transforms the image and saves it as a jpeg' do
+    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)
-      subject.class.convert(file_name, output_file, 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))
-        .to include('geo')
+        .to match(%r{output/geo_\d+})
     end
   end
 

data/spec/services/derivative_path_spec.rb

@@ -1,12 +1,26 @@
 require 'spec_helper'
 
 describe GeoConcerns::DerivativePath do
+  subject { described_class.derivative_path_for_reference('12', destination_name) }
   describe '#extension' do
-    it 'returns the appropriate file extension for a geo derivative' do
-      expect(described_class.extension('thumbnail')).to eq('.jpeg')
-      expect(described_class.extension('display_raster')).to eq('.tif')
-      expect(described_class.extension('display_vector')).to eq('.zip')
-      expect(described_class.extension('simplified')).to eq('.simplified')
+    context 'with thumbnail destination' do
+      let(:destination_name) { 'thumbnail' }
+      it { is_expected.to include('.jpeg') }
+    end
+
+    context 'with display_raster destination' do
+      let(:destination_name) { 'display_raster' }
+      it { is_expected.to include('.tif') }
+    end
+
+    context 'with display_vector destination' do
+      let(:destination_name) { 'display_vector' }
+      it { is_expected.to include('.zip') }
+    end
+
+    context 'with simplified destination' do
+      let(:destination_name) { 'simplified' }
+      it { is_expected.to include('.simplified') }
     end
   end
 end

data/spec/services/geo_concerns/delivery/geoserver_spec.rb

@@ -0,0 +1,72 @@
+require 'spec_helper'
+
+describe GeoConcerns::Delivery::Geoserver do
+  let(:id) { 'abc123' }
+
+  context '#initialize' do
+    it 'configures correctly with defaults' do
+      expect(File).to receive(:read).and_raise(Errno::ENOENT)
+      expect { subject }.not_to raise_error
+      expect(subject.config).to include('url' => 'http://localhost:8181/geoserver/rest',
+                                        'user' => 'admin',
+                                        'password' => 'geoserver')
+    end
+  end
+
+  context '#catalog' do
+    it 'connects to a RGeoServer catalog' do
+      expect(RGeoServer).to receive(:catalog).with(hash_including(:url, :user, :password)).and_return(double).once
+      subject.catalog
+      subject.catalog # should cache result
+    end
+  end
+
+  context '#publish' do
+    it 'requires a valid type' do
+      expect { subject.publish(id, 'some/file', :unknown) }.to raise_error(ArgumentError, /Unknown file type/)
+    end
+    context 'vector' do
+      let(:type) { :vector }
+      let(:filename) { 'file.zip' }
+      it 'routes to publish_vector' do
+        expect(subject).to receive(:publish_vector).with(id, filename)
+        subject.publish(id, filename, type)
+      end
+    end
+    context 'raster' do
+      let(:type) { :raster }
+      let(:filename) { 'file.tif' }
+      it 'routes to publish_raster' do
+        expect(subject).to receive(:publish_raster).with(id, filename)
+        subject.publish(id, filename, type)
+      end
+    end
+  end
+
+  context '#publish_vector' do
+    let(:filename) { 'spec/fixtures/files/tufts-cambridgegrid100-04.zip' }
+    it 'requires a vector ZIP file' do
+      expect { subject.send(:publish_vector, id, 'not-a-zip') }.to raise_error(ArgumentError, /Not ZIPed Shapefile/)
+    end
+    it 'dispatches to RGeoServer' do
+      ws_dbl = double
+      expect(RGeoServer::Workspace).to receive(:new).with(subject.catalog, hash_including(name: 'geo')).and_return(ws_dbl)
+      expect(ws_dbl).to receive(:'new?').and_return(true)
+      expect(ws_dbl).to receive(:save)
+      ds_dbl = double
+      expect(RGeoServer::DataStore).to receive(:new).with(subject.catalog, hash_including(workspace: ws_dbl, name: id)).and_return(ds_dbl)
+      expect(ds_dbl).to receive(:upload_file).with(filename, hash_including(publish: true))
+      subject.send(:publish_vector, id, filename)
+    end
+  end
+
+  context '#publish_raster' do
+    let(:filename) { 'spec/fixtures/files/S_566_1914_clip.tif' }
+    it 'requires GeoTIFF' do
+      expect { subject.send(:publish_raster, id, 'not-a-tiff') }.to raise_error(ArgumentError, /Not GeoTIFF/)
+    end
+    it 'is not implemented yet' do
+      expect { subject.send(:publish_raster, id, filename) }.to raise_error(NotImplementedError)
+    end
+  end
+end

data/spec/services/geo_concerns/delivery_service_spec.rb

@@ -0,0 +1,15 @@
+require 'spec_helper'
+
+describe GeoConcerns::DeliveryService do
+  let(:id) { 'abc123' }
+  let(:filename) { 'somewhere-to-display-copy' }
+
+  context '#publish' do
+    it 'dispatches to Geoserver delivery' do
+      dbl = double
+      expect(subject).to receive(:geoserver).and_return(dbl)
+      expect(dbl).to receive(:publish).with(id, filename)
+      subject.publish(id, filename)
+    end
+  end
+end

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

@@ -1,5 +1,7 @@
 require 'spec_helper'
 
+# See https://github.com/geoblacklight/geoblacklight/wiki/Schema
+
 describe GeoConcerns::Discovery::DocumentBuilder do
   subject { described_class.new(geo_concern_presenter, document_class) }
 
@@ -14,19 +16,18 @@ describe GeoConcerns::Discovery::DocumentBuilder do
   let(:geo_file) { FileSet.new(id: 'geofile', geo_mime_type: geo_file_mime_type) }
   let(:geo_file_presenter) { CurationConcerns::FileSetPresenter.new(SolrDocument.new(geo_file.to_solr), nil) }
   let(:coverage) { GeoConcerns::Coverage.new(43.039, -69.856, 42.943, -71.032) }
-  let(:date_modified) { Time.now.utc }
+  let(:issued) { '01/02/2013' }
+  let(:issued_xmlschema) { '2013-02-01T00:00:00Z' }
   let(:attributes) { { id: 'geo-work-1',
-                       identifier: ['abcde'],
                        title: ['Geo Work'],
                        coverage: coverage.to_s,
                        description: ['This is a Geo Work'],
                        creator: ['Yosiwo George'],
                        publisher: ['National Geographic'],
-                       date_modified: date_modified,
+                       issued: issued,
                        spatial: ['Micronesia'],
                        temporal: ['2011'],
                        subject: ['Human settlements'],
-                       provenance: 'Pacific Islands University',
                        language: ['Esperanto'] }
   }
 
@@ -35,42 +36,58 @@ describe GeoConcerns::Discovery::DocumentBuilder do
       allow(geo_concern_presenter).to receive(:file_set_presenters).and_return([geo_file_presenter, metadata_presenter])
     end
 
-    it 'has basic metadata' do
-      expect(document['uuid']).to eq('geo-work-1')
-      expect(document['dc_identifier_s']).to eq('abcde')
-      expect(document['dct_provenance_s']).to eq('Pacific Islands University')
-      expect(document['layer_slug_s']).to eq('pacific-islands-university-geo-work-1')
-      expect(document['dc_description_s']).to eq('This is a Geo Work')
-      expect(document['dc_rights_s']).to eq('Restricted')
-      expect(document['dc_creator_sm']).to eq(['Yosiwo George'])
-      expect(document['dc_subject_sm']).to eq(['Human settlements'])
-      expect(document['dct_spatial_sm']).to eq(['Micronesia'])
-      expect(document['dct_temporal_sm']).to eq(['2011'])
-      expect(document['dc_title_s']).to eq('Geo Work')
-      expect(document['dc_language_s']).to eq('Esperanto')
-      expect(document['dc_publisher_s']).to eq('National Geographic')
+    context 'required' do
+      it 'has all metadata' do
+        expect(document['dc_identifier_s']).to eq('https://your-institution/geo-work-1')
+        expect(document['layer_slug_s']).to eq('your-institution-geo-work-1')
+        expect(document['dc_title_s']).to eq('Geo Work')
+        expect(document['solr_geom']).to eq('ENVELOPE(-71.032, -69.856, 43.039, 42.943)')
+        expect(document['dct_provenance_s']).to eq('Your Institution')
+        expect(document['dc_rights_s']).to eq('Restricted')
+        expect(document['geoblacklight_version']).to eq('1.0')
+      end
     end
 
-    it 'has date field' do
-      expect(document['solr_year_i']).to eq(2011)
-    end
+    context 'optional' do
+      it 'has metadata' do
+        expect(document['dc_description_s']).to eq('This is a Geo Work')
+        expect(document['dc_creator_sm']).to eq(['Yosiwo George'])
+        expect(document['dc_subject_sm']).to eq(['Human settlements'])
+        expect(document['dct_spatial_sm']).to eq(['Micronesia'])
+        expect(document['dct_temporal_sm']).to eq(['2011'])
+        expect(document['dc_language_s']).to eq('Esperanto')
+        expect(document['dc_publisher_s']).to eq('National Geographic')
+      end
 
-    it 'has layer info fields' do
-      expect(document['layer_geom_type_s']).to eq('Mixed')
-      expect(document['dc_format_s']).to eq('Shapefile')
-    end
+      it 'has modified date' do
+        expect(document).to include('layer_modified_dt')
+        # TODO: Rails 4 puts +00:00 rather than Z for `xmlschema` format
+        expect(document['layer_modified_dt']).to match(/\d\d\d\d-\d\d-\d\dT\d\d:\d\d:\d\d(Z|\+00:00)/)
+      end
 
-    it 'has spatial fields' do
-      expect(document['georss_box_s']).to eq('42.943 -71.032 43.039 -69.856')
-      expect(document['solr_geom']).to eq('ENVELOPE(-71.032, -69.856, 43.039, 42.943)')
-    end
+      context 'issued date' do
+        it 'works with valid date' do
+          expect(document).to include('dct_issued_dt')
+          expect(document['dct_issued_dt']).to eq(issued_xmlschema)
+        end
+      end
 
-    it 'has references' do
-      refs = JSON.parse(document['dct_references_s'])
-      expect(refs['http://schema.org/url']).to eq('http://localhost:3000/concern/vector_works/geo-work-1')
-      expect(refs['http://www.isotc211.org/schemas/2005/gmd/']).to eq('http://localhost:3000/downloads/metadatafile')
-      expect(refs['http://schema.org/downloadUrl']).to eq('http://localhost:3000/downloads/geofile')
-      expect(refs['http://schema.org/thumbnailUrl']).to eq('http://localhost:3000/downloads/geofile?file=thumbnail')
+      it 'has date field' do
+        expect(document['solr_year_i']).to eq(2011)
+      end
+
+      it 'has layer info fields' do
+        expect(document['layer_geom_type_s']).to eq('Mixed')
+        expect(document['dc_format_s']).to eq('Shapefile')
+      end
+
+      it 'has references' do
+        refs = JSON.parse(document['dct_references_s'])
+        expect(refs['http://schema.org/url']).to eq('http://localhost:3000/concern/vector_works/geo-work-1')
+        expect(refs['http://www.isotc211.org/schemas/2005/gmd/']).to eq('http://localhost:3000/downloads/metadatafile')
+        expect(refs['http://schema.org/downloadUrl']).to eq('http://localhost:3000/downloads/geofile')
+        expect(refs['http://schema.org/thumbnailUrl']).to eq('http://localhost:3000/downloads/geofile?file=thumbnail')
+      end
     end
   end
 
@@ -145,6 +162,7 @@ describe GeoConcerns::Discovery::DocumentBuilder do
 
     it 'returns an error document' do
       expect(document['error'][0]).to include('dc_title_s')
+      expect(document['error'].size).to eq(1)
     end
   end
 
@@ -154,16 +172,16 @@ describe GeoConcerns::Discovery::DocumentBuilder do
       allow(geo_concern_presenter).to receive(:file_set_presenters).and_return([geo_file_presenter, metadata_presenter])
     end
 
-    it 'returns a document without the field' do
+    it 'returns a document without the field but valid' do
       expect(document['dc_language_s']).to be_nil
     end
   end
 
   context 'with a public visibility' do
     before do
-      pulic = Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_PUBLIC
+      viz = Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_PUBLIC
       allow(geo_concern_presenter).to receive(:file_set_presenters).and_return([geo_file_presenter, metadata_presenter])
-      allow(geo_concern_presenter.solr_document).to receive(:visibility).and_return(pulic)
+      allow(geo_concern_presenter.solr_document).to receive(:visibility).and_return(viz)
     end
 
     it 'return a public access' do

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

@@ -4,14 +4,16 @@ describe GeoConcerns::Discovery::GeoblacklightDocument do
   subject { described_class.new }
 
   describe '#to_hash' do
-    let(:document) { { id: 'test' } }
-
     before do
-      allow(subject).to receive(:document).and_return(document)
+      allow(subject).to receive(:document_hash).and_return(document_hash)
     end
+    context 'incomplete data' do
+      let(:document_hash) { Hash.new }
 
-    it 'returns the document hash' do
-      expect(subject.to_hash).to eq(document)
+      it 'failed to validate the document hash' do
+        expect(subject.to_hash).to include(:error)
+        expect(subject.to_hash[:error].size).to eq(6)
+      end
     end
   end
 end