geoblacklight 0.0.7 → 0.0.8

data/spec/fixtures/test-dct-references7.json

@@ -0,0 +1,42 @@
+{
+  "uuid": "urn:hul.harvard.edu:HARVARD.SDE.TG95NYCTYPY",
+  "dc_description_s": "This datalayer displays the counties for the state, based on a ground condition of January 1, 1990. The primary legal divisions of most states are termed ''counties.'' Each county and statistically equivalent entity is assigned a three-digit Federal Information Processing Standards code that is unique within the state. These codes are assigned in alphabetical order of county or county equivalent within each state.",
+  "dc_format_s": "Shapefile",
+  "dc_identifier_s": "urn:hul.harvard.edu:HARVARD.SDE.TG95NYCTYPY",
+  "dc_language_s": "English",
+  "dc_publisher_s": "U.S. Department of Commerce, Bureau of the Census, Geography Division",
+  "dc_rights_s": "Public",
+  "dc_subject_sm": [
+    "boundaries",
+    "Census",
+    "Administrative",
+    "divisions",
+    "County",
+    "government"
+  ],
+  "dc_title_s": "Census Counties, 1990 - New York (State)",
+  "dc_type_s": "Dataset",
+  "dct_references_s": "{\"http://schema.org/downloadUrl\":\"http://example.com/urn:hul.harvard.edu:HARVARD.SDE.TG95NYCTYPY/data.json\"}",
+  "dct_spatial_sm": [
+    "New York (State)"
+  ],
+  "dct_temporal_sm": [
+    "1990"
+  ],
+  "dct_issued_s": "2000",
+  "dct_provenance_s": "Harvard",
+  "georss_box_s": "40.496105 -79.762152 45.01258 -71.85615",
+  "georss_polygon_s": "45.01258 -79.762152 45.01258 -71.85615 40.496105 -71.85615 40.496105 -79.762152 45.01258 -79.762152",
+  "layer_slug_s": "harvard-tg95nyctypy",
+  "layer_id_s": "sde:SDE.TG95NYCTYPY",
+  "layer_geom_type_s": "Polygon",
+  "layer_modified_dt": "2014-05-27T18:09:35Z",
+  "solr_bbox": "-79.762152 40.496105 -71.85615 45.01258",
+  "solr_ne_pt": "45.01258,-71.85615",
+  "solr_sw_pt": "40.496105,-79.762152",
+  "solr_geom": "ENVELOPE(-79.762152, -71.85615, 45.01258, 40.496105)",
+  "solr_year_i": 1990,
+  "solr_issued_dt": "2000-01-01T00:00:00Z",
+  "solr_wms_url": "http://hgl.harvard.edu:8080/geoserver/wms",
+  "solr_wfs_url": "http://hgl.harvard.edu:8080/geoserver/wfs"
+}

data/spec/fixtures/test-dct-references8.json

@@ -0,0 +1,46 @@
+{
+  "uuid": "urn:hul.harvard.edu:HARVARD.SDE.ESRIMIZIP",
+  "dc_description_s": "Michigan ZIP Code Areas represents five-digit ZIP Code areas used by the U.S. Postal Service to deliver mail more effectively.  The first digit of a five-digit ZIP Code divides the country into 10 large groups of states numbered from 0 in the Northeast to 9 in the far West.  Within these areas, each state is divided into an average of 10 smaller geographical areas, identified by the 2nd and 3rd digits.  These digits, in conjunction with the first digit, represent a sectional center facility or a mail processing facility area.  The 4th and 5th digits identify a post office, station, branch or local delivery area.",
+  "dc_format_s": "Shapefile",
+  "dc_identifier_s": "urn:hul.harvard.edu:HARVARD.SDE.ESRIMIZIP",
+  "dc_language_s": "English",
+  "dc_publisher_s": "Environmental Systems Research Institute, Inc. (ESRI)",
+  "dc_rights_s": "Restricted",
+  "dc_subject_sm": [
+    "location",
+    "boundaries",
+    "polygon",
+    "zip",
+    "codes",
+    "areas",
+    "five-digit",
+    "post",
+    "offices",
+    "population"
+  ],
+  "dc_title_s": "Michigan ZIP Code Areas",
+  "dc_type_s": "Dataset",
+  "dct_references_s": "{\"http://www.w3.org/1999/xhtml\":\"http://example.com/#doc['uuid']/metadata.html\",\"http://www.opengis.net/def/serviceType/ogc/wms\":\"http://hgl.harvard.edu:8080/geoserver/wms\"}",
+  "dct_spatial_sm": [
+    "United States Michigan"
+  ],
+  "dct_temporal_sm": [
+    "1999"
+  ],
+  "dct_issued_s": "2000",
+  "dct_provenance_s": "Harvard",
+  "georss_box_s": "41.69609 -90.418136 48.190509 -82.418635",
+  "georss_polygon_s": "48.190509 -90.418136 48.190509 -82.418635 41.69609 -82.418635 41.69609 -90.418136 48.190509 -90.418136",
+  "layer_slug_s": "harvard-esrimizip",
+  "layer_id_s": "sde:SDE.ESRIMIZIP",
+  "layer_geom_type_s": "Polygon",
+  "layer_modified_dt": "2014-05-27T18:09:35Z",
+  "solr_bbox": "-90.418136 41.69609 -82.418635 48.190509",
+  "solr_ne_pt": "48.190509,-82.418635",
+  "solr_sw_pt": "41.69609,-90.418136",
+  "solr_geom": "ENVELOPE(-90.418136, -82.418635, 48.190509, 41.69609)",
+  "solr_year_i": 1999,
+  "solr_issued_dt": "2000-01-01T00:00:00Z",
+  "solr_wms_url": "http://hgl.harvard.edu:8080/geoserver/wms",
+  "solr_wfs_url": "http://hgl.harvard.edu:8080/geoserver/wfs"
+}

data/spec/lib/geoblacklight/references_spec.rb

@@ -0,0 +1,86 @@
+require 'spec_helper'
+
+describe Geoblacklight::References do
+  let(:typical_ogp_shapefile) {
+    Geoblacklight::References.new(
+      SolrDocument.new(
+        dc_format_s: 'Shapefile',
+        dct_references_s: {
+          'http://www.opengis.net/def/serviceType/ogc/wms' => 'http://hgl.harvard.edu:8080/geoserver/wms',
+          'http://www.opengis.net/def/serviceType/ogc/wfs' => 'http://hgl.harvard.edu:8080/geoserver/wfs'
+        }.to_json
+      )
+    )
+  }
+  let(:typical_ogp_geotiff) {
+    Geoblacklight::References.new(
+      SolrDocument.new(
+        dc_format_s: 'GeoTIFF',
+        dct_references_s: {
+          'http://www.opengis.net/def/serviceType/ogc/wms' => 'http://hgl.harvard.edu:8080/geoserver/wms',
+          'http://www.opengis.net/def/serviceType/ogc/wfs' => 'http://hgl.harvard.edu:8080/geoserver/wfs'
+        }.to_json
+      )
+    )
+  }
+  let(:complex_shapefile) {
+    Geoblacklight::References.new(
+      SolrDocument.new(
+        dc_format_s: 'Shapefile',
+        dct_references_s: {
+          'http://schema.org/downloadUrl' => 'http://example.com/urn:hul.harvard.edu:HARVARD.SDE2.TG10USAIANNH/data.zip',
+          'http://www.isotc211.org/schemas/2005/gmd/' => 'http://example.com/urn:hul.harvard.edu:HARVARD.SDE2.TG10USAIANNH/iso19139.xml',
+          'http://www.loc.gov/mods/v3' => 'http://example.com/urn:hul.harvard.edu:HARVARD.SDE2.TG10USAIANNH/mods.xml',
+          'http://schema.org/url' => 'http://example.com/urn:hul.harvard.edu:HARVARD.SDE2.TG10USAIANNH/homepage',
+          'http://www.opengis.net/def/serviceType/ogc/wms' => 'http://hgl.harvard.edu:8080/geoserver/wms',
+          'http://www.opengis.net/def/serviceType/ogc/wfs' => 'http://hgl.harvard.edu:8080/geoserver/wfs'
+        }.to_json
+      )
+    )
+  }
+  describe 'format' do
+    it 'should return format' do
+      expect(complex_shapefile.format).to eq 'Shapefile'
+    end
+  end
+  describe 'refs' do
+    it 'should be enumberable references' do
+      complex_shapefile.refs.each do |reference|
+        expect(reference).to be_an Geoblacklight::Reference
+      end
+    end
+  end
+  describe 'direct_download' do
+    it 'should return the direct download link' do
+      download = complex_shapefile.download
+      expect(download).to be_an Geoblacklight::Reference
+      expect(download.endpoint).to eq('http://example.com/urn:hul.harvard.edu:HARVARD.SDE2.TG10USAIANNH/data.zip')
+    end
+    it 'should not return if download not available' do
+      expect(typical_ogp_shapefile.download).to be_nil
+    end
+  end
+  describe 'preferred_download' do
+    it 'should return the direct download if available' do
+      expect(complex_shapefile.preferred_download[:file_download][:download]).to eq 'http://example.com/urn:hul.harvard.edu:HARVARD.SDE2.TG10USAIANNH/data.zip'
+    end
+    it 'should return nil if there is no direct download' do
+      expect(typical_ogp_shapefile.preferred_download).to be_nil
+    end
+    it 'should return nil if there is no direct download' do
+      expect(typical_ogp_geotiff.preferred_download).to be_nil
+    end
+  end
+  describe 'download_types' do
+    it 'should return available downloads by format' do
+      types = complex_shapefile.download_types
+      expect(types.first[1]).to eq wfs: 'http://hgl.harvard.edu:8080/geoserver/wfs'
+      expect(types.count).to eq 2
+    end
+    it 'should only return available downloads if no direct is present' do
+      types = typical_ogp_shapefile.download_types
+      expect(types.first[1]).to eq wfs: "http://hgl.harvard.edu:8080/geoserver/wfs"
+      expect(types.count).to eq 2
+    end
+  end
+end

data/spec/lib/geoblacklight/{solr_document.rb → solr_document_spec.rb}

@@ -12,7 +12,7 @@ describe Geoblacklight::SolrDocument do
       end
     end
     describe 'a restricted document' do
-      describe 'should only be available if from same institution' do
+      it 'should only be available if from same institution' do
         allow(document).to receive('same_institution?').and_return(true)
         allow(document).to receive('public?').and_return(false)
         expect(document.available?).to be_truthy
@@ -42,7 +42,7 @@ describe Geoblacklight::SolrDocument do
       end
       it 'should match case inconsistencies' do
         allow(Settings).to receive('Institution').and_return('StAnFord')
-        expect(document.same_institution).to be_truthy
+        expect(document.same_institution?).to be_truthy
       end
     end
     describe 'within a different institution' do
@@ -53,4 +53,37 @@ describe Geoblacklight::SolrDocument do
       end
     end
   end
+  describe 'references' do
+    let(:document_attributes) { {} }
+    it 'should generate a new references object' do
+      expect(document.references).to be_an Geoblacklight::References
+    end
+  end
+  describe 'download_types' do
+    let(:document_attributes) { {} }
+    it 'should call download_types' do
+      expect_any_instance_of(Geoblacklight::References).to receive(:download_types)
+      document.download_types
+    end
+  end
+  describe 'direct_download' do
+    let(:document_attributes) { {} }
+    describe 'with a direct download' do
+      let(:document_attributes) {
+        {
+          dct_references_s: {
+            'http://schema.org/downloadUrl' => 'http://example.com/urn:hul.harvard.edu:HARVARD.SDE2.TG10USAIANNH/data.zip'
+          }.to_json
+        }
+      }
+      it 'should return a direct download hash' do
+        expect_any_instance_of(Geoblacklight::Reference).to receive(:to_hash)
+        document.direct_download
+      end
+    end
+    it 'should return nil if no direct download' do
+      expect_any_instance_of(Geoblacklight::Reference).to_not receive(:to_hash)
+      expect(document.direct_download).to be_nil
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: geoblacklight
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors:
 - Darren Hardy
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-19 00:00:00.000000000 Z
+date: 2014-11-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: blacklight
@@ -276,6 +276,7 @@ files:
 - app/assets/stylesheets/geoblacklight/modules/icons.css.scss
 - app/assets/stylesheets/geoblacklight/modules/item.css.scss
 - app/assets/stylesheets/geoblacklight/modules/layer_opacity.css.scss
+- app/assets/stylesheets/geoblacklight/modules/mixins.css.scss
 - app/assets/stylesheets/geoblacklight/modules/results.css.scss
 - app/controllers/download_controller.rb
 - app/controllers/wms_controller.rb
@@ -302,11 +303,14 @@ files:
 - lib/generators/geoblacklight/templates/settings.yml
 - lib/geoblacklight.rb
 - lib/geoblacklight/config.rb
+- lib/geoblacklight/constants.rb
 - lib/geoblacklight/controller_override.rb
 - lib/geoblacklight/download.rb
 - lib/geoblacklight/download/kmz_download.rb
 - lib/geoblacklight/download/shapefile_download.rb
 - lib/geoblacklight/engine.rb
+- lib/geoblacklight/reference.rb
+- lib/geoblacklight/references.rb
 - lib/geoblacklight/solr_document.rb
 - lib/geoblacklight/version.rb
 - lib/geoblacklight/view_helper_override.rb
@@ -315,16 +319,28 @@ files:
 - lib/tasks/geoblacklight.rake
 - spec/controllers/download_controller_spec.rb
 - spec/factories/user.rb
+- spec/features/dct_references_generate.rb
+- spec/features/dct_references_spec.rb
 - spec/features/download_layer_spec.rb
 - spec/features/home_page_spec.rb
 - spec/features/layer_inspection_spec.rb
 - spec/features/layer_preview_spec.rb
+- spec/features/search_bar_spec.rb
 - spec/features/split_view.html.erb_spec.rb
+- spec/fixtures/test-dct-references1.json
+- spec/fixtures/test-dct-references2.json
+- spec/fixtures/test-dct-references3.json
+- spec/fixtures/test-dct-references4.json
+- spec/fixtures/test-dct-references5.json
+- spec/fixtures/test-dct-references6.json
+- spec/fixtures/test-dct-references7.json
+- spec/fixtures/test-dct-references8.json
 - spec/lib/geoblacklight/controller_override_spec.rb
 - spec/lib/geoblacklight/download/kmz_download_spec.rb
 - spec/lib/geoblacklight/download/shapefile_download_spec.rb
 - spec/lib/geoblacklight/download_spec.rb
-- spec/lib/geoblacklight/solr_document.rb
+- spec/lib/geoblacklight/references_spec.rb
+- spec/lib/geoblacklight/solr_document_spec.rb
 - spec/lib/geoblacklight/view_helper_override_spec.rb
 - spec/lib/geoblacklight/wms_layer/feature_info_response_spec.rb
 - spec/lib/geoblacklight/wms_layer_spec.rb
@@ -363,16 +379,28 @@ summary: A discovery platform for geospatial holdings
 test_files:
 - spec/controllers/download_controller_spec.rb
 - spec/factories/user.rb
+- spec/features/dct_references_generate.rb
+- spec/features/dct_references_spec.rb
 - spec/features/download_layer_spec.rb
 - spec/features/home_page_spec.rb
 - spec/features/layer_inspection_spec.rb
 - spec/features/layer_preview_spec.rb
+- spec/features/search_bar_spec.rb
 - spec/features/split_view.html.erb_spec.rb
+- spec/fixtures/test-dct-references1.json
+- spec/fixtures/test-dct-references2.json
+- spec/fixtures/test-dct-references3.json
+- spec/fixtures/test-dct-references4.json
+- spec/fixtures/test-dct-references5.json
+- spec/fixtures/test-dct-references6.json
+- spec/fixtures/test-dct-references7.json
+- spec/fixtures/test-dct-references8.json
 - spec/lib/geoblacklight/controller_override_spec.rb
 - spec/lib/geoblacklight/download/kmz_download_spec.rb
 - spec/lib/geoblacklight/download/shapefile_download_spec.rb
 - spec/lib/geoblacklight/download_spec.rb
-- spec/lib/geoblacklight/solr_document.rb
+- spec/lib/geoblacklight/references_spec.rb
+- spec/lib/geoblacklight/solr_document_spec.rb
 - spec/lib/geoblacklight/view_helper_override_spec.rb
 - spec/lib/geoblacklight/wms_layer/feature_info_response_spec.rb
 - spec/lib/geoblacklight/wms_layer_spec.rb