hydra-access-controls 9.1.4 → 9.2.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f9d76736a4784893bf7830fef1115a305586043f
-  data.tar.gz: ae74e9ffe75fd0f4207d91ac069f3c0fd4902cb9
+  metadata.gz: 361ce3b1b9ae7f917b0f671b2536f5965950ff28
+  data.tar.gz: 43a7d26a5d9ad1f913b7827ce56abcd4455d7e73
 SHA512:
-  metadata.gz: 9ed8dd701b055ad960fa2e58786e146fec30b6037a20985a676e0fca9994c7292188bc2d82ca1cba8e454f7b9a43c6e94e351a8144e5d3da192291a988eea417
-  data.tar.gz: 233d870496e4dec3770026e30c3be0f3843cc9b8b9195ca16ce47e9c83d76fbe78404e54e698b51571b9cf42c126022f53a9de4c2e366e3ad4ce7f06cde981fa
+  metadata.gz: 6d003ee8f236a5fdc56bbe001e722439023e89d3a9d58b6bb4d6420dca05aa529ba164220b289c8a5e783cdbd3803e2c2d3ad6a626799e5ac58b27f72ef0847b
+  data.tar.gz: abeb83a756abe8e91fe5f88f56e8e35a0918c5e5d27a2ba297868a436778272128474183976c2d61123a64bf86c1c46614fff3ea9bb87a4157fd5f34a4a34e95

data/lib/hydra/ability.rb

@@ -90,7 +90,7 @@ module Hydra
     # Download permissions are exercised in Hydra::Controller::DownloadBehavior
     def download_permissions
       can :download, ActiveFedora::File do |file|
-        parent_uri = file.uri.sub(/\/[^\/]*$/, '')
+        parent_uri = file.uri.to_s.sub(/\/[^\/]*$/, '')
         parent_id = ActiveFedora::Base.uri_to_id(parent_uri)
         can? :read, parent_id # i.e, can download if can read parent resource
       end

data/lib/hydra/admin_policy.rb

@@ -24,15 +24,15 @@ module Hydra
     alias_method_chain :title, :first
 
     def license_title=(_)
-      Deprecation.warn AdminPolicy, "license_title= has been remove from AdminPolicy. Look at Hydra::Rights instead"
+      Deprecation.warn AdminPolicy, "license_title= has been removed from AdminPolicy. Look at Hydra::Rights instead"
     end
 
     def license_description=(_)
-      Deprecation.warn AdminPolicy, "license_title= has been remove from AdminPolicy. Look at Hydra::Rights instead"
+      Deprecation.warn AdminPolicy, "license_description= has been removed from AdminPolicy. Look at Hydra::Rights instead"
     end
 
     def license_url=(_)
-      Deprecation.warn AdminPolicy, "license_title= has been remove from AdminPolicy. Look at Hydra::Rights instead"
+      Deprecation.warn AdminPolicy, "license_url= has been removed from AdminPolicy. Look at Hydra::Rights instead"
     end
   end
 end

data/lib/hydra/config.rb

@@ -11,6 +11,8 @@ module Hydra
           self.permissions = value
         when :user_model
           self.user_model = value
+        when :id_to_resource_uri
+          self.id_to_resource_uri = value
         else
           raise "Unknown key"
       end
@@ -22,14 +24,26 @@ module Hydra
           permissions
         when :user_model
           user_model
+        when :id_to_resource_uri
+          id_to_resource_uri
         else
           raise "Unknown key #{key}"
       end
     end
 
     attr_reader :permissions
+    attr_writer :id_to_resource_uri
     attr_accessor :user_model
 
+    # This is purely used for translating an ID to user-facing URIs not used for
+    # persistence. Useful for storing RDF in Fedora but displaying their
+    # subjects in content negotiation as local to the application.
+    #
+    # @return [Lambda] a method to convert ID to a URI
+    def id_to_resource_uri
+      @id_to_resource_uri ||= ActiveFedora::Base.translate_id_to_uri
+    end
+
     def permissions= values
       @permissions.merge! values
     end

data/spec/unit/ability_spec.rb

@@ -238,24 +238,42 @@ describe Ability do
     subject { Ability.new(user) }
     let(:asset) { FactoryGirl.create(:asset) }
     let(:user) { FactoryGirl.build(:user) }
-    let(:file) { ActiveFedora::File.new("#{asset.uri}/ds1") }
+    let(:file) { ActiveFedora::File.new() }
 
+    before { allow(file).to receive(:uri).and_return(uri) }
     after { asset.destroy }
 
-    context "user has read permission on the object" do
-      before do
-        asset.read_users = [user.user_key]
-        asset.save!
+    context "in AF < 9.2" do
+      let(:uri) { "#{asset.uri}/ds1" }
+
+      context "user has read permission on the object" do
+        before do
+          asset.read_users = [user.user_key]
+          asset.save!
+        end
+
+        it { should be_able_to(:read, asset.id) }
+        it { should be_able_to(:download, file) }
       end
 
-      it { should be_able_to(:read, asset.id) }
-      it { should be_able_to(:download, file) }
+      context "user lacks read permission on the object and file" do
+        it { should_not be_able_to(:read, asset) }
+        it { should_not be_able_to(:download, file) }
+      end
     end
 
-    context "user lacks read permission on the object and file" do
-      it { should_not be_able_to(:read, asset) }
-      it { should_not be_able_to(:download, file) }
+    context "in AF >= 9.2" do
+      let(:uri) { RDF::URI("#{asset.uri}/ds1") }
+
+      context "user has read permission on the object" do
+        before do
+          asset.read_users = [user.user_key]
+          asset.save!
+        end
+
+        it { should be_able_to(:read, asset.id) }
+        it { should be_able_to(:download, file) }
+      end
     end
   end
-
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hydra-access-controls
 version: !ruby/object:Gem::Version
-  version: 9.1.4
+  version: 9.2.0.rc1
 platform: ruby
 authors:
 - Chris Beer
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-17 00:00:00.000000000 Z
+date: 2015-06-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -213,12 +213,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Access controls for project hydra