geoblacklight 4.0.0.pre.alpha → 4.0.0.pre.alpha.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 040dd47045422f5690fcbf94d66341e1a6c7f23a17f51d08c619d5735d1e8da0
-  data.tar.gz: 4433d184dca84709c3d448d1b37e518934f8f0504aa05008c2427754d85c37d8
+  metadata.gz: d502418a98a00cc58de5824dbc9f79ac002f4e301bd994714ab0603422317fff
+  data.tar.gz: 353d8af1637ab4e6143ef29b660b032ac26d8f76cb02f2a5fe0fdc043ad8c91d
 SHA512:
-  metadata.gz: b3b8fc3bcf5d9796d7191d47c1d23e08426cf5d02227a4a3b8cd9325a4c404abf92c2f27935468b6c5673ca003672ab0955a95d7d1fadc8d19d8966bb9999d6b
-  data.tar.gz: 229378574de83e5899e25f0947de49f37e6e61946a7e2a0abe40cca934e1f8c06447aa2f86405de31ad05fe325574eb1c5f8c1350709eafb006783a324fdb73a
+  metadata.gz: 2e06534fad43010d8999c9129be281de983978859fe1004c0913c77606c76add0c081e1d09d9b0fe57d5e3a08c97120108a95e17700c414a300983487d0e3358
+  data.tar.gz: ecc3612e861656a526ce2fe0312dcff12f15d2deccbb36aac048365e7a54f28bbb2e7fe984cd60d4ecdefd806e5fe3aa4392a882334f9d40e79ee79bb96d045d

data/app/helpers/geoblacklight_helper.rb

@@ -26,21 +26,6 @@ module GeoblacklightHelper
     )
   end
 
-  def download_link_direct(text, document)
-    link_to(
-      text,
-      document.direct_download[:download],
-      'contentUrl' => document.direct_download[:download],
-      class: ['btn', 'btn-default', 'download', 'download-original'],
-      data: {
-        download: 'trigger',
-        download_type: 'direct',
-        download_id: document.id
-      }
-    )
-  end
-  deprecation_deprecate download_link_direct: 'Use download_link_file instead'
-
   def download_link_hgl(text, document)
     link_to(
       text,

data/app/views/catalog/_downloads_primary.html.erb

@@ -8,7 +8,7 @@
     <% end %>
   <% end %>
   <% if document.direct_download[:download].is_a? String %>
-    <%= render partial: 'download_link', locals: { download_link: download_link_direct(download_text(document.file_format), document) } %>
+    <%= render partial: 'download_link', locals: { download_link: download_link_file(download_text(document.file_format), document.id, document.direct_download[:download]['url']) } %>
   <% end %>
 <% end %>
 

data/lib/generators/geoblacklight/templates/catalog_controller.rb

@@ -32,6 +32,10 @@ class CatalogController < ApplicationController
      :q => "{!raw f=#{Settings.FIELDS.ID} v=$id}"
     }
 
+    # GeoBlacklight Defaults
+    # * Adds the "map" split view for catalog#index
+    config.view.split(partials: ['index'])
+    config.view.delete_field('list')
 
     # solr field configuration for search results/index views
     # config.index.show_link = 'title_display'
@@ -92,7 +96,7 @@ class CatalogController < ApplicationController
     config.add_facet_field Settings.FIELDS.INDEX_YEAR, :label => 'Year', :limit => 10
     config.add_facet_field Settings.FIELDS.SPATIAL_COVERAGE, :label => 'Place', :limit => 8
     config.add_facet_field Settings.FIELDS.ACCESS_RIGHTS, label: 'Access', limit: 8, partial: "icon_facet"
-    config.add_facet_field Settings.FIELDS.RESOURCE_CLASS, label: 'Resource Class', :limit => 8  
+    config.add_facet_field Settings.FIELDS.RESOURCE_CLASS, label: 'Resource Class', :limit => 8
     config.add_facet_field Settings.FIELDS.RESOURCE_TYPE, label: 'Resource Type', :limit => 8
     config.add_facet_field Settings.FIELDS.FORMAT, :label => 'Format', :limit => 8
     config.add_facet_field Settings.FIELDS.SUBJECT, :label => 'Subject', :limit => 8

data/lib/geoblacklight/engine.rb

@@ -11,8 +11,6 @@ require 'handlebars_assets'
 
 module Geoblacklight
   class Engine < ::Rails::Engine
-    Blacklight::Configuration.default_values[:view].split.partials = ['index']
-    Blacklight::Configuration.default_values[:view].delete_field('list')
     # GeoblacklightHelper is needed by all helpers, so we inject it
     # into action view base here.
     initializer 'geoblacklight.helpers' do

data/lib/geoblacklight/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module Geoblacklight
-  VERSION = '4.0.0-alpha'
+  VERSION = '4.0.0-alpha.1'
 end

data/spec/helpers/geoblacklight_helper_spec.rb

@@ -64,25 +64,6 @@ describe GeoblacklightHelper, type: :helper do
     end
   end
 
-  describe '#download_link_direct' do
-    let(:text) { 'Test Link Text' }
-    let(:references_field) { Settings.FIELDS.REFERENCES }
-    let(:document_attributes) do
-      {
-        references_field => {
-          'http://schema.org/downloadUrl' => 'http://example.com/urn:hul.harvard.edu:HARVARD.SDE2.TG10USAIANNH/data.zip'
-        }.to_json
-      }
-    end
-    let(:document) { SolrDocument.new(document_attributes) }
-    before do
-      allow_any_instance_of(Geoblacklight::Reference).to receive(:to_hash).and_return(download: 'http://example.com/urn:hul.harvard.edu:HARVARD.SDE2.TG10USAIANNH/data.zip')
-    end
-    it 'generates a link to download the original file' do
-      expect(download_link_direct(text, document)).to eq '<a contentUrl="http://example.com/urn:hul.harvard.edu:HARVARD.SDE2.TG10USAIANNH/data.zip" class="btn btn-default download download-original" data-download="trigger" data-download-type="direct" href="http://example.com/urn:hul.harvard.edu:HARVARD.SDE2.TG10USAIANNH/data.zip">Test Link Text</a>'
-    end
-  end
-
   describe '#download_link_hgl' do
     let(:text) { 'Test Link Text' }
     let(:document) { instance_double(SolrDocument) }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: geoblacklight
 version: !ruby/object:Gem::Version
-  version: 4.0.0.pre.alpha
+  version: 4.0.0.pre.alpha.1
 platform: ruby
 authors:
 - Mike Graves
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-09-03 00:00:00.000000000 Z
+date: 2021-10-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails