ddr-models 2.0.0.pre.3 → 2.0.0.pre.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8f7801ca7ccbd206fbcbf14c003e94e96ec27bd8
-  data.tar.gz: aa257065eb2e5633013edde3fbf9dc129c15a797
+  metadata.gz: edec71f33dfe1094a8745e65ee9442145fff93c8
+  data.tar.gz: 4d4e93ebac4f35bdf3acd49b64feb90e6be9b7e5
 SHA512:
-  metadata.gz: bf466708eec60b41361dee92ece57b90628f6942e6ac6719f4b804ad90e79fa99861de1d3554b217858bc7018f527ff5f0958acca26d4e371871d313913ca4f4
-  data.tar.gz: 7c411fd9230412b7d90498125fdadb2e0768192261628dc09e7400927776043af9943b2c4f267cdc9697f714e0d27ce63ab918b4ec62e3f4d0d61c9e077bbeae
+  metadata.gz: d1f66ebd01130976ee83afdbf334058592da001d2616d566b2c874ed5ef5b60e2a832d13935b3f49552ec2e3feb859878a85561eb598c3bb828cb322dd9a5109
+  data.tar.gz: d88b98a85c9d7496530d07ee79ea036dbd58256b83667f701b688195a46186bfbd1c376890eac921441e232aa13c7d93e639c087a3cd298daff35aef12ee00fd

data/lib/ddr/auth/ability_definitions/role_based_ability_definitions.rb

@@ -20,19 +20,15 @@ module Ddr
         case obj
         when Ddr::Models::Base, SolrDocument
           cached_permissions obj.pid do
-            effective_permissions obj
+            obj.effective_permissions(agents)
           end
         when String
           cached_permissions obj do
-            effective_permissions permissions_doc(obj)
+            permissions_doc(obj).effective_permissions(agents)
           end
         end
       end
 
-      def effective_permissions(obj)
-        EffectivePermissions.call(obj, agents)
-      end
-
       def cached_permissions(pid, &block)
         cache[pid] ||= block.call
       end

data/lib/ddr/auth/role_based_access_controls_enforcement.rb

@@ -46,6 +46,11 @@ module Ddr
         [resource_role_filters, policy_role_filters].compact
       end
 
+      # Overrides Hydra::AccessControlsEnforcement
+      def enforce_show_permissions
+        authorize! :read, params[:id]
+      end
+
     end
   end
 end

data/lib/ddr/models/has_admin_metadata.rb

@@ -1,3 +1,5 @@
+require "resque"
+
 module Ddr
   module Models
     module HasAdminMetadata
@@ -50,12 +52,8 @@ module Ddr
         roles.grant *(other.roles.in_resource_scope)
       end
 
-      def inherited_roles
-        Ddr::Auth::InheritedRoles.call(self)
-      end
-
-      def effective_roles
-        Ddr::Auth::EffectiveRoles.call(self)
+      def effective_permissions(agents)
+        Ddr::Auth::EffectivePermissions.call(self, agents)
       end
 
       private

data/lib/ddr/models/solr_document.rb

@@ -106,10 +106,6 @@ module Ddr
       end
       alias_method :title_display, :title # duck-type Ddr::Models::Base
 
-      def principal_has_role?(principal, role)
-        (Array(self["admin_metadata__#{role}_ssim"]) & Array(principal)).any?
-      end
-
       def identifier
         # We want the multivalued version here
         get(ActiveFedora::SolrService.solr_name(:identifier, :stored_searchable, type: :text))
@@ -226,6 +222,10 @@ module Ddr
         struct_maps.present? ? struct_maps.fetch(type) : nil
       end
 
+      def effective_permissions(agents)
+        Ddr::Auth::EffectivePermissions.call(self, agents)
+      end
+
       private
 
       def targets_query

data/lib/ddr/models/version.rb

@@ -1,5 +1,5 @@
 module Ddr
   module Models
-    VERSION = "2.0.0.pre.3"
+    VERSION = "2.0.0.pre.4"
   end
 end

data/spec/auth/ability_spec.rb

@@ -146,7 +146,7 @@ module Ddr::Auth
         describe "when permissions are cached" do
           before { subject.cache[cache_key] = [ Permissions::READ ] }
           it "should use the cached permissions" do
-            expect_any_instance_of(RoleBasedAbilityDefinitions).not_to receive(:effective_permissions)
+            expect(perm_obj).not_to receive(:effective_permissions)
             expect(subject).to be_able_to(:read, obj)
             expect(subject).not_to be_able_to(:edit, obj)
           end
@@ -154,7 +154,7 @@ module Ddr::Auth
         describe "when permissions are not cached" do
           describe "and user context has role based permission" do
             before do
-              allow_any_instance_of(RoleBasedAbilityDefinitions).to receive(:effective_permissions).with(perm_obj) do
+              allow(perm_obj).to receive(:effective_permissions) do
                 [ Permissions::UPDATE ]
               end
             end
@@ -162,7 +162,7 @@ module Ddr::Auth
           end
           describe "and user context does not have role based permission" do
             before do
-              allow_any_instance_of(RoleBasedAbilityDefinitions).to receive(:effective_permissions).with(perm_obj) do
+              allow(perm_obj).to receive(:effective_permissions) do
                 [ Permissions::READ ]
               end
             end

data/spec/models/solr_document_spec.rb

@@ -15,20 +15,6 @@ RSpec.describe SolrDocument, type: :model do
     end
   end
 
-  describe "#principal_has_role?" do
-    before { subject["admin_metadata__role_ssim"] = [ "inst.faculty", "inst.staff", "inst.student" ] }
-    context "user does not have role" do
-      it "should return false" do
-        expect(subject.principal_has_role?([ "registered" ], "role")).to be false
-      end
-    end
-    context "user does have role" do
-      it "should return true" do
-        expect(subject.principal_has_role?([ "inst.staff" ], "role")).to be true
-      end
-    end
-  end
-
   describe "#permanent_id" do
     before { subject[Ddr::IndexFields::PERMANENT_ID] = "foo" }
     its(:permanent_id) { is_expected.to eq("foo") }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ddr-models
 version: !ruby/object:Gem::Version
-  version: 2.0.0.pre.3
+  version: 2.0.0.pre.4
 platform: ruby
 authors:
 - Jim Coble
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-16 00:00:00.000000000 Z
+date: 2015-07-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -624,7 +624,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: Models used in the Duke Digital Repository