geoblacklight 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1e3dff76debb6018b35c109add225964984a5da3
-  data.tar.gz: f1c3cfbe2308c37e0d897ab4e88a8dbff3e62529
+  metadata.gz: 767308fdd3b12467270a409a98f4732062c57878
+  data.tar.gz: b822a8bc6294c81601963a4db3e7fbeef4434b09
 SHA512:
-  metadata.gz: 3cb8faabed2e1d3fe1cd68a134b05c9bc668a9c668b35f32ec6fd35e88b996b222da199e036577cbba82440e2f300450eedec9db3b0431a4114abc68db8df3e3
-  data.tar.gz: 03c7c599e496f974b4d6d7587211dab9c67481c30ec836b1b66bf135c40545bd7e23ca39ac71cbfff5c1a02c9796a0ca7cc14fd4099871aa0202fee0268d0031
+  metadata.gz: a1cc828205ad3c72548ad044d20522e306e01461552beea0b02fdd9313717b03fe724fc933ee808d6fe906bbe44c89f0b83967e697679911379d9b2e77d54b13
+  data.tar.gz: 27812b3d5d30157ab0c9e2a0e273d5dd5abe111503325edadae9fbc19a5a4d5706a473ad317e4501d5234969b490c3dad00691694177fc8a4745bd880db5aedb

data/lib/geoblacklight/references.rb

@@ -42,7 +42,9 @@ module Geoblacklight
     def downloads_by_format
       case format
       when 'Shapefile'
-        { shapefile: wfs.to_hash, kmz: wms.to_hash, geojson: wfs.to_hash }
+        if wfs && wms
+          { shapefile: wfs.to_hash, kmz: wms.to_hash, geojson: wfs.to_hash } if wms.present? && wfs.present?
+        end
       when 'GeoTIFF'
         { geotiff: wms.to_hash } if wms.present?
       end

data/lib/geoblacklight/solr_document.rb

@@ -3,6 +3,8 @@ module Geoblacklight
   module SolrDocument
     extend Blacklight::Solr::Document
 
+    delegate :download_types, to: :references
+
     def available?
       public? || same_institution?
     end

data/lib/geoblacklight/version.rb

@@ -1,3 +1,3 @@
 module Geoblacklight
-  VERSION = '0.2.1'
+  VERSION = '0.2.2'
 end

data/spec/lib/geoblacklight/references_spec.rb

@@ -12,6 +12,14 @@ describe Geoblacklight::References do
       )
     )
   }
+  let(:no_service_shapefile) {
+    Geoblacklight::References.new(
+      SolrDocument.new(
+        dc_format_s: 'Shapefile',
+        dct_references_s: {}.to_json
+      )
+    )
+  }
   let(:typical_ogp_geotiff) {
     Geoblacklight::References.new(
       SolrDocument.new(
@@ -95,4 +103,19 @@ describe Geoblacklight::References do
       expect(types.count).to eq 3
     end
   end
+  describe 'downloads_by_format' do
+    it 'returns shapefile' do
+      expect(typical_ogp_shapefile.downloads_by_format.count).to eq 3
+    end
+    it 'returns geotiff' do
+      expect(typical_ogp_geotiff.downloads_by_format.count).to eq 1
+      expect(typical_ogp_geotiff.downloads_by_format[:geotiff][:wms]).to eq 'http://hgl.harvard.edu:8080/geoserver/wms'
+    end
+    it 'does not return shapefile if wms and wfs are not present' do
+      expect(no_service_shapefile.downloads_by_format).to be_nil
+    end
+    it 'does not return GeoTIFF if wms is not present' do
+      expect(direct_download_only.downloads_by_format).to be_nil
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: geoblacklight
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Darren Hardy
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-03 00:00:00.000000000 Z
+date: 2014-12-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: blacklight