active-fedora 10.2.0 → 10.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: edd51836aa6c45e18a108d020753474a74b39a8a
-  data.tar.gz: 467181b690984218af00de00f2d0644e6d059601
+  metadata.gz: b0865a25cb33a8637e784833e483cafe3a140abe
+  data.tar.gz: 4f6be2a95c6c218e7fdc9f16b2900d25fe70e0fc
 SHA512:
-  metadata.gz: 9b8c013c28881485042b14d79d37ec2123fcc8e2647ede3fe9c99875afc3d02dbc1e797405c1b355f271c480e3303f6790df3f8f494cafc068aa25d19a59f46b
-  data.tar.gz: 8e8ea6f566fcc5f4067be91e28f5d4e594a711a623dae5364445cc52f3fdc017063e8f568f2d53a62e740f2856633fabf52b50a09df1ca3b7f8439d44d844b8c
+  metadata.gz: 454d2287261b2ed2a079ac1cd00fda8a3819d14144e098bd7ca040d28ea0be75406b1776387caee11905d5baf8f3e44b37ec55adcfa8762e95f0686ff4f75155
+  data.tar.gz: 1ad38bebb3535219889f3fad29f375ccbbfe29ad746408d0500c12d8d89d0ac6b73bf98eaff5c150419271bf2f6b49bc14959faa2a5958d14c15e7898043cff0

data/.solr_wrapper

@@ -0,0 +1,6 @@
+# Place any default configuration for solr_wrapper here
+# version: 6.1.0
+port: 8985
+collection:
+  dir: lib/generators/active_fedora/config/solr/templates/solr/config/
+  name: hydra-test

data/README.md

@@ -75,11 +75,9 @@ rake active_fedora:ci
 If you want to run the tests manually, follow these instructions:
 
 ```bash
-solr_wrapper -d solr/config/ --collection_name hydra-test
+solr_wrapper
 ```
 
-You can switch `hydra-test` to `hydra-dev` if you want to create a collection for development.
-
 To start FCRepo, open another shell and run:
 
 ```bash

data/lib/active_fedora/rake_support.rb

@@ -21,7 +21,7 @@ def with_server(environment)
     unless Dir.exist?(solr_config_path)
       $stderr.puts "Solr configuration not found at #{solr_config_path}. Using ActiveFedora defaults"
       # Otherwise use the configs delivered with ActiveFedora.
-      solr_config_path = File.join(File.expand_path("../..", File.dirname(__FILE__)), "solr", "config")
+      solr_config_path = File.join(File.expand_path("../..", File.dirname(__FILE__)), 'lib', 'generators', 'active_fedora', 'config', 'solr', 'templates', 'solr', 'config')
     end
     solr.with_collection(name: "hydra-#{environment}", dir: solr_config_path) do
       FcrepoWrapper.wrap(load_config(:fcrepo, environment, fcrepo_defaults)) do |fcrepo|

data/lib/active_fedora/version.rb

@@ -1,3 +1,3 @@
 module ActiveFedora
-  VERSION = "10.2.0".freeze
+  VERSION = "10.2.1".freeze
 end

data/lib/generators/active_fedora/config/solr/templates/solr/config/solrconfig.xml

@@ -187,6 +187,17 @@
     </lst>
   </requestHandler>
 
+  <searchComponent name="termsComponent" class="solr.TermsComponent" />
+
+  <requestHandler name="/terms" class="solr.SearchHandler">
+    <lst name="defaults">
+      <bool name="terms">true</bool>
+    </lst>
+    <arr name="components">
+      <str>termsComponent</str>
+    </arr>
+  </requestHandler>
+
 <!-- Spell Check
 
         The spell check component can return a list of alternative spelling

data/lib/generators/active_fedora/config/solr/templates/solr_wrapper_test.yml

@@ -1,5 +1,5 @@
 #config/solr_wrapper_test.yml
-# version: 6.0.0
+# version: 6.1.0
 port: 8985
 instance_dir: tmp/solr-test
 collection:

data/spec/integration/generators/solr_generator_spec.rb

@@ -9,17 +9,14 @@ describe ActiveFedora::Config::SolrGenerator do
       '.solr_wrapper'
     ]}
 
-    before do
-      generator.solr_wrapper_config
-    end
-
-    after do
-      files_to_test.each { |file| File.delete(file) if File.exist?(file) }
-    end
-
     it "creates config files" do
-      files_to_test.each do |file|
-        expect(File).to exist(file), "Expected #{file} to exist"
+      Dir.mktmpdir do |dir|
+        Dir.chdir(dir) do
+          generator.solr_wrapper_config
+          files_to_test.each do |file|
+            expect(File).to exist(file), "Expected #{file} to exist"
+          end
+        end
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active-fedora
 version: !ruby/object:Gem::Version
-  version: 10.2.0
+  version: 10.2.1
 platform: ruby
 authors:
 - Matt Zumwalt
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-10 00:00:00.000000000 Z
+date: 2016-08-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rsolr
@@ -353,6 +353,7 @@ files:
 - ".mailmap"
 - ".rspec"
 - ".rubocop.yml"
+- ".solr_wrapper"
 - ".travis.yml"
 - CONTRIBUTING.md
 - CONTRIBUTORS.md
@@ -580,22 +581,6 @@ files:
 - script/console
 - script/destroy
 - script/generate
-- 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/config_helper.rb
 - spec/fixtures/damsObjectModel.xml
 - spec/fixtures/dino.jpg
@@ -768,4 +753,3 @@ signing_key:
 specification_version: 4
 summary: A convenience libary for manipulating documents in the Fedora Repository.
 test_files: []
-has_rdoc: 

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"