hydra-access-controls 6.4.0.rc3 → 6.4.0.rc4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 58e7c3a8cd4a77e2f9b2073a85d97c300f3dc343
-  data.tar.gz: fe6533eaf0c9871b46fbb6efc917416e935cec29
+  metadata.gz: b88206682c3c647370e3ad2a69f8f6c6966e8be1
+  data.tar.gz: 9e41bdafc97dc0fdf4a537a885562de12dc3ec07
 SHA512:
-  metadata.gz: ef489f66366bd1fc17710b42939d55315973dead5eea64345f9f7cb5d510346ed76447b495ad95a529dcdf31c057ebc0665108170cb6dd93fd83c05faba7755e
-  data.tar.gz: d4a5b2ed08337e07003ed55cc06be0e051c0b71e8e8e405816271ffc1753177a4565f2ec4066a565bd218a3c6b4334c434578cceda7421e066f2599324c925f1
+  metadata.gz: 1b5464365e2272eecad05fa91e5c2038413cb36c770552e609f6a4a556d192922c944bfb97ea7abba1b795b97928cc295d9a22d98c27fa2a7c1ccd7ed388f7d2
+  data.tar.gz: 8053315e645d78d4dc8de1868273cad335b7a2767a9911f0cefce3f9faa60898de4846578411822a4c5839af8388b53568f146560dd94c80eca4503e0c1c1bcd

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

@@ -2,12 +2,18 @@ module Hydra
   module AccessControls
     module Permissions
       extend ActiveSupport::Concern
+      extend Deprecation
       include Hydra::AccessControls::Visibility
 
       included do
         has_metadata "rightsMetadata", type: Hydra::Datastream::RightsMetadata
       end
 
+      # permissions= added for backward compatibility of Hydra::AdminPolicy for hydra-head < 6.4
+      def permissions= attributes_collection
+        Deprecation.warn(Permissions, "The permissions= method is deprecated and will be removed from Hydra::AccessControls::Permissions in hydra-head 7.0", caller)
+        self.permissions_attributes = attributes_collection
+      end
 
       ## Updates those permissions that are provided to it. Does not replace any permissions unless they are provided
       # @example

data/lib/hydra/model_mixins/rights_metadata.rb

@@ -9,29 +9,6 @@ module Hydra
         Deprecation.warn(RightsMetadata, "Hydra::ModelMixins::RightsMetadata has been deprecated and will be removed in hydra-head 7.0. Use Hydra::AccessControls::Permissions instead", caller(3));
       end
 
-
-
-      ## Updates those permissions that are provided to it. Does not replace any permissions unless they are provided
-      # @example
-      #  obj.permissions= [{:name=>"group1", :access=>"discover", :type=>'group'},
-      #  {:name=>"group2", :access=>"discover", :type=>'group'}]
-      def permissions=(params)
-        perm_hash = {'person' => rightsMetadata.individuals, 'group'=> rightsMetadata.groups}
-
-        params.each do |row|
-          if row[:type] == 'user' || row[:type] == 'person'
-            perm_hash['person'][row[:name]] = row[:access]
-          elsif row[:type] == 'group'
-            perm_hash['group'][row[:name]] = row[:access]
-          else
-            raise ArgumentError, "Permission type must be 'user', 'person' (alias for 'user'), or 'group'"
-          end
-        end
-        
-        rightsMetadata.update_permissions(perm_hash)
-      end
-
-
       ## Returns a list with all the permissions on the object.
       # @example
       #  [{:name=>"group1", :access=>"discover", :type=>'group'},

data/spec/unit/permissions_spec.rb

@@ -111,4 +111,13 @@ describe Hydra::AccessControls::Permissions do
       subject.rightsMetadata.individuals.should == {"person1"=>"read","person2"=>"discover"}
     end
   end
+  describe "#permissions=" do
+    it "should behave like #permissions_attributes=" do
+      foo1 = Foo.new
+      foo2 = Foo.new
+      foo1.permissions = [{type: "user", access: "edit", name: "editor"}]
+      foo2.permissions_attributes = [{type: "user", access: "edit", name: "editor"}]
+      foo1.permissions.should == foo2.permissions
+    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.rc3
+  version: 6.4.0.rc4
 platform: ruby
 authors:
 - Chris Beer
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-03 00:00:00.000000000 Z
+date: 2013-10-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport