hydra-access-controls 7.1.0.rc2 → 7.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f11322c08f169903ee4db5becd7ab8228fee5536
-  data.tar.gz: 149d2abb10a3f1e812d4b914c42bee38451fb58e
+  metadata.gz: d571199bff2f9ddd36d310d407cf91ca6ae8ee39
+  data.tar.gz: f0b1fbb7e08b80ca95f65f7482b88a4663d845ee
 SHA512:
-  metadata.gz: b354963b372381e532658382bd583feb9e3cfeba345f4eed6fedf404e72bebf209d0f8d86062c2b4fd2d056a68eb416efdd389aee5bdde8c426597ee1f6ae10c
-  data.tar.gz: d7a24c9ddcc075d5beb6bc1251623ba34525c351ea75bb0ccafbf9269cf5eebc153f7e3e83d9b058b3e016f8bcac44c33a4d6506b61d664aa865fa4e1128636b
+  metadata.gz: ff1a99172103f63cb660eec1df2b1cce4e9b5b69fac5c3a76d6c26dd3c1db95726a4f3b7125b8a1361d8a60042169bc0e91d45ac6ddddda978d58a603eafebec
+  data.tar.gz: f28021dffed759533327bc3a360d1f5b208779fa639f4137b27258154b9afcb2b831dbc1b1dd9e10bf0ed87bf8a8d0b39af7b898f86d12a39f2ce717045ec7ab

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

@@ -5,7 +5,7 @@ module Hydra
       include Hydra::AccessControls::WithAccessRight
 
       included do
-        validates :embargo_release_date, :'hydra/future_date' => true
+        validates :embargo_release_date, :lease_expiration_date, :'hydra/future_date' => true
 
         has_attributes :visibility_during_embargo, :visibility_after_embargo, :embargo_release_date,
           :visibility_during_lease, :visibility_after_lease, :lease_expiration_date,

data/app/validators/hydra/future_date_validator.rb

@@ -6,13 +6,13 @@ module Hydra
         begin
           if date = value.to_date
             if date <= Date.today
-              record.errors[:embargo_release_date] << "Must be a future date"
+              record.errors[attribute] << "Must be a future date"
             end
           else
-            record.errors[:embargo_release_date] << "Invalid Date Format"
+            record.errors[attribute] << "Invalid Date Format"
           end
         rescue ArgumentError, NoMethodError
-          record.errors[:embargo_release_date] << "Invalid Date Format"
+          record.errors[attribute] << "Invalid Date Format"
         end
       end
     end

data/spec/support/rails.rb

@@ -1,5 +1,5 @@
 # Rails normally loads the locales of engines for us.
-I18n.load_path << 'config/locale/hydra-access-controls.en.yml'
+I18n.load_path << 'config/locales/hydra-access-controls.en.yml'
 
 module Rails
   def self.env

data/spec/unit/ability_spec.rb

@@ -52,12 +52,12 @@ describe Ability do
       end
       subject { Ability.new(nil) }
       it "should be able to view the asset" do
-        subject.can?(:read, @asset).should be_true
+        subject.can?(:read, @asset).should be true
       end
       it "should not be able to edit, update and destroy the asset" do
-        subject.can?(:edit, @asset).should be_false
-        subject.can?(:update, @asset).should be_false
-        subject.can?(:destroy, @asset).should be_false
+        subject.can?(:edit, @asset).should be false
+        subject.can?(:update, @asset).should be false
+        subject.can?(:destroy, @asset).should be false
       end
     end
     context "Then a registered user" do
@@ -66,12 +66,12 @@ describe Ability do
       end
       subject { Ability.new(@user) }
       it "should be able to view the asset" do
-        subject.can?(:read, @asset).should be_true
+        subject.can?(:read, @asset).should be true
       end
       it "should not be able to edit, update and destroy the asset" do
-        subject.can?(:edit, @asset).should be_false
-        subject.can?(:update, @asset).should be_false
-        subject.can?(:destroy, @asset).should be_false
+        subject.can?(:edit, @asset).should be false
+        subject.can?(:update, @asset).should be false
+        subject.can?(:destroy, @asset).should be false
       end
     end
   end
@@ -119,15 +119,15 @@ describe Ability do
       subject { Ability.new(@user) }
 
       it "should be able to view the asset" do
-        subject.can?(:read, @asset).should be_true
+        subject.can?(:read, @asset).should be true
       end
       it "should not be able to edit, update and destroy the asset" do
-        subject.can?(:edit, @asset).should be_false
-        subject.can?(:update, @asset).should be_false
-        subject.can?(:destroy, @asset).should be_false
+        subject.can?(:edit, @asset).should be false
+        subject.can?(:update, @asset).should be false
+        subject.can?(:destroy, @asset).should be false
       end
       it "should not be able to see the admin view of the asset" do
-        subject.can?(:admin, @asset).should be_false
+        subject.can?(:admin, @asset).should be false
       end
     end
   end
@@ -142,15 +142,15 @@ describe Ability do
       subject { Ability.new(@user) }
 
       it "should be able to view the asset" do
-        subject.can?(:read, @asset).should be_true
+        subject.can?(:read, @asset).should be true
       end
       it "should be able to edit, update and destroy the asset" do
-        subject.can?(:edit, @asset).should be_true
-        subject.can?(:update, @asset).should be_true
-        subject.can?(:destroy, @asset).should be_true
+        subject.can?(:edit, @asset).should be true
+        subject.can?(:update, @asset).should be true
+        subject.can?(:destroy, @asset).should be true
       end
       it "should not be able to see the admin view of the asset" do
-        subject.can?(:admin, @asset).should be_false
+        subject.can?(:admin, @asset).should be false
       end
     end
     context "Then a collaborator with edit access (group permision)" do
@@ -161,7 +161,7 @@ describe Ability do
       subject { Ability.new(@user) }
 
       it "should be able to view the asset" do
-        subject.can?(:read, @asset).should be_true
+        subject.can?(:read, @asset).should be true
       end
     end
   end
@@ -178,15 +178,15 @@ describe Ability do
       subject { Ability.new(@user) }
 
       it "should not be able to view the asset" do
-        subject.can?(:read, @asset).should be_false
+        subject.can?(:read, @asset).should be false
       end
       it "should not be able to edit, update and destroy the asset" do
-        subject.can?(:edit, @asset).should be_false
-        subject.can?(:update, @asset).should be_false
-        subject.can?(:destroy, @asset).should be_false
+        subject.can?(:edit, @asset).should be false
+        subject.can?(:update, @asset).should be false
+        subject.can?(:destroy, @asset).should be false
       end
       it "should not be able to see the admin view of the asset" do
-        subject.can?(:admin, @asset).should be_false
+        subject.can?(:admin, @asset).should be false
       end
     end
     context "Then someone whose role/group has read access" do
@@ -197,15 +197,15 @@ describe Ability do
       subject { Ability.new(@user) }
 
       it "should be able to view the asset" do
-        subject.can?(:read, @asset).should be_true
+        subject.can?(:read, @asset).should be true
       end
       it "should not be able to edit, update and destroy the asset" do
-        subject.can?(:edit, @asset).should be_false
-        subject.can?(:update, @asset).should be_false
-        subject.can?(:destroy, @asset).should be_false
+        subject.can?(:edit, @asset).should be false
+        subject.can?(:update, @asset).should be false
+        subject.can?(:destroy, @asset).should be false
       end
       it "should not be able to see the admin view of the asset" do
-        subject.can?(:admin, @asset).should be_false
+        subject.can?(:admin, @asset).should be false
       end
     end
   end
@@ -231,7 +231,7 @@ describe Ability do
     subject { MyAbility.new(@user) }
 
     it "should be set the custom permission" do
-      subject.can?(:accept, ActiveFedora::Base).should be_true
+      subject.can?(:accept, ActiveFedora::Base).should be true
     end
 
   end
@@ -249,8 +249,8 @@ describe Ability do
     subject { Ability.new(@user) }
     it "should be readable in the first instance and not in the second instance" do
       # We had a bug around this where it keeps returning the access for the first object queried
-      subject.can?(:edit, @asset1).should be_true  
-      subject.can?(:edit, @asset2).should be_false  
+      subject.can?(:edit, @asset1).should be true  
+      subject.can?(:edit, @asset2).should be false  
     end
   end
 
@@ -267,17 +267,17 @@ describe Ability do
         @asset.save
       end
       it "should permit the user to download the object's datastreams" do
-        subject.can?(:read, @asset).should be_true
+        subject.can?(:read, @asset).should be true
         @asset.datastreams.each_value do |ds|
-          subject.can?(:download, ds).should be_true
+          subject.can?(:download, ds).should be true
         end
       end
     end
     context "user lacks read permission on the object" do
       it "should not permit the user to download the object's datastreams" do
-        subject.can?(:read, @asset).should be_false
+        subject.can?(:read, @asset).should be false
         @asset.datastreams.each_value do |ds|
-          subject.can?(:download, ds).should be_false
+          subject.can?(:download, ds).should be false
         end
       end
     end

data/spec/unit/admin_policy_spec.rb

@@ -137,12 +137,12 @@ describe Hydra::AdminPolicy do
         end
         after { @asset.delete }
     		it "Then I should be able to view the asset" do
-    		  subject.can?(:read, @asset).should be_true
+    		  subject.can?(:read, @asset).should be true
   		  end
         it "Then I should not be able to edit, update and destroy the asset" do
-          subject.can?(:edit, @asset).should be_false
-          subject.can?(:update, @asset).should be_false
-          subject.can?(:destroy, @asset).should be_false
+          subject.can?(:edit, @asset).should be false
+          subject.can?(:update, @asset).should be false
+          subject.can?(:destroy, @asset).should be false
         end
       end
     end
@@ -161,12 +161,12 @@ describe Hydra::AdminPolicy do
         end
         after { @asset.delete }
     		it "Then I should be able to view the asset" do
-    		  subject.can?(:read, @asset).should be_true
+    		  subject.can?(:read, @asset).should be true
   		  end
     		it "Then I should be able to edit/update/destroy the asset" do
-          subject.can?(:edit, @asset).should be_true
-          subject.can?(:update, @asset).should be_true
-          subject.can?(:destroy, @asset).should be_true
+          subject.can?(:edit, @asset).should be true
+          subject.can?(:update, @asset).should be true
+          subject.can?(:destroy, @asset).should be true
         end
   		end
     	context "And a subscribing asset grants read access to me as an individual" do
@@ -178,12 +178,12 @@ describe Hydra::AdminPolicy do
         end
         after { @asset.delete }
     		it "Then I should be able to view the asset" do
-    		  subject.can?(:read, @asset).should be_true
+    		  subject.can?(:read, @asset).should be true
   		  end
         it "Then I should be able to edit/update/destroy the asset" do
-          subject.can?(:edit, @asset).should be_true
-          subject.can?(:update, @asset).should be_true
-          subject.can?(:destroy, @asset).should be_true
+          subject.can?(:edit, @asset).should be true
+          subject.can?(:update, @asset).should be true
+          subject.can?(:destroy, @asset).should be true
         end
       end
     end
@@ -202,12 +202,12 @@ describe Hydra::AdminPolicy do
         end
         after { @asset.delete }
   		  it "Then I should not be able to view the asset" do
-    		  subject.can?(:read, @asset).should be_false
+    		  subject.can?(:read, @asset).should be false
   		  end
         it "Then I should not be able to edit/update/destroy the asset" do
-          subject.can?(:edit, @asset).should be_false
-          subject.can?(:update, @asset).should be_false
-          subject.can?(:destroy, @asset).should be_false
+          subject.can?(:edit, @asset).should be false
+          subject.can?(:update, @asset).should be false
+          subject.can?(:destroy, @asset).should be false
         end
       end
       context "And a subscribing asset grants read access to me as an individual" do
@@ -219,12 +219,12 @@ describe Hydra::AdminPolicy do
         end
         after { @asset.delete }
   		  it "Then I should be able to view the asset" do
-    		  subject.can?(:read, @asset).should be_true
+    		  subject.can?(:read, @asset).should be true
   		  end
         it "Then I should not be able to edit/update/destroy the asset" do
-          subject.can?(:edit, @asset).should be_false
-          subject.can?(:update, @asset).should be_false
-          subject.can?(:destroy, @asset).should be_false
+          subject.can?(:edit, @asset).should be false
+          subject.can?(:update, @asset).should be false
+          subject.can?(:destroy, @asset).should be false
         end
       end
     end

data/spec/unit/embargoable_spec.rb

@@ -20,6 +20,15 @@ describe Hydra::AccessControls::Embargoable do
 
   subject { model.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']
+    end
+  end
+
   context 'visibility=' do
     it "when changing from embargo, wipes out associated embargo metadata" do
       subject.embargo_release_date = future_date.to_s

data/spec/unit/policy_aware_ability_spec.rb

@@ -86,37 +86,37 @@ describe Hydra::PolicyAwareAbility do
     context "public user" do
       it "should return false" do
         subject.stub(:user_groups).and_return(["public"])
-        subject.test_edit_from_policy(@asset.pid).should be_false
+        subject.test_edit_from_policy(@asset.pid).should be false
       end
     end
     context "registered user" do
       it "should return false" do
         subject.user_groups.should include("registered")
-        subject.test_edit_from_policy(@asset.pid).should be_false
+        subject.test_edit_from_policy(@asset.pid).should be false
       end
     end
     context "user with policy read access only" do
       it "should return false" do
         subject.current_user.stub(:user_key).and_return("nero")
-        subject.test_edit_from_policy(@asset.pid).should be_false
+        subject.test_edit_from_policy(@asset.pid).should be false
       end
     end
     context "user with policy edit access" do
       it "should return true" do
         subject.current_user.stub(:user_key).and_return("julius_caesar")
-        subject.test_edit_from_policy(@asset.pid).should be_true
+        subject.test_edit_from_policy(@asset.pid).should be true
       end
     end
     context "user in group with policy read access" do
       it "should return false" do
         subject.stub(:user_groups).and_return(["africana-faculty"])
-        subject.test_edit_from_policy(@asset.pid).should be_false
+        subject.test_edit_from_policy(@asset.pid).should be false
       end
     end
     context "user in group with policy edit access" do
       it "should return true" do
         subject.stub(:user_groups).and_return(["cool_kids"])
-        subject.test_edit_from_policy(@asset.pid).should be_true
+        subject.test_edit_from_policy(@asset.pid).should be true
       end
     end
   end
@@ -124,37 +124,37 @@ describe Hydra::PolicyAwareAbility do
     context "public user" do
       it "should return false" do
         subject.stub(:user_groups).and_return(["public"])
-        subject.test_read_from_policy(@asset.pid).should be_false
+        subject.test_read_from_policy(@asset.pid).should be false
       end
     end
     context "registered user" do
       it "should return false" do
         subject.user_groups.should include("registered")
-        subject.test_read_from_policy(@asset.pid).should be_false
+        subject.test_read_from_policy(@asset.pid).should be false
       end
     end
     context "user with policy read access only" do
       it "should return false" do
         subject.current_user.stub(:user_key).and_return("nero")
-        subject.test_read_from_policy(@asset.pid).should be_true
+        subject.test_read_from_policy(@asset.pid).should be true
       end
     end
     context "user with policy edit access" do
       it "should return true" do
         subject.current_user.stub(:user_key).and_return("julius_caesar")
-        subject.test_read_from_policy(@asset.pid).should be_true
+        subject.test_read_from_policy(@asset.pid).should be true
       end
     end
     context "user in group with policy read access" do
       it "should return false" do
         subject.stub(:user_groups).and_return(["africana-faculty"])
-        subject.test_read_from_policy(@asset.pid).should be_true
+        subject.test_read_from_policy(@asset.pid).should be true
       end
     end
     context "user in group with policy edit access" do
       it "should return true" do
         subject.stub(:user_groups).and_return(["cool_kids"])
-        subject.test_read_from_policy(@asset.pid).should be_true
+        subject.test_read_from_policy(@asset.pid).should be true
       end
     end
   end

data/spec/unit/with_access_right_spec.rb

@@ -18,18 +18,18 @@ describe "WithAccessRight" do
   context "not persisted" do
     context "when it is public" do
       before { subject.visibility = Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_PUBLIC}
-      its(:authenticated_only_access?) { should be_false}
-      its(:private_access?) { should be_false}
-      its(:open_access?) { should be_true}
-      its(:open_access_with_embargo_release_date?) { should be_false}
+      its(:authenticated_only_access?) { should be false}
+      its(:private_access?) { should be false}
+      its(:open_access?) { should be true}
+      its(:open_access_with_embargo_release_date?) { should be false}
     end
 
     context "when it is private" do
       before { subject.visibility = Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_PRIVATE }
-      its(:authenticated_only_access?) { should be_false}
-      its(:private_access?) { should be_true}
-      its(:open_access?) { should be_false}
-      its(:open_access_with_embargo_release_date?) { should be_false}
+      its(:authenticated_only_access?) { should be false}
+      its(:private_access?) { should be true}
+      its(:open_access?) { should be false}
+      its(:open_access_with_embargo_release_date?) { should be false}
     end
   end
 
@@ -39,30 +39,30 @@ describe "WithAccessRight" do
       before do
         subject.visibility = Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_PUBLIC
       end
-      its(:authenticated_only_access?) { should be_false}
-      its(:private_access?) { should be_false}
-      its(:open_access?) { should be_true}
-      its(:open_access_with_embargo_release_date?) { should be_false}
+      its(:authenticated_only_access?) { should be false}
+      its(:private_access?) { should be false}
+      its(:open_access?) { should be true}
+      its(:open_access_with_embargo_release_date?) { should be false}
     end
 
     context "when it is private" do
       before do
         subject.visibility = Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_PRIVATE
       end
-      its(:authenticated_only_access?) { should be_false}
-      its(:private_access?) { should be_true}
-      its(:open_access?) { should be_false}
-      its(:open_access_with_embargo_release_date?) { should be_false}
+      its(:authenticated_only_access?) { should be false}
+      its(:private_access?) { should be true}
+      its(:open_access?) { should be false}
+      its(:open_access_with_embargo_release_date?) { should be false}
     end
 
     context "when it is authenticated access" do
       before do
         subject.visibility = Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_AUTHENTICATED
       end
-      its(:authenticated_only_access?) { should be_true}
-      its(:private_access?) { should be_false}
-      its(:open_access?) { should be_false}
-      its(:open_access_with_embargo_release_date?) { should be_false}
+      its(:authenticated_only_access?) { should be true}
+      its(:private_access?) { should be false}
+      its(:open_access?) { should be false}
+      its(:open_access_with_embargo_release_date?) { should be false}
     end
   end
 

data/spec/validators/future_date_validator_spec.rb

@@ -0,0 +1,22 @@
+require 'spec_helper'
+
+describe Hydra::FutureDateValidator do
+  let(:future_date) { Date.today + 2 }
+  let(:past_date) { Date.today - 2 }
+  let(:validator) { Hydra::FutureDateValidator.new(attributes: [:embargo_release_date, :lease_expiration_date]) }
+  before do
+    validator.validate(subject)
+  end
+ 
+  context "when date is valid" do
+    subject { ModsAsset.new(embargo_release_date: future_date) }
+    its(:errors) { should be_empty }
+  end
+
+  context "when date is invalid" do
+    subject { ModsAsset.new(lease_expiration_date: past_date) }
+    it "has errors" do
+      expect(subject.errors[:lease_expiration_date]).to eq ['Must be a future date']
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hydra-access-controls
 version: !ruby/object:Gem::Version
-  version: 7.1.0.rc2
+  version: 7.1.0
 platform: ruby
 authors:
 - Chris Beer
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-13 00:00:00.000000000 Z
+date: 2014-06-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -167,7 +167,7 @@ files:
 - app/services/hydra/lease_service.rb
 - app/validators/hydra/future_date_validator.rb
 - config/fedora.yml
-- config/locale/hydra-access-controls.en.yml
+- config/locales/hydra-access-controls.en.yml
 - config/solr.yml
 - hydra-access-controls.gemspec
 - lib/active_fedora/accessible_by.rb
@@ -214,6 +214,7 @@ files:
 - spec/unit/role_mapper_spec.rb
 - spec/unit/visibility_spec.rb
 - spec/unit/with_access_right_spec.rb
+- spec/validators/future_date_validator_spec.rb
 - tasks/hydra-access-controls.rake
 homepage: http://projecthydra.org
 licenses:
@@ -230,9 +231,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.2.2
@@ -267,4 +268,5 @@ test_files:
 - spec/unit/role_mapper_spec.rb
 - spec/unit/visibility_spec.rb
 - spec/unit/with_access_right_spec.rb
+- spec/validators/future_date_validator_spec.rb
 has_rdoc: