hyrax 3.0.0.pre.beta1 → 3.0.0.pre.beta2

data/spec/wings/valkyrie/metadata_adapter_spec.rb

@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+require 'spec_helper'
+require 'valkyrie/specs/shared_specs'
+require 'wings'
+
+RSpec.describe Wings::Valkyrie::MetadataAdapter do
+  let(:adapter) { described_class.new }
+
+  it_behaves_like "a Valkyrie::MetadataAdapter"
+end

data/spec/wings/valkyrie/persister_spec.rb

@@ -0,0 +1,71 @@
+# frozen_string_literal: true
+require 'spec_helper'
+require 'valkyrie/specs/shared_specs'
+require 'wings'
+
+RSpec.describe Wings::Valkyrie::Persister do
+  before do
+    class Book < ActiveFedora::Base
+      property :title, predicate: ::RDF::Vocab::DC.title, multiple: true
+    end
+  end
+
+  after do
+    Object.send(:remove_const, :Book)
+  end
+
+  subject(:persister) { described_class.new(adapter: adapter) }
+  let(:adapter) { Wings::Valkyrie::MetadataAdapter.new }
+  let(:query_service) { adapter.query_service }
+  let(:af_resource_class) { Book }
+  let(:resource_class) { Wings::ModelTransformer.to_valkyrie_resource_class(klass: af_resource_class) }
+  let(:resource) { resource_class.new(title: ['Foo']) }
+
+  # it_behaves_like "a Valkyrie::Persister"
+
+  it { is_expected.to respond_to(:save).with_keywords(:resource) }
+  xit { is_expected.to respond_to(:save_all).with_keywords(:resources) }
+  xit { is_expected.to respond_to(:delete).with_keywords(:resource) }
+
+  it "can save a resource" do
+    expect(resource).not_to be_persisted
+    saved = persister.save(resource: resource)
+    # expect(saved).to be_persisted
+    expect(saved.id).not_to be_blank
+  end
+
+  xit "stores created_at/updated_at" do
+    book = persister.save(resource: resource)
+    book.title = ["test"]
+    book = persister.save(resource: book)
+    expect(book.created_at).not_to be_blank
+    expect(book.updated_at).not_to be_blank
+    expect(book.created_at).not_to be_kind_of Array
+    expect(book.updated_at).not_to be_kind_of Array
+    expect(book.updated_at > book.created_at).to eq true
+  end
+
+  xit "can override default id generation with a provided id" do
+    id = SecureRandom.uuid
+    book = persister.save(resource: resource_class.new(id: id, title: ['Foo']))
+    reloaded = query_service.find_by(id: book.id)
+    expect(reloaded.id).to eq Valkyrie::ID.new(id)
+    expect(reloaded).to be_persisted
+    expect(reloaded.created_at).not_to be_blank
+    expect(reloaded.updated_at).not_to be_blank
+    expect(reloaded.created_at).not_to be_kind_of Array
+    expect(reloaded.updated_at).not_to be_kind_of Array
+  end
+
+  it "doesn't override a resource that already has an ID" do
+    book = persister.save(resource: resource_class.new(title: ['Foo']))
+    id = book.id
+    output = persister.save(resource: book)
+    expect(output.id).to eq id
+  end
+
+  it "can find that resource again" do
+    id = persister.save(resource: resource).id
+    expect(query_service.find_by(id: id).internal_resource).to eq resource.internal_resource
+  end
+end

data/spec/wings/valkyrie/query_service_spec.rb

@@ -0,0 +1,81 @@
+# frozen_string_literal: true
+require 'spec_helper'
+require 'valkyrie/specs/shared_specs'
+require 'wings'
+
+RSpec.describe Wings::Valkyrie::QueryService do
+  before do
+    class Book < ActiveFedora::Base
+      property :title, predicate: ::RDF::Vocab::DC.title, multiple: true
+    end
+  end
+
+  after do
+    Object.send(:remove_const, :Book)
+  end
+
+  subject(:query_service) { described_class.new(adapter: adapter) }
+  let(:adapter) { Wings::Valkyrie::MetadataAdapter.new }
+  let(:persister) { Wings::Valkyrie::Persister.new(adapter: adapter) }
+  let(:af_resource_class) { Book }
+  let(:resource_class) { Wings::ModelTransformer.to_valkyrie_resource_class(klass: af_resource_class) }
+  let(:resource) { resource_class.new(title: ['Foo']) }
+
+  # it_behaves_like "a Valkyrie query provider"
+
+  it 'responds to expected methods' do
+    expect(subject).to respond_to(:find_by).with_keywords(:id)
+    expect(subject).to respond_to(:resource_factory)
+  end
+
+  describe ".find_by" do
+    it "returns a resource by id or string representation of an id" do
+      book = persister.save(resource: resource)
+
+      found = query_service.find_by(id: book.id)
+      expect(found.id).to eq book.id
+      # expect(found).to be_persisted
+
+      found = query_service.find_by(id: book.id.to_s)
+      expect(found.id).to eq book.id
+      # expect(found).to be_persisted
+    end
+
+    it "returns a Valkyrie::Persistence::ObjectNotFoundError for a non-found ID" do
+      expect { query_service.find_by(id: ::Valkyrie::ID.new("123123123")) }.to raise_error ::Valkyrie::Persistence::ObjectNotFoundError
+    end
+
+    it 'raises an error if the id is not a Valkyrie::ID or a string' do
+      expect { query_service.find_by(id: 123) }.to raise_error ArgumentError
+    end
+  end
+
+  describe ".register_query_handler" do
+    before do
+      class QueryHandler
+        def self.queries
+          [:find_by_user_id]
+        end
+
+        attr_reader :query_service
+        def initialize(query_service:)
+          @query_service = query_service
+        end
+
+        def find_by_user_id
+          1
+        end
+      end
+    end
+
+    after do
+      Object.send(:remove_const, :QueryHandler)
+    end
+
+    it "can register a query handler" do
+      query_service.custom_queries.register_query_handler(QueryHandler)
+      expect(query_service.custom_queries).to respond_to :find_by_user_id
+      expect(query_service.custom_queries.find_by_user_id).to eq 1
+    end
+  end
+end

data/spec/wings/valkyrie/resource_factory_spec.rb

@@ -0,0 +1,32 @@
+# frozen_string_literal: true
+require 'spec_helper'
+require 'wings'
+
+RSpec.describe Wings::Valkyrie::ResourceFactory do
+  subject(:factory) { described_class.new(adapter: adapter) }
+  let(:adapter)     { Valkyrie::Persistence::Memory::MetadataAdapter.new }
+  let(:work)        { GenericWork.new }
+
+  describe '#to_resource' do
+    it 'returns a valkyrie_resource for the object' do
+      expect(factory.to_resource(object: work)).to be_a Valkyrie::Resource
+    end
+  end
+
+  describe '#from_resource' do
+    let(:resource) { work.valkyrie_resource }
+
+    it 'returns an ActiveFedora object' do
+      expect(factory.from_resource(resource: resource)).to be_a GenericWork
+    end
+
+    context 'with a FileSet' do
+      let(:resource) { file_set.valkyrie_resource }
+      let(:file_set) { FileSet.new }
+
+      it 'returns an ActiveFedora object' do
+        expect(factory.from_resource(resource: resource)).to be_a FileSet
+      end
+    end
+  end
+end

data/spec/wings/value_mapper_spec.rb

@@ -0,0 +1,60 @@
+# frozen_string_literal: true
+require 'spec_helper'
+require 'wings/value_mapper'
+
+RSpec.describe Wings::ValueMapper do
+  subject(:mapper) { described_class.for(value) }
+  let(:value)      { 'a value' }
+  let(:uri)        { RDF::URI('http://example.com/moomin') }
+
+  describe '.for' do
+    it 'returns a value mapper' do
+      expect(described_class.for(value)).to be_a described_class
+    end
+  end
+
+  describe '.result' do
+    it 'returns the value by default' do
+      expect(mapper.result).to eq value
+    end
+
+    context 'with an ActiveTriples::RDFSource URI value' do
+      let(:value) { ActiveTriples::Resource.new(uri) }
+
+      it 'casts to the RDF term' do
+        expect(mapper.result).to eq uri
+      end
+    end
+
+    context 'with an ActiveTriples::RDFSource bnode value' do
+      let(:value) { ActiveTriples::Resource.new(node) }
+      let(:node)  { RDF::Node.new }
+
+      it 'somehow manages to map the node?'
+    end
+
+    context 'with an ActiveTriples::Relation value' do
+      let(:value)       { work.source }
+      let(:work)        { GenericWork.new(source: cast_values) }
+      let(:cast_values) { ['moomin', 1.125, :moomin, Time.now.utc, false, uri] }
+
+      it 'casts internal values' do
+        expect(mapper.result).to contain_exactly(*cast_values)
+      end
+    end
+
+    context 'with a URI value'
+    context 'with a blank node value'
+    context 'with a boolean value'
+    context 'with a date value'
+    context 'with a numeric value'
+
+    context 'with an enumerable value' do
+      let(:value) { ['a value'] }
+
+      it 'maps internal values' do
+        expect(mapper.result).to eq value
+      end
+    end
+  end
+end

data/spec/wings_spec.rb

@@ -0,0 +1,8 @@
+require 'spec_helper'
+require 'wings'
+
+RSpec.describe Wings do
+  it 'adds mixin to AF::Base' do
+    expect(GenericWork.new).to respond_to :valkyrie_resource
+  end
+end

data/template.rb

@@ -1,4 +1,6 @@
-gem 'hyrax', '3.0.0-beta1'
+# Hack for https://github.com/rails/rails/issues/35153
+gsub_file 'Gemfile', /^gem ["']sqlite3["']$/, 'gem "sqlite3", "~> 1.3.0"'
+gem 'hyrax', '3.0.0-beta2'
 run 'bundle install'
 generate 'hyrax:install', '-f'
 rails_command 'db:migrate'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hyrax
 version: !ruby/object:Gem::Version
-  version: 3.0.0.pre.beta1
+  version: 3.0.0.pre.beta2
 platform: ruby
 authors:
 - Justin Coyne
@@ -14,7 +14,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-15 00:00:00.000000000 Z
+date: 2019-03-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -36,20 +36,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '11.5'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 11.5.2
+        version: '12.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '11.5'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 11.5.2
+        version: '12.0'
 - !ruby/object:Gem::Dependency
   name: almond-rails
   requirement: !ruby/object:Gem::Requirement
@@ -182,14 +176,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '0.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '0.4'
 - !ruby/object:Gem::Dependency
   name: dry-transaction
   requirement: !ruby/object:Gem::Requirement
@@ -300,14 +294,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 10.5.0
+        version: 10.6.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 10.5.0
+        version: 10.6.1
 - !ruby/object:Gem::Dependency
   name: hydra-works
   requirement: !ruby/object:Gem::Requirement
@@ -554,16 +548,22 @@ dependencies:
   name: qa
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '2'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '2'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '4'
 - !ruby/object:Gem::Dependency
   name: rails_autolink
   requirement: !ruby/object:Gem::Requirement
@@ -696,6 +696,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '4.1'
+- !ruby/object:Gem::Dependency
+  name: valkyrie
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.0.0.pre.rc3
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.0.0.pre.rc3
 - !ruby/object:Gem::Dependency
   name: capybara
   requirement: !ruby/object:Gem::Requirement
@@ -730,6 +744,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.3.0
+- !ruby/object:Gem::Dependency
+  name: chromedriver-helper
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.1'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.1'
 - !ruby/object:Gem::Dependency
   name: database_cleaner
   requirement: !ruby/object:Gem::Requirement
@@ -750,14 +778,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '2.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '2.2'
 - !ruby/object:Gem::Dependency
   name: equivalent-xml
   requirement: !ruby/object:Gem::Requirement
@@ -1054,20 +1082,6 @@ dependencies:
     - - "<="
       - !ruby/object:Gem::Version
         version: 3.5.0
-- !ruby/object:Gem::Dependency
-  name: chromedriver-helper
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '2.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '2.0'
 description: Hyrax is a featureful Samvera front-end based on the latest and greatest
   Samvera software components.
 email:
@@ -1719,6 +1733,7 @@ files:
 - app/services/hyrax/tolerant_select_service.rb
 - app/services/hyrax/user_stat_importer.rb
 - app/services/hyrax/versioning_service.rb
+- app/services/hyrax/visibility_intention.rb
 - app/services/hyrax/work_form_service.rb
 - app/services/hyrax/work_query_service.rb
 - app/services/hyrax/work_thumbnail_path_service.rb
@@ -2323,7 +2338,9 @@ files:
 - lib/hyrax/transactions.rb
 - lib/hyrax/transactions/container.rb
 - lib/hyrax/transactions/create_work.rb
+- lib/hyrax/transactions/destroy_work.rb
 - lib/hyrax/transactions/steps/apply_permission_template.rb
+- lib/hyrax/transactions/steps/destroy_work.rb
 - lib/hyrax/transactions/steps/ensure_admin_set.rb
 - lib/hyrax/transactions/steps/ensure_permission_template.rb
 - lib/hyrax/transactions/steps/save_work.rb
@@ -2343,6 +2360,16 @@ files:
 - lib/tasks/reindex.rake
 - lib/tasks/stats_tasks.rake
 - lib/tasks/workflow.rake
+- lib/wings.rb
+- lib/wings/active_fedora_converter.rb
+- lib/wings/model_transformer.rb
+- lib/wings/resource_factory.rb
+- lib/wings/valkyrie/metadata_adapter.rb
+- lib/wings/valkyrie/persister.rb
+- lib/wings/valkyrie/query_service.rb
+- lib/wings/valkyrie/resource_factory.rb
+- lib/wings/valkyrizable.rb
+- lib/wings/value_mapper.rb
 - spec/.gitignore
 - spec/abilities/ability_spec.rb
 - spec/abilities/admin_ability_spec.rb
@@ -2478,6 +2505,7 @@ files:
 - spec/factories/workflows.rb
 - spec/factory_tests/adminsets_factory_spec.rb
 - spec/factory_tests/collections_factory_spec.rb
+- spec/features/actor_stack_spec.rb
 - spec/features/admin_spec.rb
 - spec/features/batch_create_spec.rb
 - spec/features/batch_edit_spec.rb
@@ -2571,7 +2599,9 @@ files:
 - spec/helpers/hyrax/trophy_helper_spec.rb
 - spec/helpers/hyrax_helper_spec.rb
 - spec/hyrax/transactions/create_work_spec.rb
+- spec/hyrax/transactions/destroy_work_spec.rb
 - spec/hyrax/transactions/steps/apply_permission_template_spec.rb
+- spec/hyrax/transactions/steps/destroy_work_spec.rb
 - spec/hyrax/transactions/steps/ensure_admin_set_spec.rb
 - spec/hyrax/transactions/steps/ensure_permission_template_spec.rb
 - spec/hyrax/transactions/steps/save_work_spec.rb
@@ -2859,6 +2889,7 @@ files:
 - spec/services/hyrax/tolerant_select_service_spec.rb
 - spec/services/hyrax/user_stat_importer_spec.rb
 - spec/services/hyrax/versioning_service_spec.rb
+- spec/services/hyrax/visibility_intention_spec.rb
 - spec/services/hyrax/work_query_service_spec.rb
 - spec/services/hyrax/workflow/action_taken_service_spec.rb
 - spec/services/hyrax/workflow/activate_object_spec.rb
@@ -3040,6 +3071,14 @@ files:
 - spec/views/records/edit_fields/_language.html.erb_spec.rb
 - spec/views/records/edit_fields/_subject.html.erb_spec.rb
 - spec/views/shared/select_work_type_modal.html.erb_spec.rb
+- spec/wings/active_fedora_converter_spec.rb
+- spec/wings/model_transformer_spec.rb
+- spec/wings/valkyrie/metadata_adapter_spec.rb
+- spec/wings/valkyrie/persister_spec.rb
+- spec/wings/valkyrie/query_service_spec.rb
+- spec/wings/valkyrie/resource_factory_spec.rb
+- spec/wings/value_mapper_spec.rb
+- spec/wings_spec.rb
 - tasks/hyrax_dev.rake
 - template.rb
 - vendor/assets/fonts/fontawesome-webfont.svg
@@ -3079,8 +3118,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 3.0.1
 signing_key: 
 specification_version: 4
 summary: Hyrax is a front-end based on the robust Samvera framework, providing a user
@@ -3224,6 +3262,7 @@ test_files:
 - spec/factories/workflows.rb
 - spec/factory_tests/adminsets_factory_spec.rb
 - spec/factory_tests/collections_factory_spec.rb
+- spec/features/actor_stack_spec.rb
 - spec/features/admin_spec.rb
 - spec/features/batch_create_spec.rb
 - spec/features/batch_edit_spec.rb
@@ -3317,7 +3356,9 @@ test_files:
 - spec/helpers/hyrax/trophy_helper_spec.rb
 - spec/helpers/hyrax_helper_spec.rb
 - spec/hyrax/transactions/create_work_spec.rb
+- spec/hyrax/transactions/destroy_work_spec.rb
 - spec/hyrax/transactions/steps/apply_permission_template_spec.rb
+- spec/hyrax/transactions/steps/destroy_work_spec.rb
 - spec/hyrax/transactions/steps/ensure_admin_set_spec.rb
 - spec/hyrax/transactions/steps/ensure_permission_template_spec.rb
 - spec/hyrax/transactions/steps/save_work_spec.rb
@@ -3605,6 +3646,7 @@ test_files:
 - spec/services/hyrax/tolerant_select_service_spec.rb
 - spec/services/hyrax/user_stat_importer_spec.rb
 - spec/services/hyrax/versioning_service_spec.rb
+- spec/services/hyrax/visibility_intention_spec.rb
 - spec/services/hyrax/work_query_service_spec.rb
 - spec/services/hyrax/workflow/action_taken_service_spec.rb
 - spec/services/hyrax/workflow/activate_object_spec.rb
@@ -3786,3 +3828,11 @@ test_files:
 - spec/views/records/edit_fields/_language.html.erb_spec.rb
 - spec/views/records/edit_fields/_subject.html.erb_spec.rb
 - spec/views/shared/select_work_type_modal.html.erb_spec.rb
+- spec/wings/active_fedora_converter_spec.rb
+- spec/wings/model_transformer_spec.rb
+- spec/wings/valkyrie/metadata_adapter_spec.rb
+- spec/wings/valkyrie/persister_spec.rb
+- spec/wings/valkyrie/query_service_spec.rb
+- spec/wings/valkyrie/resource_factory_spec.rb
+- spec/wings/value_mapper_spec.rb
+- spec/wings_spec.rb