geo_concerns 0.0.1 → 0.0.2

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

@@ -4,7 +4,7 @@ describe GeoConcerns::Processors::Raster::Base do
   let(:output_file) { 'output/geo.png' }
   let(:file_name) { 'files/geo.tif' }
   let(:label) {}
-  let(:options) { { output_format: 'PNG', output_size: '150 150', label: label } }
+  let(:options) { { output_size: '150 150', label: label } }
 
   subject { described_class.new(file_name, {}) }
 
@@ -26,61 +26,29 @@ describe GeoConcerns::Processors::Raster::Base do
     end
   end
 
-  describe '#encode_raster' do
-    it 'executes the translate command and cleans up aux file' do
-      expect(subject.class).to receive(:execute)
-      expect(File).to receive(:unlink).with("#{output_file}.aux.xml")
-      subject.class.encode_raster(file_name, options, output_file)
+  describe '#encode_queue' do
+    it 'returns an array of command name symbols' do
+      expect(subject.class.encode_queue).to include :translate
     end
   end
 
-  describe '#reproject_raster' do
-    it 'executes the warp and compress commands, then cleans up intermediate file' do
-      expect(subject.class).to receive(:execute).twice
-      expect(FileUtils).to receive(:rm_rf)
-      subject.class.reproject_raster(file_name, options, output_file)
+  describe '#reproject_queue' do
+    it 'returns an array of command name symbols' do
+      expect(subject.class.reproject_queue).to include :warp
     end
   end
 
-  describe '#warp' do
-    it 'returns a gdalwarp command ' do
-      expect(subject.class.warp(file_name, options, output_file))
-        .to include('gdalwarp')
-    end
-  end
-
-  describe '#compress' do
-    it 'returns a gdal_translate command with a compress option' do
-      expect(subject.class.compress(file_name, options, output_file))
-        .to include('gdal_translate', 'COMPRESS=LZW')
-    end
-  end
-
-  describe '#get_raster_min_max' do
-    let(:min_max) { subject.class.get_raster_min_max(info_string) }
-
-    context 'when a string has computed min and max' do
-      let(:info_string) { 'Band 1 Block=256x16 Type=Float32 Computed Min/Max=2.054,11.717 ' }
-
-      it 'returns with formatted text' do
-        expect(min_max).to eq('2.054 11.717')
-      end
-    end
-
-    context 'when a string does not have a computed min and max' do
-      let(:info_string) { 'Band 1 Block=256x16 Type=Float32' }
-
-      it 'returns with formatted text' do
-        expect(min_max).to eq('')
-      end
+  describe '#encode_raster' do
+    it 'runs commands to encode the raster thumbnail' do
+      expect(subject.class).to receive(:run_commands)
+      subject.class.encode_raster(file_name, options, output_file)
     end
   end
 
-  describe '#gdalinfo' do
-    it 'shells out to gdalinfo and returns the output as a string' do
-      expect(Open3).to receive(:capture3).with("gdalinfo -mm #{file_name}")
-        .and_return(['info', '', ''])
-      expect(subject.class.gdalinfo(file_name)).to eq('info')
+  describe '#reproject_raster' do
+    it 'runs commands to reproject the raster' do
+      expect(subject.class).to receive(:run_commands)
+      subject.class.reproject_raster(file_name, options, output_file)
     end
   end
 end

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

@@ -3,24 +3,28 @@ require 'spec_helper'
 describe GeoConcerns::Processors::Raster::Dem do
   let(:output_file) { 'output/geo.png' }
   let(:file_name) { 'files/geo.dem' }
-  let(:options) { { output_format: 'PNG',
-                    output_size: '150 150',
-                    label: :thumbnail }
+  let(:options) { { output_size: '150 150', label: :thumbnail }
   }
 
   subject { described_class.new(file_name, {}) }
 
-  describe '#translate' do
-    it 'returns a translate command for the USGS Digital Elevation Model format' do
-      expect(subject.class.translate(file_name, options, output_file))
-        .to include('USGSDEM')
+  describe '#encode_queue' do
+    it 'returns an array of command name symbols' do
+      expect(subject.class.encode_queue).to include :hillshade
+    end
+  end
+
+  describe '#reproject_queue' do
+    it 'returns an array of command name symbols' do
+      expect(subject.class.reproject_queue).to include :hillshade
     end
   end
 
   describe '#hillshade' do
-    it 'returns a gdal hillshade command' do
-      expect(subject.class.hillshade(file_name, options, output_file))
-        .to include('gdaldem hillshade')
+    it 'executes a gdal hillshade command' do
+      command = "gdaldem hillshade -q -of GTiff \"files/geo.dem\" output/geo.png"
+      expect(subject.class).to receive(:execute).with command
+      subject.class.hillshade(file_name, output_file, options)
     end
   end
 end

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

@@ -0,0 +1,35 @@
+require 'spec_helper'
+require 'open3'
+
+describe GeoConcerns::Processors::Raster::Info do
+  let(:path) { 'test.tif' }
+  let(:info_doc) { read_test_data_fixture('gdalinfo.txt') }
+
+  subject { described_class.new(path) }
+
+  context 'when initializing a new info class' do
+    it 'shells out to gdalinfo and sets the doc variable to the output string' do
+      expect(Open3).to receive(:capture3).with("gdalinfo -mm #{path}")
+        .and_return([info_doc, '', ''])
+      expect(subject.doc).to eq(info_doc)
+    end
+  end
+
+  context 'after intialization' do
+    before do
+      allow(subject).to receive(:doc).and_return(info_doc)
+    end
+
+    describe '#min_max' do
+      it 'returns with min and max values' do
+        expect(subject.min_max).to eq('354.000 900.000')
+      end
+    end
+
+    describe '#size' do
+      it 'returns raster size' do
+        expect(subject.size).to eq('310 266')
+      end
+    end
+  end
+end

data/spec/processors/geo_concerns/processors/vector/base_spec.rb

@@ -4,7 +4,7 @@ describe GeoConcerns::Processors::Vector::Base do
   let(:output_file) { 'output/geo.png' }
   let(:file_name) { 'files/geo.zip' }
   let(:label) {}
-  let(:options) { { output_format: 'PNG', output_size: '150 150', label: label } }
+  let(:options) { { output_size: '150 150', label: label } }
 
   subject { described_class.new(file_name, {}) }
 
@@ -26,42 +26,29 @@ describe GeoConcerns::Processors::Vector::Base do
     end
   end
 
-  describe '#encode_vector' do
-    it 'executes rasterize and translate commands, and cleans up files' do
-      expect(subject.class).to receive(:execute).twice
-      expect(File).to receive(:unlink)
-      expect(File).to receive(:unlink).with("#{output_file}.aux.xml")
-      subject.class.encode_vector(file_name, options, output_file)
+  describe '#encode_queue' do
+    it 'returns an array of command name symbols' do
+      expect(subject.class.encode_queue).to include :rasterize
     end
   end
 
-  describe '#reproject_vector' do
-    it 'executes the reproject command, zips the output, then cleans up' do
-      expect(subject.class).to receive(:execute)
-      expect(subject.class).to receive(:zip)
-      expect(FileUtils).to receive(:rm_rf)
-      subject.class.reproject_vector(file_name, options, output_file)
+  describe '#reproject_queue' do
+    it 'returns an array of command name symbols' do
+      expect(subject.class.reproject_queue).to include :zip
     end
   end
 
-  describe '#rasterize' do
-    it 'returns a gdal_rasterize command ' do
-      expect(subject.class.rasterize(file_name, options, output_file))
-        .to include('gdal_rasterize')
-    end
-  end
-
-  describe '#reproject' do
-    it 'returns a ogr2ogr command' do
-      expect(subject.class.reproject(file_name, options, output_file))
-        .to include('ogr2ogr', 'ESRI Shapefile')
+  describe '#encode_vector' do
+    it 'runs commands to encode the raster thumbnail' do
+      expect(subject.class).to receive(:run_commands)
+      subject.class.encode_vector(file_name, options, output_file)
     end
   end
 
-  describe '#intermediate_shapefile_path' do
-    it 'returns a path to a shapefile' do
-      expect(subject.class.intermediate_shapefile_path('/test/path/file.zip'))
-        .to eq('/test/path/file/')
+  describe '#reproject_vector' do
+    it 'runs commands to reproject the raster' do
+      expect(subject.class).to receive(:run_commands)
+      subject.class.reproject_vector(file_name, options, output_file)
     end
   end
 end

data/spec/processors/geo_concerns/processors/vector/shapefile_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 describe GeoConcerns::Processors::Vector::Shapefile do
   let(:output_file) { 'output/geo.png' }
   let(:file_name) { 'files/Shapefile.zip' }
-  let(:options) { { output_format: 'PNG', output_size: '150 150', label: :thumbnail } }
+  let(:options) { { output_size: '150 150', label: :thumbnail } }
 
   subject { described_class.new(file_name, {}) }
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: geo_concerns
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - James Griffin
@@ -12,50 +12,36 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-28 00:00:00.000000000 Z
+date: 2016-05-05 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: rails
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 4.2.6
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 4.2.6
 - !ruby/object:Gem::Dependency
   name: curation_concerns
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.14.0.pre1
+        version: 0.14.0.pre4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.14.0.pre1
+        version: 0.14.0.pre4
 - !ruby/object:Gem::Dependency
   name: leaflet-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.7'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -88,30 +74,30 @@ dependencies:
   name: engine_cart
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.8'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.8'
 - !ruby/object:Gem::Dependency
   name: solr_wrapper
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.10'
 - !ruby/object:Gem::Dependency
   name: fcrepo_wrapper
   requirement: !ruby/object:Gem::Requirement
@@ -158,30 +144,30 @@ dependencies:
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.39'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.39'
 - !ruby/object:Gem::Dependency
   name: rubocop-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.4.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.4.1
 - !ruby/object:Gem::Dependency
   name: factory_girl
   requirement: !ruby/object:Gem::Requirement
@@ -200,16 +186,16 @@ dependencies:
   name: capybara
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.7'
 description: 'Rails engine for Hydra Geo models. Built around Curation Concerns engine. '
 email:
 - jrgriffiniii@gmail.com
@@ -281,10 +267,13 @@ files:
 - app/presenters/geo_concerns/raster_work_show_presenter.rb
 - app/presenters/geo_concerns/vector_work_show_presenter.rb
 - app/processors/geo_concerns/processors/base_geo_processor.rb
+- app/processors/geo_concerns/processors/gdal.rb
+- app/processors/geo_concerns/processors/ogr.rb
 - app/processors/geo_concerns/processors/raster.rb
 - app/processors/geo_concerns/processors/raster/aig.rb
 - app/processors/geo_concerns/processors/raster/base.rb
 - app/processors/geo_concerns/processors/raster/dem.rb
+- app/processors/geo_concerns/processors/raster/info.rb
 - app/processors/geo_concerns/processors/raster/processor.rb
 - app/processors/geo_concerns/processors/vector.rb
 - app/processors/geo_concerns/processors/vector/base.rb
@@ -417,9 +406,12 @@ files:
 - spec/presenters/raster_work_show_presenter_spec.rb
 - spec/presenters/vector_work_show_presenter_spec.rb
 - spec/processors/geo_concerns/processors/base_geo_processor_spec.rb
+- spec/processors/geo_concerns/processors/gdal_spec.rb
+- spec/processors/geo_concerns/processors/ogr_spec.rb
 - spec/processors/geo_concerns/processors/raster/aig_spec.rb
 - spec/processors/geo_concerns/processors/raster/base_spec.rb
 - spec/processors/geo_concerns/processors/raster/dem_spec.rb
+- spec/processors/geo_concerns/processors/raster/info_spec.rb
 - spec/processors/geo_concerns/processors/raster/processor_spec.rb
 - spec/processors/geo_concerns/processors/vector/base_spec.rb
 - spec/processors/geo_concerns/processors/vector/processor_spec.rb
@@ -503,9 +495,12 @@ test_files:
 - spec/presenters/raster_work_show_presenter_spec.rb
 - spec/presenters/vector_work_show_presenter_spec.rb
 - spec/processors/geo_concerns/processors/base_geo_processor_spec.rb
+- spec/processors/geo_concerns/processors/gdal_spec.rb
+- spec/processors/geo_concerns/processors/ogr_spec.rb
 - spec/processors/geo_concerns/processors/raster/aig_spec.rb
 - spec/processors/geo_concerns/processors/raster/base_spec.rb
 - spec/processors/geo_concerns/processors/raster/dem_spec.rb
+- spec/processors/geo_concerns/processors/raster/info_spec.rb
 - spec/processors/geo_concerns/processors/raster/processor_spec.rb
 - spec/processors/geo_concerns/processors/vector/base_spec.rb
 - spec/processors/geo_concerns/processors/vector/processor_spec.rb