Merge pull request #248 from projecthydra-labs/pass-id

Pass id to processors and use to name display vector

.rubocop.yml

@@ -49,6 +49,7 @@ Metrics/MethodLength:
   Exclude:
     - 'Rakefile'
     - 'app/models/concerns/geo_concerns/extractors/iso19139_helper.rb'
+    - 'app/models/concerns/geo_concerns/file_set/derivatives.rb'
 
 Metrics/ClassLength:
   Exclude:

app/models/concerns/geo_concerns/file_set/derivatives.rb

@@ -3,7 +3,6 @@ module FileSet
     module Derivatives
       extend ActiveSupport::Concern
 
-      # rubocop:disable Metrics/MethodLength
       def create_derivatives(filename)
         content_url = nil
         case geo_mime_type
@@ -23,11 +22,11 @@ def create_derivatives(filename)
         # deliver them to external services
         DeliveryJob.perform_later(self, content_url) if content_url.present?
       end
-      # rubocop:enable Metrics/MethodLength
 
       def image_derivatives(filename)
         Hydra::Derivatives::ImageDerivatives
           .create(filename, outputs: [{ label: :thumbnail,
+                                        id: id,
                                         format: 'png',
                                         size: '200x150>',
                                         url: derivative_url('thumbnail') }])
@@ -37,10 +36,12 @@ def raster_derivatives(filename)
         GeoConcerns::Runners::RasterDerivatives
           .create(filename, outputs: [{ input_format: geo_mime_type,
                                         label: :display_raster,
+                                        id: id,
                                         format: 'tif',
                                         url: derivative_url('display_raster') },
                                       { input_format: geo_mime_type,
                                         label: :thumbnail,
+                                        id: id,
                                         format: 'png',
                                         size: '200x150',
                                         url: derivative_url('thumbnail') }])
@@ -50,10 +51,12 @@ def vector_derivatives(filename)
         GeoConcerns::Runners::VectorDerivatives
           .create(filename, outputs: [{ input_format: geo_mime_type,
                                         label: :display_vector,
+                                        id: id,
                                         format: 'zip',
                                         url: derivative_url('display_vector') },
                                       { input_format: geo_mime_type,
                                         label: :thumbnail,
+                                        id: id,
                                         format: 'png',
                                         size: '200x150',
                                         url: derivative_url('thumbnail') }])

app/processors/geo_concerns/processors/base_geo_processor.rb

@@ -41,7 +41,8 @@ def options_for(_format)
           label: label,
           output_size: output_size,
           output_srid: output_srid,
-          basename: basename
+          basename: basename,
+          id: id
         }
       end
 
@@ -69,6 +70,12 @@ def output_srid
       def basename
         File.basename(source_path, File.extname(source_path))
       end
+
+      # Gets the fileset id or returns nil.
+      # @return [String] fileset id
+      def id
+        directives.fetch(:id, nil)
+      end
     end
   end
 end

app/processors/geo_concerns/processors/ogr.rb

@@ -10,10 +10,7 @@ module Ogr
         # #param options [Hash] creation options
         # @param out_path [String] processor output file path
         def self.reproject(in_path, out_path, options)
-          # reset the basename
-          vector_info = GeoConcerns::Processors::Vector::Info.new(in_path)
-          options[:basename] = vector_info.name
-          execute "env SHAPE_ENCODING= ogr2ogr -q -nln #{options[:basename]} -f 'ESRI Shapefile'"\
+          execute "env SHAPE_ENCODING= ogr2ogr -q -nln #{options[:id]} -f 'ESRI Shapefile'"\
                     " -t_srs #{options[:output_srid]} -preserve_fid '#{out_path}' '#{in_path}'"
         end
       end

spec/processors/geo_concerns/processors/base_geo_processor_spec.rb

@@ -83,6 +83,21 @@ def source_path
     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')