hydra-access-controls 7.0.1 → 7.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bb6cb1d19ad64f66858147ca9c34f6e8f3a20ca6
-  data.tar.gz: f2c37ea26c46cdd7676f676d9c5822c84da6300d
+  metadata.gz: f8991a10cef55bfeacde859174a79ad06fda0ea6
+  data.tar.gz: 7b29e9376d5c436628aaba2d3a30d0b29691b6af
 SHA512:
-  metadata.gz: f119dc26165b9b35e4b32e1071c6746e985a45a1742f31d4c5d698ae3a165efa6489b9101826db75823aee112b9fdc98f515f2155c43f48d65d0994f99605d45
-  data.tar.gz: 6eb53ab0ec02bb635df587d16ee0a7ceed58df5b78ba28be433e9845a467c4bba4d28c0291b94e8af2c72f2df49e72701886eea029994b56f2f8db12cd14a283
+  metadata.gz: 59fa9683aaa9f348c6ce9fd6009e721b8049a03b1c802cace301880dacad92af1b6529836d74eaab5022270d312f97fd8865ad0992cb79058f685d7b9bf805cf
+  data.tar.gz: 7b86ebf9be757ce7fd69ec7e35f3b77ddac573608f17a5c8667c2430579c5dcc6dd986d98e194e5e4d3dd5f6a8025657828d5a853fda3f45cb21a569e31c3708

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

@@ -0,0 +1,40 @@
+module Hydra
+  module AdminPolicyBehavior
+    extend ActiveSupport::Concern
+
+    included do
+      has_metadata "defaultRights", type: Hydra::Datastream::InheritableRightsMetadata 
+    end
+
+    ## Updates those permissions that are provided to it. Does not replace any permissions unless they are provided
+    # @example
+    #  obj.default_permissions= [{:name=>"group1", :access=>"discover", :type=>'group'},
+    #  {:name=>"group2", :access=>"discover", :type=>'group'}]
+    def default_permissions=(params)
+      perm_hash = {'person' => defaultRights.users, 'group'=> defaultRights.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
+      defaultRights.update_permissions(perm_hash)
+    end
+
+    ## Returns a list with all the permissions on the object.
+    # @example
+    #  [{:name=>"group1", :access=>"discover", :type=>'group'},
+    #  {:name=>"group2", :access=>"discover", :type=>'group'},
+    #  {:name=>"user2", :access=>"read", :type=>'user'},
+    #  {:name=>"user1", :access=>"edit", :type=>'user'},
+    #  {:name=>"user3", :access=>"read", :type=>'user'}]
+    def default_permissions
+      (defaultRights.groups.map {|x| {:type=>'group', :access=>x[1], :name=>x[0] }} + 
+       defaultRights.users.map {|x| {:type=>'user', :access=>x[1], :name=>x[0]}})
+    end
+
+  end
+end

data/lib/hydra-access-controls.rb

@@ -14,6 +14,7 @@ module Hydra
   autoload :Datastream
   autoload :PolicyAwareAbility
   autoload :AdminPolicy
+  autoload :AdminPolicyBehavior
   autoload :RoleMapperBehavior
   autoload :PermissionsQuery
   autoload :PermissionsCache

data/lib/hydra/admin_policy.rb

@@ -1,17 +1,11 @@
 class Hydra::AdminPolicy < ActiveFedora::Base
   
-  # When you subclass Hydra::AdminPolicy, you probably want to include Hydra::ModelMethods so you can call apply_depositor_metadata
-  # include Hydra::ModelMethods
-
-  # Uses the Hydra Rights Metadata Schema for tracking access permissions & copyright
-  has_metadata "defaultRights", type: Hydra::Datastream::InheritableRightsMetadata 
-
-  # Uses the Hydra Rights Metadata Schema for tracking access permissions & copyright
-  has_metadata "rightsMetadata", type: Hydra::Datastream::RightsMetadata 
+  include Hydra::AdminPolicyBehavior
+  include Hydra::AccessControls::Permissions 
+  extend Deprecation
 
   has_metadata 'descMetadata', type: ActiveFedora::QualifiedDublinCoreDatastream do |m|
-    m.title :type=> :text, :index_as=>[:searchable]
-    
+    m.title :type=> :text, :index_as=>[:searchable]    
   end
 
   has_attributes :title, :description, datastream: 'descMetadata', multiple: false
@@ -19,18 +13,18 @@ class Hydra::AdminPolicy < ActiveFedora::Base
   has_attributes :license_description, datastream: 'rightsMetadata', at: [:license, :description], multiple: false
   has_attributes :license_url, datastream: 'rightsMetadata', at: [:license, :url], multiple: false
 
-  # easy access to edit_groups, etc
-  include Hydra::AccessControls::Permissions 
-
   def self.readable_by_user(user)
+    Deprecation.warn(Hydra::AdminPolicy, "The class method Hydra::AdminPolicy.readable_by_user(user) is deprecated and will be removed from hydra-head 8.0.", caller)
     where_user_has_permissions(user, [:read, :edit])
   end
 
   def self.editable_by_user(user)
+    Deprecation.warn(Hydra::AdminPolicy, "The class method Hydra::AdminPolicy.editable_by_user(user) is deprecated and will be removed from hydra-head 8.0.", caller)
     where_user_has_permissions(user, [:edit])
   end
 
   def self.where_user_has_permissions(user, permissions=[:edit])
+    Deprecation.warn(Hydra::AdminPolicy, "The class method Hydra::AdminPolicy.where_user_has_permissions(user) is deprecated and will be removed from hydra-head 8.0.", caller)
     or_query = [] 
     RoleMapper.roles(user).each do |group|
       permissions.each do |permission|
@@ -43,37 +37,4 @@ class Hydra::AdminPolicy < ActiveFedora::Base
     find_with_conditions(or_query.join(" OR "))
   end
 
-  ## Updates those permissions that are provided to it. Does not replace any permissions unless they are provided
-  # @example
-  #  obj.default_permissions= [{:name=>"group1", :access=>"discover", :type=>'group'},
-  #  {:name=>"group2", :access=>"discover", :type=>'group'}]
-  def default_permissions=(params)
-    perm_hash = {'person' => defaultRights.users, 'group'=> defaultRights.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
-    
-    defaultRights.update_permissions(perm_hash)
-  end
-
-  ## Returns a list with all the permissions on the object.
-  # @example
-  #  [{:name=>"group1", :access=>"discover", :type=>'group'},
-  #  {:name=>"group2", :access=>"discover", :type=>'group'},
-  #  {:name=>"user2", :access=>"read", :type=>'user'},
-  #  {:name=>"user1", :access=>"edit", :type=>'user'},
-  #  {:name=>"user3", :access=>"read", :type=>'user'}]
-  def default_permissions
-    (defaultRights.groups.map {|x| {:type=>'group', :access=>x[1], :name=>x[0] }} + 
-      defaultRights.users.map {|x| {:type=>'user', :access=>x[1], :name=>x[0]}})
-
-  end
-
 end

data/lib/hydra/datastream/rights_metadata.rb

@@ -176,7 +176,7 @@ module Hydra
       def embargo_release_date=(release_date)
         release_date = release_date.to_s if release_date.is_a? Date
         begin
-          Date.parse(release_date)
+          release_date.nil? || Date.parse(release_date)
         rescue 
           return "INVALID DATE"
         end

data/lib/hydra/permissions_query.rb

@@ -1,9 +1,6 @@
 module Hydra
   module PermissionsQuery
     extend ActiveSupport::Concern
-    included do 
-      include Blacklight::SolrHelper # for force_to_utf8
-    end
 
     def permissions_doc(pid)
       doc = cache.get(pid)
@@ -26,7 +23,7 @@ module Hydra
       raise Blacklight::Exceptions::InvalidSolrID.new("The application is trying to retrieve permissions without specifying an asset id") if id.nil?
       solr_opts = permissions_solr_doc_params(id).merge(extra_controller_params)
       response = ActiveFedora::SolrService.instance.conn.get('select', :params=> solr_opts)
-      solr_response = Blacklight::SolrResponse.new(force_to_utf8(response), solr_opts)
+      solr_response = Blacklight::SolrResponse.new(response, solr_opts)
 
       raise Blacklight::Exceptions::InvalidSolrID.new("The solr permissions search handler didn't return anything for id \"#{id}\"") if solr_response.docs.empty?
       Hydra::PermissionsSolrDocument.new(solr_response.docs.first, solr_response)

data/spec/unit/hydra_rights_metadata_spec.rb

@@ -176,6 +176,11 @@ describe Hydra::Datastream::RightsMetadata do
     it "should only accept valid date values" do
       
     end
+    it "should accept a nil value after having a date value" do
+      @sample.embargo_release_date=("2010-12-01")
+      @sample.embargo_release_date=(nil)
+      @sample.embargo_release_date.should == nil
+    end
   end
   describe "embargo_release_date" do
     it "should return solr formatted date" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hydra-access-controls
 version: !ruby/object:Gem::Version
-  version: 7.0.1
+  version: 7.0.2
 platform: ruby
 authors:
 - Chris Beer
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-01 00:00:00.000000000 Z
+date: 2014-05-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -140,6 +140,7 @@ files:
 - app/models/concerns/hydra/access_controls/permissions.rb
 - app/models/concerns/hydra/access_controls/visibility.rb
 - app/models/concerns/hydra/access_controls/with_access_right.rb
+- app/models/concerns/hydra/admin_policy_behavior.rb
 - app/models/role_mapper.rb
 - config/fedora.yml
 - config/solr.yml