hydra-access-controls 9.2.0 → 9.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 253a587f6be8c789190ce4652d72a76c96192c1b
-  data.tar.gz: b8b48f8969ffac5925ad5a1f80c0a82de1e92c9c
+  metadata.gz: 4e86f8618f5fea8b5b0ebb586211a5a24e69af62
+  data.tar.gz: ade8ed9c17682b50360720acc0e676dbb06a2da4
 SHA512:
-  metadata.gz: 48166e2c463853f451ca6526a160c50c458f9bcb7b0d18703c8f85db33a48160ebdd7e0a474b228c3d3304927892a82613474ddaa37d0eaa2c52288f74dbedd8
-  data.tar.gz: 1948d7ec0915657d4458ba332c751e554df761f72dbcd04320a1cb26c067e66ffd572b42b16c4e9e032a3b44eaed2da0cef38fcd40ce7a152c16dda813af1cff
+  metadata.gz: 38c71a8bea0eba274948914728e8b482e2be8ea17017d1e7a185ccc9507c2cd4a38ed2b2800aba272a4b04219b913bac0093c32ca369e539270195b987011e91
+  data.tar.gz: 22f264780da8a0add489f00ea65ef86fa20ee5201d0b0c9dc0a8e9aba0213fbed13b716b51b574e3fcca664ed7b02bf07c90f0874a97f4a6afd736958284a909

data/app/models/concerns/hydra/access_controls/embargoable.rb

@@ -5,7 +5,8 @@ module Hydra
       include Hydra::AccessControls::WithAccessRight
 
       included do
-        validates :embargo_release_date, :lease_expiration_date, :'hydra/future_date' => true
+        validates :lease_expiration_date, :'hydra/future_date' => true, if: :lease
+        validates :embargo_release_date, :'hydra/future_date' => true, if: :embargo
 
         belongs_to :embargo, predicate: Hydra::ACL.hasEmbargo, class_name: 'Hydra::AccessControls::Embargo'
         belongs_to :lease, predicate: Hydra::ACL.hasLease, class_name: 'Hydra::AccessControls::Lease'
@@ -44,12 +45,8 @@ module Hydra
       # The lease_visibility! and embargo_visibility! methods rely on this to deactivate the lease when applicable.
       def visibility=(value)
         # If changing from embargo or lease, deactivate the lease/embargo and wipe out the associated metadata before proceeding
-        if !embargo_release_date.nil?
-          deactivate_embargo! unless value == visibility_during_embargo
-        end
-        if !lease_expiration_date.nil?
-          deactivate_lease! unless value == visibility_during_lease
-        end
+        deactivate_embargo! if deactivate_embargo?(value)
+        deactivate_lease! if deactivate_lease?(value)
         super
       end
 
@@ -149,6 +146,19 @@ module Hydra
           end
         end
       end
+
+      private
+
+        # @return [true, false] true if there is an embargo set up and the visibility will change
+        def deactivate_embargo?(value)
+          embargo && embargo.embargo_release_date && value != embargo.visibility_during_embargo
+        end
+
+        # @return [true, false] true if there is a lease set up and the visibility will change
+        def deactivate_lease?(value)
+          lease && lease.lease_expiration_date && value != lease.visibility_during_lease
+        end
+
     end
   end
 end

data/app/models/concerns/hydra/access_controls/visibility.rb

@@ -39,7 +39,7 @@ module Hydra
 
       def public_visibility!
         visibility_will_change! unless visibility == Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_PUBLIC
-        set_read_groups([Hydra::AccessControls::AccessRight::PERMISSION_TEXT_VALUE_PUBLIC], [])
+        set_read_groups([Hydra::AccessControls::AccessRight::PERMISSION_TEXT_VALUE_PUBLIC], [Hydra::AccessControls::AccessRight::PERMISSION_TEXT_VALUE_AUTHENTICATED])
       end
 
       def registered_visibility!

data/spec/unit/embargoable_spec.rb

@@ -18,25 +18,58 @@ describe Hydra::AccessControls::Embargoable do
   let(:past_date) { Date.today-2 }
   subject { TestModel.new }
 
-  context 'validations' do
-    subject { ModsAsset.new(lease_expiration_date: past_date, embargo_release_date: past_date) }
-    it "validates embargo_release_date and lease_expiration_date" do
-      expect(subject).to_not be_valid
-      expect(subject.errors[:lease_expiration_date]).to eq ['Must be a future date']
-      expect(subject.errors[:embargo_release_date]).to eq ['Must be a future date']
+  describe 'validations' do
+    context "with dates" do
+      subject { ModsAsset.new(lease_expiration_date: past_date, embargo_release_date: past_date) }
+      it "validates embargo_release_date and lease_expiration_date" do
+        expect(subject).to_not be_valid
+        expect(subject.errors[:lease_expiration_date]).to eq ['Must be a future date']
+        expect(subject.errors[:embargo_release_date]).to eq ['Must be a future date']
+      end
+    end
+
+    context "without an embargo" do
+      subject { ModsAsset.new }
+
+      before { subject.valid? }
+
+      it "doesn't create a new embargo" do
+        expect(subject.embargo).to be_nil
+      end
+
+      it "doesn't create a new lease" do
+        expect(subject.lease).to be_nil
+      end
     end
   end
 
   context 'visibility=' do
-    it "when changing from embargo, wipes out associated embargo metadata" do
-      subject.embargo_release_date = future_date.to_s
-      expect(subject).to receive(:deactivate_embargo!)
-      subject.visibility = Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_PUBLIC
+    context "when the object is not under embargo or lease" do
+      before do
+        subject.visibility = Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_PRIVATE
+      end
+      it "doesn't create embargo or lease" do
+        expect(subject.embargo).to be_nil
+        expect(subject.lease).to be_nil
+      end
+    end
+
+    context "when changing from embargo" do
+      before do
+        subject.embargo_release_date = future_date.to_s
+      end
+      it "wipes out associated embargo metadata" do
+        expect(subject).to receive(:deactivate_embargo!)
+        subject.visibility = Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_PUBLIC
+      end
     end
 
     context "when changing from lease" do
-      it "wipes out associated lease metadata and marks visibility as changed" do
+      before do
         subject.apply_lease(future_date.to_s, Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_AUTHENTICATED, Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_PRIVATE)
+      end
+
+      it "wipes out associated lease metadata and marks visibility as changed" do
         expect(subject).to receive(:deactivate_lease!)
         subject.visibility = Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_PUBLIC
         expect(subject).to be_visibility_changed

data/spec/unit/visibility_spec.rb

@@ -11,6 +11,67 @@ describe Hydra::AccessControls::Visibility do
     include VisibilityOverride
   end
 
+  describe "setting visibility" do
+    before do
+      class Foo < ActiveFedora::Base
+        include Hydra::AccessControls::Permissions
+      end
+    end
+
+    after { Object.send(:remove_const, :Foo) }
+
+    subject { Foo.new }
+
+    [ Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_PRIVATE,
+      Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_AUTHENTICATED,
+      Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_PUBLIC ]
+    .each do |vis|
+
+      describe "to #{vis}" do
+
+        before { subject.visibility=vis }
+
+        it "should be set to #{vis}" do
+          expect(subject.visibility).to eql vis
+        end
+
+        describe "and then to private" do
+          before { subject.visibility=Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_PRIVATE }
+          it "should be set to private" do
+            expect(subject.visibility).to eql Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_PRIVATE
+          end
+          it "should have no permissions" do
+            expect(subject.permissions.map(&:to_hash)).to be_empty
+          end
+        end
+
+        describe "and then to authenticated" do
+          before { subject.visibility=Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_AUTHENTICATED }
+          it "should be set to authenticated" do
+            expect(subject.visibility).to eql Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_AUTHENTICATED
+          end
+          it "should have authenticated permissions only" do
+            expect(subject.permissions.map(&:to_hash)).to match_array [
+                {type: "group", access: "read", name: Hydra::AccessControls::AccessRight::PERMISSION_TEXT_VALUE_AUTHENTICATED } ]
+          end
+        end
+
+        describe "and then to public" do
+          before { subject.visibility=Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_PUBLIC }
+          it "should be set to public" do
+            expect(subject.visibility).to eql Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_PUBLIC
+          end
+          it "should have public permissions only" do
+            expect(subject.permissions.map(&:to_hash)).to match_array [
+                {type: "group", access: "read", name: Hydra::AccessControls::AccessRight::PERMISSION_TEXT_VALUE_PUBLIC } ]
+          end
+        end
+      end
+
+    end
+
+  end
+
   it 'allows for overrides of visibility' do
     expect{
       MockParent.new(visibility: Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_PRIVATE)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hydra-access-controls
 version: !ruby/object:Gem::Version
-  version: 9.2.0
+  version: 9.2.1
 platform: ruby
 authors:
 - Chris Beer
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-08 00:00:00.000000000 Z
+date: 2015-07-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -218,7 +218,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Access controls for project hydra