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

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 08285f91280c40edeb4fc605b7d953b44a70d1f5
-  data.tar.gz: 9f59a3412954e6e8f615bea4fa597e1017fa2158
+  metadata.gz: 4cbc85eecc7904f7f1b66f74700dd8598641be95
+  data.tar.gz: 11830ae7b14a2ecd73c6110e39fec83f51de8be0
 SHA512:
-  metadata.gz: 93a2d9fe2e17186dbbd219ac14db54aa89056ea45bcbbdba01b91b93a9a8fe4bf05cb41a6a0c82ee927b3b3cf2f926d60e7e9c9a28f5cf1896fc5a71a46f363a
-  data.tar.gz: c5d34233e4e9f2732636c1bdc5ce7cc66f6b97130c453081eb22fceff5a5dd2b6f0799f74bb7d8d0a1f403f8f7ea368c3f4af94f12020640bb30d4ff5a30d7cf
+  metadata.gz: 46f10df766dff5c1ebd73093e5db030eb46cb7400689c96f55463c56beb00bcd590c7d8b4329e79761b1035446cd23fa9b8a379008fb79319410d9d87b2ce8c3
+  data.tar.gz: 520bee3b4bfbcbceac1652864c724043e2926c4a63ce3872501328784dca91d8633a7a957927f3e8e81fb02a2b4c5e36015296c1f7fd748cf5000b891f6b5787

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

@@ -45,6 +45,8 @@ module Hydra
           has_visibility_text_for?(VISIBILITY_TEXT_VALUE_AUTHENTICATED)
       end
 
+      alias :authenticated_only_access? :authenticated_only?
+
       def private?
         return false if open_access?
         return false if authenticated_only?
@@ -52,6 +54,8 @@ module Hydra
         true
       end
 
+      alias :private_access? :private?
+
       private
 
         def persisted_open_access_permission?
@@ -75,7 +79,7 @@ module Hydra
           visibility == text
         end
         def has_permission_text_for?(text)
-          !!permissions.detect { |perm| perm[:name] == text }
+          !!permissions.detect { |perm| perm.name == text }
         end
     end
   end

data/hydra-access-controls.gemspec

@@ -19,12 +19,12 @@ Gem::Specification.new do |gem|
   gem.required_ruby_version = '>= 1.9.3'
 
   gem.add_dependency 'activesupport'
-  gem.add_dependency "active-fedora", '~> 6.1'
+  gem.add_dependency "active-fedora", '>= 6.6.0.rc1'
   gem.add_dependency 'cancan'
   gem.add_dependency 'deprecation'
   gem.add_dependency 'blacklight', '~> 4.0' 
 
-  gem.add_development_dependency("rake")
+  gem.add_development_dependency "rake"
   gem.add_development_dependency 'rspec'
 
   

data/lib/hydra/admin_policy.rb

@@ -4,20 +4,20 @@ class Hydra::AdminPolicy < ActiveFedora::Base
   # include Hydra::ModelMethods
 
   # Uses the Hydra Rights Metadata Schema for tracking access permissions & copyright
-  has_metadata :name => "defaultRights", :type => Hydra::Datastream::InheritableRightsMetadata 
+  has_metadata "defaultRights", type: Hydra::Datastream::InheritableRightsMetadata 
 
   # Uses the Hydra Rights Metadata Schema for tracking access permissions & copyright
-  has_metadata :name => "rightsMetadata", :type => Hydra::Datastream::RightsMetadata 
+  has_metadata "rightsMetadata", type: Hydra::Datastream::RightsMetadata 
 
-  has_metadata :name =>'descMetadata', :type => ActiveFedora::QualifiedDublinCoreDatastream do |m|
+  has_metadata 'descMetadata', type: ActiveFedora::QualifiedDublinCoreDatastream do |m|
     m.title :type=> :text, :index_as=>[:searchable]
     
   end
 
-  delegate_to :descMetadata, [:title, :description], :unique=>true
-  delegate :license_title, :to=>'rightsMetadata', :at=>[:license, :title], :unique=>true
-  delegate :license_description, :to=>'rightsMetadata', :at=>[:license, :description], :unique=>true
-  delegate :license_url, :to=>'rightsMetadata', :at=>[:license, :url], :unique=>true
+  delegate_to :descMetadata, [:title, :description], multiple: false
+  delegate :license_title, to: 'rightsMetadata', at: [:license, :title], multiple: false
+  delegate :license_description, to: 'rightsMetadata', at: [:license, :description], multiple: false
+  delegate :license_url, to: 'rightsMetadata', at: [:license, :url], multiple: false
 
   # easy access to edit_groups, etc
   include Hydra::AccessControls::Permissions 

data/lib/hydra/policy_aware_ability.rb

@@ -24,18 +24,18 @@ module Hydra::PolicyAwareAbility
   end
   
   # Returns the pid of policy object (is_governed_by) for the specified object
-  # Assumes that the policy object is associated by an is_governed_by relationship (Whis is stored as "is_governed_by_s" in object's solr document)
+  # Assumes that the policy object is associated by an is_governed_by relationship 
+  # (which is stored as "is_governed_by_ssim" in object's solr document)
   # Returns nil if no policy associated with the object
   def policy_pid_for(object_pid)
-    return @policy_pid if @policy_pid
-    #is_governed_by_ssim
+    policy_pid = policy_pid_cache[object_pid]
+    return policy_pid if policy_pid
     solr_result = ActiveFedora::Base.find_with_conditions({:id=>object_pid}, :fl=>ActiveFedora::SolrService.solr_name('is_governed_by', :symbol))
     begin
-      @policy_pid = value_from_solr_field(solr_result, ActiveFedora::SolrService.solr_name('is_governed_by', :symbol)).first.gsub("info:fedora/", "")
+      policy_pid_cache[object_pid] = policy_pid = value_from_solr_field(solr_result, ActiveFedora::SolrService.solr_name('is_governed_by', :symbol)).first.gsub("info:fedora/", "")
     rescue NoMethodError
-      @policy_pid = nil
     end
-    return @policy_pid
+    return policy_pid
   end
   
   # Returns the permissions solr document for policy_pid
@@ -127,4 +127,9 @@ module Hydra::PolicyAwareAbility
       return field_from_result[field_name]
     end
   end
+
+  def policy_pid_cache
+    @policy_pid_cache ||= {}
+  end
+
 end

data/spec/unit/access_right_spec.rb

@@ -38,7 +38,7 @@ describe Hydra::AccessControls::AccessRight do
     TEXT
 
     it spec_text do
-      permissions = [{access: :edit, name: givin_permission}]
+      permissions = [Hydra::AccessControls::Permission.new({access: :edit, name: givin_permission})]
       permissionable = double(
         'permissionable',
         permissions: permissions,

data/spec/unit/policy_aware_ability_spec.rb

@@ -34,7 +34,7 @@ describe Hydra::PolicyAwareAbility do
       ]
       
     @policy.save
-    @asset = ModsAsset.new()
+    @asset = ModsAsset.new
     @asset.admin_policy = @policy
     @asset.save
   end
@@ -46,8 +46,31 @@ describe Hydra::PolicyAwareAbility do
   subject { PolicyAwareClass.new( User.new ) }
   
   describe "policy_pid_for" do
+    before do
+      @policy2 = Hydra::AdminPolicy.new
+      @policy2.default_permissions = 
+        [
+         {:type=>"group", :access=>"read", :name=>"untenured-faculty"},
+         {:type=>"group", :access=>"edit", :name=>"awesome_kids"},
+         {:type=>"group", :access=>"edit", :name=>"bad_crowd"},
+         {:type=>"user", :access=>"read", :name=>"constantine"},
+         {:type=>"user", :access=>"edit", :name=>"brutus"}
+        ]
+      @policy2.save
+      @asset2 = ModsAsset.new
+      @asset2.admin_policy = @policy2
+      @asset2.save
+      @asset3 = ModsAsset.create
+    end
+    after do
+      @policy2.delete
+      @asset2.delete
+      @asset3.delete
+    end
     it "should retrieve the pid doc for the current object's governing policy" do
       subject.policy_pid_for(@asset.pid).should == @policy.pid
+      subject.policy_pid_for(@asset2.pid).should == @policy2.pid
+      subject.policy_pid_for(@asset3.pid).should be_nil
     end
   end
 
@@ -60,10 +83,80 @@ describe Hydra::PolicyAwareAbility do
     end
   end
   describe "test_edit_from_policy" do
-    it "should test_edit_from_policy"
+    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
+      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
+      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
+      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
+      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
+      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
+      end
+    end
   end
   describe "test_read_from_policy" do
-    it "should test_read_from_policy"
+    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
+      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
+      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
+      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
+      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
+      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
+      end
+    end
   end
   describe "edit_groups_from_policy" do
     it "should retrieve the list of groups with edit access from the policy" do

data/spec/unit/with_access_right_spec.rb

@@ -0,0 +1,69 @@
+require 'spec_helper'
+
+describe "WithAccessRight" do
+
+  before do
+    class TestClass < ActiveFedora::Base
+      include Hydra::AccessControls::Permissions
+      include Hydra::AccessControls::WithAccessRight
+    end
+  end
+
+  after do
+    Object.send(:remove_const, :TestClass)
+  end
+
+  subject { TestClass.new }
+
+  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}
+    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}
+    end
+  end
+
+  context "persisted" do
+    before { subject.stub( persisted?: true) }
+    context "when it is public" 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}
+    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}
+    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}
+    end
+  end
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hydra-access-controls
 version: !ruby/object:Gem::Version
-  version: 6.4.0.rc1
+  version: 6.4.0.rc2
 platform: ruby
 authors:
 - Chris Beer
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-30 00:00:00.000000000 Z
+date: 2013-10-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -30,16 +30,16 @@ dependencies:
   name: active-fedora
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '6.1'
+        version: 6.6.0.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '6.1'
+        version: 6.6.0.rc1
 - !ruby/object:Gem::Dependency
   name: cancan
   requirement: !ruby/object:Gem::Requirement
@@ -169,6 +169,7 @@ files:
 - spec/unit/rights_metadata_spec.rb
 - spec/unit/role_mapper_spec.rb
 - spec/unit/visibility_spec.rb
+- spec/unit/with_access_right_spec.rb
 - tasks/hydra-access-controls.rake
 homepage: http://projecthydra.org
 licenses:
@@ -217,4 +218,5 @@ test_files:
 - spec/unit/rights_metadata_spec.rb
 - spec/unit/role_mapper_spec.rb
 - spec/unit/visibility_spec.rb
+- spec/unit/with_access_right_spec.rb
 has_rdoc: