warclight 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8e1a86239db7cb3980ec2b5ccc0cfb0363cfa38f
-  data.tar.gz: e76c85f197a7e161db4f044b1b802a495eac909b
+  metadata.gz: 4dfb09424453dcf42c6d11f0ae31c6fb2db9cf35
+  data.tar.gz: 2a479ba8653d7a49771dd844ef79012fdf9fcd84
 SHA512:
-  metadata.gz: feccb07631707fb23b3039844a8d1d377af30e9e6ae0698a274a4b015b45086ebb2d7d2d695f24fdd148e20392e5b47b3c498b5dbb1bd92b2cad1c5786551572
-  data.tar.gz: 572b71c85c56a2c51c6a919680affb04089b97ff0a55e5d030f904186bda420ec90f5284c9b42f8c96e8b3483afbf96a34711b4a3696efb543ec1f97ba8ac1eb
+  metadata.gz: 364bcd61d925d71036fd089b27556a4f8f6587a47f7c36af3584cdfe17577f252a21568614bb888560eafc6f55e95e5b2212c3326ad041beb2d3d0a1fe8570f9
+  data.tar.gz: d054e07be0178a744e818cd08912c75ac0eb0420d4577ec4f7c3e211220e42d0e85c09cefbbb93c3322f488437f9a2493c720ae6a2ef9dfc0af6054f92b76d7f

data/.rubocop.yml

@@ -17,6 +17,7 @@ Metrics/LineLength:
   Max: 120
   Exclude:
     - 'Gemfile'
+    - 'spec/models/concerns/warclight/solr_document_spec.rb'
 
 Metrics/ModuleLength:
   Max: 120
@@ -34,12 +35,17 @@ Metrics/BlockLength:
     - 'spec/**/*'
     - 'lib/warclight/custom_document.rb'
 
+Metrics/AbcSize:
+  Exclude:
+    - 'app/models/concerns/warclight/solr_document.rb' #Come back to this later
+
 Performance/RegexpMatch:
   Enabled: false
 
 Rails/OutputSafety:
   Exclude:
     - 'app/controllers/concerns/warclight/field_config_helpers.rb' # html_safe needs to be called to mimic BL JOIN behavior
+    - 'app/models/concerns/warclight/solr_document.rb'
 
 RSpec/ExampleLength:
   Enabled: false
@@ -50,6 +56,10 @@ RSpec/MultipleExpectations:
 RSpec/NestedGroups:
   Max: 4
 
+Rails/TimeZone:
+  Exclude:
+    - 'app/models/concerns/warclight/solr_document.rb' #Come back to this later
+
 Style/Documentation:
   Exclude:
     - 'spec/**/*'

data/CHANGELOG.md

@@ -1,5 +1,22 @@
 # Change Log
 
+## [v0.3.0](https://github.com/archivesunleashed/warclight/tree/v0.3.0) (2017-10-11)
+[Full Changelog](https://github.com/archivesunleashed/warclight/compare/v0.2.0...v0.3.0)
+
+**Implemented enhancements:**
+
+- Document titles occasionally seem off [\#18](https://github.com/archivesunleashed/warclight/issues/18)
+- Truncate fields on search results display? [\#9](https://github.com/archivesunleashed/warclight/issues/9)
+
+**Closed issues:**
+
+- Change resourcename type from text\_general to string [\#24](https://github.com/archivesunleashed/warclight/issues/24)
+
+**Merged pull requests:**
+
+- Add helper method to truncate arrays; Resolves \#9 [\#28](https://github.com/archivesunleashed/warclight/pull/28) ([ruebot](https://github.com/ruebot))
+- Add live http status code check for linking out urls; Resolves \#26. [\#27](https://github.com/archivesunleashed/warclight/pull/27) ([ruebot](https://github.com/ruebot))
+
 ## [v0.2.0](https://github.com/archivesunleashed/warclight/tree/v0.2.0) (2017-09-07)
 [Full Changelog](https://github.com/archivesunleashed/warclight/compare/v0.1.1...v0.2.0)
 

data/app/assets/javascripts/warclight/warclight.js

@@ -1,4 +1,2 @@
-//= require warclight/oembed_viewer
-
 // Vendor Scripts
 //= require responsiveTruncator

data/app/models/concerns/warclight/solr_document.rb

@@ -5,5 +5,18 @@ module Warclight
   # Extends Blacklight::Solr::Document to provide Warclight specific behavior
   module SolrDocument
     extend Blacklight::Solr::Document
+
+    def replay_link
+      time_travel_base_url = 'http://timetravel.mementoweb.org/api/json/'
+      time_travel_time_format = '%Y%m%d%H%M%S'
+      time_travel_time = (Time.parse(first(:crawl_date)).strftime time_travel_time_format).to_s
+      time_travel_request_url = time_travel_base_url + time_travel_time + '/' + first(:url).to_s
+      time_travel_request = URI(time_travel_request_url)
+      time_travel_response = Net::HTTP.get(time_travel_request)
+      time_travel_response_json = JSON.parse(time_travel_response)
+      replay_url = time_travel_response_json['mementos']['closest']['uri'][0]
+      replay_url_link = '<a href="' + "#{replay_url}" '" target="_blank">'"#{replay_url}"'</a> 🔗'
+      replay_url_link.html_safe
+    end
   end
 end

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

@@ -20,7 +20,7 @@ class CatalogController < ApplicationController
     }
 
     # solr field configuration for search results/index views
-    config.index.title_field = ['title', 'resourcename_s']
+    config.index.title_field = ['title', 'resourcename']
 
     # solr fields that will be treated as facets by the blacklight application
     # The ordering of the field names is the order of the display
@@ -48,16 +48,16 @@ class CatalogController < ApplicationController
     # :index_range can be an array or range of prefixes that will be used to
     # create the navigation (note: It is case sensitive when searching values)
 
-    config.add_facet_field 'content_type_norm', label: 'General Content Type', collapse: false
-    config.add_facet_field 'crawl_year', label: 'Crawl Year', collapse: false
+    config.add_facet_field 'content_type_norm', label: 'General Content Type', collapse: false, limit: true
+    config.add_facet_field 'crawl_year', label: 'Crawl Year', collapse: false, limit: true, sort: 'index'
     config.add_facet_field 'public_suffix', label: 'Public Suffix', collapse: false, limit: true
     config.add_facet_field 'domain', label: 'Domain', limit: true
     config.add_facet_field 'links_domains', label: 'Links Domains', limit: true
     config.add_facet_field 'content_language', label: 'Content Language', limit: true
-    config.add_facet_field 'resourcename_s', label: 'Filename', limit: true
-    config.add_facet_field 'institution', label: 'Institution'
-    config.add_facet_field 'collection_name', label: 'Collection Name'
-    config.add_facet_field 'collection_number', label: 'Collection Number'
+    config.add_facet_field 'resourcename_s', label: 'Resource Name', limit: true
+    config.add_facet_field 'institution', label: 'Institution', limit: true
+    config.add_facet_field 'collection_name', label: 'Collection Name', limit: true
+    config.add_facet_field 'collection_number', label: 'Collection Number', limit: true
 
     # Have BL send all facet field names to Solr, which has been the default
     # previously. Simply remove these lines if you'd rather use Solr request
@@ -80,13 +80,14 @@ class CatalogController < ApplicationController
     # solr fields to be displayed in the show (single result) view
     #   The ordering of the field names is the order of the display
     config.add_show_field 'url', label: 'URL', helper_method: :url_to_link
-    config.add_show_field 'resourcename_s', label: 'Filename', link_to_facet: true
+    config.add_show_field 'replay_url', label: 'Replay URL', accessor: :replay_link
+    config.add_show_field 'resourcename', label: 'Resource Name', link_to_facet: true
     config.add_show_field 'host', label: 'Host', link_to_facet: true
     config.add_show_field 'institution', label: 'Institution', link_to_facet: true
     config.add_show_field 'collection_name', label: 'Collection Name', link_to_facet: true
     config.add_show_field 'collection_number', label: 'Collection Number', link_to_facet: true
     config.add_show_field 'crawl_date', label: 'Crawl Date'
-    config.add_show_field 'source_file', label: 'Source File'
+    config.add_show_field 'source_file', label: 'Source File', link_to_facet: true
     config.add_show_field 'content_type_norm', label: 'General Content Type', link_to_facet: true
     config.add_show_field 'content_language', label: 'Content Language', link_to_facet: true
     config.add_show_field 'content_length', label: 'Length'

data/lib/warclight/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Warclight
-  VERSION = '0.3.0'
+  VERSION = '0.4.0'
 end

data/solr/conf/solrconfig.xml

@@ -92,28 +92,26 @@
       <int name="rows">10</int>
       <str name="q.alt">*:*</str>
       <str name="qf">
-        title^50
-        author^50
-        keywords^40
-        description^35
-        wct_title_^50
-        wct_description^35
-        url^75
-        content^25
-        host^25
-        text^25
+        title^10
+        author^10
+        keywords^9
+        description^8.5
+        wct_title_^10
+        wct_description^8.5
+        url^15
+        content^5
+        host^5
       </str>
       <str name="pf">
-        title^50
-        author^50
-        keywords^40
-        description^35
-        wct_title^50
-        wct_description^35
-        url^75
-        content^25
-        host^25
-        text^25
+        title^10
+        author^10
+        keywords^9
+        description^8.5
+        wct_title^10
+        wct_description^8.5
+        url^15
+        content^5
+        host^5
       </str>
       <int name="ps">3</int>
       <float name="tie">0.01</float>

data/template.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 # We can remove `blacklight` and `blacklight_range_limit` once they are released
-# since they are already dependents of Arclight (but we need to pin to particular branches)
+# since they are already dependents of Warclight (but we need to pin to particular branches)
 gem 'blacklight', github: 'projectblacklight/blacklight'
 gem 'blacklight_range_limit', github: 'projectblacklight/blacklight_range_limit', branch: 'blacklight-7'
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: warclight
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Nick Ruest
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-10-11 00:00:00.000000000 Z
+date: 2017-10-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: blacklight
@@ -213,7 +213,6 @@ files:
 - Rakefile
 - app/assets/images/blacklight/compact.svg
 - app/assets/images/blacklight/logo.png
-- app/assets/javascripts/warclight/oembed_viewer.js
 - app/assets/javascripts/warclight/warclight.js
 - app/assets/stylesheets/warclight/application.scss
 - app/assets/stylesheets/warclight/warclight.scss

data/app/assets/javascripts/warclight/oembed_viewer.js

@@ -1,39 +0,0 @@
-Blacklight.onLoad(function () {
-  'use strict';
-  var onlineContentTabSelector = '[data-arclight-online-content-tab="true"]';
-  var oEmbedViewerSelector = '[data-arclight-oembed="true"]';
-
-  $(onlineContentTabSelector).on('shown.bs.tab', function() {
-    var $viewerElements = $(oEmbedViewerSelector);
-    if($viewerElements.length === 0) {
-      return;
-    }
-
-    $viewerElements.each(function (i, element) {
-      var $el = $(element);
-      var data = $el.data();
-      var resourceUrl = data.arclightOembedUrl;
-      $.ajax({
-        url: resourceUrl,
-        dataType: 'html'
-      }).done(function (response) {
-        var links = $('<div>' + response.match(/<link .*>/g).join('') + '</div>'); // Parse out link elements so image assets are not loaded
-        var oEmbedEndPoint = links.find('link[rel="alternate"][type="application/json+oembed"]').prop('href');
-
-        if(!oEmbedEndPoint || oEmbedEndPoint.length === 0) {
-          return;
-        }
-
-        $.ajax({
-          url: oEmbedEndPoint
-        }).done(function (oEmbedResponse) {
-          if(oEmbedResponse.html) {
-            $el.hide()
-               .html(oEmbedResponse.html)
-               .fadeIn(500);
-          }
-        });
-      });
-    });
-  });
-});