hydra-works 2.1.0 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 299915df094f99166ceb8580278c609aae957c1b2730e43fa59ef8f04dab6a44
-  data.tar.gz: e02e90ef61fb828758714a41fccfb3c80d4e78a1820492fe1475a7d70f472e21
+  metadata.gz: 6b4123e2b8108c9029c4edf996648ab431eb99a879fe252f7d09821cd5ce7627
+  data.tar.gz: d870ef52fd4f4bd0287b583dd8af4015eb05c3b4b9dc6e1a5fbe76cc00bf5969
 SHA512:
-  metadata.gz: 8339edf5dc4ff96f1ec1bec49af72b624b87be9d93786522b991d49305269f08ee750ba1ceee12758a0e6c21f379941c36a91336ab6e9d3b086945c4f8d189ac
-  data.tar.gz: ba1ddb8186a4d86186fa322052327bebf2ef80f7d212b90adc802b41e23d994f698eada5676c68a89ca0345390a3ffbbce9bd526316d5759b69f4340d169ab0c
+  metadata.gz: 276959f9579fe82a6af347c537a36fe1190f2749ac54f151d10ded01d758cabfc8ba83a13e8cd44a1d73db207e0bbcde59b992062901de79fe2e5426857c5380
+  data.tar.gz: 917a2d31b2a368deb1b51f87c900f8801f2939c9b4646fb3b4664ea3b76924ea527fa6bb2d426fd6584bd00bd9189d7da0ce2a75fc83a0bf428105429f214e38

data/.circleci/config.yml

@@ -3,22 +3,49 @@ version: 2.1
 orbs:
   samvera: samvera/circleci-orb@1.0
 jobs:
-  test:
+  bundle_lint_test:
     parameters:
       ruby_version:
         type: string
       bundler_version:
         type: string
-        default: 2.3.10
+        default: 2.4.5
       rails_version:
         type: string
+      solr_config_path:
+        type: string
+        default: solr/conf
+      ruby_type:
+        type: string
+        default: 'ruby'
+      solr_port:
+        type: string
+        default: '8985'
+      fcrepo_version:
+        type: string
+        default: "4.7.5"
+      solr_version:
+        type: string
+        default: "9"
+    docker:
+      - image: cimg/<< parameters.ruby_type >>:<< parameters.ruby_version >>-browsers
+      - image: samvera/fcrepo4:<< parameters.fcrepo_version >>
+        environment:
+          CATALINA_OPTS: "-Djava.awt.headless=true -Dfile.encoding=UTF-8 -server -Xms512m -Xmx1024m -XX:NewSize=256m -XX:MaxNewSize=256m -XX:PermSize=256m -XX:MaxPermSize=256m -XX:+DisableExplicitGC"
+      - image: zookeeper:3.9
+        environment:
+          ZOO_ADMINSERVER_ENABLED: false
+      - image: solr:<< parameters.solr_version >>
+        environment:
+          VERBOSE: yes
+          SECURITY_JSON: '{"authentication":{"blockUnknown": false, "class":"solr.BasicAuthPlugin", "credentials":{"solr":"IV0EHq1OnNrj6gvRCwvFwTrZ1+z1oBbnQdiVC3otuq0= Ndd7LKvVBAaZIF0QAVi1ekCfAJXr1GGfLtRUXhgrF8c="}, "realm":"My Solr users", "forwardCredentials": false}, "authorization":{ "class":"solr.RuleBasedAuthorizationPlugin", "permissions":[{"name":"security-edit", "role":"admin"}], "user-role":{"solr":"admin"}}}'
+        command: sh -c "server/scripts/cloud-scripts/zkcli.sh -zkhost localhost:2181 -cmd put /security.json \"${SECURITY_JSON}\" && solr-fg -cloud -noprompt  -p << parameters.solr_port >> -z localhost:2181"
     environment:
       RAILS_VERSION: << parameters.rails_version >>
       NOKOGIRI_USE_SYSTEM_LIBRARIES: true
-    executor:
-      name: 'samvera/ruby_fcrepo_solr_redis_postgres'
-      ruby_version: << parameters.ruby_version >>
+      FCREPO_TEST_PORT: 8080
     steps:
+      - run: 'wget -q -O - https://dl.google.com/linux/linux_signing_key.pub | sudo apt-key add -'
       - run: 'sudo apt-get update'
       - run: 'sudo apt-get install -y clamav libsqlite3-dev'
       - run: 'sudo freshclam'
@@ -30,66 +57,63 @@ jobs:
           bundler_version: << parameters.bundler_version >>
           project: hydra-works
 
-      - samvera/install_solr_core
+      - run:
+          name: Install solr core
+          command: |
+            cd << parameters.solr_config_path >>
+            zip -1 -r solr_conf.zip ./*
+            curl -H "Content-type:application/octet-stream" --data-binary @solr_conf.zip "http://solr:SolrRocks@127.0.0.1:8985/solr/admin/configs?action=UPLOAD&name=solrconfig"
+            curl "http://solr:SolrRocks@127.0.0.1:8985/solr/admin/collections?action=CREATE&name=hydra-test&numShards=1&collection.configName=solrconfig"
 
       - samvera/parallel_rspec
 
 workflows:
-  version: 2
   ci:
     jobs:
-      # Rails 7.0
-      - test:
+      # Ruby 3.3 releases
+      - bundle_lint_test:
+          name: ruby3-3_rails7-2
+          ruby_version: 3.3.4
+          rails_version: 7.2.0
+      - bundle_lint_test:
+          name: ruby3-3_rails7-1
+          ruby_version: 3.3.4
+          rails_version: 7.1.3.4
+      - bundle_lint_test:
+          name: ruby3-3_rails7-0
+          ruby_version: 3.3.4
+          rails_version: 7.0.8.4
+      - bundle_lint_test:
+          name: ruby3-3_rails6-1
+          ruby_version: 3.3.4
+          rails_version: 6.1.7.8
+      # Ruby 3.2 releases
+      - bundle_lint_test:
+          name: ruby3-2_rails7-1
+          ruby_version: 3.2.5
+          rails_version: 7.1.3.4
+      - bundle_lint_test:
           name: ruby3-2_rails7-0
-          ruby_version: 3.2.0
-          rails_version: 7.0.4.1
-      - test:
-          name: ruby3-1_rails7-0
-          ruby_version: 3.1.3
-          rails_version: 7.0.4.1
-      - test:
-          name: ruby3-0_rails7-0
-          ruby_version: 3.0.5
-          rails_version: 7.0.4.1
-      # Rails 6.1
-      - test:
+          ruby_version: 3.2.5
+          rails_version: 7.0.8.4
+      - bundle_lint_test:
           name: ruby3-2_rails6-1
-          ruby_version: 3.2.0
-          rails_version: 6.1.7.1
-      - test:
+          ruby_version: 3.2.5
+          rails_version: 6.1.7.8
+      # Ruby 3.1 releases
+      - bundle_lint_test:
+          name: ruby3-1_rails7-1
+          ruby_version: 3.1.6
+          rails_version: 7.1.3.4
+      - bundle_lint_test:
+          name: ruby3-1_rails7-0
+          ruby_version: 3.1.6
+          rails_version: 7.0.8.4
+      - bundle_lint_test:
           name: ruby3-1_rails6-1
-          ruby_version: 3.1.3
-          rails_version: 6.1.7.1
-      - test:
-          name: ruby3-0_rails6-1
-          ruby_version: 3.0.5
-          rails_version: 6.1.7.1
-      - test:
-          name: ruby2-7_rails6-1
-          ruby_version: 2.7.7
-          rails_version: 6.1.7.1
-      # Rails 6.0
-      - test:
-          name: ruby3-2_rails6-0
-          ruby_version: 3.2.0
-          rails_version: 6.0.6.1
-      - test:
-          name: ruby3-1_rails6-0
-          ruby_version: 3.1.3
-          rails_version: 6.0.6.1
-      - test:
-          name: ruby3-0_rails6-0
-          ruby_version: 3.0.5
-          rails_version: 6.0.6.1
-      - test:
-          name: ruby2-7_rails6-0
-          ruby_version: 2.7.7
-          rails_version: 6.0.6.1
-      # Rails 5.2
-      - test:
-          name: ruby2-7_rails5-2
-          ruby_version: 2.7.7
-          rails_version: 5.2.8.1
+          ruby_version: 3.1.6
+          rails_version: 6.1.7.8
+
 
   nightly:
     triggers:
@@ -100,55 +124,46 @@ workflows:
               only:
                 - main
     jobs:
-      # Rails 7.0
-      - test:
+      # Ruby 3.3 releases
+      - bundle_lint_test:
+          name: ruby3-3_rails7-2
+          ruby_version: 3.3.4
+          rails_version: 7.2.0
+      - bundle_lint_test:
+          name: ruby3-3_rails7-1
+          ruby_version: 3.3.4
+          rails_version: 7.1.3.4
+      - bundle_lint_test:
+          name: ruby3-3_rails7-0
+          ruby_version: 3.3.4
+          rails_version: 7.0.8.4
+      - bundle_lint_test:
+          name: ruby3-3_rails6-1
+          ruby_version: 3.3.4
+          rails_version: 6.1.7.8
+      # Ruby 3.2 releases
+      - bundle_lint_test:
+          name: ruby3-2_rails7-1
+          ruby_version: 3.2.5
+          rails_version: 7.1.3.4
+      - bundle_lint_test:
           name: ruby3-2_rails7-0
-          ruby_version: 3.2.0
-          rails_version: 7.0.4.1
-      - test:
-          name: ruby3-1_rails7-0
-          ruby_version: 3.1.3
-          rails_version: 7.0.4.1
-      - test:
-          name: ruby3-0_rails7-0
-          ruby_version: 3.0.5
-          rails_version: 7.0.4.1
-      # Rails 6.1
-      - test:
+          ruby_version: 3.2.5
+          rails_version: 7.0.8.4
+      - bundle_lint_test:
           name: ruby3-2_rails6-1
-          ruby_version: 3.2.0
-          rails_version: 6.1.7.1
-      - test:
+          ruby_version: 3.2.5
+          rails_version: 6.1.7.8
+      # Ruby 3.1 releases
+      - bundle_lint_test:
+          name: ruby3-1_rails7-1
+          ruby_version: 3.1.6
+          rails_version: 7.1.3.4
+      - bundle_lint_test:
+          name: ruby3-1_rails7-0
+          ruby_version: 3.1.6
+          rails_version: 7.0.8.4
+      - bundle_lint_test:
           name: ruby3-1_rails6-1
-          ruby_version: 3.1.3
-          rails_version: 6.1.7.1
-      - test:
-          name: ruby3-0_rails6-1
-          ruby_version: 3.0.5
-          rails_version: 6.1.7.1
-      - test:
-          name: ruby2-7_rails6-1
-          ruby_version: 2.7.7
-          rails_version: 6.1.7.1
-      # Rails 6.0
-      - test:
-          name: ruby3-2_rails6-0
-          ruby_version: 3.2.0
-          rails_version: 6.0.6.1
-      - test:
-          name: ruby3-1_rails6-0
-          ruby_version: 3.1.3
-          rails_version: 6.0.6.1
-      - test:
-          name: ruby3-0_rails6-0
-          ruby_version: 3.0.5
-          rails_version: 6.0.6.1
-      - test:
-          name: ruby2-7_rails6-0
-          ruby_version: 2.7.7
-          rails_version: 6.0.6.1
-      # Rails 5.2
-      - test:
-          name: ruby2-7_rails5-2
-          ruby_version: 2.7.7
-          rails_version: 5.2.8.1
+          ruby_version: 3.1.6
+          rails_version: 6.1.7.8

data/hydra-works.gemspec

@@ -20,8 +20,8 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ['lib']
 
-  spec.add_dependency 'activesupport', '>= 5.2', '< 7.1'
-  spec.add_dependency 'hydra-derivatives', '~> 3.6'
+  spec.add_dependency 'activesupport', '>= 5.2', '< 8.0'
+  spec.add_dependency 'hydra-derivatives', '>= 3.6'
   spec.add_dependency 'hydra-file_characterization', '~> 1.0'
   spec.add_dependency 'hydra-pcdm', '>= 0.9'
 

data/lib/hydra/works/version.rb

@@ -1,5 +1,5 @@
 module Hydra
   module Works
-    VERSION = '2.1.0'.freeze
+    VERSION = '2.2.0'.freeze
   end
 end

data/solr/conf/_rest_managed.json

@@ -0,0 +1,3 @@
+{
+  "initArgs":{},
+  "managedList":[]}

data/solr/conf/admin-extra.html

@@ -0,0 +1,31 @@
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements.  See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License.  You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<!-- The content of this page will be statically included into the top
+of the admin page.  Uncomment this as an example to see there the content
+will show up.
+
+<hr>
+<i>This line will appear before the first table</i>
+<tr>
+<td colspan="2">
+This row will be appended to the end of the first table
+</td>
+</tr>
+<hr>
+
+-->

data/solr/conf/elevate.xml

@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements.  See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License.  You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<!-- If this file is found in the config directory, it will only be
+     loaded once at startup.  If it is found in Solr's data
+     directory, it will be re-loaded every commit.
+-->
+
+<elevate>
+ <query text="foo bar">
+  <doc id="1" />
+  <doc id="2" />
+  <doc id="3" />
+ </query>
+ 
+ <query text="ipod">
+   <doc id="MA147LL/A" />  <!-- put the actual ipod at the top -->
+   <doc id="IW-02" exclude="true" /> <!-- exclude this cable -->
+ </query>
+ 
+</elevate>

data/solr/conf/mapping-ISOLatin1Accent.txt

@@ -0,0 +1,246 @@
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# Syntax:
+#   "source" => "target"
+#     "source".length() > 0 (source cannot be empty.)
+#     "target".length() >= 0 (target can be empty.)
+
+# example:
+#   "??" => "A"
+#   "\u00C0" => "A"
+#   "\u00C0" => "\u0041"
+#   "??" => "ss"
+#   "\t" => " "
+#   "\n" => ""
+
+# ?? => A
+"\u00C0" => "A"
+
+# ?? => A
+"\u00C1" => "A"
+
+# ?? => A
+"\u00C2" => "A"
+
+# ?? => A
+"\u00C3" => "A"
+
+# ?? => A
+"\u00C4" => "A"
+
+# ?? => A
+"\u00C5" => "A"
+
+# ?? => AE
+"\u00C6" => "AE"
+
+# ?? => C
+"\u00C7" => "C"
+
+# ?? => E
+"\u00C8" => "E"
+
+# ?? => E
+"\u00C9" => "E"
+
+# ?? => E
+"\u00CA" => "E"
+
+# ?? => E
+"\u00CB" => "E"
+
+# ?? => I
+"\u00CC" => "I"
+
+# ?? => I
+"\u00CD" => "I"
+
+# ?? => I
+"\u00CE" => "I"
+
+# ?? => I
+"\u00CF" => "I"
+
+# ?? => IJ
+"\u0132" => "IJ"
+
+# ?? => D
+"\u00D0" => "D"
+
+# ?? => N
+"\u00D1" => "N"
+
+# ?? => O
+"\u00D2" => "O"
+
+# ?? => O
+"\u00D3" => "O"
+
+# ?? => O
+"\u00D4" => "O"
+
+# ?? => O
+"\u00D5" => "O"
+
+# ?? => O
+"\u00D6" => "O"
+
+# ?? => O
+"\u00D8" => "O"
+
+# ?? => OE
+"\u0152" => "OE"
+
+# ??
+"\u00DE" => "TH"
+
+# ?? => U
+"\u00D9" => "U"
+
+# ?? => U
+"\u00DA" => "U"
+
+# ?? => U
+"\u00DB" => "U"
+
+# ?? => U
+"\u00DC" => "U"
+
+# ?? => Y
+"\u00DD" => "Y"
+
+# ?? => Y
+"\u0178" => "Y"
+
+# ?? => a
+"\u00E0" => "a"
+
+# ?? => a
+"\u00E1" => "a"
+
+# ?? => a
+"\u00E2" => "a"
+
+# ?? => a
+"\u00E3" => "a"
+
+# ?? => a
+"\u00E4" => "a"
+
+# ?? => a
+"\u00E5" => "a"
+
+# ?? => ae
+"\u00E6" => "ae"
+
+# ?? => c
+"\u00E7" => "c"
+
+# ?? => e
+"\u00E8" => "e"
+
+# ?? => e
+"\u00E9" => "e"
+
+# ?? => e
+"\u00EA" => "e"
+
+# ?? => e
+"\u00EB" => "e"
+
+# ?? => i
+"\u00EC" => "i"
+
+# ?? => i
+"\u00ED" => "i"
+
+# ?? => i
+"\u00EE" => "i"
+
+# ?? => i
+"\u00EF" => "i"
+
+# ?? => ij
+"\u0133" => "ij"
+
+# ?? => d
+"\u00F0" => "d"
+
+# ?? => n
+"\u00F1" => "n"
+
+# ?? => o
+"\u00F2" => "o"
+
+# ?? => o
+"\u00F3" => "o"
+
+# ?? => o
+"\u00F4" => "o"
+
+# ?? => o
+"\u00F5" => "o"
+
+# ?? => o
+"\u00F6" => "o"
+
+# ?? => o
+"\u00F8" => "o"
+
+# ?? => oe
+"\u0153" => "oe"
+
+# ?? => ss
+"\u00DF" => "ss"
+
+# ?? => th
+"\u00FE" => "th"
+
+# ?? => u
+"\u00F9" => "u"
+
+# ?? => u
+"\u00FA" => "u"
+
+# ?? => u
+"\u00FB" => "u"
+
+# ?? => u
+"\u00FC" => "u"
+
+# ?? => y
+"\u00FD" => "y"
+
+# ?? => y
+"\u00FF" => "y"
+
+# ??? => ff
+"\uFB00" => "ff"
+
+# ??? => fi
+"\uFB01" => "fi"
+
+# ??? => fl
+"\uFB02" => "fl"
+
+# ??? => ffi
+"\uFB03" => "ffi"
+
+# ??? => ffl
+"\uFB04" => "ffl"
+
+# ??? => ft
+"\uFB05" => "ft"
+
+# ??? => st
+"\uFB06" => "st"

data/solr/conf/protwords.txt

@@ -0,0 +1,21 @@
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+#-----------------------------------------------------------------------
+# Use a protected word file to protect against the stemmer reducing two
+# unrelated words to the same base word.
+
+# Some non-words that normally won't be encountered,
+# just to test that they won't be stemmed.
+dontstems
+zwhacky
+