curation_concerns 0.6.0 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9e77165da47c309d90805ddb6981da218c262545
-  data.tar.gz: 5b4967ede0c3c0a0eafc7bb60d4db47950519044
+  metadata.gz: 7af44881c5c91d837ca80398c54f3e52fd686b01
+  data.tar.gz: d4186500d7ca262837a72912a0e681b83fac149f
 SHA512:
-  metadata.gz: 295594240997309f48717675eca0bd6e4104e2e13c468fb9f9cdb67496853a6b2380456281e913a453e0d341fa86407d4769eb6366462ee7795b52f7cbbef048
-  data.tar.gz: 0a874acf3320fca7cac2ebd597baa353ff0fbfdc5211b32afa24eab97662297713bad2ef749253426f959a16170865292c4b4e59f7fe04771388e99b93710fe2
+  metadata.gz: fa316af1763c1a5fd5fe369fd1d88c33b42ff7a5b4f14e8b63191de19862707bc82c3f3f0420c93d0ca9e9c26a9a4406fd400f866559e6201969f1c55dd7a56a
+  data.tar.gz: 243f21c6b7cea9a5fa6b18de63a373a7a40461fda1d3551490b1a4c17051dcc112e550e109ef4d55d802dc48dde368db8b0b2279eb4a1594eec4b0cee4eb671b

data/.gitignore

@@ -8,7 +8,7 @@ jetty
 /.ruby-version
 /.ruby-gemset
 solr_conf/
-spec/internal
 .internal_test_app
 .byebug_history
 spec/mock_upload_directory
+fcrepo4-data

data/.rubocop.yml

@@ -21,6 +21,9 @@ Performance/RedundantBlockCall:
   Exclude:
     - 'curation_concerns-models/lib/curation_concerns/null_logger.rb'
 
+Performance/RedundantMerge:
+  Enabled: false
+
 Lint/AssignmentInCondition:
   Exclude:
     - 'curation_concerns-models/app/services/curation_concerns/persist_derivatives.rb'
@@ -66,6 +69,9 @@ Metrics/ModuleLength:
     - 'app/helpers/curation_concerns/curation_concerns_helper_behavior.rb'
     - 'curation_concerns-models/app/models/concerns/curation_concerns/solr_document_behavior.rb'
 
+Style/ZeroLengthPredicate:
+  Enabled: false
+
 Style/BlockDelimiters:
   Exclude:
     - 'spec/**/*'

data/Gemfile

@@ -15,13 +15,12 @@ group :development, :test do
   gem 'pry-byebug' unless ENV['CI']
 end
 
-
 # BEGIN ENGINE_CART BLOCK
 # engine_cart: 0.8.0
 # engine_cart stanza: 0.8.0
 # the below comes from engine_cart, a gem used to test this Rails engine gem in the context of a Rails app.
 file = File.expand_path("Gemfile", ENV['ENGINE_CART_DESTINATION'] || ENV['RAILS_ROOT'] || File.expand_path(".internal_test_app", File.dirname(__FILE__)))
-if File.exists?(file)
+if File.exist?(file)
   begin
     eval_gemfile file
   rescue Bundler::GemfileError => e

data/RELEASING.md

@@ -1,2 +1,3 @@
-* Bump version number in VERSION
-* Release the gem to rubygems.org: rake all:release
+* Bump version number in `VERSION`
+* Release the gem to rubygems.org: `rake all:release`
+* `git push`

data/Rakefile

@@ -1,17 +1,13 @@
 require 'bundler/gem_tasks'
 require 'bundler/setup'
 require 'rspec/core/rake_task'
-require 'jettywrapper'
 require 'engine_cart/rake_task'
 require 'rubocop/rake_task'
+require 'solr_wrapper'
+require 'fcrepo_wrapper'
 
 Dir.glob('tasks/*.rake').each { |r| import r }
 
-# This makes it possible to run curation_concerns:jetty:config from here.
-import 'curation_concerns-models/lib/tasks/curation_concerns-models_tasks.rake'
-
-Jettywrapper.hydra_jetty_version = 'v8.6.0'
-
 desc 'Run style checker'
 RuboCop::RakeTask.new(:rubocop) do |task|
   task.requires << 'rubocop-rspec'
@@ -23,15 +19,20 @@ task spec: :rubocop do
   RSpec::Core::RakeTask.new(:spec)
 end
 
-task ci: ['engine_cart:generate', 'jetty:clean', 'jetty:config'] do
-  puts 'running continuous integration'
-  jetty_params = Jettywrapper.load_config
-  jetty_params[:startup_wait] = 90
-
-  error = Jettywrapper.wrap(jetty_params) do
-    Rake::Task['spec'].invoke
+desc 'Spin up Solr & Fedora and run the test suite'
+task ci: ['engine_cart:generate'] do
+  # TODO: set port to nil (random port)
+  solr_params = { port: '8985', verbose: true, managed: true }
+  fcrepo_params = { port: '8986', verbose: true, managed: true }
+  SolrWrapper.wrap(solr_params) do |solr|
+    ENV['SOLR_TEST_PORT'] = solr.port
+    solr.with_collection(name: 'hydra-test', dir: File.join(File.expand_path('.', File.dirname(__FILE__)), 'solr', 'config')) do
+      FcrepoWrapper.wrap(fcrepo_params) do |fcrepo|
+        ENV['FCREPO_TEST_PORT'] = fcrepo.port
+        Rake::Task['spec'].invoke
+      end
+    end
   end
-  fail "test failures: #{error}" if error
 end
 
 task clean: 'engine_cart:clean'

data/VERSION

@@ -1 +1 @@
-0.6.0
+0.7.0

data/app/controllers/concerns/curation_concerns/curation_concern_controller.rb

@@ -4,7 +4,7 @@ module CurationConcerns::CurationConcernController
   include Blacklight::AccessControls::Catalog
 
   included do
-    copy_blacklight_config_from(CatalogController)
+    copy_blacklight_config_from(::CatalogController)
     include CurationConcerns::ThemedLayoutController
     with_themed_layout '1_column'
     helper CurationConcerns::AbilityHelper

data/app/controllers/concerns/curation_concerns/parent_container.rb

@@ -22,7 +22,7 @@ module CurationConcerns::ParentContainer
   end
 
   def parent_id
-    @parent_id ||= new_or_create? ? params[:parent_id] : curation_concern.generic_works.in_objects.first.id
+    @parent_id ||= new_or_create? ? params[:parent_id] : lookup_parent_from_child.id
   end
 
   protected

data/app/renderers/curation_concerns/attribute_renderer.rb

@@ -70,7 +70,7 @@ module CurationConcerns
         if options[:catalog_search_link]
           link_to(ERB::Util.h(value), search_path(value))
         else
-          auto_link(value)
+          auto_link(ERB::Util.h(value))
         end
       end
 

data/curation_concerns.gemspec

@@ -26,6 +26,8 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'blacklight_advanced_search', '~> 6.0'
   spec.add_dependency 'rails_autolink'
 
+  spec.add_development_dependency 'solr_wrapper', '~> 0.4'
+  spec.add_development_dependency 'fcrepo_wrapper', '~> 0.1'
   spec.add_development_dependency "devise", "~> 3.0"
   spec.add_development_dependency "bundler", "~> 1.6"
   spec.add_development_dependency "rake"

data/lib/curation_concerns/rails/routes.rb

@@ -1,12 +1,17 @@
 module ActionDispatch::Routing
   class Mapper
-    def curation_concerns_basic_routes
+    # @yield If a block is passed it is yielded for each curation_concern
+    # @example
+    #   curation_concerns_basic_routes do
+    #     concerns :exportable
+    #   end
+    def curation_concerns_basic_routes(&block)
       resources :downloads, only: :show
       resources :upload_sets, only: [:edit, :update]
 
       namespace :curation_concerns, path: :concern do
-        CurationConcerns.config.registered_curation_concern_types.map(&:tableize).each do |curation_concern_name|
-          namespaced_resources curation_concern_name, except: [:index]
+        concerns_to_route.each do |curation_concern_name|
+          namespaced_resources curation_concern_name, except: [:index], &block
         end
 
         resources :permissions, only: [] do
@@ -63,20 +68,27 @@ module ActionDispatch::Routing
       ROUTE_OPTIONS = { 'curation_concerns' => { path: :concern } }.freeze
 
       # Namespaces routes appropriately
-      # @example route_namespaced_target("curation_concerns/generic_work") is equivalent to
+      # @example namespaced_resources("curation_concerns/generic_work") is equivalent to
       #   namespace "curation_concerns", path: :concern do
       #     resources "generic_work", except: [:index]
       #   end
-      def namespaced_resources(target, opts = {})
+      def namespaced_resources(target, opts = {}, &block)
         if target.include?('/')
           the_namespace = target[0..target.index('/') - 1]
           new_target = target[target.index('/') + 1..-1]
           namespace the_namespace, ROUTE_OPTIONS.fetch(the_namespace, nil) do
-            namespaced_resources(new_target, opts)
+            namespaced_resources(new_target, opts, &block)
           end
         else
-          resources target, opts
+          resources target, opts do
+            yield if block_given?
+          end
         end
       end
+
+      # @return [Array<String>] the list of works to build routes for
+      def concerns_to_route
+        CurationConcerns.config.registered_curation_concern_types.map(&:tableize)
+      end
   end
 end

data/lib/curation_concerns/version.rb

@@ -1,3 +1,3 @@
 module CurationConcerns
-  VERSION = "0.6.0".freeze
+  VERSION = "0.7.0".freeze
 end

data/solr/config/_rest_managed.json

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

data/solr/config/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/config/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/config/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/config/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
+