hydra-access-controls 7.1.0.rc1 → 7.1.0.rc2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cb1a2767144b61de76cedcc965dcd1d88bd12f46
-  data.tar.gz: 16e60959b2f2782197a0833d365fa5ae815c19ba
+  metadata.gz: f11322c08f169903ee4db5becd7ab8228fee5536
+  data.tar.gz: 149d2abb10a3f1e812d4b914c42bee38451fb58e
 SHA512:
-  metadata.gz: 37b630c64ad0407ac2bd7f61dc690a543c746aad151a81d24e931c62dfe06343dd65cefa559b637702d3111fb670ec05f8273c4a1c08f73bf1d4e295e11c8bea
-  data.tar.gz: ad5aad6fbeaa457286db70a4d40e606b3b600d915eeca2fddd1cdf9979b44bad5f46825ff33ba38fba9725c065cb82a22cebbaa4b1030f9bda358093e123ce99
+  metadata.gz: b354963b372381e532658382bd583feb9e3cfeba345f4eed6fedf404e72bebf209d0f8d86062c2b4fd2d056a68eb416efdd389aee5bdde8c426597ee1f6ae10c
+  data.tar.gz: d7a24c9ddcc075d5beb6bc1251623ba34525c351ea75bb0ccafbf9269cf5eebc153f7e3e83d9b058b3e016f8bcac44c33a4d6506b61d664aa865fa4e1128636b

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

@@ -7,8 +7,7 @@ module Hydra
 
       # The values that get drawn to the page
       VISIBILITY_TEXT_VALUE_PUBLIC = 'open'.freeze
-      VISIBILITY_TEXT_VALUE_EMBARGO = 'open_with_embargo_release_date'.freeze
-      #VISIBILITY_TEXT_VALUE_EMBARGO = 'embargo'.freeze  # << !! Will change to this in next major release !!
+      VISIBILITY_TEXT_VALUE_EMBARGO = 'embargo'.freeze
       VISIBILITY_TEXT_VALUE_LEASE = 'lease'.freeze
       VISIBILITY_TEXT_VALUE_AUTHENTICATED = 'authenticated'.freeze
       VISIBILITY_TEXT_VALUE_PRIVATE = 'restricted'.freeze

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

@@ -7,20 +7,19 @@ module Hydra
       included do
         validates :embargo_release_date, :'hydra/future_date' => true
 
-        has_attributes :visibility_during_embargo, :visibility_after_embargo, 
+        has_attributes :visibility_during_embargo, :visibility_after_embargo, :embargo_release_date,
           :visibility_during_lease, :visibility_after_lease, :lease_expiration_date,
-          :embargo_release_date,
           datastream: 'rightsMetadata', multiple: false
 
         has_attributes :embargo_history, :lease_history, datastream: 'rightsMetadata', multiple:true
       end
 
       def under_embargo?
-        @under_embargo ||= rightsMetadata.under_embargo?
+        rightsMetadata.under_embargo?
       end
 
       def active_lease?
-        @active_lease ||= rightsMetadata.active_lease?
+        rightsMetadata.active_lease?
       end
 
       # If changing away from embargo or lease, this will deactivate the lease/embargo before proceeding.
@@ -40,12 +39,12 @@ module Hydra
         self.embargo_release_date = release_date
         self.visibility_during_embargo = visibility_during unless visibility_during.nil?
         self.visibility_after_embargo = visibility_after unless visibility_after.nil?
-        self.embargo_visibility!
+        embargo_visibility!
       end
 
       def deactivate_embargo!
         embargo_state = under_embargo? ? "active" : "expired"
-        embargo_record = "An #{embargo_state} embargo was deactivated on #{Date.today}.  Its release date was #{embargo_release_date}.  Visibility during embargo was #{visibility_during_embargo} and intended visibility after embargo was #{visibility_after_embargo}"
+        embargo_record = embargo_history_message(embargo_state, Date.today, embargo_release_date, visibility_during_embargo, visibility_after_embargo)
         self.embargo_release_date = nil
         self.visibility_during_embargo = nil
         self.visibility_after_embargo = nil
@@ -73,6 +72,7 @@ module Hydra
         end
       end
 
+      # Set the current visibility to match what is described in the embargo.
       def embargo_visibility!
         if embargo_release_date
           if under_embargo?
@@ -115,13 +115,14 @@ module Hydra
 
       def deactivate_lease!
         lease_state = active_lease? ? "active" : "expired"
-        lease_record = "An #{lease_state} lease was deactivated on #{Date.today}.  Its release date was #{lease_expiration_date}.  Visibility during the lease was #{visibility_during_lease} and intended visibility after lease was #{visibility_after_lease}."
+        lease_record = lease_history_message(lease_state, Date.today, lease_expiration_date, visibility_during_lease, visibility_after_lease)
         self.lease_expiration_date = nil
         self.visibility_during_lease = nil
         self.visibility_after_lease = nil
         self.lease_history += [lease_record]
       end
 
+      # Set the current visibility to match what is described in the lease.
       def lease_visibility!
         if lease_expiration_date
           if active_lease?
@@ -134,6 +135,21 @@ module Hydra
         end
       end
 
+      protected
+
+        # Create the log message used when deactivating an embargo
+        # This method may be overriden in order to transform the values of the passed parameters.
+        def embargo_history_message(state, deactivate_date, release_date, visibility_during, visibility_after)
+          I18n.t 'hydra.embargo.history_message', state: state, deactivate_date: deactivate_date, release_date: release_date,
+            visibility_during: visibility_during, visibility_after: visibility_after
+        end
+
+        # Create the log message used when deactivating a lease
+        # This method may be overriden in order to transform the values of the passed parameters.
+        def lease_history_message(state, deactivate_date, expiration_date, visibility_during, visibility_after)
+          I18n.t 'hydra.lease.history_message', state: state, deactivate_date: deactivate_date, expiration_date: expiration_date,
+            visibility_during: visibility_during, visibility_after: visibility_after
+        end
     end
   end
 end

data/config/locale/hydra-access-controls.en.yml

@@ -0,0 +1,6 @@
+en:
+  hydra:
+    embargo:
+      history_message: 'An %{state} embargo was deactivated on %{deactivate_date}.  Its release date was %{release_date}.  Visibility during embargo was %{visibility_during} and intended visibility after embargo was %{visibility_after}'
+    lease:
+      history_message: 'An %{state} lease was deactivated on %{deactivate_date}.  Its expiration date was %{expiration_date}.  Visibility during the lease was %{visibility_during} and intended visibility after the lease was %{visibility_after}'

data/hydra-access-controls.gemspec

@@ -20,6 +20,7 @@ Gem::Specification.new do |gem|
 
   gem.add_dependency 'activesupport'
   gem.add_dependency "active-fedora", '~> 7.0.0'
+  gem.add_dependency "om", '~> 3.0', '>= 3.0.7'
   gem.add_dependency 'cancancan'
   gem.add_dependency 'deprecation'
   gem.add_dependency "blacklight", '~> 5.3'

data/lib/hydra/datastream/rights_metadata.rb

@@ -61,16 +61,16 @@ module Hydra
 
         t.license(:ref=>[:copyright])
 
-        t.visibility_during_embargo ref: [:embargo, :machine, :visibility_during]
-        t.visibility_after_embargo ref: [:embargo, :machine, :visibility_after]
-        t.visibility_during_lease ref: [:lease, :machine, :visibility_during]
-        t.visibility_after_lease ref: [:lease, :machine, :visibility_after]
-        t.embargo_history ref: [:embargo, :human_readable]
-        t.lease_history ref: [:lease, :human_readable]
-        t.embargo_release_date ref: [:embargo, :machine, :date], type: :time
-        t.embargo_deactivation_date ref: [:embargo, :machine, :date_deactivated]
-        t.lease_expiration_date ref: [:lease, :machine, :date], type: :time
-        t.lease_deactivation_date ref: [:lease, :machine, :date_deactivated]
+        t.visibility_during_embargo proxy: [:embargo, :machine, :visibility_during]
+        t.visibility_after_embargo proxy: [:embargo, :machine, :visibility_after]
+        t.visibility_during_lease proxy: [:lease, :machine, :visibility_during]
+        t.visibility_after_lease proxy: [:lease, :machine, :visibility_after]
+        t.embargo_history proxy: [:embargo, :human_readable]
+        t.lease_history proxy: [:lease, :human_readable]
+        t.embargo_release_date proxy: [:embargo, :machine, :date], type: :time
+        t.embargo_deactivation_date proxy: [:embargo, :machine, :date_deactivated]
+        t.lease_expiration_date proxy: [:lease, :machine, :date], type: :time
+        t.lease_deactivation_date proxy: [:lease, :machine, :date_deactivated]
 
       end
 

data/spec/spec_helper.rb

@@ -1,7 +1,7 @@
 ENV["environment"] ||= "test"
 
 require 'rspec/mocks'
-require 'rspec/autorun'
+require 'rspec/its'
 require 'hydra-access-controls'
 
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))

data/spec/support/rails.rb

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

data/spec/unit/embargoable_spec.rb

@@ -48,16 +48,38 @@ describe Hydra::AccessControls::Embargoable do
       expect(subject.visibility_after_embargo).to eq Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_AUTHENTICATED
     end
   end
+
   context 'deactivate_embargo!' do
-    it "should remove the associated embargo information and record it in the object's embargo history" do
-      subject.embargo_release_date = past_date.to_s
+    before do
       subject.visibility_during_embargo = Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_PRIVATE
       subject.visibility_after_embargo = Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_PUBLIC
-      subject.deactivate_embargo!
-      expect(subject.embargo_release_date).to be_nil
-      expect(subject.visibility_during_embargo).to be_nil
-      expect(subject.visibility_after_embargo).to be_nil
-      expect(subject.embargo_history.last).to include("An expired embargo was deactivated on #{Date.today}.")
+      subject.embargo_release_date = release_date
+    end
+
+    context "when the embargo is expired" do
+      let(:release_date) { past_date.to_s }
+
+      it "should remove the associated embargo information and record it in the object's embargo history" do
+        subject.deactivate_embargo!
+        expect(subject.embargo_release_date).to be_nil
+        expect(subject.visibility_during_embargo).to be_nil
+        expect(subject.visibility_after_embargo).to be_nil
+        expect(subject.embargo_history.last).to include("An expired embargo was deactivated on #{Date.today}.")
+      end
+    end
+
+    context "when the embargo is active" do
+      let(:release_date) { future_date.to_s }
+
+      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)
+        expect(subject.embargo_release_date).to be_nil
+        expect(subject.visibility_during_embargo).to be_nil
+        expect(subject.visibility_after_embargo).to be_nil
+        expect(subject.embargo_history.last).to include("An active embargo was deactivated on #{Date.today}.")
+      end
     end
   end
 
@@ -78,15 +100,35 @@ describe Hydra::AccessControls::Embargoable do
   end
 
   context 'deactivate_lease!' do
-    it "should remove the associated embargo information and record it in the object's embargo history" do
-      subject.lease_expiration_date = past_date.to_s
+    before do
+      subject.lease_expiration_date = expiration_date
       subject.visibility_during_lease = Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_PUBLIC
       subject.visibility_after_lease = Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_PRIVATE
-      subject.deactivate_lease!
-      expect(subject.lease_expiration_date).to be_nil
-      expect(subject.visibility_during_lease).to be_nil
-      expect(subject.visibility_after_lease).to be_nil
-      expect(subject.lease_history.last).to include("An expired lease was deactivated on #{Date.today}.")
+    end
+
+    context "when the lease is expired" 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.lease_expiration_date).to be_nil
+        expect(subject.visibility_during_lease).to be_nil
+        expect(subject.visibility_after_lease).to be_nil
+        expect(subject.lease_history.last).to include("An expired lease was deactivated on #{Date.today}.")
+      end
+    end
+    context "when the lease is active" do
+      let(:expiration_date) { future_date.to_s }
+
+      it "should remove the associated lease information and record it in the object's lease history" do
+        expect {
+          subject.deactivate_lease!
+        }.to change { subject.active_lease? }.from(true).to(false)
+        expect(subject.lease_expiration_date).to be_nil
+        expect(subject.visibility_during_lease).to be_nil
+        expect(subject.visibility_after_lease).to be_nil
+        expect(subject.lease_history.last).to include("An active lease was deactivated on #{Date.today}.")
+      end
     end
   end
 

data/spec/unit/hydra_rights_metadata_spec.rb

@@ -1,23 +1,17 @@
 require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
-require "nokogiri"
 
 describe Hydra::Datastream::RightsMetadata do
-  
-  before(:each) do
-    # The way RubyDora loads objects prevents us from stubbing the fedora connection :(
-    # ActiveFedora::RubydoraConnection.stubs(:instance).returns(stub_everything())
-    obj = ActiveFedora::Base.new
-    @sample = Hydra::Datastream::RightsMetadata.new(obj.inner_object, nil)
-    @sample.stub(:content).and_return('')
-  end
 
+  let(:obj) { ActiveFedora::Base.new }
+  let(:sample) { Hydra::Datastream::RightsMetadata.new(obj.inner_object, nil) }
+  
   describe "license" do
     before do
-      @sample.license.title = "Creative Commons Attribution 3.0 Unported License." 
-      @sample.license.description = "This Creative Commons license lets others distribute, remix, tweak, and build upon your work, even commercially, as long as they credit you for the original creation. This is the most accommodating of licenses offered. Recommended for maximum dissemination and use of licensed materials." 
-      @sample.license.url = "http://creativecommons.org/licenses/by/3.0/" 
+      sample.license.title = "Creative Commons Attribution 3.0 Unported License." 
+      sample.license.description = "This Creative Commons license lets others distribute, remix, tweak, and build upon your work, even commercially, as long as they credit you for the original creation. This is the most accommodating of licenses offered. Recommended for maximum dissemination and use of licensed materials." 
+      sample.license.url = "http://creativecommons.org/licenses/by/3.0/" 
     end
-    subject { @sample.license}
+    subject { sample.license}
     its(:title) {should == ["Creative Commons Attribution 3.0 Unported License."] }
     its(:description) { should == ["This Creative Commons license lets others distribute, remix, tweak, and build upon your work, even commercially, as long as they credit you for the original creation. This is the most accommodating of licenses offered. Recommended for maximum dissemination and use of licensed materials."] }
     its(:url) {should == ["http://creativecommons.org/licenses/by/3.0/"] }
@@ -25,131 +19,131 @@ describe Hydra::Datastream::RightsMetadata do
     it "should be accessable as a term path" do
       # This enables us to use:
       #  delegate :license_title, :to=>'rightsMetadata', :at=>[:license, :title]
-      @sample.term_values(:license, :title).should == ["Creative Commons Attribution 3.0 Unported License."]
+      sample.term_values(:license, :title).should == ["Creative Commons Attribution 3.0 Unported License."]
     end
   end
   
   describe "permissions" do
     describe "setter" do
       it "should set person permissions" do
-        @sample.permissions = {"person"=>{"maria"=>"read","marcus"=>"discover"}}
+        sample.permissions = {"person"=>{"maria"=>"read","marcus"=>"discover"}}
       end
       it "should set group permissions" do
-        @sample.permissions = {"group"=>{"librarians"=>"read","students"=>"discover"}}
+        sample.permissions = {"group"=>{"librarians"=>"read","students"=>"discover"}}
       end
       it "should create/update/delete permissions for the given user/group" do
-        @sample.class.terminology.xpath_for(:access, :person, "person_123").should == '//oxns:access/oxns:machine/oxns:person[contains(., "person_123")]'
+        sample.class.terminology.xpath_for(:access, :person, "person_123").should == '//oxns:access/oxns:machine/oxns:person[contains(., "person_123")]'
         
-        person_123_perms_xpath = @sample.class.terminology.xpath_for(:access, :person, "person_123")
-        group_zzz_perms_xpath = @sample.class.terminology.xpath_for(:access, :group, "group_zzz")
+        person_123_perms_xpath = sample.class.terminology.xpath_for(:access, :person, "person_123")
+        group_zzz_perms_xpath = sample.class.terminology.xpath_for(:access, :group, "group_zzz")
         
-        @sample.find_by_terms(person_123_perms_xpath).should be_empty 
-        @sample.permissions({"person"=>"person_123"}, "edit").should == "edit"
-        @sample.permissions({"group"=>"group_zzz"}, "edit").should == "edit"      
+        sample.find_by_terms(person_123_perms_xpath).should be_empty 
+        sample.permissions({"person"=>"person_123"}, "edit").should == "edit"
+        sample.permissions({"group"=>"group_zzz"}, "edit").should == "edit"      
         
-        @sample.find_by_terms(person_123_perms_xpath).first.ancestors("access").first.attributes["type"].text.should == "edit"
-        @sample.find_by_terms(group_zzz_perms_xpath).first.ancestors("access").first.attributes["type"].text.should == "edit"
+        sample.find_by_terms(person_123_perms_xpath).first.ancestors("access").first.attributes["type"].text.should == "edit"
+        sample.find_by_terms(group_zzz_perms_xpath).first.ancestors("access").first.attributes["type"].text.should == "edit"
         
-        @sample.permissions({"person"=>"person_123"}, "read")
-        @sample.permissions({"group"=>"group_zzz"}, "read")
-        @sample.find_by_terms(person_123_perms_xpath).length.should == 1
+        sample.permissions({"person"=>"person_123"}, "read")
+        sample.permissions({"group"=>"group_zzz"}, "read")
+        sample.find_by_terms(person_123_perms_xpath).length.should == 1
         
-        @sample.find_by_terms(person_123_perms_xpath).first.ancestors("access").first.attributes["type"].text.should == "read"
-        @sample.find_by_terms(group_zzz_perms_xpath).first.ancestors("access").first.attributes["type"].text.should == "read"
+        sample.find_by_terms(person_123_perms_xpath).first.ancestors("access").first.attributes["type"].text.should == "read"
+        sample.find_by_terms(group_zzz_perms_xpath).first.ancestors("access").first.attributes["type"].text.should == "read"
       
-        @sample.permissions({"person"=>"person_123"}, "none").should == "none"
-        @sample.permissions({"group"=>"group_zzz"}, "none").should == "none"
-        @sample.find_by_terms(person_123_perms_xpath).should be_empty 
-        @sample.find_by_terms(person_123_perms_xpath).should be_empty 
+        sample.permissions({"person"=>"person_123"}, "none").should == "none"
+        sample.permissions({"group"=>"group_zzz"}, "none").should == "none"
+        sample.find_by_terms(person_123_perms_xpath).should be_empty 
+        sample.find_by_terms(person_123_perms_xpath).should be_empty 
       end
       it "should remove existing permissions (leaving only one permission level per user/group)" do
-        person_123_perms_xpath = @sample.class.terminology.xpath_for(:access, :person, "person_123")
-        group_zzz_perms_xpath = @sample.class.terminology.xpath_for(:access, :group, "group_zzz")
+        person_123_perms_xpath = sample.class.terminology.xpath_for(:access, :person, "person_123")
+        group_zzz_perms_xpath = sample.class.terminology.xpath_for(:access, :group, "group_zzz")
                         
-        @sample.find_by_terms(person_123_perms_xpath).length.should == 0
-        @sample.find_by_terms(group_zzz_perms_xpath).length.should == 0
-        @sample.permissions({"person"=>"person_123"}, "read")
-        @sample.permissions({"group"=>"group_zzz"}, "read")
-        @sample.find_by_terms(person_123_perms_xpath).length.should == 1
-        @sample.find_by_terms(group_zzz_perms_xpath).length.should == 1
+        sample.find_by_terms(person_123_perms_xpath).length.should == 0
+        sample.find_by_terms(group_zzz_perms_xpath).length.should == 0
+        sample.permissions({"person"=>"person_123"}, "read")
+        sample.permissions({"group"=>"group_zzz"}, "read")
+        sample.find_by_terms(person_123_perms_xpath).length.should == 1
+        sample.find_by_terms(group_zzz_perms_xpath).length.should == 1
         
-        @sample.permissions({"person"=>"person_123"}, "edit")
-        @sample.permissions({"group"=>"group_zzz"}, "edit")
-        @sample.find_by_terms(person_123_perms_xpath).length.should == 1
-        @sample.find_by_terms(group_zzz_perms_xpath).length.should == 1
+        sample.permissions({"person"=>"person_123"}, "edit")
+        sample.permissions({"group"=>"group_zzz"}, "edit")
+        sample.find_by_terms(person_123_perms_xpath).length.should == 1
+        sample.find_by_terms(group_zzz_perms_xpath).length.should == 1
       end
       it "should not impact other users permissions" do
-        @sample.permissions({"person"=>"person_123"}, "read")
-        @sample.permissions({"person"=>"person_789"}, "edit")
+        sample.permissions({"person"=>"person_123"}, "read")
+        sample.permissions({"person"=>"person_789"}, "edit")
         
-        @sample.permissions({"person"=>"person_123"}).should == "read"
-        @sample.permissions({"person"=>"person_456"}, "read")
-        @sample.permissions({"person"=>"person_123"}).should == "read"
-        @sample.permissions({"person"=>"person_456"}).should == "read"
-        @sample.permissions({"person"=>"person_789"}).should == "edit"
+        sample.permissions({"person"=>"person_123"}).should == "read"
+        sample.permissions({"person"=>"person_456"}, "read")
+        sample.permissions({"person"=>"person_123"}).should == "read"
+        sample.permissions({"person"=>"person_456"}).should == "read"
+        sample.permissions({"person"=>"person_789"}).should == "edit"
         
         
       end
     end
     describe "getter" do
       it "should return permissions level for the given user/group" do
-        @sample.permissions({"person"=>"person_123"}, "edit")
-        @sample.permissions({"group"=>"group_zzz"}, "discover")
-        @sample.permissions({"person"=>"person_123"}).should == "edit"
-        @sample.permissions({"group"=>"group_zzz"}).should == "discover"
-        @sample.permissions({"group"=>"foo_people"}).should == "none"
+        sample.permissions({"person"=>"person_123"}, "edit")
+        sample.permissions({"group"=>"group_zzz"}, "discover")
+        sample.permissions({"person"=>"person_123"}).should == "edit"
+        sample.permissions({"group"=>"group_zzz"}).should == "discover"
+        sample.permissions({"group"=>"foo_people"}).should == "none"
       end
     end
   end
   describe "groups" do
     it "should return a hash of all groups with permissions set, along with their permission levels" do
-      @sample.permissions({"group"=>"group_zzz"}, "edit")
-      @sample.permissions({"group"=>"public"}, "discover")
+      sample.permissions({"group"=>"group_zzz"}, "edit")
+      sample.permissions({"group"=>"public"}, "discover")
 
-      #@sample.groups.should == {"group_zzz"=>"edit", "public"=>"discover"}
-      @sample.groups.should == {"public"=>"discover", "group_zzz"=>"edit"}
+      #sample.groups.should == {"group_zzz"=>"edit", "public"=>"discover"}
+      sample.groups.should == {"public"=>"discover", "group_zzz"=>"edit"}
     end
   end
   describe "individuals" do
     it "should return a hash of all individuals with permissions set, along with their permission levels" do
-      @sample.permissions({"person"=>"person_123"}, "read")
-      @sample.permissions({"person"=>"person_456"}, "edit")
-      expect(@sample.users).to eq("person_123"=>"read", "person_456"=>"edit")
+      sample.permissions({"person"=>"person_123"}, "read")
+      sample.permissions({"person"=>"person_456"}, "edit")
+      expect(sample.users).to eq("person_123"=>"read", "person_456"=>"edit")
     end
   end
   
   describe "update_permissions" do
     it "should accept a hash of groups and persons, updating their permissions accordingly" do
-      @sample.should_receive(:permissions).with({"group" => "group1"}, "discover")
-      @sample.should_receive(:permissions).with({"group" => "group2"}, "edit")
-      @sample.should_receive(:permissions).with({"person" => "person1"}, "read")
-      @sample.should_receive(:permissions).with({"person" => "person2"}, "discover")
+      sample.should_receive(:permissions).with({"group" => "group1"}, "discover")
+      sample.should_receive(:permissions).with({"group" => "group2"}, "edit")
+      sample.should_receive(:permissions).with({"person" => "person1"}, "read")
+      sample.should_receive(:permissions).with({"person" => "person2"}, "discover")
       
-      @sample.update_permissions( {"group"=>{"group1"=>"discover","group2"=>"edit"}, "person"=>{"person1"=>"read","person2"=>"discover"}} )
+      sample.update_permissions( {"group"=>{"group1"=>"discover","group2"=>"edit"}, "person"=>{"person1"=>"read","person2"=>"discover"}} )
     end
   end
 
   describe "clear_permissions!" do
     before do
-      @sample.permissions({"person"=>"person_123"}, "read")
-      @sample.permissions({"person"=>"person_456"}, "edit")
-      @sample.permissions({"person"=>"person_789"}, "discover")
-      @sample.permissions({"group"=>"group_123"}, "read")
-      @sample.permissions({"group"=>"group_456"}, "edit")
-      @sample.permissions({"group"=>"group_789"}, "discover")
+      sample.permissions({"person"=>"person_123"}, "read")
+      sample.permissions({"person"=>"person_456"}, "edit")
+      sample.permissions({"person"=>"person_789"}, "discover")
+      sample.permissions({"group"=>"group_123"}, "read")
+      sample.permissions({"group"=>"group_456"}, "edit")
+      sample.permissions({"group"=>"group_789"}, "discover")
     end
     it "clears permissions" do
-      @sample.clear_permissions!
-      expect(@sample.users).to eq({})
-      expect(@sample.groups).to eq({})
+      sample.clear_permissions!
+      expect(sample.users).to eq({})
+      expect(sample.groups).to eq({})
     end
   end
   
   describe "to_solr" do
     it "should populate solr doc with the correct fields" do
       params = {[:edit_access, :person]=>"Lil Kim", [:edit_access, :group]=>["group1","group2"], [:discover_access, :group]=>["public"],[:discover_access, :person]=>["Joe Schmoe"]}
-      @sample.update_values(params)
-      solr_doc = @sample.to_solr
+      sample.update_values(params)
+      solr_doc = sample.to_solr
       
       solr_doc["edit_access_person_ssim"].should == ["Lil Kim"]
       solr_doc["edit_access_group_ssim"].sort.should == ["group1", "group2"]
@@ -169,111 +163,139 @@ describe Hydra::Datastream::RightsMetadata do
     end
 
     it "should solrize embargo information if set" do
-      @sample.embargo_release_date = DateTime.parse("2010-12-01T23:59:59+0")
-      solr_doc = @sample.to_solr
+      sample.embargo_release_date = DateTime.parse("2010-12-01T23:59:59+0")
+      solr_doc = sample.to_solr
       expect(solr_doc["embargo_release_date_dtsi"]).to eq "2010-12-01T23:59:59Z"
     end
 
     it "should solrize lease information if set" do
-      @sample.lease_expiration_date = DateTime.parse("2010-12-01T23:59:59Z")
-      solr_doc = @sample.to_solr
+      sample.lease_expiration_date = DateTime.parse("2010-12-01T23:59:59Z")
+      solr_doc = sample.to_solr
       expect(solr_doc["lease_expiration_date_dtsi"]).to eq "2010-12-01T23:59:59Z"
     end
   end
 
-  #
-  # Embargo
-  #
-  describe "embargo_release_date=" do
-    it "should update the appropriate node with the value passed" do
-      @sample.embargo_release_date = Date.parse("2010-12-01")
-      expect(@sample.embargo_release_date).to eq [Date.parse("2010-12-01").to_time.utc]
-    end
-    it "should accept a nil value after having a date value" do
-      @sample.embargo_release_date = Date.parse("2010-12-01")
-      @sample.embargo_release_date = nil
-      expect(@sample.embargo_release_date).to be_empty
-    end
-  end
+  describe "embargo" do
+    describe "embargo_release_date=" do
+      it "should update the appropriate node with the value passed" do
+        sample.embargo_release_date = Date.parse("2010-12-01")
+        expect(sample.embargo_release_date).to eq [Date.parse("2010-12-01").to_time.utc]
+      end
 
-  describe "embargo_release_date" do
-    it "should return solr formatted date" do
-      @sample.embargo_release_date = DateTime.parse("2010-12-01T23:59:59Z")
-      expect(@sample.embargo_release_date).to eq [DateTime.parse("2010-12-01T23:59:59Z")]
+      it "should accept a nil value after having a date value" do
+        sample.embargo_release_date = Date.parse("2010-12-01")
+        sample.embargo_release_date = nil
+        expect(sample.embargo_release_date).to be_empty
+      end
     end
-  end
 
-  describe "under_embargo?" do
-    it "should return true if the current date is before the embargo release date" do
-      @sample.embargo_release_date=Date.today+1.month
-      expect(@sample).to be_under_embargo
-    end
-    it "should return false if the current date is after the embargo release date" do
-      @sample.embargo_release_date=Date.today-1.month
-      expect(@sample).to_not be_under_embargo
-    end
-    it "should return false if there is no embargo date" do
-      @sample.embargo_release_date = nil
-      expect(@sample).to_not be_under_embargo
-    end
-  end
-  describe "visibility during/after embargo" do
-    it "should track visibility values and index them into solr" do
-      expect(@sample.visibility_during_embargo).to be_empty
-      expect(@sample.visibility_after_embargo).to be_empty
-      @sample.visibility_during_embargo = "private"
-      @sample.visibility_after_embargo = "restricted"
-      expect(@sample.visibility_during_embargo).to eq ["private"]
-      expect(@sample.visibility_after_embargo).to eq ["restricted"]
-      solr_doc = @sample.to_solr
-      expect(solr_doc["visibility_during_embargo_ssim"]).to eq ["private"]
-      expect(solr_doc["visibility_after_embargo_ssim"]).to eq ["restricted"]
+    describe "embargo_release_date" do
+      it "should return solr formatted date" do
+        sample.embargo_release_date = DateTime.parse("2010-12-01T23:59:59Z")
+        expect(sample.embargo_release_date).to eq [DateTime.parse("2010-12-01T23:59:59Z")]
+      end
     end
-  end
 
-  #
-  # Leases
-  #
-  describe "lease_expiration_date=" do
-    it "should update the appropriate node with the value passed" do
-      @sample.lease_expiration_date = "2010-12-01"
-      expect(@sample.lease_expiration_date).to eq [Date.parse("2010-12-01").to_time.utc]
+    describe "under_embargo?" do
+      it "should return true if the current date is before the embargo release date" do
+        sample.embargo_release_date=Date.today+1.month
+        expect(sample).to be_under_embargo
+      end
+
+      it "should return false if the current date is after the embargo release date" do
+        sample.embargo_release_date=Date.today-1.month
+        expect(sample).to_not be_under_embargo
+      end
+
+      it "should return false if there is no embargo date" do
+        sample.embargo_release_date = nil
+        expect(sample).to_not be_under_embargo
+      end
     end
-    it "should only accept valid date values" do
 
+    describe "visibility during/after embargo" do
+      it "should track visibility values and index them into solr" do
+        expect(sample.visibility_during_embargo).to be_empty
+        expect(sample.visibility_after_embargo).to be_empty
+        sample.visibility_during_embargo = "private"
+        sample.visibility_after_embargo = "restricted"
+        expect(sample.visibility_during_embargo).to eq ["private"]
+        expect(sample.visibility_after_embargo).to eq ["restricted"]
+        solr_doc = sample.to_solr
+        expect(solr_doc["visibility_during_embargo_ssim"]).to eq ["private"]
+        expect(solr_doc["visibility_after_embargo_ssim"]).to eq ["restricted"]
+      end
+
+      it "has the correct xpath" do
+        expect(sample.visibility_during_embargo.xpath).to eq "//oxns:embargo/oxns:machine/oxns:visibility[@scope=\"during\"]"
+        expect(sample.visibility_after_embargo.xpath).to eq "//oxns:embargo/oxns:machine/oxns:visibility[@scope=\"after\"]"
+      end
     end
-    it "should accept a nil value after having a date value" do
-      @sample.lease_expiration_date = "2010-12-01"
-      @sample.lease_expiration_date = nil
-      expect(@sample.lease_expiration_date).to be_empty
+
+    describe 'embargo_history' do
+      subject { sample.embargo_history }
+      it "has the correct xpath" do
+        expect(subject.xpath).to eq '//oxns:embargo/oxns:human'
+      end
     end
   end
 
-  describe "active_lease?" do
-    it "should return true if the current date is after the lease expiration date" do
-      @sample.lease_expiration_date = Date.today-1.month
-      expect(@sample).to_not be_active_lease
+  describe "leases" do
+
+    describe "lease_expiration_date=" do
+      it "should update the appropriate node with the value passed" do
+        sample.lease_expiration_date = "2010-12-01"
+        expect(sample.lease_expiration_date).to eq [Date.parse("2010-12-01").to_time.utc]
+      end
+      it "should only accept valid date values" do
+
+      end
+      it "should accept a nil value after having a date value" do
+        sample.lease_expiration_date = "2010-12-01"
+        sample.lease_expiration_date = nil
+        expect(sample.lease_expiration_date).to be_empty
+      end
     end
-    it "should return false if the current date is before the lease expiration date" do
-      @sample.lease_expiration_date = Date.today+1.month
-      expect(@sample).to be_active_lease
+
+    describe "active_lease?" do
+      it "should return true if the current date is after the lease expiration date" do
+        sample.lease_expiration_date = Date.today-1.month
+        expect(sample).to_not be_active_lease
+      end
+      it "should return false if the current date is before the lease expiration date" do
+        sample.lease_expiration_date = Date.today+1.month
+        expect(sample).to be_active_lease
+      end
+      it "should return false if there is no lease expiration date" do
+        sample.lease_expiration_date = nil
+        expect(sample).to_not be_active_lease
+      end
     end
-    it "should return false if there is no lease expiration date" do
-      @sample.lease_expiration_date = nil
-      expect(@sample).to_not be_active_lease
+
+    describe "visibility during/after lease" do
+      it "should track visibility values and index them into solr" do
+        expect(sample.visibility_during_lease).to be_empty
+        expect(sample.visibility_after_lease).to be_empty
+        sample.visibility_during_lease = "restricted"
+        sample.visibility_after_lease = "private"
+        expect(sample.visibility_during_lease).to eq ["restricted"]
+        expect(sample.visibility_after_lease).to eq ["private"]
+        solr_doc = sample.to_solr
+        expect(solr_doc["visibility_during_lease_ssim"]).to eq ["restricted"]
+        expect(solr_doc["visibility_after_lease_ssim"]).to eq ["private"]
+      end
+
+      it "has the correct xpath" do
+        expect(sample.visibility_during_lease.xpath).to eq "//oxns:lease/oxns:machine/oxns:visibility[@scope=\"during\"]"
+        expect(sample.visibility_after_lease.xpath).to eq "//oxns:lease/oxns:machine/oxns:visibility[@scope=\"after\"]"
+      end
     end
-  end
-  describe "visibility during/after lease" do
-    it "should track visibility values and index them into solr" do
-      expect(@sample.visibility_during_lease).to be_empty
-      expect(@sample.visibility_after_lease).to be_empty
-      @sample.visibility_during_lease = "restricted"
-      @sample.visibility_after_lease = "private"
-      expect(@sample.visibility_during_lease).to eq ["restricted"]
-      expect(@sample.visibility_after_lease).to eq ["private"]
-      solr_doc = @sample.to_solr
-      expect(solr_doc["visibility_during_lease_ssim"]).to eq ["restricted"]
-      expect(solr_doc["visibility_after_lease_ssim"]).to eq ["private"]
+
+    describe 'lease_history' do
+      subject { sample.lease_history }
+      it "has the correct xpath" do
+        expect(subject.xpath).to eq '//oxns:lease/oxns:human'
+      end
     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.rc1
+  version: 7.1.0.rc2
 platform: ruby
 authors:
 - Chris Beer
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-05 00:00:00.000000000 Z
+date: 2014-06-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -40,6 +40,26 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 7.0.0
+- !ruby/object:Gem::Dependency
+  name: om
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.0.7
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.0.7
 - !ruby/object:Gem::Dependency
   name: cancancan
   requirement: !ruby/object:Gem::Requirement
@@ -147,6 +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/solr.yml
 - hydra-access-controls.gemspec
 - lib/active_fedora/accessible_by.rb