warclight 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 30e0c2b3c96bda4a0c197bc20f9e15987294a6e7
-  data.tar.gz: 55ecd9497198b8742025d37755a30e18ac432a19
+  metadata.gz: 8e1a86239db7cb3980ec2b5ccc0cfb0363cfa38f
+  data.tar.gz: e76c85f197a7e161db4f044b1b802a495eac909b
 SHA512:
-  metadata.gz: 0ed70a7e4dff2676c6a35fecc199fa0861e6ab5c1b9ca26dd1f2be9b5fc734b5c6a830e50038fb05ec43fff4aa551f4ec337cdf2ca7971c7e9a24919be8bdb81
-  data.tar.gz: 23a4970ac3c95637b4c871fe308f5ca39221a5c02274ced5ed9e2b236072eff9acdb33c0936be87c6237136ab72a2fd0536d9c09794e80f7bddb6e9da4fbe381
+  metadata.gz: feccb07631707fb23b3039844a8d1d377af30e9e6ae0698a274a4b015b45086ebb2d7d2d695f24fdd148e20392e5b47b3c498b5dbb1bd92b2cad1c5786551572
+  data.tar.gz: 572b71c85c56a2c51c6a919680affb04089b97ff0a55e5d030f904186bda420ec90f5284c9b42f8c96e8b3483afbf96a34711b4a3696efb543ec1f97ba8ac1eb

data/.rubocop.yml

@@ -17,8 +17,6 @@ Metrics/LineLength:
   Max: 120
   Exclude:
     - 'Gemfile'
-    - 'lib/warclight/custom_document.rb'  # XPaths get long
-    - 'lib/warclight/custom_component.rb' # XPaths get long
 
 Metrics/ModuleLength:
   Max: 120
@@ -26,6 +24,9 @@ Metrics/ModuleLength:
 Metrics/ClassLength:
   Max: 120
 
+Metrics/MethodLength:
+  Max: 20
+
 Metrics/BlockLength:
   Exclude:
     - !ruby/regexp /\.rake$/
@@ -33,10 +34,6 @@ Metrics/BlockLength:
     - 'spec/**/*'
     - 'lib/warclight/custom_document.rb'
 
-Metrics/MethodLength:
-  Exclude:
-    - 'lib/warclight/custom_document.rb' # warclight_field_definitions too long
-
 Performance/RegexpMatch:
   Enabled: false
 
@@ -47,10 +44,6 @@ Rails/OutputSafety:
 RSpec/ExampleLength:
   Enabled: false
 
-RSpec/FilePath:
-  Exclude:
-    - 'spec/lib/warclight/viewers/oembed_spec.rb' # Default file path is o_embed, and that looks weird
-
 RSpec/MultipleExpectations:
   Enabled: false
 

data/CHANGELOG.md

@@ -1,5 +1,16 @@
 # Change Log
 
+## [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)
+
+**Implemented enhancements:**
+
+- 'url' field value should be presented as a link [\#20](https://github.com/archivesunleashed/warclight/issues/20)
+
+**Closed issues:**
+
+- Additional fields in the standard search [\#23](https://github.com/archivesunleashed/warclight/issues/23)
+
 ## [v0.1.1](https://github.com/archivesunleashed/warclight/tree/v0.1.1) (2017-08-20)
 [Full Changelog](https://github.com/archivesunleashed/warclight/compare/v0.1.0...v0.1.1)
 

data/app/helpers/warclight_helper.rb

@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+##
+# Generic Helpers used in Warclight
+module WarclightHelper
+  def url_to_link(options = {})
+    safe_join(options[:value].map do |url|
+      begin
+        res = Net::HTTP.get_response(URI(url))
+        if res.code.start_with?('1', '2', '3')
+          link_to(url, url, target: '_blank') << ' 🔗'
+        else
+          url + ' (Not available)'
+        end
+      rescue
+        url + ' (Not available)'
+      end
+    end, '')
+  end
+
+  def return_five(options = {})
+    options[:value][0, 5].join('; ') + '...'
+  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'
+    config.index.title_field = ['title', 'resourcename_s']
 
     # solr fields that will be treated as facets by the blacklight application
     # The ordering of the field names is the order of the display
@@ -50,10 +50,11 @@ class CatalogController < ApplicationController
 
     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 'public_suffix', label: 'Public Suffix', collapse: false
-    config.add_facet_field 'domain', label: 'Domain'
-    config.add_facet_field 'links_domains', label: 'Links Domains'
-    config.add_facet_field 'content_language', label: 'Content Language'
+    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'
@@ -74,13 +75,12 @@ class CatalogController < ApplicationController
     config.add_index_field 'institution', label: 'Institution', link_to_facet: true
     config.add_index_field 'collection_name', label: 'Collection Name', link_to_facet: true
     config.add_index_field 'collection_number', label: 'Collection Number', link_to_facet: true
-    config.add_index_field 'links_domains', label: 'This page links to', link_to_facet: true,
-                                            separator_options: { words_connector: '; ' }
+    config.add_index_field 'links_domains', label: 'This page links to', helper_method: :return_five
 
     # 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 'title', label: 'Title'
-    config.add_show_field 'url', label: 'URL (live web)', helper_method: :link_to_live_web
+    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 '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

data/lib/warclight/version.rb

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

data/solr/conf/schema.xml

@@ -23,6 +23,9 @@
         <field name="_root_" type="string" indexed="true" docValues="true" />
         <field name="_text_" type="text_general" indexed="true" stored="false" multiValued="true"/>
 
+        <!--Not defined in SolrFields. Schema only defintion -->
+        <field name="index_time" type="date" indexed="true" stored="false" docValues="true" default="NOW" /> 
+
         <!-- BL UKWA: additional -->
         <field name="access_terms" type="string" indexed="true" docValues="true" multiValued="true"/>
         <field name="author" type="string" indexed="true" docValues="true"/>
@@ -73,6 +76,7 @@
         <field name="last_modified" type="tdate" indexed="true" stored="true" docValues="true"/>
         <field name="last_modified_year" type="string" indexed="true" docValues="true"/>
         <field name="license_url" type="string" indexed="true" docValues="true" multiValued="true"/>
+        <field name="links_images" type="string" indexed="true" docValues="true" multiValued="true"/>
         <field name="links_domains" type="string" indexed="true" docValues="true" multiValued="true"/>
         <field name="links_hosts" type="string" indexed="true" docValues="true" multiValued="true"/>
         <field name="links_hosts_surts" type="string" indexed="true" docValues="true" multiValued="true"/>
@@ -94,6 +98,7 @@
         <field name="sentiment_score" type="float" indexed="true" stored="true" multiValued="false"/>
         <field name="sentiment" type="string" indexed="true" docValues="true" multiValued="false"/>
         <field name="server" type="string" indexed="true" docValues="true" multiValued="true"/>
+        <field name="source_file_path" type="string" indexed="true" docValues="true" />
         <field name="source_file_offset" type="tlong" indexed="true" stored="true" />
         <field name="source_file" type="string" indexed="true" docValues="true" />
         <field name="status_code" type="int" indexed="true" stored="true" docValues="true" />
@@ -114,12 +119,15 @@
         <field name="wct_target_id" type="string" indexed="true" docValues="true" multiValued="false"/>
         <field name="wct_title" type="string" indexed="true" docValues="true"/>
         <field name="xml_root_ns" type="string" indexed="true" docValues="true" multiValued="false"/>
+        <field name="warc_key_id" type="string" indexed="true" docValues="true" multiValued="false"/>
+        <field name="warc_ip" type="string" indexed="true" docValues="true" multiValued="false"/>
         <!--:BL UKWA -->
 
-        <!--:User Supplied Values - Web Archives for Historical Research -->
+        <!-- User supplied Archive-It fields: -->
         <field name="institution" type="string" indexed="true" multiValued="false" docValues="true"/>
         <field name="collection_name" type="string" indexed="true" multiValued="false" docValues="true"/>
         <field name="collection_number" type="string" indexed="true" multiValued="false" docValues="true"/>
+        <!--:User supplied Archive-It fields -->
 
         <dynamicField name="*_i"  type="int"    indexed="true"  stored="true"/>
         <dynamicField name="*_is" type="ints"    indexed="true"  stored="true"/>
@@ -153,6 +161,10 @@
         <dynamicField name="attr_*" type="text_general" indexed="true" stored="true" multiValued="true"/>
         <dynamicField name="random_*" type="random" />
 
+        <!--:IMAGE EXIF-->
+        <field name="exif_location" type="location" indexed="true" stored="true" multiValued="false"/>
+        <field name="exif_version" type="string" indexed="true" stored="true" multiValued="false"/>
+
         <!-- BL UKWA: additional -->
         <dynamicField name="ssdeep_hash_bs_*" type="string" indexed="true" stored="true" multiValued="false"/>
         <dynamicField name="ssdeep_hash_ngram_bs_*" type="literal_ngram" indexed="true" stored="true" multiValued="false"/>
@@ -181,6 +193,7 @@
         <copyField source="wct_description" dest="text"/>
         <copyField source="url" dest="text"/>
         <copyField source="content" dest="text"/>
+        <copyField source="resourcename" dest="resourcename_s" indexed="false" stored="false" docValues="true"/>
 
   <types>
         <fieldType name="string" class="solr.StrField" sortMissingLast="true" />

data/solr/conf/solrconfig.xml

@@ -51,9 +51,6 @@
       <maxTime>${solr.autoCommit.maxTime:15000}</maxTime>
       <openSearcher>false</openSearcher>
     </autoCommit>
-    <autoSoftCommit>
-      <maxTime>${solr.autoSoftCommit.maxTime:-1}</maxTime>
-    </autoSoftCommit>
   </updateHandler>
 
   <query>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: warclight
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Nick Ruest
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-09-07 00:00:00.000000000 Z
+date: 2017-10-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: blacklight
@@ -218,7 +218,7 @@ files:
 - app/assets/stylesheets/warclight/application.scss
 - app/assets/stylesheets/warclight/warclight.scss
 - app/controllers/concerns/warclight/field_config_helpers.rb
-- app/helpers/warclight/application_helper.rb
+- app/helpers/warclight_helper.rb
 - app/jobs/warclight/application_job.rb
 - app/models/concerns/warclight/catalog.rb
 - app/models/concerns/warclight/search_behavior.rb

data/app/helpers/warclight/application_helper.rb

@@ -1,13 +0,0 @@
-# frozen_string_literal: true
-
-module Warclight
-  ##
-  # Helper methods for Warclight.
-  module ApplicationHelper
-    def link_to_live_web(options = {})
-      safe_join(options[:value].map do |url|
-        link_to(url, url, target: '_blank') << ' 🔗'
-      end, '')
-    end
-  end
-end