geo_concerns 0.0.3 → 0.0.4

data/spec/models/external_metadata_file_spec.rb

@@ -2,9 +2,9 @@ require 'spec_helper'
 
 describe FileSet do
   let(:user) { create(:user) }
-  subject { described_class.new(mime_type: 'application/xml; schema=iso19139') }
+  subject { described_class.new(geo_mime_type: 'application/xml; schema=iso19139') }
 
-  context "when mime_type is a metadata format" do
+  context "when geo_mime_type is a metadata format" do
     it "responds as a metadata file" do
       expect(subject.external_metadata_file?).to be_truthy
     end
@@ -16,7 +16,7 @@ describe FileSet do
   describe "to_solr" do
     let(:solr_doc) { FactoryGirl.build(:external_metadata_file,
                                        date_uploaded: Time.zone.today,
-                                       mime_type: 'application/xml; schema=iso19139').to_solr
+                                       geo_mime_type: 'application/xml; schema=iso19139').to_solr
     }
 
     it "does not index bbox field" do
@@ -26,7 +26,7 @@ describe FileSet do
 
   describe 'metadata' do
     it 'has standard' do
-      expect(subject).to respond_to(:mime_type)
+      expect(subject).to respond_to(:geo_mime_type)
     end
   end
 
@@ -38,26 +38,26 @@ describe FileSet do
   it 'will route the extraction request for ISO' do
     expect(subject).to receive(:original_file) { Hydra::PCDM::File.new }
     expect(subject).to receive(:extract_iso19139_metadata)
-    subject.mime_type = 'application/xml; schema=iso19139'
+    subject.geo_mime_type = 'application/xml; schema=iso19139'
     expect(subject.extract_metadata).to be_nil
   end
 
   it 'will route the extraction request for FGDC' do
     expect(subject).to receive(:original_file) { Hydra::PCDM::File.new }
     expect(subject).to receive(:extract_fgdc_metadata)
-    subject.mime_type = 'application/xml; schema=fgdc'
+    subject.geo_mime_type = 'application/xml; schema=fgdc'
     expect(subject.extract_metadata).to be_nil
   end
 
   it 'will route the extraction request for MODS' do
     expect(subject).to receive(:original_file) { Hydra::PCDM::File.new }
     expect(subject).to receive(:extract_mods_metadata)
-    subject.mime_type = 'application/mods+xml'
+    subject.geo_mime_type = 'application/mods+xml'
     expect(subject.extract_metadata).to be_nil
   end
 
   it 'will not route the extraction request for bogus standard' do
-    subject.mime_type = 'bogus'
+    subject.geo_mime_type = 'bogus'
     expect { subject.extract_metadata }.to raise_error(ArgumentError)
   end
 

data/spec/models/image_file_spec.rb

@@ -2,9 +2,9 @@ require 'spec_helper'
 
 describe FileSet do
   let(:user) { create(:user) }
-  subject { described_class.new(mime_type: 'image/jpeg') }
+  subject { described_class.new(geo_mime_type: 'image/jpeg') }
 
-  context "when mime_type is an image format" do
+  context "when geo_mime_type is an image format" do
     it "responds as an image file" do
       expect(subject.image_file?).to be_truthy
     end
@@ -42,7 +42,7 @@ describe FileSet do
     end
 
     it 'has standard' do
-      expect(subject).to respond_to(:mime_type)
+      expect(subject).to respond_to(:geo_mime_type)
     end
   end
 end

data/spec/models/image_work_spec.rb

@@ -2,9 +2,9 @@ require 'spec_helper'
 
 describe ImageWork do
   let(:user) { FactoryGirl.find_or_create(:jill) }
-  let(:image_file1) { FileSet.new(mime_type: 'image/jpeg') }
-  let(:ext_metadata_file1) { FileSet.new(mime_type: 'application/xml; schema=iso19139') }
-  let(:ext_metadata_file2) { FileSet.new(mime_type: 'application/xml; schema=iso19139') }
+  let(:image_file1) { FileSet.new(geo_mime_type: 'image/jpeg') }
+  let(:ext_metadata_file1) { FileSet.new(geo_mime_type: 'application/xml; schema=iso19139') }
+  let(:ext_metadata_file2) { FileSet.new(geo_mime_type: 'application/xml; schema=iso19139') }
   let(:raster1) { RasterWork.new }
   let(:raster2) { RasterWork.new }
   let(:coverage) { GeoConcerns::Coverage.new(43.039, -69.856, 42.943, -71.032) }
@@ -47,7 +47,7 @@ describe ImageWork do
     subject { FactoryGirl.create(:image_work_with_raster_works, title: ['Test title 4'], coverage: coverage.to_s) }
 
     it 'aggregates by raster resources' do
-      expect(subject.raster_works.size).to eq 2
+      expect(subject.raster_works.size).to eq 1
       expect(subject.raster_works.first).to be_kind_of RasterWork
     end
   end
@@ -63,7 +63,7 @@ describe ImageWork do
     it 'can perform extraction and set properties for ISO 19139' do
       external_metadata_file = subject.metadata_files.first
       allow(external_metadata_file).to receive(:metadata_xml) { doc }
-      allow(external_metadata_file).to receive(:mime_type) { 'application/xml; schema=iso19139' }
+      allow(external_metadata_file).to receive(:geo_mime_type) { 'application/xml; schema=iso19139' }
       subject.populate_metadata
       expect(subject.title).to eq(['S_566_1914_clip.tif'])
     end

data/spec/models/raster_file_spec.rb

@@ -2,9 +2,9 @@ require 'spec_helper'
 
 describe FileSet do
   let(:user) { create(:user) }
-  subject { described_class.new(mime_type: 'image/tiff; gdal-format=GTiff') }
+  subject { described_class.new(geo_mime_type: 'image/tiff; gdal-format=GTiff') }
 
-  context "when mime_type is a raster format" do
+  context "when geo_mime_type is a raster format" do
     it "responds as a raster file" do
       expect(subject.raster_file?).to be_truthy
     end
@@ -42,7 +42,7 @@ describe FileSet do
     end
 
     it 'has standard' do
-      expect(subject).to respond_to(:mime_type)
+      expect(subject).to respond_to(:geo_mime_type)
     end
   end
 end

data/spec/models/raster_work_spec.rb

@@ -2,10 +2,10 @@ require 'spec_helper'
 
 describe RasterWork do
   let(:user) { FactoryGirl.find_or_create(:jill) }
-  let(:raster_file1) { FileSet.new(mime_type: 'image/tiff; gdal-format=GTiff') }
-  let(:raster_file2) { FileSet.new(mime_type: 'image/tiff; gdal-format=GTiff') }
-  let(:ext_metadata_file1) { FileSet.new(mime_type: 'application/xml; schema=iso19139') }
-  let(:ext_metadata_file2) { FileSet.new(mime_type: 'application/xml; schema=iso19139') }
+  let(:raster_file1) { FileSet.new(geo_mime_type: 'image/tiff; gdal-format=GTiff') }
+  let(:raster_file2) { FileSet.new(geo_mime_type: 'image/tiff; gdal-format=GTiff') }
+  let(:ext_metadata_file1) { FileSet.new(geo_mime_type: 'application/xml; schema=iso19139') }
+  let(:ext_metadata_file2) { FileSet.new(geo_mime_type: 'application/xml; schema=iso19139') }
   let(:vector1) { VectorWork.new }
   let(:vector2) { VectorWork.new }
   let(:coverage) { GeoConcerns::Coverage.new(43.039, -69.856, 42.943, -71.032) }
@@ -59,15 +59,15 @@ describe RasterWork do
 
     it 'has two files' do
       expect(subject.raster_files.size).to eq 2
-      expect(subject.raster_files.first.mime_type).to eq 'image/tiff; gdal-format=GTiff'
+      expect(subject.raster_files.first.geo_mime_type).to eq 'image/tiff; gdal-format=GTiff'
     end
   end
 
   context 'with vector feature extractions' do
-    subject { FactoryGirl.create(:raster_work_with_vector_works) }
+    subject { FactoryGirl.create(:raster_work_with_vector_work) }
 
     it 'aggregates vector data set resources' do
-      expect(subject.vector_works.size).to eq 2
+      expect(subject.vector_works.size).to eq 1
       expect(subject.vector_works.first).to be_kind_of VectorWork
     end
   end
@@ -77,7 +77,7 @@ describe RasterWork do
 
     it 'aggregates external metadata files' do
       expect(subject.metadata_files.size).to eq 2
-      expect(subject.metadata_files.first.mime_type).to eq 'application/xml; schema=iso19139'
+      expect(subject.metadata_files.first.geo_mime_type).to eq 'application/xml; schema=iso19139'
     end
   end
 
@@ -114,7 +114,7 @@ describe RasterWork do
     it 'can perform extraction and set properties for ISO 19139' 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(:mime_type).and_return('application/xml; schema=iso19139')
+      allow(external_metadata_file).to receive(:geo_mime_type).and_return('application/xml; schema=iso19139')
       subject.should_populate_metadata = 'true'
       expect(subject.title).to eq(['S_566_1914_clip.tif'])
     end

data/spec/models/vector_file_spec.rb

@@ -2,9 +2,9 @@ require 'spec_helper'
 
 describe FileSet do
   let(:user) { create(:user) }
-  subject { described_class.new(mime_type: 'application/zip; ogr-format="ESRI Shapefile"') }
+  subject { described_class.new(geo_mime_type: 'application/zip; ogr-format="ESRI Shapefile"') }
 
-  context "when mime_type is a vector format" do
+  context "when geo_mime_type is a vector format" do
     it "responds as a vector file" do
       expect(subject.vector_file?).to be_truthy
     end
@@ -42,7 +42,7 @@ describe FileSet do
     end
 
     it 'has standard' do
-      expect(subject).to respond_to(:mime_type)
+      expect(subject).to respond_to(:geo_mime_type)
     end
   end
 end

data/spec/models/vector_work_spec.rb

@@ -2,10 +2,10 @@ require 'spec_helper'
 
 describe VectorWork do
   let(:user) { FactoryGirl.find_or_create(:jill) }
-  let(:vector_file1) { FileSet.new(mime_type: 'application/zip; ogr-format="ESRI Shapefile"') }
-  let(:vector_file2) { FileSet.new(mime_type: 'application/zip; ogr-format="ESRI Shapefile"') }
-  let(:ext_metadata_file1) { FileSet.new(mime_type: 'application/xml; schema=iso19139') }
-  let(:ext_metadata_file2) { FileSet.new(mime_type: 'application/xml; schema=iso19139') }
+  let(:vector_file1) { FileSet.new(geo_mime_type: 'application/zip; ogr-format="ESRI Shapefile"') }
+  let(:vector_file2) { FileSet.new(geo_mime_type: 'application/zip; ogr-format="ESRI Shapefile"') }
+  let(:ext_metadata_file1) { FileSet.new(geo_mime_type: 'application/xml; schema=iso19139') }
+  let(:ext_metadata_file2) { FileSet.new(geo_mime_type: 'application/xml; schema=iso19139') }
   let(:coverage) { GeoConcerns::Coverage.new(43.039, -69.856, 42.943, -71.032) }
 
   describe 'with acceptable inputs' do
@@ -55,7 +55,7 @@ describe VectorWork do
 
     it 'has two files' do
       expect(subject.vector_files.size).to eq 2
-      expect(subject.vector_files.first.mime_type).to eq 'application/zip; ogr-format="ESRI Shapefile"'
+      expect(subject.vector_files.first.geo_mime_type).to eq 'application/zip; ogr-format="ESRI Shapefile"'
     end
   end
 
@@ -64,7 +64,7 @@ describe VectorWork do
 
     it 'aggregates external metadata files' do
       expect(subject.metadata_files.size).to eq 2
-      expect(subject.metadata_files.first.mime_type).to eq 'application/xml; schema=iso19139'
+      expect(subject.metadata_files.first.geo_mime_type).to eq 'application/xml; schema=iso19139'
     end
   end
 
@@ -101,7 +101,7 @@ describe VectorWork do
     it 'can perform extraction and set for ISO 19139' do
       external_metadata_file = subject.metadata_files.first
       allow(external_metadata_file).to receive(:metadata_xml) { doc }
-      allow(external_metadata_file).to receive(:mime_type) { 'application/xml; schema=iso19139' }
+      allow(external_metadata_file).to receive(:geo_mime_type) { 'application/xml; schema=iso19139' }
       subject.populate_metadata
       expect(subject.title).to eq(['S_566_1914_clip.tif'])
     end

data/spec/presenters/geo_concerns_show_presenter_spec.rb

@@ -5,32 +5,22 @@ RSpec.describe ::GeoConcerns::GeoConcernsShowPresenter do
   let(:ability) { nil }
 
   describe "delegated methods" do
-    let(:attributes)  { { "mime_type_ssi" => ['image/tiff; gdal-format=GTiff'] } }
+    let(:attributes)  { { "geo_mime_type_tesim" => ['image/tiff; gdal-format=GTiff'] } }
     subject { described_class.new(solr_document, ability) }
 
     describe "#first" do
       it "delegates to solr document" do
-        expect(subject.first('mime_type_ssi')).to eq('image/tiff; gdal-format=GTiff')
+        expect(subject.first('geo_mime_type_tesim')).to eq('image/tiff; gdal-format=GTiff')
       end
     end
 
     describe "#has?" do
       it "delegates to solr document" do
-        expect(subject.has?('mime_type_ssi')).to be_truthy
+        expect(subject.has?('geo_mime_type_tesim')).to be_truthy
       end
     end
   end
 
-  describe "#external_metadata_file_formats_presenters" do
-    let(:obj) { FactoryGirl.create(:raster_work_with_metadata_files) }
-    let(:attributes) { obj.to_solr }
-    subject { described_class.new(solr_document, ability) }
-
-    it "returns external_metadata_file_formats_presenters" do
-      expect(subject.external_metadata_file_formats_presenters.count).to eq 2
-    end
-  end
-
   describe "#attribute_to_html" do
     let(:attributes) { FactoryGirl.create(:raster_work).to_solr }
     let(:attribute_renderer) { double('attribute_renderer') }
@@ -39,8 +29,8 @@ RSpec.describe ::GeoConcerns::GeoConcernsShowPresenter do
     subject { described_class.new(solr_document, ability) }
 
     before do
-      allow(CurationConcerns::AttributeRenderer).to receive(:new).and_return(attribute_renderer)
-      allow(CoverageRenderer).to receive(:new).and_return(coverage_renderer)
+      allow(CurationConcerns::Renderers::AttributeRenderer).to receive(:new).and_return(attribute_renderer)
+      allow(GeoConcerns::CoverageRenderer).to receive(:new).and_return(coverage_renderer)
     end
 
     it "uses a CoverageRenderer when the field is coverage" do

data/spec/presenters/image_work_show_presenter_spec.rb

@@ -4,48 +4,47 @@ RSpec.describe GeoConcerns::ImageWorkShowPresenter do
   let(:solr_document) { SolrDocument.new(attributes) }
   let(:ability) { nil }
 
+  subject { described_class.new(solr_document, ability) }
+
   describe "delegated methods" do
-    let(:attributes)  { { "mime_type_ssi" => ['image/tiff'] } }
-    subject { described_class.new(solr_document, ability) }
+    let(:attributes)  { { "geo_mime_type_tesim" => ['image/tiff'] } }
 
     describe "#first" do
       it "delegates to solr document" do
-        expect(subject.first('mime_type_ssi')).to eq('image/tiff')
+        expect(subject.first('geo_mime_type_tesim')).to eq('image/tiff')
       end
     end
 
     describe "#has?" do
       it "delegates to solr document" do
-        expect(subject.has?('mime_type_ssi')).to be_truthy
+        expect(subject.has?('geo_mime_type_tesim')).to be_truthy
       end
     end
   end
 
-  describe "#raster_work_presenters" do
+  describe "#work_presenters" do
     let(:obj) { FactoryGirl.create(:image_work_with_raster_works) }
     let(:attributes) { obj.to_solr }
-    subject { described_class.new(solr_document, ability) }
 
     it "returns raster work presenters" do
-      expect(subject.raster_work_presenters.count).to eq 2
-      expect(subject.raster_work_presenters.first.first('has_model_ssim')).to eq "RasterWork"
+      expect(subject.work_presenters.count).to eq 1
+      expect(subject.work_presenters.first.first('has_model_ssim')).to eq "RasterWork"
     end
   end
 
   describe "file presenters" do
     let(:obj) { FactoryGirl.create(:image_work_with_files_and_metadata_files) }
     let(:attributes) { obj.to_solr }
-    subject { described_class.new(solr_document, ability) }
 
-    describe "#image_file_presenters" do
-      it "returns only raster_file_presenters file presenters" do
-        expect(subject.image_file_presenters.count).to eq 2
+    describe "#geo_file_set_presenters" do
+      it "returns image file presenters" do
+        expect(subject.geo_file_set_presenters.count).to eq 1
       end
     end
 
-    describe "#external_metadata_file_formats_presenters" do
-      it "returns only external_metadata_file_formats_presenters" do
-        expect(subject.external_metadata_file_formats_presenters.count).to eq 2
+    describe "#external_metadata_file_set_presenters" do
+      it "returns only external_metadata_file_set_presenters" do
+        expect(subject.external_metadata_file_set_presenters.count).to eq 1
       end
     end
   end

data/spec/presenters/raster_work_show_presenter_spec.rb

@@ -5,30 +5,30 @@ RSpec.describe GeoConcerns::RasterWorkShowPresenter do
   let(:ability) { nil }
 
   describe "delegated methods" do
-    let(:attributes)  { { "mime_type_ssi" => ['image/tiff; gdal-format=GTiff'] } }
+    let(:attributes)  { { "geo_mime_type_tesim" => ['image/tiff; gdal-format=GTiff'] } }
     subject { described_class.new(solr_document, ability) }
 
     describe "#first" do
       it "delegates to solr document" do
-        expect(subject.first('mime_type_ssi')).to eq('image/tiff; gdal-format=GTiff')
+        expect(subject.first('geo_mime_type_tesim')).to eq('image/tiff; gdal-format=GTiff')
       end
     end
 
     describe "#has?" do
       it "delegates to solr document" do
-        expect(subject.has?('mime_type_ssi')).to be_truthy
+        expect(subject.has?('geo_mime_type_tesim')).to be_truthy
       end
     end
   end
 
-  describe "#vector_work_presenters" do
-    let(:obj) { FactoryGirl.create(:raster_work_with_vector_works) }
+  describe "#work_presenters" do
+    let(:obj) { FactoryGirl.create(:raster_work_with_vector_work) }
     let(:attributes) { obj.to_solr }
     subject { described_class.new(solr_document, ability) }
 
     it "returns vector work presenters" do
-      expect(subject.vector_work_presenters.count).to eq 2
-      expect(subject.vector_work_presenters.first.first('has_model_ssim')).to eq "VectorWork"
+      expect(subject.work_presenters.count).to eq 1
+      expect(subject.work_presenters.first.first('has_model_ssim')).to eq "VectorWork"
     end
   end
 
@@ -37,15 +37,15 @@ RSpec.describe GeoConcerns::RasterWorkShowPresenter do
     let(:attributes) { obj.to_solr }
     subject { described_class.new(solr_document, ability) }
 
-    describe "#raster_file_presenters" do
-      it "returns only raster_file_presenters file presenters" do
-        expect(subject.raster_file_presenters.count).to eq 2
+    describe "#geo_file_set_presenters" do
+      it "returns only raster file presenters" do
+        expect(subject.geo_file_set_presenters.count).to eq 1
       end
     end
 
-    describe "#external_metadata_file_formats_presenters" do
-      it "returns only external_metadata_file_formats_presenters" do
-        expect(subject.external_metadata_file_formats_presenters.count).to eq 2
+    describe "#external_metadata_file_set_presenters" do
+      it "returns only external_metadata_file_set_presenters" do
+        expect(subject.external_metadata_file_set_presenters.count).to eq 1
       end
     end
   end

data/spec/presenters/vector_work_show_presenter_spec.rb

@@ -5,36 +5,36 @@ RSpec.describe ::GeoConcerns::VectorWorkShowPresenter do
   let(:ability) { nil }
 
   describe "delegated methods" do
-    let(:attributes)  { { "mime_type_ssi" => ['application/zip; ogr-format="ESRI Shapefile"'] } }
+    let(:attributes)  { { "geo_mime_type_tesim" => ['application/zip; ogr-format="ESRI Shapefile"'] } }
     subject { described_class.new(solr_document, ability) }
 
     describe "#first" do
       it "delegates to solr document" do
-        expect(subject.first('mime_type_ssi')).to eq('application/zip; ogr-format="ESRI Shapefile"')
+        expect(subject.first('geo_mime_type_tesim')).to eq('application/zip; ogr-format="ESRI Shapefile"')
       end
     end
 
     describe "#has?" do
       it "delegates to solr document" do
-        expect(subject.has?('mime_type_ssi')).to be_truthy
+        expect(subject.has?('geo_mime_type_tesim')).to be_truthy
       end
     end
   end
 
   describe "file presenters" do
-    let(:obj) { FactoryGirl.create(:vector_work_with_vector_and_metadata_files) }
+    let(:obj) { FactoryGirl.create(:vector_work_with_vector_and_metadata_file) }
     let(:attributes) { obj.to_solr }
     subject { described_class.new(solr_document, ability) }
 
-    describe "#vector_file_presenters" do
-      it "returns only vector file presenters" do
-        expect(subject.vector_file_presenters.count).to eq 2
+    describe "#geo_file_set_presenters" do
+      it "returns only vector file set presenters" do
+        expect(subject.geo_file_set_presenters.count).to eq 1
       end
     end
 
-    describe "#external_metadata_file_formats_presenters" do
-      it "returns only external_metadata_file_formats_presenters" do
-        expect(subject.external_metadata_file_formats_presenters.count).to eq 2
+    describe "#external_metadata_file_set_presenters" do
+      it "returns only external_metadata_file_set_presenters" do
+        expect(subject.external_metadata_file_set_presenters.count).to eq 1
       end
     end
   end