ddr-core 1.12.0 → 1.13.0

data/config/aux/rights_statement.yml

@@ -0,0 +1,107 @@
+- title: Creative Commons Public Domain Mark 1.0
+  url: https://creativecommons.org/publicdomain/mark/1.0
+  short_title: Public Domain
+  feature:
+    - cc-pd
+  reuse_text: Free Re-Use
+
+- title: Creative Commons Attribution-NonCommercial-ShareAlike 4.0 International (CC BY-NC-SA 4.0)
+  url: https://creativecommons.org/licenses/by-nc-sa/4.0/
+  short_title: CC BY-NC-SA 4.0
+  feature:
+    - cc-cc
+    - cc-by
+    - cc-nc
+    - cc-sa
+  reuse_text: Limited Re-Use
+
+- title: 'RightsStatements.org: No Known Copyright'
+  url: http://rightsstatements.org/vocab/NKC/1.0/
+  short_title: No Known Copyright
+  feature:
+    - rs-other
+  reuse_text: null
+
+- title: 'RightsStatements.org: Copyright Undetermined'
+  url: http://rightsstatements.org/vocab/UND/1.0/
+  short_title: Copyright Undetermined
+  feature:
+    - rs-other
+  reuse_text: null
+
+- title: 'RightsStatements.org: Copyright Not Evaluated'
+  url: http://rightsstatements.org/vocab/CNE/1.0/
+  short_title: Copyright Not Evaluated
+  feature:
+    - rs-other
+  reuse_text: null
+
+- title: 'RightsStatements.org: No Copyright - United States'
+  url: http://rightsstatements.org/vocab/NoC-US/1.0/
+  short_title: No Copyright - United States
+  feature:
+    - rs-noc
+  reuse_text: Free Re-Use
+
+- title: 'RightsStatements.org: In Copyright - Rights-Holder(s) Unlocatable or Unidentifiable'
+  url: http://rightsstatements.org/vocab/InC-RUU/1.0/
+  short_title: Unknown Rights-Holder
+  feature:
+    - rs-inc
+  reuse_text: Limited Re-Use
+
+- title: 'RightsStatements.org: In Copyright - Non-Commercial Use Permitted'
+  url: http://rightsstatements.org/vocab/InC-NC/1.0/
+  short_title: Non-Commercial Use Permitted
+  feature:
+    - rs-inc
+  reuse_text: Limited Re-Use
+
+- title: 'RightsStatements.org: In Copyright - Educational Use Permitted'
+  url: http://rightsstatements.org/vocab/InC-EDU/1.0/
+  short_title: Educational Use Permitted
+  feature:
+    - rs-inc
+  reuse_text: Limited Re-Use
+
+- title: 'RightsStatements.org: In Copyright'
+  url: http://rightsstatements.org/vocab/InC/1.0/
+  short_title: In Copyright
+  feature:
+    - rs-inc
+  reuse_text: No Re-Use
+
+- title: Creative Commons 1.0 Universal (CC0 Public Domain Dedication)
+  url: https://creativecommons.org/publicdomain/zero/1.0/
+  short_title: CC0 1.0
+  feature:
+    - cc-cc
+    - cc-zero
+  reuse_text: Free Re-Use
+
+- title: Creative Commons Attribution-NonCommercial-NoDerivatives 4.0 International
+  url: https://creativecommons.org/licenses/by-nc-nd/4.0/
+  short_title: CC BY-NC-ND 4.0
+  feature:
+    - cc-cc
+    - cc-by
+    - cc-nc
+    - cc-nd
+  reuse_text: Limited Re-Use
+
+- title: Creative Commons Attribution-NonCommercial 4.0 International
+  url: https://creativecommons.org/licenses/by-nc/4.0/
+  short_title: CC BY-NC 4.0
+  feature:
+    - cc-cc
+    - cc-by
+    - cc-nc
+  reuse_text: Limited Re-Use
+
+- title: Creative Commons Attribution 4.0 International
+  url: https://creativecommons.org/licenses/by/4.0/
+  short_title: CC BY 4.0
+  feature:
+    - cc-cc
+    - cc-by
+  reuse_text: Free Re-Use

data/lib/ddr/auth/ability_definitions/publication_ability_definitions.rb

@@ -4,8 +4,7 @@ module Ddr
 
       # An object can't be published if it's already published or not publishable
       # It can't be unpublished if it's already unpublished
-      # It can't be made nonpublishable if it's already published (must be unpublished 
-      # first) or already nonpublishable
+      # It can't be made nonpublishable if it's already nonpublishable
       def call
         cannot :publish, Ddr::Resource do |obj|
           obj.published? || !obj.publishable?
@@ -14,7 +13,7 @@ module Ddr
           !obj.published? && !obj.nonpublishable?
         end
         cannot :make_nonpublishable, Ddr::Resource do |obj|
-          obj.published? || !obj.publishable?
+          obj.nonpublishable?
         end
       end
 

data/lib/ddr/index/query_result.rb

@@ -59,9 +59,11 @@ module Ddr::Index
     end
 
     def objects
+      resource_factory = Valkyrie::MetadataAdapter.find(:index_solr).resource_factory
+
       Enumerator.new do |e|
-        each_id do |id|
-          e << ActiveFedora::Base.find(id)
+        each do |obj|
+          e << resource_factory.to_resource(object: obj)
         end
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ddr-core
 version: !ruby/object:Gem::Version
-  version: 1.12.0
+  version: 1.13.0
 platform: ruby
 authors:
 - Jim Coble
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-03-24 00:00:00.000000000 Z
+date: 2022-04-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activeresource
@@ -338,6 +338,10 @@ files:
 - app/models/ddr/resource.rb
 - app/models/ddr/rights_statement.rb
 - app/models/ddr/target.rb
+- config/aux/admin_set.yml
+- config/aux/contact.yml
+- config/aux/language.yml
+- config/aux/rights_statement.yml
 - config/initializers/devise.rb
 - config/locales/ddr-core.en.yml
 - config/routes.rb
@@ -447,7 +451,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.10
+rubygems_version: 3.3.12
 signing_key: 
 specification_version: 4
 summary: Models used in the Duke Digital Repository