hydra-pcdm 1.0.1 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 75e35c5a58d206fa1b16cf2409c36cc30eee52804cb0cf013b3d1b3f09b4e83c
-  data.tar.gz: 303e20c156922151d3aa11129dcbb8ecdffd3270db928fdf06014a20e4af8648
+  metadata.gz: 0d6cf2ebed3f1e7622b790b110f6bb3f3ae8502510e262002f75f1f49946ad61
+  data.tar.gz: '00745687d301f636eb79898c9aecb69e97a5dcd96eeb544cbed0aeaa193f14b0'
 SHA512:
-  metadata.gz: 77a7c82045f215454c3de6ee24e4d9111dd524f643db89c4eae46bcb79b9ced5e9ba77be146708ea1ccbd14073a59e1a296b2ea195c02a533fab399630eae4da
-  data.tar.gz: 0ea2662ecad8f50852220d20a883c2af9e8f2f0383564138ee006fce82555c70215915a8a1633d5ed486e76ff15350d99e040bf77dcdb39cb15e461f2bde860b
+  metadata.gz: b4f960faed3b527b4a80f17430e8566aeb7a3e0ca95ff29ef3fa5b2a3a0f282d960104480f021993594d5f600e7923585ea52d39f74d4d3dc2b05567ec8d0b09
+  data.tar.gz: 5dbeea93fba9e520e43a9cd1aa374ecf5071773b600144dcb06a652d18aed694b69c1ec0d52d6879d202b8edf3c544b213e2b36c2773524a77f1fef48696133c

data/.circleci/config.yml

@@ -0,0 +1,62 @@
+version: 2.1
+orbs:
+  samvera: samvera/circleci-orb@0
+jobs:
+  bundle_lint_test:
+    parameters:
+      ruby_version:
+        type: string
+      rails_version:
+        type: string
+      project:
+        type: string
+        default: hydra-pcdm
+      bundler_version:
+        type: string
+        default: 1.17.3
+    executor:
+      name: 'samvera/ruby_fcrepo_solr'
+      ruby_version: << parameters.ruby_version >>
+    environment:
+      RAILS_VERSION: << parameters.rails_version >>
+    steps:
+      - samvera/cached_checkout
+
+      - samvera/bundle_for_gem:
+          ruby_version: << parameters.ruby_version >>
+          bundler_version: << parameters.bundler_version >>
+          project: << parameters.project >>
+
+      - samvera/install_solr_active_fedora_core
+
+      - samvera/rubocop
+
+      - samvera/parallel_rspec
+
+workflows:
+  ci:
+    jobs:
+      - bundle_lint_test:
+          name: ruby2-6_rails5-2
+          ruby_version: 2.6.3
+          rails_version: 5.2.3
+      - bundle_lint_test:
+          name: ruby2-6_rails5-1
+          ruby_version: 2.6.3
+          rails_version: 5.1.7
+      - bundle_lint_test:
+          name: ruby2-5_rails5-2
+          ruby_version: 2.5.5
+          rails_version: 5.2.3
+      - bundle_lint_test:
+          name: ruby2-6_rails5-1
+          ruby_version: 2.6.3
+          rails_version: 5.1.7
+      - bundle_lint_test:
+          name: ruby2-4_rails5-2
+          ruby_version: 2.4.6
+          rails_version: 5.2.3
+      - bundle_lint_test:
+          name: ruby2-6_rails5-1
+          ruby_version: 2.6.3
+          rails_version: 5.1.7

data/Gemfile

@@ -4,7 +4,18 @@ group :development, :test do
   gem 'bixby', '~> 1.0'
   gem 'pry' unless ENV['CI']
   gem 'pry-byebug' unless ENV['CI']
+  gem 'rspec_junit_formatter'
 end
 
 # Specify your gem's dependencies in hydra-pcdm.gemspec
 gemspec
+
+# rubocop:disable Bundler/DuplicatedGem
+if ENV['RAILS_VERSION']
+  if ENV['RAILS_VERSION'] == 'edge'
+    gem 'rails', github: 'rails/rails'
+  else
+    gem 'rails', ENV['RAILS_VERSION']
+  end
+end
+# rubocop:enable Bundler/DuplicatedGem

data/README.md

@@ -2,7 +2,7 @@
 
 Code:
 [![Version](https://badge.fury.io/rb/hydra-pcdm.png)](http://badge.fury.io/rb/hydra-pcdm)
-[![Build Status](https://travis-ci.org/samvera/hydra-pcdm.svg?branch=master)](https://travis-ci.org/samvera/hydra-pcdm)
+[![Build Status](https://circleci.com/gh/samvera/hydra-pcdm.svg?style=svg)](https://circleci.com/gh/samvera/hydra-pcdm)
 [![Coverage Status](https://coveralls.io/repos/samvera/hydra-pcdm/badge.svg?branch=master)](https://coveralls.io/r/samvera/hydra-pcdm?branch=master)
 [![Code Climate](https://codeclimate.com/github/projecthydra/hydra-pcdm/badges/gpa.svg)](https://codeclimate.com/github/projecthydra/hydra-pcdm)
 

data/Rakefile

@@ -29,4 +29,16 @@ task ci: :rubocop do
   Rake::Task['spec_with_app_load'].invoke
 end
 
+desc 'Start up test server'
+task :test_server do
+  ENV["RAILS_ENV"] = "test"
+  with_test_server do
+    puts "Solr: http://localhost:#{ENV['SOLR_TEST_PORT']}/solr"
+    puts "Fedora: http://localhost:#{ENV['FCREPO_TEST_PORT']}/rest"
+    loop do
+      sleep(1)
+    end
+  end
+end
+
 task default: :ci

data/config/fcrepo_wrapper_test.yml

@@ -0,0 +1,7 @@
+---
+port: 8986
+verbose: true
+managed: true
+enable_jms: false
+fcrepo_home_dir: tmp/fcrepo4-test-data
+version: 4.7.4

data/config/solr_wrapper_test.yml

@@ -0,0 +1,2 @@
+---
+port: 8985

data/hydra-pcdm.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ['lib']
 
-  spec.add_dependency 'active-fedora', '>= 10', '< 13'
+  spec.add_dependency 'active-fedora', '>= 10', '< 14'
   spec.add_dependency 'mime-types', '>= 1'
 
   spec.add_development_dependency 'bundler', '~> 1.6'

data/lib/hydra/pcdm/models/concerns/pcdm_behavior.rb

@@ -77,12 +77,6 @@ module Hydra::PCDM
       ActiveFedora::Base.where(Config.indexing_member_ids_key => id)
     end
 
-    ##
-    # @return [Enumerable<String>] an ordered list of member ids
-    def ordered_member_ids
-      ordered_member_proxies.map(&:target_id)
-    end
-
     ##
     # Gives the subset of #members that are PCDM objects
     #
@@ -125,12 +119,6 @@ module Hydra::PCDM
       in_collections.map(&:id)
     end
 
-    ##
-    # @return [Enumerable<String>]
-    def member_of_collection_ids
-      member_of_collections.map(&:id)
-    end
-
     ##
     # @param [ActiveFedora::Base] potential_ancestor  the resource to check for
     #   ancestorship

data/lib/hydra/pcdm/version.rb

@@ -1,5 +1,5 @@
 module Hydra
   module PCDM
-    VERSION = '1.0.1'.freeze
+    VERSION = '1.1.0'.freeze
   end
 end

data/spec/spec_helper.rb

@@ -7,6 +7,7 @@ SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter.new(
    Coveralls::SimpleCov::Formatter]
 )
 
+SimpleCov.minimum_coverage 100
 SimpleCov.start { add_filter '/spec' }
 
 require 'bundler/setup'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hydra-pcdm
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.0
 platform: ruby
 authors:
 - E. Lynette Rayle
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-03-06 00:00:00.000000000 Z
+date: 2019-08-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active-fedora
@@ -19,7 +19,7 @@ dependencies:
         version: '10'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '13'
+        version: '14'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -29,7 +29,7 @@ dependencies:
         version: '10'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '13'
+        version: '14'
 - !ruby/object:Gem::Dependency
   name: mime-types
   requirement: !ruby/object:Gem::Requirement
@@ -135,12 +135,12 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".circleci/config.yml"
 - ".coveralls.yml"
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"
 - ".rubocop_todo.yml"
-- ".travis.yml"
 - CODE_OF_CONDUCT.md
 - CONTRIBUTING.md
 - Gemfile
@@ -148,7 +148,9 @@ files:
 - README.md
 - Rakefile
 - SUPPORT.md
+- config/fcrepo_wrapper_test.yml
 - config/jetty.yml
+- config/solr_wrapper_test.yml
 - hydra-pcdm.gemspec
 - lib/hydra/pcdm.rb
 - lib/hydra/pcdm/ancestor_checker.rb
@@ -172,22 +174,6 @@ files:
 - lib/hydra/pcdm/validators/pcdm_validator.rb
 - lib/hydra/pcdm/version.rb
 - lib/hydra/pcdm/vocab/pcdm_terms.rb
-- solr/config/_rest_managed.json
-- solr/config/admin-extra.html
-- solr/config/elevate.xml
-- solr/config/mapping-ISOLatin1Accent.txt
-- solr/config/protwords.txt
-- solr/config/schema.xml
-- solr/config/scripts.conf
-- solr/config/solrconfig.xml
-- solr/config/spellings.txt
-- solr/config/stopwords.txt
-- solr/config/stopwords_en.txt
-- solr/config/synonyms.txt
-- solr/config/xslt/example.xsl
-- solr/config/xslt/example_atom.xsl
-- solr/config/xslt/example_rss.xsl
-- solr/config/xslt/luke.xsl
 - spec/hydra/pcdm/ancestor_checker_spec.rb
 - spec/hydra/pcdm/collection_indexer_spec.rb
 - spec/hydra/pcdm/config_spec.rb
@@ -218,7 +204,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.0.4
 signing_key: 
 specification_version: 4
 summary: Portland Common Data Model (PCDM)

data/.travis.yml

@@ -1,17 +0,0 @@
-language: ruby
-cache: bundler
-sudo: false
-bundler_args: --without debug
-env:
-  global:
-    - NOKOGIRI_USE_SYSTEM_LIBRARIES=true
-jdk:
-  - oraclejdk8
-rvm:
-  - 2.2.7
-  - 2.3.4
-  - 2.4.1
-  - jruby-9.1.8.0
-matrix:
-  allow_failures:
-      - rvm: jruby-9.1.8.0

data/solr/config/_rest_managed.json

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

data/solr/config/admin-extra.html

@@ -1,31 +0,0 @@
-<!--
- 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/config/elevate.xml

@@ -1,36 +0,0 @@
-<?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/config/mapping-ISOLatin1Accent.txt

@@ -1,246 +0,0 @@
-# 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"