hydra-access-controls 7.2.1 → 7.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a5d5102b10b6d153f696ab99a80b4a7e6997b908
-  data.tar.gz: c609a6d44d6143918a340708aacd31b4ed2b41c4
+  metadata.gz: d443ec507006b3d9f0c15ffa68e0a5e13736386a
+  data.tar.gz: f634a0c9d408027ca268490158e02ef27cb4dc28
 SHA512:
-  metadata.gz: 965849b283e9754b4f2248a5c0d409622921b21cde480755e34efbcb7f9fa31d324d640855064d0d8bc672cbc630139f23905c645f83996dff7a9a40b068e55f
-  data.tar.gz: cd37db01c12f66a4c1563a71c26f92f5420e4a84ea00274d23bf6ef0f2eb52a727b87c01685db5f49c4e3eb0b2caef9306cb50a772ef0abb9612e6a08293b413
+  metadata.gz: 92aea9fff4e578c80ec13c3faf8ebca5dca5c3f09531f79d6de053394242a6942e4803c1f67810b65a962e0d20be1069038473c8c30a158d694f9bc15d31d575
+  data.tar.gz: 1893daf644784b0c7141f2a52095f67c20704b27d65dcd7a3c59dc3c486fe517b5ee7fbd9fbb83f124428e0cda0922e34ae30d2c73c4f965d5418626d3cafccf

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

@@ -44,6 +44,7 @@ module Hydra
           self.visibility_during_embargo = visibility_during unless visibility_during.nil?
           self.visibility_after_embargo = visibility_after unless visibility_after.nil?
           embargo_visibility!
+          visibility_will_change!
         end
 
         def deactivate_embargo!
@@ -54,6 +55,7 @@ module Hydra
           self.visibility_during_embargo = nil
           self.visibility_after_embargo = nil
           self.embargo_history += [embargo_record]
+          visibility_will_change!
         end
 
         def validate_embargo
@@ -115,7 +117,8 @@ module Hydra
           self.lease_expiration_date = release_date
           self.visibility_during_lease = visibility_during unless visibility_during.nil?
           self.visibility_after_lease = visibility_after unless visibility_after.nil?
-          self.lease_visibility!
+          lease_visibility!
+          visibility_will_change!
         end
 
         def deactivate_lease!
@@ -126,6 +129,7 @@ module Hydra
           self.visibility_during_lease = nil
           self.visibility_after_lease = nil
           self.lease_history += [lease_record]
+          visibility_will_change!
         end
 
         # Set the current visibility to match what is described in the lease.

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

@@ -29,7 +29,7 @@ module Hydra
       end
 
       def visibility_changed?
-        @visibility_will_change
+        !!@visibility_will_change
       end
 
       private

data/spec/unit/embargoable_spec.rb

@@ -35,15 +35,22 @@ describe Hydra::AccessControls::Embargoable do
       expect(subject).to receive(:deactivate_embargo!)
       subject.visibility = Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_PUBLIC
     end
-    it "when changing from lease, wipes out associated lease metadata" do
-      subject.lease_expiration_date = future_date.to_s
-      expect(subject).to receive(:deactivate_lease!)
-      subject.visibility = Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_PUBLIC
+
+    context "when changing from lease" do
+      it "wipes out associated lease metadata and marks visibility as changed" do
+        subject.apply_lease(future_date.to_s, Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_AUTHENTICATED, Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_PRIVATE)
+        expect(subject).to receive(:deactivate_lease!)
+        subject.visibility = Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_PUBLIC
+        expect(subject).to be_visibility_changed
+      end
     end
   end
+
   context 'apply_embargo' do
     it "applies appropriate embargo_visibility settings" do
-      subject.apply_embargo(future_date.to_s, Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_PRIVATE, Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_PUBLIC)
+      expect {
+        subject.apply_embargo(future_date.to_s, Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_PRIVATE, Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_PUBLIC)
+      }.to change { subject.visibility_changed? }.from(false).to(true)
       expect(subject).to be_under_embargo
       expect(subject.visibility).to eq  Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_PRIVATE
       expect(subject.embargo_release_date).to eq future_date.to_time.utc
@@ -84,7 +91,8 @@ describe Hydra::AccessControls::Embargoable do
       it "should remove the associated embargo information and record it in the object's embargo history" do
         expect {
           subject.deactivate_embargo!
-        }.to change { subject.under_embargo? }.from(true).to(false)
+        }.to change { subject.under_embargo? }.from(true).to(false).and change {
+          subject.visibility_changed? }.from(false).to(true)
         expect(subject.embargo_release_date).to be_nil
         expect(subject.visibility_during_embargo).to be_nil
         expect(subject.visibility_after_embargo).to be_nil
@@ -104,18 +112,39 @@ describe Hydra::AccessControls::Embargoable do
   end
 
   context 'apply_lease' do
-    it "applies appropriate embargo_visibility settings" do
-      subject.apply_lease(future_date.to_s, Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_PUBLIC, Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_PRIVATE)
-      expect(subject).to be_active_lease
-      expect(subject.visibility).to eq  Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_PUBLIC
-      expect(subject.lease_expiration_date).to eq future_date.to_time.utc
-      expect(subject.visibility_after_lease).to eq Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_PRIVATE
+    context "when the initial value is restricted" do
+      it "applies appropriate embargo_visibility settings" do
+        subject.apply_lease(future_date.to_s, Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_PUBLIC, Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_PRIVATE)
+        expect(subject).to be_active_lease
+        expect(subject).to be_visibility_changed
+        expect(subject.visibility).to eq  Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_PUBLIC
+        expect(subject.lease_expiration_date).to eq future_date.to_time.utc
+        expect(subject.visibility_after_lease).to eq Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_PRIVATE
+      end
+      it "relies on default before/after visibility if none provided" do
+        subject.apply_lease(future_date.to_s)
+        expect(subject.visibility_during_lease).to eq  Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_AUTHENTICATED
+        expect(subject.lease_expiration_date).to eq future_date.to_time.utc
+        expect(subject.visibility_after_lease).to eq Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_PRIVATE
+      end
     end
-    it "relies on default before/after visibility if none provided" do
-      subject.apply_lease(future_date.to_s)
-      expect(subject.visibility_during_lease).to eq  Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_AUTHENTICATED
-      expect(subject.lease_expiration_date).to eq future_date.to_time.utc
-      expect(subject.visibility_after_lease).to eq Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_PRIVATE
+
+    context "when the initial value is public" do
+      before do
+        subject.visibility = Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_PUBLIC
+        # reset the changed log
+        subject.send(:instance_variable_set, :@visibility_will_change, false)
+      end
+
+      it "applies appropriate embargo_visibility settings" do
+        expect {
+          subject.apply_lease(future_date.to_s, Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_PUBLIC, Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_PRIVATE)
+        }.to change { subject.visibility_changed? }.from(false).to(true)
+        expect(subject).to be_active_lease
+        expect(subject.visibility).to eq  Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_PUBLIC
+        expect(subject.lease_expiration_date).to eq future_date.to_time.utc
+        expect(subject.visibility_after_lease).to eq Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_PRIVATE
+      end
     end
   end
 
@@ -130,7 +159,9 @@ describe Hydra::AccessControls::Embargoable do
       let(:expiration_date) { past_date.to_s }
 
       it "should remove the associated lease information and record it in the object's lease history" do
-        subject.deactivate_lease!
+        expect {
+          subject.deactivate_lease!
+        }.to change { subject.visibility_changed? }.from(false).to(true)
         expect(subject.lease_expiration_date).to be_nil
         expect(subject.visibility_during_lease).to be_nil
         expect(subject.visibility_after_lease).to be_nil

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hydra-access-controls
 version: !ruby/object:Gem::Version
-  version: 7.2.1
+  version: 7.2.2
 platform: ruby
 authors:
 - Chris Beer
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-02 00:00:00.000000000 Z
+date: 2014-09-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -236,7 +236,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.1
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Access controls for project hydra