hydra-access-controls 9.0.0.beta1 → 9.0.0.beta2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 83a5be099ceb5cd745dc8fe1cd49ae0c5a72ba6d
-  data.tar.gz: 3670874653b5bc44c0dac63b277f755b99ad93cb
+  metadata.gz: 08c21733735b5901ccfd378e26d531434c3693c0
+  data.tar.gz: 1193c86b764762ab44ec693466f0f60adfbe5f67
 SHA512:
-  metadata.gz: caf8e64a95d305198f5558e05cdf59fcffa12a0c48ccb447644cd108aff0595dad6c0e8b9924efb0c1067883bf5e5b049dd81f5ff03f5523fb93c575873f1c91
-  data.tar.gz: 4543dfab3f31ac9d8077fce7a29a17dcb3e72cfa97635300f7fadd52dca7fa69599cda30cf4400b9671610f6c05a8dd13c04251ccc0b999a1aef352e7e876f0d
+  metadata.gz: 8b587e9d3574cc44c4b0fedb6f7395467780959f0de3adcdc3238da29f7c935eec3fc6c946af10717c2abe2262f741089d8eb64a972eb5240fa2aa83fe2152a3
+  data.tar.gz: 0e3ed0753358d92ecdb14d521a612e81b08ac6f49f1e1a5f676c90183c7a6d68b7bfe110c2177048967a993b85b6cbd28ae9d37c99fdf15b53f6856f67537454

data/app/models/hydra/access_controls/embargo.rb

@@ -1,27 +1,10 @@
 module Hydra::AccessControls
   class Embargo < ActiveFedora::Base
-    property :visibility_during_embargo, predicate: Hydra::ACL.visibilityDuringEmbargo
-    property :visibility_after_embargo, predicate: Hydra::ACL.visibilityAfterEmbargo
-    property :embargo_release_date, predicate: Hydra::ACL.embargoReleaseDate
+    property :visibility_during_embargo, predicate: Hydra::ACL.visibilityDuringEmbargo, multiple:false
+    property :visibility_after_embargo, predicate: Hydra::ACL.visibilityAfterEmbargo, multiple:false
+    property :embargo_release_date, predicate: Hydra::ACL.embargoReleaseDate, multiple:false
     property :embargo_history, predicate: Hydra::ACL.embargoHistory
 
-    # Hack until ActiveFedora supports activeTriples 0.3.0 (then we can just use super)
-    def visibility_during_embargo_with_first
-      visibility_during_embargo_without_first.first
-    end
-    alias_method_chain :visibility_during_embargo, :first
-
-    # Hack until ActiveFedora supports activeTriples 0.3.0 (then we can just use super)
-    def visibility_after_embargo_with_first
-      visibility_after_embargo_without_first.first
-    end
-    alias_method_chain :visibility_after_embargo, :first
-
-    # Hack until ActiveFedora supports activeTriples 0.3.0 (then we can just use super)
-    def embargo_release_date_with_first
-      embargo_release_date_without_first.first
-    end
-    alias_method_chain :embargo_release_date, :first
 
     # Hack until ActiveFedora supports activeTriples 0.3.0 (then we can just use super)
     def embargo_release_date_with_casting=(date)

data/app/models/hydra/access_controls/lease.rb

@@ -1,28 +1,10 @@
 module Hydra::AccessControls
   class Lease < ActiveFedora::Base
-    property :visibility_during_lease, predicate: Hydra::ACL.visibilityDuringLease
-    property :visibility_after_lease, predicate: Hydra::ACL.visibilityAfterLease
-    property :lease_expiration_date, predicate: Hydra::ACL.leaseExpirationDate
+    property :visibility_during_lease, predicate: Hydra::ACL.visibilityDuringLease, multiple:false
+    property :visibility_after_lease, predicate: Hydra::ACL.visibilityAfterLease, multiple:false
+    property :lease_expiration_date, predicate: Hydra::ACL.leaseExpirationDate, multiple:false
     property :lease_history, predicate: Hydra::ACL.leaseHistory
 
-    # Hack until ActiveFedora supports activeTriples 0.3.0 (then we can just use super)
-    def visibility_during_lease_with_first
-      visibility_during_lease_without_first.first
-    end
-    alias_method_chain :visibility_during_lease, :first
-
-    # Hack until ActiveFedora supports activeTriples 0.3.0 (then we can just use super)
-    def visibility_after_lease_with_first
-      visibility_after_lease_without_first.first
-    end
-    alias_method_chain :visibility_after_lease, :first
-
-    # Hack until ActiveFedora supports activeTriples 0.3.0 (then we can just use super)
-    def lease_expiration_date_with_first
-      lease_expiration_date_without_first.first
-    end
-    alias_method_chain :lease_expiration_date, :first
-
     # Hack until ActiveFedora supports activeTriples 0.3.0 (then we can just use super)
     def lease_expiration_date_with_casting=(date)
       date = DateTime.parse(date) if date && date.kind_of?(String)

data/spec/unit/admin_policy_spec.rb

@@ -4,8 +4,8 @@ describe Hydra::AdminPolicy do
 
   describe "when setting attributes" do
     before do
-      subject.title = "My title"
-      subject.description = "My description"
+      subject.title = ["My title"]
+      subject.description = ["My description"]
     end
     its(:title) { is_expected.to eq "My title"}
     its(:description) { is_expected.to eq "My description"}
@@ -13,7 +13,7 @@ describe Hydra::AdminPolicy do
 
 
   describe "to_solr" do
-    subject { Hydra::AdminPolicy.new(:title=>"Foobar").to_solr }
+    subject { Hydra::AdminPolicy.new(:title=>["Foobar"]).to_solr }
     it "should have title_ssim" do
       expect(subject[ActiveFedora::SolrQueryBuilder.solr_name('title', type: :string)]).to eq ["Foobar"]
     end
@@ -42,12 +42,12 @@ describe Hydra::AdminPolicy do
     end
     it "should update permissions on existing users" do
       subject.default_permissions.build({:name=>'user1', :access=>'discover', :type=>'person'})
-      subject.default_permissions.first.mode = ::ACL.Write
+      subject.default_permissions.first.mode = Hydra::AccessControls::Mode.new(::ACL.Write)
       expect(subject.default_permissions.map(&:to_hash)).to eq [{:type=>'person', :access=>'edit', :name=>'user1'}]
     end
     it "should update permissions on existing groups" do
       subject.default_permissions.build({:name=>'group1', :access=>'discover', :type=>'group'})
-      subject.default_permissions.first.mode = ::ACL.Write
+      subject.default_permissions.first.mode = Hydra::AccessControls::Mode.new(::ACL.Write)
       expect(subject.default_permissions.map(&:to_hash)).to eq [{:type=>'group', :access=>'edit', :name=>'group1'}]
     end
     it "should assign user permissions when :type == 'person'" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hydra-access-controls
 version: !ruby/object:Gem::Version
-  version: 9.0.0.beta1
+  version: 9.0.0.beta2
 platform: ruby
 authors:
 - Chris Beer
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-03 00:00:00.000000000 Z
+date: 2014-12-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport