blacklight-marc 6.1.0 → 6.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6afab16e002745041c1c9e04d24d6285b666c349
-  data.tar.gz: bb0dc662ae4197a5072a045cb44216b2e15cf043
+  metadata.gz: 2dad28dda5b571d3d111370ddab6cdbd03bab70b
+  data.tar.gz: 0177360550a4b9b7387790c51dd543b8c1396c4a
 SHA512:
-  metadata.gz: 6a41fc49bc09c38a42cb319db12a7c31817e3e7b1d1ec2c19816a1436dd5271e6f732e65c9bdab1e5c9f9112356971f9bdf9efb919e8f0d068ba73e599f19e1e
-  data.tar.gz: 7d2fd4fe4c039c7177d173a006732f557c7f08a688d17fa324c84e3b5d7654431d3400735c4a879f44d193ccde206a67d9dd1dff5341e4f28653078cbca5af88
+  metadata.gz: 82744f0a7fb2e5a2688753211de0a5fa449caca6682d7ae78eada10819828d0e0e67cd9b380339d9c1f7ba53a231dff1618f3a19618f4b67b0c01c410378dfee
+  data.tar.gz: 283589fa380fe66a421a93a6354b9555b965ac72091dd06fd777535679a45d5fe58375cad0482ac7e38a9b41646e8bab7b381a2b4fb6dcd12b0203bccf6a35c8

data/.solr_wrapper.yaml

@@ -0,0 +1,5 @@
+# Place any default configuration for solr_wrapper here
+# port: 8983
+collection:
+  dir: solr/conf/
+  name: blacklight-core

data/.travis.yml

@@ -5,23 +5,17 @@ notifications:
   email: false
 
 rvm:
-  - 2.2.4
-
-matrix:
-  include:
-    - rvm: 2.1.8
-      env: "RAILS_VERSION=4.2.5.1"
+  - 2.3.1
 
 before_install:
   - gem install bundler
 
-env:
- - "RAILS_VERSION=4.2.5.1"
-
 notifications:
   irc: "irc.freenode.org#blacklight"
   email:
       - blacklight-commits@googlegroups.com
 
 global_env:
-  - NOKOGIRI_USE_SYSTEM_LIBRARIES=true
+  - NOKOGIRI_USE_SYSTEM_LIBRARIES=true
+  
+jdk: oraclejdk8

data/Gemfile

@@ -3,14 +3,11 @@ source 'https://rubygems.org'
 # Please see blacklight_marc.gemspec for dependency information.
 gemspec path: File.expand_path('..', __FILE__)
 
-gem 'simplecov', '~> 0.10', require: false
-gem 'coveralls', require: false
-
 # BEGIN ENGINE_CART BLOCK
-# engine_cart: 0.8.2
-# engine_cart stanza: 0.8.0
+# engine_cart: 1.0.1
+# engine_cart stanza: 0.10.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__)))
+file = File.expand_path('Gemfile', ENV['ENGINE_CART_DESTINATION'] || ENV['RAILS_ROOT'] || File.expand_path('.internal_test_app', File.dirname(__FILE__)))
 if File.exist?(file)
   begin
     eval_gemfile file
@@ -24,21 +21,19 @@ else
   if ENV['RAILS_VERSION']
     if ENV['RAILS_VERSION'] == 'edge'
       gem 'rails', github: 'rails/rails'
-      ENV['ENGINE_CART_RAILS_OPTIONS']= "--edge --skip-turbolinks"
+      ENV['ENGINE_CART_RAILS_OPTIONS'] = '--edge --skip-turbolinks'
     else
       gem 'rails', ENV['RAILS_VERSION']
     end
   end
 
-  if ENV['RAILS_VERSION'].nil? || ENV['RAILS_VERSION'] =~ /^4.2/
-    #gem 'bootstrap-sass', '>= 3.3.5.1'
-    gem 'responders', "~> 2.0"
-    gem 'sass-rails', ">= 5.0"
-  elsif ENV['RAILS_VERSION'] =~ /^5.0/ || ENV['RAILS_VERSION'] == 'edge'
-    # nop
-  else
-    gem 'bootstrap-sass', '< 3.3.5' # 3.3.5 requires sass 3.3, incompatible with sass-rails 4.x
-    gem 'sass-rails', "< 5.0"
+  case ENV['RAILS_VERSION']
+  when /^4.2/
+    gem 'responders', '~> 2.0'
+    gem 'sass-rails', '>= 5.0'
+    gem 'coffee-rails', '~> 4.1.0'
+  when /^4.[01]/
+    gem 'sass-rails', '< 5.0'
   end
 end
 # END ENGINE_CART BLOCK

data/README.md

@@ -16,7 +16,7 @@ And then execute:
 
 After running the blacklight generator, run the blacklight_marc generator:
 
-    $ rails generate blacklight_marc:marc
+    $ rails generate blacklight:marc:install
 
 The generator will create a model called MarcIndexer. This model can be customized by modifying
 the field configurations in its initializer as a Traject 2 indexer; new indexing behaviors can

data/Rakefile

@@ -1,7 +1,4 @@
 require "bundler/gem_tasks"
-ZIP_URL = "https://github.com/projectblacklight/blacklight-jetty/archive/v4.10.4.zip"
-
-require 'jettywrapper'
 require 'rspec/core/rake_task'
 require 'engine_cart/rake_task'
 
@@ -11,31 +8,24 @@ RSpec::Core::RakeTask.new(:spec)
 
 task :default => [:ci]
 
-task :ci => ['blacklight_marc:clean', 'blacklight_marc:generate'] do
-  jetty_params = Jettywrapper.load_config('test')
-  error = Jettywrapper.wrap(jetty_params) do
-    Rake::Task["blacklight_marc:fixtures"].invoke
-    Rake::Task['spec'].invoke
+task :ci => ['engine_cart:generate'] do
+  require 'solr_wrapper'
+  SolrWrapper.wrap(port: '8983') do |solr|
+    solr.with_collection(name: 'blacklight-core', dir: File.join(File.expand_path(File.dirname(__FILE__)), "solr", "conf")) do
+      Rake::Task["blacklight_marc:fixtures"].invoke
+      Rake::Task['spec'].invoke
+    end
   end
-  raise "test failures: #{error}" if error
 end
 
 
 namespace :blacklight_marc do
 
   desc "Load fixtures"
-  task :fixtures => [:generate] do
+  task :fixtures => ['engine_cart:generate'] do
     within_test_app do
       system "bundle exec rake solr:marc:index_test_data RAILS_ENV=test"
       abort "Error running fixtures" unless $?.success?
     end
   end
-
-  desc "Clean out the test rails app"
-  task :clean => ['jetty:clean'] do
-  end
-
-  desc "Create the test rails app"
-  task :generate => ['engine_cart:generate'] do
-  end
 end

data/blacklight-marc.gemspec

@@ -18,16 +18,7 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_dependency 'blacklight', '~> 6.1'
-
-  spec.add_development_dependency "bundler", "~> 1.3"
-  spec.add_development_dependency "rake"
-  spec.add_development_dependency "rspec-rails", '~> 3.0'
-  spec.add_development_dependency "rspec-activemodel-mocks"
-  spec.add_development_dependency "jettywrapper"
-  spec.add_development_dependency "capybara"
-  spec.add_development_dependency "engine_cart", "~> 0.8"
-
+  spec.add_dependency 'blacklight', '> 6.1', '< 8.a'
   spec.add_dependency "library_stdnums"
   spec.add_dependency "rails"
   # Let's allow future versions of marc, count on
@@ -35,4 +26,14 @@ Gem::Specification.new do |spec|
   spec.add_dependency "marc",      ">= 0.4.3", "< 1.1"  # Marc record parser.
   spec.add_dependency "traject", "~>2.1"
   spec.add_dependency 'marc-fastxmlwriter' # NO REXML
+
+  spec.add_development_dependency "bundler", "~> 1.3"
+  spec.add_development_dependency "rake"
+  spec.add_development_dependency "rspec-rails", '~> 3.0'
+  spec.add_development_dependency "rspec-activemodel-mocks"
+  spec.add_development_dependency "solr_wrapper"
+  spec.add_development_dependency "capybara"
+  spec.add_development_dependency "coveralls"
+  spec.add_development_dependency "simplecov"
+  spec.add_development_dependency "engine_cart", "~> 1.0"
 end

data/lib/blacklight/marc/version.rb

@@ -1,5 +1,5 @@
 module Blacklight
   module Marc
-    VERSION = '6.1.0'
+    VERSION = '6.1.1'
   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"