geo_concerns 0.0.3 → 0.0.4

data/app/views/{curation_concerns/image_works/_members.html.erb → geo_concerns/_related_geo_works.html.erb}

@@ -1,7 +1,7 @@
-<% if presenter.raster_work_presenters.present? %>
+<% if presenter.work_presenters.present? %>
   <div class="panel panel-default raster_works">
     <div class="panel-heading">
-      <h2>Raster Works</h2>
+      <h2><%= child_geo_works_type(presenter) %> Works</h2>
     </div>
     <table class="table">
       <thead>
@@ -11,13 +11,13 @@
         </tr>
       </thead>
       <tbody>
-        <% presenter.raster_work_presenters.each do |res| %>
+        <% presenter.work_presenters.each do |res| %>
           <tr class="file_set attributes">
             <td class="thumbnail" style="margin-bottom: 0px">
               <%= render_thumbnail_tag res %>
             </td>
             <td>
-              <%= link_to res.title, main_app.curation_concerns_raster_work_path(res.id) %>
+              <%= link_to res.title.first, polymorphic_path([main_app, res]) %>
             </td>
           </tr>
         <% end %>
@@ -25,6 +25,8 @@
     </table>
   </div>
 <% elsif can? :edit, presenter.id %>
-  <h2>Raster Works</h2>
-  <p class="center"><em>This <%= presenter.human_readable_type %> has no raster works associated with it. You can add one using the "Attach a Raster Work" button below.</em></p>
+  <% if child_geo_works_type(presenter) %>
+    <h2><%= child_geo_works_type(presenter) %> Works</h2>
+    <p class="center"><em>This <%= presenter.human_readable_type %> has no <%= child_geo_works_type(presenter).downcase %> works associated with it.</em></p>
+  <% end %>
 <% end %>

data/geo_concerns.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |spec|
   spec.test_files = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ['lib']
 
-  spec.add_dependency 'curation_concerns', '~> 0.14.0.pre4'
+  spec.add_dependency 'curation_concerns', '1.0.0.beta3'
   spec.add_dependency 'leaflet-rails', '~> 0.7'
 
   spec.add_development_dependency 'sqlite3'

data/lib/generators/geo_concerns/install_generator.rb

@@ -102,10 +102,10 @@ module GeoConcerns
       def install_work
         name = @class_name.underscore
         model_path = "app/models/#{name}.rb"
-        actor_path = "app/actors/curation_concerns/#{name}_actor.rb"
+        actor_path = "app/actors/curation_concerns/actors/#{name}_actor.rb"
         controller_path = "app/controllers/curation_concerns/#{name.pluralize}_controller.rb"
         copy_file "models/#{name}.rb", model_path
-        copy_file "actors/curation_concerns/#{name}_actor.rb", actor_path
+        copy_file "actors/curation_concerns/actors/#{name}_actor.rb", actor_path
         copy_file "controllers/curation_concerns/#{name.pluralize}_controller.rb", controller_path
       end
 

data/lib/generators/geo_concerns/templates/actors/curation_concerns/actors/image_work_actor.rb

@@ -0,0 +1,6 @@
+module CurationConcerns
+  module Actors
+    class ImageWorkActor < CurationConcerns::Actors::BaseActor
+    end
+  end
+end

data/lib/generators/geo_concerns/templates/actors/curation_concerns/actors/raster_work_actor.rb

@@ -0,0 +1,6 @@
+module CurationConcerns
+  module Actors
+    class RasterWorkActor < CurationConcerns::Actors::BaseActor
+    end
+  end
+end

data/lib/generators/geo_concerns/templates/actors/curation_concerns/actors/vector_work_actor.rb

@@ -0,0 +1,6 @@
+module CurationConcerns
+  module Actors
+    class VectorWorkActor < CurationConcerns::Actors::BaseActor
+    end
+  end
+end

data/lib/generators/geo_concerns/templates/jobs/characterize_job.rb

@@ -1,11 +1,12 @@
 class CharacterizeJob < ActiveJob::Base
-  queue_as :characterize
+  queue_as CurationConcerns.config.ingest_queue_name
 
   # @param [FileSet] file_set
   # @param [String] filename a local path for the file to characterize.
   def perform(file_set, filename)
-    Hydra::Works::CharacterizationService.run(file_set, filename)
-    file_set.mime_type = file_set.original_file.mime_type
+    error_msg = "#{file_set.class.characterization_proxy} was not found"
+    raise(LoadError, error_msg) unless file_set.characterization_proxy?
+    Hydra::Works::CharacterizationService.run(file_set.characterization_proxy, filename)
     file_set.save!
     CreateDerivativesJob.perform_later(file_set, filename)
   end

data/lib/geo_concerns/version.rb

@@ -1,3 +1,3 @@
 module GeoConcerns
-  VERSION = "0.0.3".freeze
+  VERSION = "0.0.4".freeze
 end

data/spec/actors/geo_concerns/{file_actor_spec.rb → actors/file_actor_spec.rb}

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe GeoConcerns::FileActor do
+describe GeoConcerns::Actors::FileActor do
   include ActionDispatch::TestProcess
   let(:user) { double }
   let(:file) { double }
@@ -10,14 +10,14 @@ describe GeoConcerns::FileActor do
   describe '#mime_type' do
     context 'there is a mime_type attribute on the file set' do
       it 'returns the file set mime type' do
-        allow(file_set).to receive(:mime_type).and_return('text/plain; gdal-format=USGSDEM')
+        allow(file_set).to receive(:geo_mime_type).and_return('text/plain; gdal-format=USGSDEM')
         expect(actor.mime_type(file)).to eq('text/plain; gdal-format=USGSDEM')
       end
     end
 
     context 'there is not a mime_type attribute on the file set' do
       it 'returns the file set mime type' do
-        allow(file_set).to receive(:mime_type).and_return(nil)
+        allow(file_set).to receive(:geo_mime_type).and_return(nil)
         allow(file).to receive(:content_type).and_return('text/plain; gdal-format=USGSDEM')
         expect(actor.mime_type(file)).to eq('text/plain; gdal-format=USGSDEM')
       end

data/spec/factories/external_metadata_files.rb

@@ -1,6 +1,6 @@
 FactoryGirl.define do
   factory :external_metadata_file, class: FileSet do
-    initialize_with { new(mime_type: 'application/xml; schema=iso19139') }
+    initialize_with { new(geo_mime_type: 'application/xml; schema=iso19139') }
     transient do
       user { FactoryGirl.create(:user) }
       content nil
@@ -13,7 +13,7 @@ FactoryGirl.define do
 
     after(:create) do |file, evaluator|
       if evaluator.content
-        Hydra::Works::UploadFileToGenericFile.call(file, evaluator.content)
+        Hydra::Works::UploadFileToFileSet.call(file, evaluator.content)
       end
     end
   end

data/spec/factories/image_files.rb

@@ -1,6 +1,6 @@
 FactoryGirl.define do
   factory :image_file, class: FileSet do
-    initialize_with { new(mime_type: 'image/tiff') }
+    initialize_with { new(geo_mime_type: 'image/tiff') }
     transient do
       user { FactoryGirl.create(:user) }
       content nil
@@ -13,19 +13,19 @@ FactoryGirl.define do
 
     after(:create) do |file, evaluator|
       if evaluator.content
-        Hydra::Works::UploadFileToGenericFile.call(file, evaluator.content)
+        Hydra::Works::UploadFileToFileSet.call(file, evaluator.content)
       end
     end
 
     factory :image_file_with_image do
       after(:build) do |file, evaluator|
-        FactoryGirl.create(:image, user: evaluator.user).image_files << file
+        FactoryGirl.create(:image, user: evaluator.user).members << file
       end
       after(:create) do |file, evaluator|
         if evaluator.content
-          Hydra::Works::UploadFileToGenericFile.call(file, evaluator.content)
+          Hydra::Works::UploadFileToFileSet.call(file, evaluator.content)
         end
-        FactoryGirl.create(:image, user: evaluator.user).image_files << file
+        FactoryGirl.create(:image, user: evaluator.user).members << file
       end
     end
   end

data/spec/factories/image_works.rb

@@ -30,14 +30,15 @@ FactoryGirl.define do
 
     factory :image_work_with_raster_works do
       before(:create) do |image_work, evaluator|
-        2.times { image_work.ordered_members << FactoryGirl.create(:raster_work, user: evaluator.user) }
+        image_work.ordered_members << FactoryGirl.create(:raster_work, user: evaluator.user)
       end
     end
 
     factory :image_work_with_files_and_metadata_files do
       after(:create) do |image_work, evaluator|
-        2.times { image_work.ordered_members << FactoryGirl.create(:image_file, user: evaluator.user) }
-        2.times { image_work.ordered_members << FactoryGirl.create(:external_metadata_file, user: evaluator.user) }
+        image_work.ordered_members << FactoryGirl.create(:image_file, user: evaluator.user)
+        image_work.ordered_members << FactoryGirl.create(:external_metadata_file, user: evaluator.user)
+        image_work.save
       end
     end
 

data/spec/factories/raster_files.rb

@@ -1,6 +1,6 @@
 FactoryGirl.define do
   factory :raster_file, class: FileSet do
-    initialize_with { new(mime_type: 'image/tiff; gdal-format=GTiff') }
+    initialize_with { new(geo_mime_type: 'image/tiff; gdal-format=GTiff') }
     transient do
       user { FactoryGirl.create(:user) }
       content nil
@@ -14,7 +14,7 @@ FactoryGirl.define do
 
     after(:create) do |file, evaluator|
       if evaluator.content
-        Hydra::Works::UploadFileToGenericFile.call(file, evaluator.content)
+        Hydra::Works::UploadFileToFileSet.call(file, evaluator.content)
       end
     end
 
@@ -24,7 +24,7 @@ FactoryGirl.define do
       # end
       after(:create) do |file, evaluator|
         if evaluator.content
-          Hydra::Works::UploadFileToGenericFile.call(file, evaluator.content)
+          Hydra::Works::UploadFileToFileSet.call(file, evaluator.content)
         end
 
         raster = FactoryGirl.create(:raster, user: evaluator.user)

data/spec/factories/raster_works.rb

@@ -18,7 +18,7 @@ FactoryGirl.define do
 
     factory :raster_work_with_one_file do
       before(:create) do |raster_work, evaluator|
-        raster_work.ordered_members << FactoryGirl.create(:raster_file, user: evaluator.user, title: ['A GeoTIFF file'], filename: 'filename.tif')
+        raster_work.ordered_members << FactoryGirl.create(:raster_file, user: evaluator.user, title: ['A GeoTIFF file'])
       end
     end
 
@@ -35,9 +35,10 @@ FactoryGirl.define do
       end
     end
 
-    factory :raster_work_with_vector_works do
+    factory :raster_work_with_vector_work do
       after(:create) do |raster_work, evaluator|
-        2.times { raster_work.ordered_members << FactoryGirl.create(:vector_work, user: evaluator.user) }
+        raster_work.ordered_members << FactoryGirl.create(:vector_work, user: evaluator.user)
+        raster_work.save
       end
     end
 
@@ -55,8 +56,9 @@ FactoryGirl.define do
 
     factory :raster_work_with_files_and_metadata_files do
       after(:create) do |raster_work, evaluator|
-        2.times { raster_work.ordered_members << FactoryGirl.create(:raster_file, user: evaluator.user) }
-        2.times { raster_work.ordered_members << FactoryGirl.create(:external_metadata_file, user: evaluator.user) }
+        raster_work.ordered_members << FactoryGirl.create(:raster_file, user: evaluator.user)
+        raster_work.ordered_members << FactoryGirl.create(:external_metadata_file, user: evaluator.user)
+        raster_work.save
       end
     end
 

data/spec/factories/vector_files.rb

@@ -1,6 +1,6 @@
 FactoryGirl.define do
   factory :vector_file, class: FileSet do
-    initialize_with { new(mime_type: 'application/zip; ogr-format="ESRI Shapefile"') }
+    initialize_with { new(geo_mime_type: 'application/zip; ogr-format="ESRI Shapefile"') }
     transient do
       user { FactoryGirl.create(:user) }
       content nil
@@ -12,7 +12,7 @@ FactoryGirl.define do
 
     after(:create) do |file, evaluator|
       if evaluator.content
-        Hydra::Works::UploadFileToGenericFile.call(file, evaluator.content)
+        Hydra::Works::UploadFileToFileSet.call(file, evaluator.content)
       end
     end
 
@@ -22,7 +22,7 @@ FactoryGirl.define do
       end
       after(:create) do |file, evaluator|
         if evaluator.content
-          Hydra::Works::UploadFileToGenericFile.call(file, evaluator.content)
+          Hydra::Works::UploadFileToFileSet.call(file, evaluator.content)
         end
         FactoryGirl.create(:vector, user: evaluator.user).vector_files << file
       end

data/spec/factories/vector_works.rb

@@ -18,7 +18,7 @@ FactoryGirl.define do
 
     factory :vector_work_with_one_file do
       before(:create) do |vector_work, evaluator|
-        vector_work.ordered_members << FactoryGirl.create(:vector_file, user: evaluator.user, title: ['A shapefile'], filename: 'filename.zip')
+        vector_work.ordered_members << FactoryGirl.create(:vector_file, user: evaluator.user, title: ['A shapefile'])
       end
     end
 
@@ -49,10 +49,11 @@ FactoryGirl.define do
       end
     end
 
-    factory :vector_work_with_vector_and_metadata_files do
+    factory :vector_work_with_vector_and_metadata_file do
       before(:create) do |vector_work, evaluator|
-        2.times { vector_work.ordered_members << FactoryGirl.create(:vector_file, user: evaluator.user) }
-        2.times { vector_work.ordered_members << FactoryGirl.create(:external_metadata_file, user: evaluator.user) }
+        vector_work.ordered_members << FactoryGirl.create(:vector_file, user: evaluator.user)
+        vector_work.ordered_members << FactoryGirl.create(:external_metadata_file, user: evaluator.user)
+        vector_work.save
       end
     end
 

data/spec/features/create_raster_work_spec.rb

@@ -39,7 +39,7 @@ RSpec.feature 'RasterWorkController', type: :feature do
 
       click_link 'Attach a Metadata File'
       fill_in 'file_set[title][]', with: 'File Title'
-      select 'FGDC', from: 'file_set_mime_type'
+      select 'FGDC', from: 'file_set_geo_mime_type'
       attach_file 'file_set[files][]', fgdc_file
       click_button 'Attach to Vector Work'
 

data/spec/helpers/bounding_box_helper_spec.rb

@@ -1,11 +1,11 @@
 require 'spec_helper'
 
-describe BoundingBoxHelper do
+describe GeoConcerns::BoundingBoxHelper do
   let(:property) { :coverage }
   let(:helper) { TestingHelper.new }
   before do
     class TestingHelper
-      include BoundingBoxHelper
+      include GeoConcerns::BoundingBoxHelper
 
       def curation_concern
       end

data/spec/helpers/geo_works_helper_spec.rb

@@ -0,0 +1,30 @@
+require 'spec_helper'
+
+describe GeoConcerns::GeoWorksHelper do
+  let(:helper) { TestingHelper.new }
+  let(:presenter) { instance_double('Presenter', class: GeoConcerns::ImageWorkShowPresenter) }
+  before do
+    class TestingHelper
+      include GeoConcerns::GeoWorksHelper
+    end
+  end
+  after do
+    Object.send(:remove_const, :TestingHelper)
+  end
+
+  describe '#child_geo_works_type' do
+    it 'returns a the child work type name' do
+      expect(helper.child_geo_works_type(presenter)).to eq 'Raster'
+    end
+  end
+
+  describe '#geo_work_type' do
+    before do
+      allow(presenter).to receive(:human_readable_type).and_return('ImageWork')
+    end
+
+    it 'returns a the work type name' do
+      expect(helper.geo_work_type(presenter)).to eq 'Image'
+    end
+  end
+end

data/spec/models/concerns/basic_geo_metadata_spec.rb

@@ -6,7 +6,7 @@ RSpec.describe GeoConcerns::BasicGeoMetadata do
   it 'inherits the specified properties' do
     %w(title date_uploaded date_modified contributor creator date_created
        description identifier language part_of publisher resource_type
-       rights source subject tag).map(&:to_sym).each do |p|
+       rights source subject keyword).map(&:to_sym).each do |p|
       expect(subject.respond_to?(p)).to be_truthy
       expect(subject.respond_to?("#{p}=".to_sym)).to be_truthy
     end

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

@@ -50,7 +50,7 @@ describe CurationConcerns::FileSet do
   let(:file_set) { FileSet.create { |gf| gf.apply_depositor_metadata('geonerd@example.com') } }
 
   before do
-    allow(file_set).to receive(:mime_type).and_return(mime_type)
+    allow(file_set).to receive(:geo_mime_type).and_return(geo_mime_type)
 
     allow(CurationConcerns::DerivativePath).to receive(:derivative_path_for_reference) do |object, key|
       "#{Rails.root}/tmp/derivatives/#{object.id}/#{key}.#{key}"
@@ -65,7 +65,7 @@ describe CurationConcerns::FileSet do
   describe 'geo derivatives' do
     describe 'image processing' do
       context 'with a jpeg' do
-        let(:mime_type) { 'image/jpeg' }
+        let(:geo_mime_type) { 'image/jpeg' }
         let(:file_name) { File.join(fixture_path, 'files', 'americas.jpg') }
         it_behaves_like 'a set of image derivatives'
       end
@@ -73,13 +73,13 @@ describe CurationConcerns::FileSet do
 
     describe 'vector processing' do
       context 'with a shapefile' do
-        let(:mime_type) { 'application/zip; ogr-format="ESRI Shapefile"' }
+        let(:geo_mime_type) { 'application/zip; ogr-format="ESRI Shapefile"' }
         let(:file_name) { File.join(fixture_path, 'files', 'tufts-cambridgegrid100-04.zip') }
         it_behaves_like 'a set of vector derivatives'
       end
 
       context 'with a geojson file' do
-        let(:mime_type) { 'application/vnd.geo+json' }
+        let(:geo_mime_type) { 'application/vnd.geo+json' }
         let(:file_name) { File.join(fixture_path, 'files', 'mercer.json') }
         it_behaves_like 'a set of vector derivatives'
       end
@@ -87,19 +87,19 @@ describe CurationConcerns::FileSet do
 
     describe 'raster processing' do
       context 'with a geo tiff file' do
-        let(:mime_type) { 'image/tiff; gdal-format=GTiff' }
+        let(:geo_mime_type) { 'image/tiff; gdal-format=GTiff' }
         let(:file_name) { File.join(fixture_path, 'files', 'S_566_1914_clip.tif') }
         it_behaves_like 'a set of raster derivatives'
       end
 
       context 'with a usgs ascii dem file' do
-        let(:mime_type) { 'text/plain; gdal-format=USGSDEM' }
+        let(:geo_mime_type) { 'text/plain; gdal-format=USGSDEM' }
         let(:file_name) { File.join(fixture_path, 'files', 'shandaken_clip.dem') }
         it_behaves_like 'a set of raster derivatives'
       end
 
       context 'with an arc/info binary grid file' do
-        let(:mime_type) { 'application/octet-stream; gdal-format=AIG' }
+        let(:geo_mime_type) { 'application/octet-stream; gdal-format=AIG' }
         let(:file_name) { File.join(fixture_path, 'files', 'precipitation.zip') }
         it_behaves_like 'a set of raster derivatives'
       end

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

@@ -5,7 +5,7 @@ describe GeoConcerns::GeoFileFormatBehavior do
 
   describe '#image_file?' do
     before do
-      allow(subject).to receive(:mime_type).and_return('image/tiff')
+      allow(subject).to receive(:geo_mime_type).and_return('image/tiff')
     end
     it 'is true' do
       expect(subject.image_file?).to be true
@@ -14,7 +14,7 @@ describe GeoConcerns::GeoFileFormatBehavior do
 
   describe '#raster_file?' do
     before do
-      allow(subject).to receive(:mime_type).and_return('image/tiff; gdal-format=GTiff')
+      allow(subject).to receive(:geo_mime_type).and_return('image/tiff; gdal-format=GTiff')
     end
     it 'is true' do
       expect(subject.raster_file?).to be true
@@ -23,7 +23,7 @@ describe GeoConcerns::GeoFileFormatBehavior do
 
   describe '#vector_file?' do
     before do
-      allow(subject).to receive(:mime_type).and_return('application/zip; ogr-format="ESRI Shapefile"')
+      allow(subject).to receive(:geo_mime_type).and_return('application/zip; ogr-format="ESRI Shapefile"')
     end
     it 'is true' do
       expect(subject.vector_file?).to be true
@@ -32,7 +32,7 @@ describe GeoConcerns::GeoFileFormatBehavior do
 
   describe '#external_metadata_file?' do
     before do
-      allow(subject).to receive(:mime_type).and_return('application/xml; schema=iso19139')
+      allow(subject).to receive(:geo_mime_type).and_return('application/xml; schema=iso19139')
     end
     it 'is true' do
       expect(subject.external_metadata_file?).to be true
@@ -41,7 +41,7 @@ describe GeoConcerns::GeoFileFormatBehavior do
 
   describe '#geo_file_format?' do
     before do
-      allow(subject).to receive(:mime_type).and_return('image/tiff; gdal-format=GTiff')
+      allow(subject).to receive(:geo_mime_type).and_return('image/tiff; gdal-format=GTiff')
     end
     it 'is true' do
       expect(subject.geo_file_format?).to be true