hyrax 3.0.1 → 3.0.2

data/lib/hyrax/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module Hyrax
-  VERSION = '3.0.1'
+  VERSION = '3.0.2'
 end

data/lib/wings.rb

@@ -98,27 +98,6 @@ require 'wings/valkyrie/persister'
 require 'wings/valkyrie/storage'
 require 'wings/valkyrie/query_service'
 
-Hydra::AccessControl.send(:define_method, :valkyrie_resource) do
-  attrs = attributes.symbolize_keys
-  attrs[:new_record]  = new_record?
-  attrs[:created_at]  = create_date
-  attrs[:updated_at]  = modified_date
-
-  attrs[:permissions] = permissions.map do |permission|
-    agent = permission.type == 'group' ? "group/#{permission.agent_name}" : permission.agent_name
-
-    Hyrax::Permission.new(id: permission.id,
-                          mode: permission.access.to_sym,
-                          agent: agent,
-                          access_to: Valkyrie::ID.new(permission.access_to_id),
-                          new_record: permission.new_record?)
-  end
-
-  attrs[:access_to] = attrs[:permissions].find { |p| p.access_to&.id&.present? }&.access_to
-
-  Hyrax::AccessControl.new(**attrs)
-end
-
 begin
   require 'wings/setup'
 rescue NameError, Hyrax::SimpleSchemaLoader::UndefinedSchemaError => err

data/lib/wings/active_fedora_converter/default_work.rb

@@ -100,6 +100,9 @@ module Wings
       include Hydra::AccessControls::Embargoable
       property :nested_resource, predicate: ::RDF::URI("http://example.com/nested_resource"), class_name: "Wings::ActiveFedoraConverter::NestedResource"
 
+      validates :lease_expiration_date, 'hydra/future_date': true, on: :create
+      validates :embargo_release_date, 'hydra/future_date': true, on: :create
+
       class_attribute :valkyrie_class
       self.valkyrie_class = Hyrax::Resource
 
@@ -121,6 +124,18 @@ module Wings
         alias to_s inspect
       end
 
+      ##
+      # Override aggressive Hydra::AccessControls validation
+      def enforce_future_date_for_embargo?
+        false
+      end
+
+      ##
+      # Override aggressive Hydra::AccessControls validation
+      def enforce_future_date_for_lease?
+        false
+      end
+
       def indexing_service
         Hyrax::ValkyrieIndexer.for(resource: valkyrie_resource)
       end

data/lib/wings/model_transformer.rb

@@ -110,7 +110,7 @@ module Wings
     private
 
     def mint_id
-      id = pcdm_object.assign_id
+      id = pcdm_object.try(:assign_id)
 
       pcdm_object.id = id if id.present?
     end
@@ -121,6 +121,7 @@ module Wings
 
       append_embargo(result)
       append_lease(result)
+      append_permissions(result)
 
       result
     end
@@ -168,5 +169,20 @@ module Wings
 
       attrs[:lease] = Hyrax::Lease.new(**lease_attrs)
     end
+
+    def append_permissions(attrs)
+      return unless pcdm_object.try(:permissions)
+      attrs[:permissions] = pcdm_object.permissions.map do |permission|
+        agent = permission.type == 'group' ? "group/#{permission.agent_name}" : permission.agent_name
+
+        Hyrax::Permission.new(id: permission.id,
+                              mode: permission.access.to_sym,
+                              agent: agent,
+                              access_to: ::Valkyrie::ID.new(permission.access_to_id),
+                              new_record: permission.new_record?)
+      end
+
+      attrs[:access_to] = attrs[:permissions].find { |p| p.access_to&.id&.present? }&.access_to
+    end
   end
 end

data/lib/wings/setup.rb

@@ -2,6 +2,7 @@
 
 ActiveFedora::Base.include Wings::Valkyrizable
 ActiveFedora::File.include Wings::Valkyrizable
+Hydra::AccessControl.include Wings::Valkyrizable
 
 module ActiveTriples
   class NodeConfig

data/template.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 # Hack for https://github.com/rails/rails/issues/35153
 gsub_file 'Gemfile', /^gem ["']sqlite3["']$/, 'gem "sqlite3", "~> 1.3.0"'
-gem 'hyrax', '3.0.1'
+gem 'hyrax', '3.0.2'
 run 'bundle install'
 generate 'hyrax:install', '-f'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hyrax
 version: !ruby/object:Gem::Version
-  version: 3.0.1
+  version: 3.0.2
 platform: ruby
 authors:
 - Justin Coyne
@@ -14,7 +14,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-03-31 00:00:00.000000000 Z
+date: 2021-05-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -1835,6 +1835,7 @@ files:
 - app/models/concerns/hyrax/collection_behavior.rb
 - app/models/concerns/hyrax/collection_nesting.rb
 - app/models/concerns/hyrax/core_metadata.rb
+- app/models/concerns/hyrax/embargoable.rb
 - app/models/concerns/hyrax/file_set/belongs_to_works.rb
 - app/models/concerns/hyrax/file_set/characterization.rb
 - app/models/concerns/hyrax/file_set/derivatives.rb
@@ -1959,6 +1960,7 @@ files:
 - app/presenters/hyrax/model_icon.rb
 - app/presenters/hyrax/model_proxy.rb
 - app/presenters/hyrax/page_title_decorator.rb
+- app/presenters/hyrax/pcdm_member_presenter_factory.rb
 - app/presenters/hyrax/permission_badge.rb
 - app/presenters/hyrax/presenter_factory.rb
 - app/presenters/hyrax/presenter_renderer.rb
@@ -2085,6 +2087,7 @@ files:
 - app/services/hyrax/file_set_fixity_check_service.rb
 - app/services/hyrax/file_set_type_service.rb
 - app/services/hyrax/file_set_visibility_propagator.rb
+- app/services/hyrax/find_objects_via_solr_service.rb
 - app/services/hyrax/fixity/active_fedora_fixity_service.rb
 - app/services/hyrax/fixity/missing_content_error.rb
 - app/services/hyrax/fixity_check_failure_service.rb
@@ -2633,6 +2636,7 @@ files:
 - config/initializers/listeners.rb
 - config/initializers/nesting_indexer_initializer.rb
 - config/initializers/simple_form.rb
+- config/initializers/valkryrie_storage.rb
 - config/initializers/valkyrie_id_equality.rb
 - config/locales/hyrax.de.yml
 - config/locales/hyrax.en.yml
@@ -2873,6 +2877,7 @@ files:
 - lib/hyrax/transactions/work_create.rb
 - lib/hyrax/transactions/work_destroy.rb
 - lib/hyrax/valkyrie_can_can_adapter.rb
+- lib/hyrax/valkyrie_simple_path_generator.rb
 - lib/hyrax/version.rb
 - lib/hyrax/zotero.rb
 - lib/hyrax/zotero/config.rb
@@ -2958,7 +2963,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.1.6
 signing_key:
 specification_version: 4
 summary: Hyrax is a front-end based on the robust Samvera framework, providing a user