valkyrie 0.1.0 → 1.0.0.rc1

data/solr/solr.xml

@@ -0,0 +1,35 @@
+<?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.
+-->
+
+<!--
+ All (relative) paths are relative to the installation path
+  
+  persistent: Save changes made via the API to this file
+  sharedLib: path to a lib directory that will be shared across all cores
+-->
+<solr persistent="false" sharedLib="lib">
+
+  <!--
+  adminPath: RequestHandler path to manage cores.  
+    If 'null' (or absent), cores will not be manageable via REST
+  -->
+  <cores adminPath="/admin/cores" defaultCoreName="development">
+    <core name="development" instanceDir="development-core" />
+    <core name="test" instanceDir="test-core" />
+  </cores>
+</solr>

data/tasks/dev.rake

@@ -0,0 +1,66 @@
+# frozen_string_literal: true
+
+namespace :server do
+  desc "Start solr and fedora servers for testing"
+  task :test do
+    require 'solr_wrapper'
+    require 'fcrepo_wrapper'
+    SolrWrapper.wrap(shared_solr_opts.merge(port: 8984, instance_dir: 'tmp/blacklight-core-test')) do |solr|
+      solr.with_collection(name: "blacklight-core-test", dir: Pathname.new(__dir__).join("..", "solr", "config").to_s) do
+        SolrWrapper.wrap(shared_solr_opts.merge(port: 8985, instance_dir: 'tmp/hydra-test')) do |solr2|
+          solr2.with_collection(name: "hydra-test", dir: Pathname.new(__dir__).join("..", "solr", "config").to_s) do
+            FcrepoWrapper.wrap(shared_fedora_opts.merge(port: 8988, fcrepo_home_dir: "tmp/fcrepo4-test-data")) do |_fcrepo|
+              puts "Setup two solr servers & Fedora"
+              loop do
+                sleep(1)
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+
+  desc "Cleanup test servers"
+  task :clean_test do
+    require 'solr_wrapper'
+    require 'fcrepo_wrapper'
+    SolrWrapper.instance(shared_solr_opts.merge(port: 8984, instance_dir: 'tmp/blacklight-core-test')).remove_instance_dir!
+    SolrWrapper.instance(shared_solr_opts.merge(port: 8985, instance_dir: 'tmp/hydra-test')).remove_instance_dir!
+    FcrepoWrapper.default_instance(shared_fedora_opts.merge(port: 8988, fcrepo_home_dir: "tmp/fcrepo4-test-data")).remove_instance_dir!
+    puts "Cleaned up test solr & fedora servers."
+  end
+
+  desc "Start solr and fedora servers for development"
+  task :development do
+    require 'solr_wrapper'
+    require 'fcrepo_wrapper'
+
+    SolrWrapper.wrap(shared_solr_opts.merge(port: 8983, instance_dir: 'tmp/blacklight-core')) do |solr|
+      solr.with_collection(name: "blacklight-core", dir: Pathname.new(__dir__).join("..", "solr", "config").to_s) do
+        SolrWrapper.wrap(shared_solr_opts.merge(port: 8987, instance_dir: 'tmp/hydra-dev')) do |solr2|
+          solr2.with_collection(name: "hydra-dev", dir: Pathname.new(__dir__).join("..", "solr", "config").to_s) do
+            FcrepoWrapper.wrap(shared_fedora_opts.merge(port: 8986, fcrepo_home_dir: "fcrepo4-dev-data")) do |_fcrepo|
+              puts "Setup two solr servers & Fedora"
+              loop do
+                sleep(1)
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+
+  def shared_solr_opts
+    opts = { managed: true, verbose: true, persist: false, download_dir: "tmp" }
+    opts[:version] = ENV['SOLR_VERSION'] if ENV['SOLR_VERSION']
+    opts
+  end
+
+  def shared_fedora_opts
+    opts = { managed: true, verbose: true, enable_jms: false, download_dir: "tmp" }
+    opts[:version] = ENV['FCREPO_VERSION'] if ENV['FCREPO_VERSION']
+    opts
+  end
+end

data/valkyrie.gemspec

@@ -27,15 +27,15 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'active-fedora'
   spec.add_dependency 'activesupport'
   spec.add_dependency 'activerecord'
+  spec.add_dependency 'railties' # To use generators and engines
   spec.add_dependency 'reform'
   spec.add_dependency 'reform-rails'
-  spec.add_dependency 'pg'
+  # pg 1.0 is not compatable with Rails 5 yet.
+  # https://stackoverflow.com/a/48201362
+  spec.add_dependency 'pg', '< 1.0'
   spec.add_dependency 'json-ld'
   spec.add_dependency 'json'
   spec.add_dependency 'active-triples'
-  spec.add_dependency 'hydra-access-controls'
-  spec.add_dependency 'hydra-derivatives'
-  spec.add_dependency 'ruby_tika_app'
 
   spec.add_development_dependency "bundler", "~> 1.13"
   spec.add_development_dependency "rake", "~> 10.0"
@@ -46,7 +46,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "simplecov"
   spec.add_development_dependency "coveralls"
   spec.add_development_dependency "bixby"
-  spec.add_development_dependency 'rubocop', '~> 0.48.0'
-  spec.add_development_dependency 'rubocop-rails'
   spec.add_development_dependency 'yard'
+  spec.add_development_dependency 'solr_wrapper'
+  spec.add_development_dependency 'fcrepo_wrapper'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: valkyrie
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 1.0.0.rc1
 platform: ruby
 authors:
 - Trey Pendragon
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-09-26 00:00:00.000000000 Z
+date: 2018-03-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dry-struct
@@ -123,35 +123,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: reform
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: reform-rails
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: pg
+  name: railties
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -165,7 +137,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: json-ld
+  name: reform
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -179,7 +151,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: json
+  name: reform-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -193,21 +165,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: active-triples
+  name: pg
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
-  name: hydra-access-controls
+  name: json-ld
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -221,7 +193,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: hydra-derivatives
+  name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -235,7 +207,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: ruby_tika_app
+  name: active-triples
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -375,21 +347,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rubocop
+  name: yard
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.48.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.48.0
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: rubocop-rails
+  name: solr_wrapper
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -403,7 +375,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: yard
+  name: fcrepo_wrapper
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -423,20 +395,32 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".ctags"
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"
+- ".rubocop_todo.yml"
+- CHANGELOG.md
 - Gemfile
+- LICENSE
 - README.md
 - Rakefile
 - bin/console
+- bin/jetty_wait
+- bin/rspec
 - bin/setup
+- browserslist
+- circle.yml
+- config/fedora.yml
 - config/valkyrie.yml
 - db/config.yml
 - db/migrate/20160111215816_enable_uuid_extension.rb
 - db/migrate/20161007101725_create_orm_resources.rb
 - db/migrate/20170124135846_add_model_type_to_orm_resources.rb
 - db/migrate/20170531004548_change_model_type_to_internal_model.rb
+- db/migrate/20171011224121_create_path_gin_index.rb
+- db/migrate/20171204224121_create_internal_resource_index.rb
+- db/migrate/20180212092225_create_updated_at_index.rb
 - db/schema.rb
 - db/seeds.rb
 - lib/config/database_connection.rb
@@ -446,25 +430,21 @@ files:
 - lib/valkyrie.rb
 - lib/valkyrie/adapter_container.rb
 - lib/valkyrie/change_set.rb
-- lib/valkyrie/decorators/decorator_list.rb
-- lib/valkyrie/decorators/decorator_with_arguments.rb
-- lib/valkyrie/derivative_service.rb
 - lib/valkyrie/engine.rb
-- lib/valkyrie/file_characterization_service.rb
 - lib/valkyrie/id.rb
 - lib/valkyrie/indexers/access_controls_indexer.rb
-- lib/valkyrie/local_file_service.rb
 - lib/valkyrie/metadata_adapter.rb
-- lib/valkyrie/persist_derivatives.rb
 - lib/valkyrie/persistence.rb
 - lib/valkyrie/persistence/buffered_persister.rb
 - lib/valkyrie/persistence/composite_persister.rb
+- lib/valkyrie/persistence/custom_query_container.rb
 - lib/valkyrie/persistence/delete_tracking_buffer.rb
 - lib/valkyrie/persistence/fedora.rb
 - lib/valkyrie/persistence/fedora/list_node.rb
 - lib/valkyrie/persistence/fedora/metadata_adapter.rb
 - lib/valkyrie/persistence/fedora/ordered_list.rb
 - lib/valkyrie/persistence/fedora/ordered_reader.rb
+- lib/valkyrie/persistence/fedora/permissive_schema.rb
 - lib/valkyrie/persistence/fedora/persister.rb
 - lib/valkyrie/persistence/fedora/persister/model_converter.rb
 - lib/valkyrie/persistence/fedora/persister/orm_converter.rb
@@ -480,14 +460,11 @@ files:
 - lib/valkyrie/persistence/postgres/orm/resource.rb
 - lib/valkyrie/persistence/postgres/orm_converter.rb
 - lib/valkyrie/persistence/postgres/persister.rb
-- lib/valkyrie/persistence/postgres/queries.rb
-- lib/valkyrie/persistence/postgres/queries/find_inverse_references_query.rb
-- lib/valkyrie/persistence/postgres/queries/find_members_query.rb
-- lib/valkyrie/persistence/postgres/queries/find_references_query.rb
 - lib/valkyrie/persistence/postgres/query_service.rb
 - lib/valkyrie/persistence/postgres/resource_converter.rb
 - lib/valkyrie/persistence/postgres/resource_factory.rb
 - lib/valkyrie/persistence/solr.rb
+- lib/valkyrie/persistence/solr/composite_indexer.rb
 - lib/valkyrie/persistence/solr/metadata_adapter.rb
 - lib/valkyrie/persistence/solr/model_converter.rb
 - lib/valkyrie/persistence/solr/orm_converter.rb
@@ -497,6 +474,7 @@ files:
 - lib/valkyrie/persistence/solr/queries/find_all_query.rb
 - lib/valkyrie/persistence/solr/queries/find_by_id_query.rb
 - lib/valkyrie/persistence/solr/queries/find_inverse_references_query.rb
+- lib/valkyrie/persistence/solr/queries/find_many_by_ids_query.rb
 - lib/valkyrie/persistence/solr/queries/find_members_query.rb
 - lib/valkyrie/persistence/solr/queries/find_references_query.rb
 - lib/valkyrie/persistence/solr/query_service.rb
@@ -506,10 +484,9 @@ files:
 - lib/valkyrie/resource.rb
 - lib/valkyrie/resource/access_controls.rb
 - lib/valkyrie/specs/shared_specs.rb
+- lib/valkyrie/specs/shared_specs/change_set.rb
 - lib/valkyrie/specs/shared_specs/change_set_persister.rb
-- lib/valkyrie/specs/shared_specs/derivative_service.rb
 - lib/valkyrie/specs/shared_specs/file.rb
-- lib/valkyrie/specs/shared_specs/file_characterization_service.rb
 - lib/valkyrie/specs/shared_specs/metadata_adapter.rb
 - lib/valkyrie/specs/shared_specs/persister.rb
 - lib/valkyrie/specs/shared_specs/queries.rb
@@ -524,6 +501,24 @@ files:
 - lib/valkyrie/value_mapper.rb
 - lib/valkyrie/version.rb
 - lib/valkyrie/vocab/pcdm_use.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
+- solr/solr.xml
+- tasks/dev.rake
 - valkyrie.gemspec
 homepage: 
 licenses: []
@@ -539,12 +534,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.7.4
 signing_key: 
 specification_version: 4
 summary: An ORM using the Data Mapper pattern, specifically built to solve Digital

data/lib/valkyrie/decorators/decorator_list.rb

@@ -1,15 +0,0 @@
-# frozen_string_literal: true
-module Valkyrie::Decorators
-  class DecoratorList
-    attr_reader :decorators
-    def initialize(*decorators)
-      @decorators = decorators
-    end
-
-    def new(undecorated_object)
-      decorators.inject(undecorated_object) do |obj, decorator|
-        decorator.new(obj)
-      end
-    end
-  end
-end

data/lib/valkyrie/decorators/decorator_with_arguments.rb

@@ -1,14 +0,0 @@
-# frozen_string_literal: true
-module Valkyrie::Decorators
-  class DecoratorWithArguments
-    attr_reader :decorator, :args
-    def initialize(decorator, *args)
-      @decorator = decorator
-      @args = args
-    end
-
-    def new(item)
-      decorator.new(item, *args)
-    end
-  end
-end