geo_concerns 0.0.1 → 0.0.2

data/app/processors/geo_concerns/processors/raster/info.rb

@@ -0,0 +1,52 @@
+module GeoConcerns
+  module Processors
+    module Raster
+      class Info
+        attr_accessor :doc
+        attr_writer :min_max, :size
+
+        def initialize(path)
+          @doc = gdalinfo(path)
+        end
+
+        # Returns the min and max values for a raster.
+        # @return [String] computed min and max values
+        def min_max
+          @min_max ||= raster_min_max
+        end
+
+        # Returns the raster size.
+        # @return [Array] raster size
+        def size
+          @size ||= raster_size
+        end
+
+        private
+
+          # Runs the gdalinfo command and returns the result as a string.
+          # @param path [String] path to raster file
+          # @return [String] output of gdalinfo
+          def gdalinfo(path)
+            stdout, _stderr, _status = Open3.capture3("gdalinfo -mm #{path}")
+            stdout
+          end
+
+          # Given an output string from the gdalinfo command, returns
+          # a formatted string for the computed min and max values.
+          # @return [String] computed min and max values
+          def raster_min_max
+            match = %r{(?<=Computed Min/Max=).*?(?=\s)}.match(doc)
+            match ? match[0].tr(',', ' ') : ''
+          end
+
+          # Given an output string from the gdalinfo command, returns
+          # an array containing the raster width and height as strings.
+          # @return [String] raster size
+          def raster_size
+            match = /(?<=Size is ).*/.match(doc)
+            match ? match[0].tr(',', '') : ''
+          end
+      end
+    end
+  end
+end

data/app/processors/geo_concerns/processors/raster/processor.rb

@@ -9,7 +9,6 @@ module GeoConcerns
         end
 
         # Returns a raster processor class based on mime type passed in the directives object.
-        #
         # @return raster processing class
         def raster_processor_class
           case directives.fetch(:input_format)

data/app/processors/geo_concerns/processors/vector/base.rb

@@ -4,63 +4,37 @@ module GeoConcerns
       class Base < Hydra::Derivatives::Processors::Processor
         include Hydra::Derivatives::Processors::ShellBasedProcessor
         include GeoConcerns::Processors::BaseGeoProcessor
+        include GeoConcerns::Processors::Ogr
+        include GeoConcerns::Processors::Gdal
         include GeoConcerns::Processors::Zip
 
         def self.encode(path, options, output_file)
           case options[:label]
           when :thumbnail
-            encode_vector(path, options, output_file)
+            encode_vector(path, output_file, options)
           when :display_vector
-            reproject_vector(path, options, output_file)
+            reproject_vector(path, output_file, options)
           end
         end
 
-        def self.encode_vector(in_path, options, out_path)
-          tiff_path = "#{File.dirname(in_path)}/out.tif"
-          execute rasterize(in_path, options, tiff_path)
-          execute translate(tiff_path, options, out_path)
-          File.unlink(tiff_path)
-          File.unlink("#{out_path}.aux.xml")
+        # Set of commands to run to encode the vector thumbnail.
+        # @return [Array] set of command name symbols
+        def self.encode_queue
+          [:rasterize, :convert]
         end
 
-        def self.reproject_vector(in_path, options, out_path)
-          shapefile_path = intermediate_shapefile_path(out_path)
-          execute reproject(in_path, options, shapefile_path)
-          zip(shapefile_path, out_path)
-          FileUtils.rm_rf(shapefile_path)
+        # Set of commands to run to reproject the vector.
+        # @return [Array] set of command name symbols
+        def self.reproject_queue
+          [:reproject, :zip]
         end
 
-        # Returns a formatted gdal_rasterize command. Used to rasterize vector
-        # format into raster format.
-        #
-        # @param in_path [String] file input path
-        # #param options [Hash] creation options
-        # @param out_path [String] processor output file path
-        # @return [String] command for rasterizing vector dataset
-        def self.rasterize(in_path, options, out_path)
-          "gdal_rasterize -q -burn 0 -init 255 -ot Byte -ts "\
-            "#{options[:output_size]} -of GTiff #{in_path} #{out_path}"
+        def self.encode_vector(in_path, out_path, options)
+          run_commands(in_path, out_path, encode_queue, options)
         end
 
-        # Returns a formatted ogr2ogr command. Used to reproject a
-        # vector dataset and save the output as a shapefile.
-        #
-        # @param in_path [String] file input path
-        # #param options [Hash] creation options
-        # @param out_path [String] processor output file path
-        # @return [String] command for reprojecting vector data
-        def self.reproject(in_path, options, out_path)
-          "env SHAPE_ENCODING= ogr2ogr -q -nln #{options[:basename]} "\
-            "-f 'ESRI Shapefile' -t_srs #{options[:output_srid]} '#{out_path}' '#{in_path}'"
-        end
-
-        # Returns a path to an intermediate shape file directory.
-        #
-        # @param path [String] file path to base temp path on
-        # @return [String] tempfile path
-        def self.intermediate_shapefile_path(path)
-          ext = File.extname(path)
-          "#{File.dirname(path)}/#{File.basename(path, ext)}/"
+        def self.reproject_vector(in_path, out_path, options)
+          run_commands(in_path, out_path, reproject_queue, options)
         end
       end
     end

data/app/processors/geo_concerns/processors/vector/processor.rb

@@ -9,7 +9,6 @@ module GeoConcerns
         end
 
         # Returns a vector processor class based on mime type passed in the directives object.
-        #
         # @return vector processing class
         def vector_processor_class
           case directives.fetch(:input_format)

data/app/processors/geo_concerns/processors/vector/shapefile.rb

@@ -8,9 +8,9 @@ module GeoConcerns
           unzip(path, output_file) do |zip_path|
             case options[:label]
             when :thumbnail
-              encode_vector(zip_path, options, output_file)
+              encode_vector(zip_path, output_file, options)
             when :display_vector
-              reproject_vector(zip_path, options, output_file)
+              reproject_vector(zip_path, output_file, options)
             end
           end
         end

data/app/processors/geo_concerns/processors/zip.rb

@@ -7,10 +7,9 @@ module GeoConcerns
         # Unzips a file, invokes a block, and then deletes the unzipped file(s).
         # Use to wrap processor methods for geo file formats that
         # are zipped before uploading.
-        #
         # @param in_path [String] file input path
         # @param output_file [String] processor output file path
-        def self.unzip(in_path, output_file)
+        def self.unzip(in_path, output_file, _options = {})
           basename = File.basename(output_file, File.extname(output_file))
           zip_out_path = "#{File.dirname(output_file)}/#{basename}_out"
           execute "unzip -qq -j -d \"#{zip_out_path}\" \"#{in_path}\""
@@ -19,10 +18,9 @@ module GeoConcerns
         end
 
         # Zips a file or directory.
-        #
         # @param in_path [String] file input path
         # @param output_file [String] output zip file
-        def self.zip(in_path, output_file)
+        def self.zip(in_path, output_file, _options = {})
           execute "zip -j -qq -r \"#{output_file}\" \"#{in_path}\""
         end
       end

data/geo_concerns.gemspec

@@ -18,19 +18,18 @@ Gem::Specification.new do |spec|
   spec.test_files = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ['lib']
 
-  spec.add_dependency 'rails', '~> 4.2.6'
-  spec.add_dependency 'curation_concerns', '~> 0.14.0.pre1'
-  spec.add_dependency 'leaflet-rails'
+  spec.add_dependency 'curation_concerns', '~> 0.14.0.pre4'
+  spec.add_dependency 'leaflet-rails', '~> 0.7'
 
   spec.add_development_dependency 'sqlite3'
   spec.add_development_dependency 'rspec-rails'
-  spec.add_development_dependency 'engine_cart'
-  spec.add_development_dependency 'solr_wrapper'
+  spec.add_development_dependency 'engine_cart', '~> 0.8'
+  spec.add_development_dependency 'solr_wrapper', '~> 0.10'
   spec.add_development_dependency 'fcrepo_wrapper', '~> 0.1'
   spec.add_development_dependency 'pry-byebug'
   spec.add_development_dependency 'database_cleaner', '< 1.1.0'
-  spec.add_development_dependency 'rubocop'
-  spec.add_development_dependency 'rubocop-rspec'
+  spec.add_development_dependency 'rubocop', '~> 0.39'
+  spec.add_development_dependency 'rubocop-rspec', '~> 1.4.1'
   spec.add_development_dependency 'factory_girl'
-  spec.add_development_dependency 'capybara'
+  spec.add_development_dependency 'capybara', '~> 2.7'
 end

data/lib/geo_concerns/version.rb

@@ -1,3 +1,3 @@
 module GeoConcerns
-  VERSION = "0.0.1".freeze
+  VERSION = "0.0.2".freeze
 end

data/spec/controllers/image_works_controller_spec.rb

@@ -22,4 +22,20 @@ describe CurationConcerns::ImageWorksController, type: :controller do
       end
     end
   end
+
+  describe '#create' do
+    let(:user) { FactoryGirl.create(:admin) }
+    before do
+      sign_in user
+    end
+
+    context 'when create is successful' do
+      let(:work) { FactoryGirl.create(:image_work, user: user) }
+      it 'creates an image work' do
+        allow(controller).to receive(:curation_concern).and_return(work)
+        post :create, image_work: { title: ['a title'] }
+        expect(response).to redirect_to main_app.curation_concerns_image_work_path(work)
+      end
+    end
+  end
 end

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

@@ -4,6 +4,7 @@ describe GeoConcerns::Processors::BaseGeoProcessor do
   before do
     class TestProcessor
       include GeoConcerns::Processors::BaseGeoProcessor
+      include GeoConcerns::Processors::Gdal
       def directives
       end
 
@@ -22,19 +23,38 @@ describe GeoConcerns::Processors::BaseGeoProcessor do
   let(:directives) { { format: 'png', size: '200x400' } }
   let(:output_file) { 'output/geo.png' }
   let(:file_name) { 'files/geo.tif' }
-  let(:options) { { output_format: 'PNG', output_size: '150 150' } }
+  let(:options) { { output_size: '150 150' } }
+
+  describe '#run_commands' do
+    let(:method_queue) { [:translate, :warp, :compress] }
+    it 'calls the methods in the queue and cleans up temp files' do
+      expect(subject.class).to receive(:translate)
+      expect(subject.class).to receive(:warp)
+      expect(subject.class).to receive(:compress)
+      expect(FileUtils).to receive(:rm_rf).twice
+      subject.class.run_commands(file_name, output_file, method_queue, options)
+    end
+  end
+
+  describe '#convert' do
+    let(:image) { double }
 
-  describe '#translate' do
-    it 'returns a gdal_translate command ' do
-      expect(subject.class.translate(file_name, options, output_file))
-        .to include('gdal_translate')
+    before do
+      allow(MiniMagick::Image).to receive(:open).and_return(image)
+    end
+
+    it 'transforms the image and saves it as a jpeg' 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)
     end
   end
 
-  describe '#intermediate_file_path' do
+  describe '#temp_path' do
     it 'returns a path to a temporary file based on the input file' do
-      expect(subject.class.intermediate_file_path(output_file))
-        .to include('geo_temp.png')
+      expect(subject.class.temp_path(output_file))
+        .to include('geo')
     end
   end
 
@@ -53,21 +73,6 @@ describe GeoConcerns::Processors::BaseGeoProcessor do
     end
   end
 
-  describe '#output_format' do
-    context 'when given jpg as a format' do
-      let(:directives) { { format: 'jpg' } }
-      it 'returns JPEG' do
-        expect(subject.output_format).to eq('JPEG')
-      end
-    end
-
-    context 'when given png as a format' do
-      it 'returns PNG' do
-        expect(subject.output_format).to eq('PNG')
-      end
-    end
-  end
-
   describe '#output_size' do
     context 'when given a size string with an x' do
       it 'returns a size string with a space instead' do
@@ -99,8 +104,7 @@ describe GeoConcerns::Processors::BaseGeoProcessor do
 
   describe '#options_for' do
     it 'returns a hash that includes output size and format' do
-      expect(subject.options_for("a")).to include(:output_format,
-                                                  :output_size,
+      expect(subject.options_for("a")).to include(:output_size,
                                                   :label,
                                                   :output_srid,
                                                   :basename)

data/spec/processors/geo_concerns/processors/gdal_spec.rb

@@ -0,0 +1,59 @@
+require 'spec_helper'
+
+describe GeoConcerns::Processors::BaseGeoProcessor do
+  before do
+    class TestProcessor
+      include Hydra::Derivatives::Processors::ShellBasedProcessor
+      include GeoConcerns::Processors::Gdal
+      def directives
+      end
+
+      def source_path
+      end
+    end
+
+    allow(subject).to receive(:directives).and_return(directives)
+    allow(subject).to receive(:source_path).and_return(file_name)
+  end
+
+  after { Object.send(:remove_const, :TestProcessor) }
+
+  subject { TestProcessor.new }
+
+  let(:directives) { { format: 'png', size: '200x400' } }
+  let(:output_file) { 'output/geo.png' }
+  let(:file_name) { 'files/geo.tif' }
+  let(:options) { { output_size: '150 150', output_srid: 'EPSG:4326' } }
+
+  describe '#translate' do
+    it 'executes a gdal_translate command' do
+      command = "gdal_translate -q -ot Byte -of GTiff \"files/geo.tif\" output/geo.png"
+      expect(subject.class).to receive(:execute).with command
+      subject.class.translate(file_name, output_file, options)
+    end
+  end
+
+  describe '#warp' do
+    it 'executes a reproject command' do
+      command = "gdalwarp -q -r bilinear -t_srs EPSG:4326 files/geo.tif output/geo.png -co 'COMPRESS=NONE'"
+      expect(subject.class).to receive(:execute).with command
+      subject.class.warp(file_name, output_file, options)
+    end
+  end
+
+  describe '#compress' do
+    it 'returns a gdal_translate command with a compress option' do
+      command = "gdal_translate -q -ot Byte -a_srs EPSG:4326 files/geo.tif output/geo.png -co 'COMPRESS=LZW'"
+      expect(subject.class).to receive(:execute).with command
+      subject.class.compress(file_name, output_file, options)
+    end
+  end
+
+  describe '#rasterize' do
+    it 'executes a rasterize command' do
+      command = "gdal_rasterize -q -burn 0 -init 255 -ot Byte -ts 150 150 -of GTiff files/geo.tif output/geo.png"
+      expect(subject.class).to receive(:execute).with command
+      subject.class.rasterize(file_name, output_file, options)
+    end
+  end
+end

data/spec/processors/geo_concerns/processors/ogr_spec.rb

@@ -0,0 +1,36 @@
+require 'spec_helper'
+
+describe GeoConcerns::Processors::BaseGeoProcessor do
+  before do
+    class TestProcessor
+      include Hydra::Derivatives::Processors::ShellBasedProcessor
+      include GeoConcerns::Processors::Ogr
+      def directives
+      end
+
+      def source_path
+      end
+    end
+
+    allow(subject).to receive(:directives).and_return(directives)
+    allow(subject).to receive(:source_path).and_return(file_name)
+  end
+
+  after { Object.send(:remove_const, :TestProcessor) }
+
+  subject { TestProcessor.new }
+
+  let(:directives) { { format: 'png', size: '200x400' } }
+  let(:output_file) { 'output/geo.png' }
+  let(:file_name) { 'files/geo.zip' }
+  let(:options) { { output_size: '150 150', output_srid: 'EPSG:4326' } }
+
+  describe '#reproject' do
+    it 'executes a reproject command' do
+      command = "env SHAPE_ENCODING= ogr2ogr -q -nln  -f 'ESRI Shapefile' "\
+                  "-t_srs EPSG:4326 'output/geo.png' 'files/geo.zip'"
+      expect(subject.class).to receive(:execute).with command
+      subject.class.reproject(file_name, output_file, options)
+    end
+  end
+end

data/spec/processors/geo_concerns/processors/raster/aig_spec.rb

@@ -3,8 +3,7 @@ require 'spec_helper'
 describe GeoConcerns::Processors::Raster::Aig do
   let(:output_file) { 'output/geo.png' }
   let(:file_name) { 'files/aig.zip' }
-  let(:options) { { output_format: 'PNG',
-                    output_size: '150 150',
+  let(:options) { { output_size: '150 150',
                     min_max: '2.054 11.717',
                     label: :thumbnail }
   }
@@ -12,9 +11,17 @@ describe GeoConcerns::Processors::Raster::Aig do
   subject { described_class.new(file_name, {}) }
 
   describe '#translate' do
-    it 'returns a gdal_translate command with scaling' do
-      expect(subject.class.translate(file_name, options, output_file))
-        .to include('-scale 2.054 11.717 255 0')
+    it 'executes a gdal_translate command with scaling' do
+      command = "gdal_translate -scale 2.054 11.717 255 0 -q -ot Byte -of "\
+                  "GTiff \"files/aig.zip\" output/geo.png"
+      expect(subject.class).to receive(:execute).with command
+      subject.class.translate(file_name, output_file, options)
+    end
+  end
+
+  describe '#reproject_queue' do
+    it 'returns an array of command name symbols' do
+      expect(subject.class.reproject_queue).to include :warp
     end
   end