activefedora-aggregation 0.8.1 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 031bef619d22d1ec3213adf373c87d88cdf8d3fe
-  data.tar.gz: 5bca5027dfaba99cd2fd5cd12bd88d652011351b
+  metadata.gz: 1bb8da4f1630029337549d9975113e80a7882d7a
+  data.tar.gz: da0dc596fba4be563217e0eba4b066c9230bfdae
 SHA512:
-  metadata.gz: 1c364682160e0e65964868af415481c339a48930f69a0f579b432ece3bdecc0c2d264976bff1686a05a23ab885e2ab04ce98a2c9a7ed58893d00640ee89b7625
-  data.tar.gz: cecb2ee08d6d81d7f641ca0f7f3e204926e699ef57f3c31a909551889c574aed667df3de25984762768e8db508bdeb4708f802e9cc91d00f3b6665b3da5d468a
+  metadata.gz: a1760935368d3699da0320d8e768f653ca31434f59df34d7e5a6377d0994b38adfc02d101839e31219f21fc83263164a705b63acc24efc8a9d6e4286e999f280
+  data.tar.gz: 8a6e54cb29ba1821be04b8d4c9f63684a8133bcce86fd3182a81b0c3e89691e40e16888a85b934b257f38f12d74e65b50d75d717708271b8f86280a473c4b21b

data/.gitignore

@@ -9,3 +9,5 @@
 /tmp/
 /jetty
 logfile.log
+fcrepo4-data/
+fcrepo4-test-data/

data/Gemfile

@@ -3,4 +3,3 @@ source 'https://rubygems.org'
 # Specify your gem's dependencies in activefedora-aggregation.gemspec
 gemspec
 gem 'byebug' unless ENV['CI']
-gem 'active-fedora', github: "projecthydra/active_fedora"

data/README.md

@@ -15,7 +15,7 @@ end
 
 generic_file1 = GenericFile.create(id: 'file1')
 generic_file2 = GenericFile.create(id: 'file2')
-generic_file3 = GenericFile.create(id: 'file2')
+generic_file3 = GenericFile.create(id: 'file3')
 
 class Image < ActiveFedora::Base
   ordered_aggregation :generic_files, through: :list_source
@@ -25,20 +25,21 @@ image = Image.create(id: 'my_image')
 image.ordered_generic_file_proxies.append_target generic_file2
 image.ordered_generic_file_proxies.append_target generic_file1
 image.save
-image.generic_files # => [generic_file2, generic_file]
-image.ordered_generic_files # => [generic_file2, generic_file]
+image.generic_files # => [#<GenericFile id: "file2">, #<GenericFile id: "file1">]
+image.ordered_generic_files.to_a # => [#<GenericFile id: "file2">, #<GenericFile id: "file1">]
 
 # Not all generic files must be ordered.
 image.generic_files += [generic_file3]
-image.generic_files # => [generic_file2, generic_file, generic_file3]
-image.ordered_generic_files # => [generic_file2, generic_file]
+image.generic_files => [#<GenericFile id: "file2">, #<GenericFile id: "file1">, #<GenericFile id: "file3">]
+image.ordered_generic_files.to_a => [#<GenericFile id: "file2">, #<GenericFile id: "file1">]
 
 # non-ordered accessor is not ordered.
-image.ordered_generic_file_proxies.insert_at(0, generic_file3)
-image.generic_files # => [generic_file2, generic_file, generic_file3]
-image.ordered_generic_files # => [generic_file3, generic_file2, generic_file]
+image.ordered_generic_file_proxies.insert_target_at(0, generic_file3)
+image.generic_files # => [#<GenericFile id: "file2">, #<GenericFile id: "file1">, #<GenericFile id: "file3">]
+image.ordered_generic_files.to_a # => [#<GenericFile id: "file3">, #<GenericFile id: "file2">, #<GenericFile id: "file1">] 
 
 # Deletions
-image.ordered_generic_file_proxies.delete_at(1)
-image.ordered_generic_files # => [generic_file3, generic_file]
+image.ordered_generic_file_proxies.delete_at(1) => #<GenericFile id: "file2">
+image.ordered_generic_files.to_a # => [#<GenericFile id: "file3">, #<GenericFile id: "file1">]
+image.generic_files # => [#<GenericFile id: "file2">, #<GenericFile id: "file1">, #<GenericFile id: "file3">]
 ```

data/Rakefile

@@ -3,21 +3,18 @@ require "bundler/gem_tasks"
 
 require 'rspec/core'
 require 'rspec/core/rake_task'
-RSpec::Core::RakeTask.new(:spec)
+RSpec::Core::RakeTask.new(:spec) do |spec|
+  spec.rspec_opts = '--backtrace'
+end
 
-require 'jettywrapper'
-Jettywrapper.hydra_jetty_version = "v8.3.1"
+require 'solr_wrapper/rake_task'
+require 'fcrepo_wrapper'
+require 'active_fedora/rake_support'
 
-desc 'Spin up hydra-jetty and run specs'
-task ci: ['jetty:clean'] do
-  puts 'running continuous integration'
-  jetty_params = Jettywrapper.load_config
-  jetty_params[:startup_wait]= 90
-  error = Jettywrapper.wrap(jetty_params) do
+desc 'Start Fedora and Solr and run specs'
+task :ci do
+  with_test_server do
     Rake::Task['spec'].invoke
   end
-  raise "test failures: #{error}" if error
 end
-
-
 task default: :ci

data/activefedora-aggregation.gemspec

@@ -17,7 +17,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency 'activesupport'
-  spec.add_dependency 'active-fedora', '~> 9.5'
+  spec.add_dependency 'active-fedora', '~> 9.9.0'
   spec.add_dependency 'rdf-vocab', '~> 0.8.1'
   # Avoid RDF 1.1.17 because of a bug from ruby 2.2
   # https://github.com/ruby-rdf/rdf/pull/213
@@ -26,6 +26,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler", "~> 1.8"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec", "~> 3.2"
-  spec.add_development_dependency "jettywrapper"
   spec.add_development_dependency "pry-byebug"
+  spec.add_development_dependency "solr_wrapper", "~> 0.4"
+  spec.add_development_dependency 'fcrepo_wrapper', '~> 0.2'
 end

data/circle.yml

@@ -1,11 +1,11 @@
 machine:
   ruby:
     version: 2.2.0
+  java:
+    version: oraclejdk8
 dependencies:
   pre:
     - gem install bundler
-  post:
-    - bundle exec rake jetty:clean
-    - cd jetty && java -Djetty.port=8983 -Dsolr.solr.home=/home/ubuntu/activefedora-aggregation/jetty/solr -XX:MaxPermSize=128m -Xmx256m -jar start.jar:
-        background: true
-    - bin/jetty_wait
+test:
+  override:
+    - bundle exec rake

data/lib/active_fedora/aggregation/version.rb

@@ -1,5 +1,5 @@
 module ActiveFedora
   module Aggregation
-    VERSION = "0.8.1"
+    VERSION = "0.9.0"
   end
 end

data/lib/active_fedora/orders/builder.rb

@@ -22,10 +22,35 @@ module ActiveFedora::Orders
       super
     end
 
+    module FixFirstLast
+      def save(*args)
+        super.tap do |result|
+          if result
+            apply_first_and_last
+          end
+        end
+      end
+      def save!(*args)
+        super.tap do |result|
+          if result
+            apply_first_and_last
+          end
+        end
+      end
+    end
+
     def build
-      super.tap do
+      super.tap do |result|
         model.property :head, predicate: ::RDF::Vocab::IANA['first']
         model.property :tail, predicate: ::RDF::Vocab::IANA.last
+        model.send(:define_method, :apply_first_and_last) do
+          source = send(result.options[:through])
+          return if head.map(&:rdf_subject) == source.head_id && tail.map(&:rdf_subject) == source.tail_id
+          self.head = source.head_id
+          self.tail = source.tail_id
+          save! if changed?
+        end
+        model.include ActiveFedora::Orders::Builder::FixFirstLast
       end
     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"