hydra-access-controls 9.4.0 → 9.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e77408cf3b024c305f4c9e0115e328970dbecce3
-  data.tar.gz: 7bde23563a7c7553d1714d1f438d8520e5fd82f8
+  metadata.gz: 2936e5b807433daa6ecd2c103eb663255afa6815
+  data.tar.gz: 0bcbd88134dea8542bf81852bb9ff15d39c35317
 SHA512:
-  metadata.gz: 8275440b6eac3fac51c150c5c2e419d83ce40cd30e3e52a569171cf5ea75c55f16da4efa4d3fa73f404503e8697f502163d64b2313cacbfa44ce593757f2fbf1
-  data.tar.gz: f05ae2c6242af7d39552179a27cd67bab85be0c315538c2a7b1ba31a4ff0e355aa7c2d5d5106411f19f8a5d3a99dd9a9e4a6b60580a976171bb1620218a74f38
+  metadata.gz: 9e3a0171c9cb88cbc161b86295a628f2c4d5b0a1f45a22a4322d2c562ed167d49455c6c064ef4d8a9909fdc44df951584c8332d8bf4c09e0276a551a766f32bd
+  data.tar.gz: a15532976668837b47d10e1f93511abe7f109486a21a1b832bc1e7117ffd7063c3e2750e4130e02a62df0975e464a15cc371d7d057f97ad4643d47d592a74672

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

@@ -1,57 +1,65 @@
-module Hydra
-  module AccessControls
-    module Visibility
-      extend ActiveSupport::Concern
-
-      def visibility=(value)
-        return if value.nil?
-        # only set explicit permissions
-        case value
-        when Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_PUBLIC
-          public_visibility!
-        when Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_AUTHENTICATED
-          registered_visibility!
-        when Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_PRIVATE
-          private_visibility!
-        else
-          raise ArgumentError, "Invalid visibility: #{value.inspect}"
-        end
+module Hydra::AccessControls
+  module Visibility
+    extend ActiveSupport::Concern
+
+    def visibility=(value)
+      return if value.nil?
+      # only set explicit permissions
+      case value
+      when AccessRight::VISIBILITY_TEXT_VALUE_PUBLIC
+        public_visibility!
+      when AccessRight::VISIBILITY_TEXT_VALUE_AUTHENTICATED
+        registered_visibility!
+      when AccessRight::VISIBILITY_TEXT_VALUE_PRIVATE
+        private_visibility!
+      else
+        raise ArgumentError, "Invalid visibility: #{value.inspect}"
       end
+    end
 
-      def visibility
-        if read_groups.include? Hydra::AccessControls::AccessRight::PERMISSION_TEXT_VALUE_PUBLIC
-          Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_PUBLIC
-        elsif read_groups.include? Hydra::AccessControls::AccessRight::PERMISSION_TEXT_VALUE_AUTHENTICATED
-          Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_AUTHENTICATED
-        else
-          Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_PRIVATE
-        end
+    def visibility
+      if read_groups.include? AccessRight::PERMISSION_TEXT_VALUE_PUBLIC
+        AccessRight::VISIBILITY_TEXT_VALUE_PUBLIC
+      elsif read_groups.include? AccessRight::PERMISSION_TEXT_VALUE_AUTHENTICATED
+        AccessRight::VISIBILITY_TEXT_VALUE_AUTHENTICATED
+      else
+        AccessRight::VISIBILITY_TEXT_VALUE_PRIVATE
       end
+    end
+
+    def visibility_changed?
+      !!@visibility_will_change
+    end
+
+    private
 
-      def visibility_changed?
-        !!@visibility_will_change
+      # Override represented_visibility if you want to add another visibility that is
+      # represented as a read group (e.g. on-campus)
+      # @return [Array] a list of visibility types that are represented as read groups
+      def represented_visibility
+        [AccessRight::PERMISSION_TEXT_VALUE_AUTHENTICATED,
+         AccessRight::PERMISSION_TEXT_VALUE_PUBLIC]
       end
 
-      private
       def visibility_will_change!
         @visibility_will_change = true
       end
 
       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], [Hydra::AccessControls::AccessRight::PERMISSION_TEXT_VALUE_AUTHENTICATED])
+        visibility_will_change! unless visibility == AccessRight::VISIBILITY_TEXT_VALUE_PUBLIC
+        remove_groups = represented_visibility - [AccessRight::PERMISSION_TEXT_VALUE_PUBLIC]
+        set_read_groups([AccessRight::PERMISSION_TEXT_VALUE_PUBLIC], remove_groups)
       end
 
       def registered_visibility!
-        visibility_will_change! unless visibility == Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_AUTHENTICATED
-        set_read_groups([Hydra::AccessControls::AccessRight::PERMISSION_TEXT_VALUE_AUTHENTICATED], [Hydra::AccessControls::AccessRight::PERMISSION_TEXT_VALUE_PUBLIC])
+        visibility_will_change! unless visibility == AccessRight::VISIBILITY_TEXT_VALUE_AUTHENTICATED
+        remove_groups = represented_visibility - [AccessRight::PERMISSION_TEXT_VALUE_AUTHENTICATED]
+        set_read_groups([AccessRight::PERMISSION_TEXT_VALUE_AUTHENTICATED], remove_groups)
       end
 
       def private_visibility!
-        visibility_will_change! unless visibility == Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_PRIVATE
-        set_read_groups([], [Hydra::AccessControls::AccessRight::PERMISSION_TEXT_VALUE_AUTHENTICATED, Hydra::AccessControls::AccessRight::PERMISSION_TEXT_VALUE_PUBLIC])
+        visibility_will_change! unless visibility == AccessRight::VISIBILITY_TEXT_VALUE_PRIVATE
+        set_read_groups([], represented_visibility)
       end
-
-    end
   end
 end

data/app/models/concerns/hydra/rights.rb

@@ -3,7 +3,7 @@ module Hydra
     extend ActiveSupport::Concern
     included do
       # Rights
-      property :rights, predicate: ::RDF::DC.rights do |index|
+      property :rights, predicate: ::RDF::Vocab::DC.rights do |index|
         index.as :facetable
       end
       property :rightsHolder, predicate: ::RDF::URI('http://opaquenamespace.org/rights/rightsHolder') do |index|

data/lib/hydra/admin_policy.rb

@@ -4,10 +4,10 @@ module Hydra
     include Hydra::AdminPolicyBehavior
     include Hydra::AccessControls::Permissions
 
-    property :title, predicate: ::RDF::DC.title do |index|
+    property :title, predicate: ::RDF::Vocab::DC.title do |index|
       index.as :stored_searchable
     end
-    property :description, predicate: ::RDF::DC.description do |index|
+    property :description, predicate: ::RDF::Vocab::DC.description do |index|
       index.as :searchable
     end
 

data/spec/unit/visibility_spec.rb

@@ -1,16 +1,6 @@
 require 'spec_helper'
 
 describe Hydra::AccessControls::Visibility do
-  module VisibilityOverride
-    extend ActiveSupport::Concern
-    include Hydra::AccessControls::Permissions
-    def visibility; super; end
-    def visibility=(value); super(value); end
-  end
-  class MockParent < ActiveFedora::Base
-    include VisibilityOverride
-  end
-
   describe "setting visibility" do
     before do
       class Foo < ActiveFedora::Base
@@ -67,14 +57,47 @@ describe Hydra::AccessControls::Visibility do
           end
         end
       end
+    end
+  end
 
+  describe "overiding visibility" do
+    module VisibilityOverride
+      extend ActiveSupport::Concern
+      include Hydra::AccessControls::Permissions
+      def visibility; super; end
+      def visibility=(value); super(value); end
+    end
+    class MockParent < ActiveFedora::Base
+      include VisibilityOverride
     end
 
+    it 'allows for overrides of visibility' do
+      expect {
+        MockParent.new(visibility: Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_PRIVATE)
+      }.to_not raise_error
+    end
   end
 
-  it 'allows for overrides of visibility' do
-    expect{
-      MockParent.new(visibility: Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_PRIVATE)
-    }.to_not raise_error
+  context "when represented_visibility is overridden" do
+    let(:model) { MockObject.new }
+    before do
+      class MockObject < ActiveFedora::Base
+        include Hydra::AccessControls::Permissions
+        def represented_visibility
+          ['one']
+        end
+      end
+
+      model.read_groups = ['one', 'another']
+    end
+
+    after do
+      Object.send(:remove_const, :MockObject)
+    end
+
+    it "replaces the represented visibility" do
+      model.visibility = Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_PUBLIC
+      expect(model.read_groups).to contain_exactly 'public', 'another'
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hydra-access-controls
 version: !ruby/object:Gem::Version
-  version: 9.4.0
+  version: 9.4.1
 platform: ruby
 authors:
 - Chris Beer
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-02 00:00:00.000000000 Z
+date: 2015-11-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport