hydra-access-controls 10.6.1 → 10.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c717d8b64aa57e3baf983b4941afe227aaeaa4d0b82908ec1580305df87bb04d
-  data.tar.gz: 929fff58673109ed89c24d5c3fb0b4d4051d2d465ec34d7766ee9c437adcfccd
+  metadata.gz: 59c85b9ad05b984f2c51a16b14fea58931a6d63f9b34e2b632869b7d96f8eea5
+  data.tar.gz: f2b1c0daa69c0afee47b4065eaff8507326cadfbce996ad338554760a827015c
 SHA512:
-  metadata.gz: f869c751327ced2026ddce996719d2f77a909da1e782c7d70cb79f3ffa2125a90cb12342a361360f2c448b56135fc949b13f32eb78c3e83f8b78cfd312dce62a
-  data.tar.gz: 073c4713f9b97aa30900ec4209ea73817491e675884835724d8e8861fd8ba131a792c52040fc8dee8ca1ba315db1705cda21afee2ffebb720813a50af302a036
+  metadata.gz: '018366d44ecf5c886e36da31dd5a61ebb7c38b2156ecf2f60c59b0c767fb206b56b4b7fae547538d75fdb16748df4718b8f657ddd01389c489cd05d821216c6f'
+  data.tar.gz: d61093876bcebebb316f74aa0bebe9eee6d9349c017c45ea9c61a4a4b02ffde9578a12404973a4299d5e4b6d618e210fa2356574bd2306e71e1917f0c21205cc

data/app/services/hydra/embargo_service.rb

@@ -14,7 +14,7 @@ module Hydra
       #   (assumes that when lease visibility is applied to assets
       #    whose leases have expired, the lease expiration date will be removed from its metadata)
       def assets_under_embargo
-        ActiveFedora::Base.where("#{Hydra.config.permissions.embargo.release_date}:*")
+        ActiveFedora::Base.where("#{Hydra.config.permissions.embargo.release_date}:[* TO *]")
       end
 
       # Returns all assets that have had embargoes deactivated in the past.

data/app/services/hydra/lease_service.rb

@@ -10,7 +10,7 @@ module Hydra
       #   (assumes that when lease visibility is applied to assets
       #    whose leases have expired, the lease expiration date will be removed from its metadata)
       def assets_under_lease
-        ActiveFedora::Base.where("#{Hydra.config.permissions.lease.expiration_date}:*")
+        ActiveFedora::Base.where("#{Hydra.config.permissions.lease.expiration_date}:[* TO *]")
       end
 
       # Returns all assets that have had embargoes deactivated in the past.
@@ -20,4 +20,3 @@ module Hydra
     end
   end
 end
-

data/spec/factories.rb

@@ -11,52 +11,52 @@ FactoryBot.define do
   end
 
   factory :archivist, :parent=>:user do |u|
-    uid 'archivist1'
-    password 'archivist1'
+    uid { 'archivist1' }
+    password { 'archivist1' }
   end
   factory :registered_user, :parent=>:user do |u|
-    uid 'registered_user'
-    password 'registered_user'
+    uid { 'registered_user' }
+    password { 'registered_user' }
   end
   factory :staff, :parent=>:user do |u|
-    uid 'staff1'
-    password 'staff1'
+    uid { 'staff1' }
+    password { 'staff1' }
   end
   factory :student, :parent=>:user do |u|
-    uid 'student1'
-    password 'student1'
+    uid { 'student1' }
+    password { 'student1' }
   end
   factory :joe_creator, :parent=>:user do |u|
-    uid 'joe_creator'
-    password 'joe_creator'
+    uid { 'joe_creator' }
+    password { 'joe_creator' }
   end
   factory :martia_morocco, :parent=>:user do |u|
-    uid 'martia_morocco'
-    password 'martia_morocco'
+    uid { 'martia_morocco' }
+    password { 'martia_morocco' }
   end
   factory :ira_instructor, :parent=>:user do |u|
-    uid 'ira_instructor'
-    password 'ira_instructor'
+    uid { 'ira_instructor' }
+    password { 'ira_instructor' }
   end
   factory :calvin_collaborator, :parent=>:user do |u|
-    uid 'calvin_collaborator'
-    password 'calvin_collaborator'
+    uid { 'calvin_collaborator' }
+    password { 'calvin_collaborator' }
   end
   factory :sara_student, :parent=>:user do |u|
-    uid 'sara_student'
-    password 'sara_student'
+    uid { 'sara_student' }
+    password { 'sara_student' }
   end
   factory :louis_librarian, :parent=>:user do |u|
-    uid 'louis_librarian'
-    password 'louis_librarian'
+    uid { 'louis_librarian' }
+    password { 'louis_librarian' }
   end
   factory :carol_curator, :parent=>:user do |u|
-    uid 'carol_curator'
-    password 'carol_curator'
+    uid { 'carol_curator' }
+    password { 'carol_curator' }
   end
   factory :alice_admin, :parent=>:user do |u|
-    uid 'alice_admin'
-    password 'alice_admin'
+    uid { 'alice_admin' }
+    password { 'alice_admin' }
   end
 
   #
@@ -70,23 +70,23 @@ FactoryBot.define do
   end
 
   factory :default_access_asset, :parent=>:asset do |a|
-    permissions_attributes [{ name: "joe_creator", access: "edit", type: "person" }]
+    permissions_attributes { [{ name: "joe_creator", access: "edit", type: "person" }] }
   end
 
   factory :dept_access_asset, :parent=>:asset do |a|
-    permissions_attributes [{ name: "africana-faculty", access: "read", type: "group" }, { name: "joe_creator", access: "edit", type: "person" }]
+    permissions_attributes { [{ name: "africana-faculty", access: "read", type: "group" }, { name: "joe_creator", access: "edit", type: "person" }] }
   end
 
   factory :group_edit_asset, :parent=>:asset do |a|
-    permissions_attributes [{ name:"africana-faculty", access: "edit", type: "group" }, {name: "calvin_collaborator", access: "edit", type: "person"}]
+    permissions_attributes { [{ name:"africana-faculty", access: "edit", type: "group" }, {name: "calvin_collaborator", access: "edit", type: "person"}] }
   end
 
   factory :org_read_access_asset, :parent=>:asset do |a|
-    permissions_attributes [{ name: "registered", access: "read", type: "group" }, { name: "joe_creator", access: "edit", type: "person" }, { name: "calvin_collaborator", access: "edit", type: "person" }]
+    permissions_attributes { [{ name: "registered", access: "read", type: "group" }, { name: "joe_creator", access: "edit", type: "person" }, { name: "calvin_collaborator", access: "edit", type: "person" }] }
   end
 
   factory :open_access_asset, :parent=>:asset do |a|
-    permissions_attributes [{ name: "public", access: "read", type: "group" }, { name: "joe_creator", access: "edit", type: "person" }, { name: "calvin_collaborator", access: "edit", type: "person" }]
+    permissions_attributes { [{ name: "public", access: "read", type: "group" }, { name: "joe_creator", access: "edit", type: "person" }, { name: "calvin_collaborator", access: "edit", type: "person" }] }
   end
 
 end

data/spec/services/embargo_service_spec.rb

@@ -29,7 +29,6 @@ describe Hydra::EmbargoService do
 
   describe "#assets_under_embargo" do
     it "returns all assets with embargo release date set" do
-      result = subject.assets_under_embargo
       returned_ids = subject.assets_under_embargo.map {|a| a.id}
       expect(returned_ids).to include work_with_expired_embargo1.id, work_with_expired_embargo2.id, work_with_embargo_in_effect.id
       expect(returned_ids).to_not include work_without_embargo.id

data/spec/support/user.rb

@@ -5,7 +5,7 @@ class User
   attr_accessor :uid
 
   def initialize(params={})
-    self.uid = params.delete(:uid) if params[:uid]
+    self.uid = params.delete(:uid) if params && params[:uid]
     super
   end
   

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hydra-access-controls
 version: !ruby/object:Gem::Version
-  version: 10.6.1
+  version: 10.6.2
 platform: ruby
 authors:
 - Chris Beer
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-31 00:00:00.000000000 Z
+date: 2019-03-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -236,7 +236,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.1
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Access controls for project hydra