sufia 3.4.0.rc1 → 3.4.0.rc2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9e8b880c78652a7107ed7c477a2fd60ac2a18d9b
-  data.tar.gz: f398c4358574df797fcaac72f0ba960c89f5cceb
+  metadata.gz: 8b88dc1dec7671c314b32538775b0691c7c01bb5
+  data.tar.gz: feb60f9924a19dc05ac5e0c7e71f19c387eaadf8
 SHA512:
-  metadata.gz: 8f053ac8dcd4692883e481ee0645f72e3f58b0fba80cfb7f12d03b3428e0bf84fa81a5ca80cafba91c73773a37e59e258620fd6bb3b7d0761fb00cf0774df2ca
-  data.tar.gz: 21ea3febe2601469eddf35eb786ab2848f2de7bb2a881153e1655d976242bf4ee9bbad12c4b7253f566217743d15af21b7b2996678d99f701ed183f7a9f4f257
+  metadata.gz: 9c3601baf4d5fc2f28d2e027072dadf1d239a703ea1c60584c944d8d3e03c2e71142b8adb2d119c771715ff278062f52f344d4bd027f154d8fcda5eb2f435450
+  data.tar.gz: 58484082783d403699c326e44774ddfd6698718d9f0549ec2cd2adaad07c4161644a7590510a691c837d6b5d09b7285c3e23668fbcc6b92045d2ef0eb3f6befc

data/History.md

@@ -1,8 +1,15 @@
 # History of Sufia releases
 
-## 3.4.0.rc1
-* 2013-10-01: Remove Visibility, which was moved into hydra-head [Justin Coyne]
-* 2013-10-01: Fix deprecation warnings by switching to
+## 3.4.0.rc2
+* Moved trophies related methods to Trophies module [Justin Coyne]
+* Move mime type related methods into MimeTypes module [Justin Coyne]
+* Extract version methods into its own module [Justin Coyne]
+* Extract metadata into its own module [Justin Coyne]
+* Update to latest rc of hydra-head [Justin Coyne]
+* AccessRight has moved into HydraHead [Justin Coyne]
+* Remove cruft [ci skip] [Justin Coyne]
+* Remove Visibility, which was moved into hydra-head [Justin Coyne]
+* Fix deprecation warnings by switching to
   Hydra::AccessControls::Permissions [Justin Coyne]
 * 2013-09-27: Works with hydra 6.1.0.rc1 [Justin Coyne]
 

data/SUFIA_VERSION

@@ -1 +1 @@
-3.4.0.rc1
+3.4.0.rc2

data/UpgradeGuide.md

@@ -0,0 +1,3 @@
+#Upgrading to Sufia 3.4.0
+
+* If you are using Sufia::Models::AccessRight, substitute Hydra::AccessControls::AccessRight instead

data/app/views/generic_files/_permission_form.html.erb

@@ -60,13 +60,13 @@
     <h3>Visibility - <small>who should have the ability to read and download</small></h3>
       <div class="controls">
         <label class="radio">
-          <input type="radio" id="visibility_open" name="visibility" value="<%=Sufia::Models::AccessRight::VISIBILITY_TEXT_VALUE_PUBLIC %>" <% if !public_perm.blank? %> checked="true"<% end %>/> <span class="label label-success">Open Access</span> Visible to the world.
+          <input type="radio" id="visibility_open" name="visibility" value="<%=Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_PUBLIC %>" <% if !public_perm.blank? %> checked="true"<% end %>/> <span class="label label-success">Open Access</span> Visible to the world.
         </label>
         <label class="radio">
-          <input type="radio" id="visibility_psu" name="visibility" value="<%=Sufia::Models::AccessRight::VISIBILITY_TEXT_VALUE_AUTHENTICATED %>" <% if !registered_perm.blank? %> checked="true"<% end %> /><span class="label label-info"><%=t('sufia.institution_name') %></span> Visible to all <%=t('sufia.institution_name') %> users. 
+          <input type="radio" id="visibility_psu" name="visibility" value="<%=Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_AUTHENTICATED %>" <% if !registered_perm.blank? %> checked="true"<% end %> /><span class="label label-info"><%=t('sufia.institution_name') %></span> Visible to all <%=t('sufia.institution_name') %> users. 
         </label>
         <label class="radio">
-          <input type="radio" id="visibility_restricted" name="visibility" value="<%=Sufia::Models::AccessRight::VISIBILITY_TEXT_VALUE_PRIVATE %>"<% if registered_perm.blank? and public_perm.blank?%> checked="true"<% end %> /> <span class="label label-important">Private</span> Visible to users/groups specified below, if any. 
+          <input type="radio" id="visibility_restricted" name="visibility" value="<%=Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_PRIVATE %>"<% if registered_perm.blank? and public_perm.blank?%> checked="true"<% end %> /> <span class="label label-important">Private</span> Visible to users/groups specified below, if any. 
         </label>
     </div><!-- /.controls -->
   </div><!-- /.control-group --> 

data/lib/sufia.rb

@@ -20,8 +20,6 @@ module Sufia
       #{config.root}/app/models/datastreams
       #{Hydra::Engine.root}/app/models/concerns
     )
-    puts "concern #{Hydra::Engine.root}/app/models/concerns"
-
   end
 
   autoload :Controller

data/lib/sufia/version.rb

@@ -1,3 +1,3 @@
 module Sufia
-  VERSION = "3.4.0.rc1"
+  VERSION = "3.4.0.rc2"
 end

data/spec/models/generic_file/visibility_spec.rb

@@ -13,7 +13,7 @@ describe Sufia::GenericFile do
 
   it 'allows for overrides of visibility' do
     expect{
-      MockParent.new(visibility: Sufia::Models::AccessRight::VISIBILITY_TEXT_VALUE_PRIVATE)
+      MockParent.new(visibility: Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_PRIVATE)
     }.to_not raise_error
   end
 end

data/sufia-models/lib/sufia/models/generic_file.rb

@@ -6,6 +6,9 @@ module Sufia
     autoload :Permissions, 'sufia/models/generic_file/permissions'
     autoload :WebForm, 'sufia/models/generic_file/web_form'
     autoload :AccessibleAttributes, 'sufia/models/generic_file/accessible_attributes'
+    autoload :Trophies, 'sufia/models/generic_file/trophies'
+    autoload :Metadata, 'sufia/models/generic_file/metadata'
+    autoload :Versions, 'sufia/models/generic_file/versions'
     include Sufia::ModelMethods
     include Sufia::Noid
     include Sufia::GenericFile::MimeTypes
@@ -16,55 +19,18 @@ module Sufia
     include Sufia::GenericFile::Permissions
     include Sufia::GenericFile::WebForm
     include Sufia::GenericFile::Derivatives
+    include Sufia::GenericFile::Trophies
+    include Sufia::GenericFile::Metadata
+    include Sufia::GenericFile::Versions
 
     included do
-      has_metadata :name => "descMetadata", :type => GenericFileRdfDatastream
-      has_metadata :name => "properties", :type => PropertiesDatastream
-      has_file_datastream :name => "content", :type => FileContentDatastream
-      has_file_datastream :name => "thumbnail"
-
       belongs_to :batch, :property => :is_part_of
 
-      delegate_to :properties, [:relative_path, :depositor, :import_url], multiple: false
-      delegate_to :descMetadata, [:date_uploaded, :date_modified], multiple: false 
-      delegate_to :descMetadata, [:related_url, :based_near, :part_of, :creator,
-                                  :contributor, :title, :tag, :description, :rights,
-                                  :publisher, :date_created, :subject,
-                                  :resource_type, :identifier, :language], multiple: true
-
       around_save :characterize_if_changed, :retry_warming
-      before_destroy :cleanup_trophies
 
       attr_accessible *(ds_specs['descMetadata'][:type].fields + [:permissions])
     end
 
-
-    def record_version_committer(user)
-      version = content.latest_version
-      # content datastream not (yet?) present
-      return if version.nil?
-      VersionCommitter.create(:obj_id => version.pid,
-                              :datastream_id => version.dsid,
-                              :version_id => version.versionID,
-                              :committer_login => user.user_key)
-    end
-
-    def pdf?
-      self.class.pdf_mime_types.include? self.mime_type
-    end
-
-    def image?
-      self.class.image_mime_types.include? self.mime_type
-    end
-
-    def video?
-      self.class.video_mime_types.include? self.mime_type
-    end
-
-    def audio?
-      self.class.audio_mime_types.include? self.mime_type
-    end
-
     def persistent_url
       "#{Sufia.config.persistent_hostpath}#{noid}"
     end
@@ -100,10 +66,6 @@ module Sufia
         end
     end
 
-    def cleanup_trophies
-      Trophy.destroy_all(generic_file_id: self.noid)
-    end
-
     def related_files
       relateds = begin
                    self.batch.generic_files
@@ -130,13 +92,6 @@ module Sufia
       return solr_doc
     end
 
-    def file_format
-      return nil if self.mime_type.blank? and self.format_label.blank?
-      return self.mime_type.split('/')[1]+ " ("+self.format_label.join(", ")+")" unless self.mime_type.blank? or self.format_label.blank?
-      return self.mime_type.split('/')[1] unless self.mime_type.blank?
-      return self.format_label
-    end
-
     # Redefine this for more intuitive keys in Redis
     def to_param
       noid

data/sufia-models/lib/sufia/models/generic_file/metadata.rb

@@ -0,0 +1,22 @@
+module Sufia
+  module GenericFile
+    module Metadata
+      extend ActiveSupport::Concern
+
+      included do
+        has_metadata "descMetadata", type: GenericFileRdfDatastream
+        has_metadata "properties", type: PropertiesDatastream
+        has_file_datastream "content", type: FileContentDatastream
+        has_file_datastream "thumbnail"
+
+
+        delegate_to :properties, [:relative_path, :depositor, :import_url], multiple: false
+        delegate_to :descMetadata, [:date_uploaded, :date_modified], multiple: false 
+        delegate_to :descMetadata, [:related_url, :based_near, :part_of, :creator,
+                                    :contributor, :title, :tag, :description, :rights,
+                                    :publisher, :date_created, :subject,
+                                    :resource_type, :identifier, :language], multiple: true
+      end
+    end
+  end
+end

data/sufia-models/lib/sufia/models/generic_file/mime_types.rb

@@ -3,6 +3,29 @@ module Sufia
     module MimeTypes
       extend ActiveSupport::Concern
 
+      def pdf?
+        self.class.pdf_mime_types.include? self.mime_type
+      end
+
+      def image?
+        self.class.image_mime_types.include? self.mime_type
+      end
+
+      def video?
+        self.class.video_mime_types.include? self.mime_type
+      end
+
+      def audio?
+        self.class.audio_mime_types.include? self.mime_type
+      end
+
+      def file_format
+        return nil if self.mime_type.blank? and self.format_label.blank?
+        return self.mime_type.split('/')[1]+ " ("+self.format_label.join(", ")+")" unless self.mime_type.blank? or self.format_label.blank?
+        return self.mime_type.split('/')[1] unless self.mime_type.blank?
+        return self.format_label
+      end
+
       module ClassMethods
         def image_mime_types
           ['image/png','image/jpeg', 'image/jpg', 'image/jp2', 'image/bmp', 'image/gif']

data/sufia-models/lib/sufia/models/generic_file/trophies.rb

@@ -0,0 +1,15 @@
+module Sufia
+  module GenericFile
+    module Trophies
+      extend ActiveSupport::Concern
+      included do
+        before_destroy :cleanup_trophies
+      end
+
+      def cleanup_trophies
+        Trophy.destroy_all(generic_file_id: self.noid)
+      end
+
+    end
+  end
+end

data/sufia-models/lib/sufia/models/generic_file/versions.rb

@@ -0,0 +1,16 @@
+module Sufia
+  module GenericFile
+    module Versions
+      def record_version_committer(user)
+        version = content.latest_version
+        # content datastream not (yet?) present
+        return if version.nil?
+        VersionCommitter.create(:obj_id => version.pid,
+                                :datastream_id => version.dsid,
+                                :version_id => version.versionID,
+                                :committer_login => user.user_key)
+      end
+
+    end
+  end
+end

data/sufia-models/lib/sufia/models/version.rb

@@ -1,5 +1,5 @@
 module Sufia
   module Models
-    VERSION = "3.4.0.rc1"
+    VERSION = "3.4.0.rc2"
   end
 end

data/sufia-models/sufia-models.gemspec

@@ -30,10 +30,10 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'rails', '>= 3.2.13', '< 5.0'
   spec.add_dependency 'activeresource' # No longer a dependency of rails 4.0
 
-  # spec.add_dependency "hydra", "6.1.0.rc1"
+  # spec.add_dependency "hydra", "6.1.0.rc2"
   # Since hydra 6.1 isn't out yet, we'll just build it so that it's compatible 
   # without an explicit dependency
-  spec.add_dependency "hydra-head", "~> 6.4.0.rc1"
+  spec.add_dependency "hydra-head", "~> 6.4.0.rc2"
   spec.add_dependency 'active-fedora', "~> 6.6.0.rc1"
 
   spec.add_dependency 'nest', '~> 1.1.1'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sufia
 version: !ruby/object:Gem::Version
-  version: 3.4.0.rc1
+  version: 3.4.0.rc2
 platform: ruby
 authors:
 - Justin Coyne
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-01 00:00:00.000000000 Z
+date: 2013-10-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sufia-models
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.4.0.rc1
+        version: 3.4.0.rc2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.4.0.rc1
+        version: 3.4.0.rc2
 - !ruby/object:Gem::Dependency
   name: blacklight_advanced_search
   requirement: !ruby/object:Gem::Requirement
@@ -162,6 +162,7 @@ files:
 - Rakefile
 - Releasing_sufia.md
 - SUFIA_VERSION
+- UpgradeGuide.md
 - app/assets/images/blacklight/bg.png
 - app/assets/images/blacklight/border.png
 - app/assets/images/blacklight/bul_sq_gry.gif
@@ -576,7 +577,6 @@ files:
 - spec/jobs/ingest_local_file_job_spec.rb
 - spec/lib/sufia/id_service_spec.rb
 - spec/lib/sufia/upload_complete_behavior_spec.rb
-- spec/models/access_right_spec.rb
 - spec/models/audit_job_spec.rb
 - spec/models/batch_spec.rb
 - spec/models/batch_update_job_spec.rb
@@ -614,8 +614,6 @@ files:
 - sufia-models/Rakefile
 - sufia-models/app/models/batch.rb
 - sufia-models/app/models/checksum_audit_log.rb
-- sufia-models/app/models/concerns/sufia/models/access_right.rb
-- sufia-models/app/models/concerns/sufia/models/with_access_right.rb
 - sufia-models/app/models/datastreams/batch_rdf_datastream.rb
 - sufia-models/app/models/datastreams/file_content_datastream.rb
 - sufia-models/app/models/datastreams/fits_datastream.rb
@@ -668,9 +666,12 @@ files:
 - sufia-models/lib/sufia/models/generic_file/characterization.rb
 - sufia-models/lib/sufia/models/generic_file/derivatives.rb
 - sufia-models/lib/sufia/models/generic_file/export.rb
+- sufia-models/lib/sufia/models/generic_file/metadata.rb
 - sufia-models/lib/sufia/models/generic_file/mime_types.rb
 - sufia-models/lib/sufia/models/generic_file/permissions.rb
 - sufia-models/lib/sufia/models/generic_file/thumbnail.rb
+- sufia-models/lib/sufia/models/generic_file/trophies.rb
+- sufia-models/lib/sufia/models/generic_file/versions.rb
 - sufia-models/lib/sufia/models/generic_file/web_form.rb
 - sufia-models/lib/sufia/models/id_service.rb
 - sufia-models/lib/sufia/models/jobs/active_fedora_pid_based_job.rb
@@ -831,7 +832,6 @@ test_files:
 - spec/jobs/ingest_local_file_job_spec.rb
 - spec/lib/sufia/id_service_spec.rb
 - spec/lib/sufia/upload_complete_behavior_spec.rb
-- spec/models/access_right_spec.rb
 - spec/models/audit_job_spec.rb
 - spec/models/batch_spec.rb
 - spec/models/batch_update_job_spec.rb

data/spec/models/access_right_spec.rb

@@ -1,57 +0,0 @@
-require 'spec_helper'
-
-describe Sufia::Models::AccessRight do
-  [
-    [false, Sufia::Models::AccessRight::PERMISSION_TEXT_VALUE_PUBLIC,        nil,                                              nil,             true, false, false, false],
-    [false, Sufia::Models::AccessRight::PERMISSION_TEXT_VALUE_AUTHENTICATED, nil,                                              nil,             true, false, false, false],
-    [false, nil,                                              nil,                                              nil,             true, false, false, false],
-    [false, nil,                                              nil,                                              2.days.from_now, false, false, false, true],
-    [false, nil,                                              nil,                                              2.days.ago,      false, false, false, true],
-    [false, nil,                                              Sufia::Models::AccessRight::VISIBILITY_TEXT_VALUE_PUBLIC,        nil,             true, false, false, false],
-    [false, nil,                                              Sufia::Models::AccessRight::VISIBILITY_TEXT_VALUE_AUTHENTICATED, nil,             false, true, false, false],
-    [false, nil,                                              Sufia::Models::AccessRight::VISIBILITY_TEXT_VALUE_PRIVATE,       nil,             false, false, true, false],
-    [false, nil,                                              Sufia::Models::AccessRight::VISIBILITY_TEXT_VALUE_EMBARGO,       nil,             false, false, false, true],
-    [true,  Sufia::Models::AccessRight::PERMISSION_TEXT_VALUE_PUBLIC,        nil,                                              nil,             true, false, false, false],
-    [true,  Sufia::Models::AccessRight::PERMISSION_TEXT_VALUE_PUBLIC,        nil,                                              2.days.from_now, false, false, false, true],
-    [true,  Sufia::Models::AccessRight::PERMISSION_TEXT_VALUE_PUBLIC,        nil,                                              2.days.ago,      false, false, false, true],
-    [true,  Sufia::Models::AccessRight::PERMISSION_TEXT_VALUE_AUTHENTICATED, nil,                                              nil,             false, true, false, false],
-    [true,  nil,                                              nil,                                              nil,             false, false, true, false],
-    [true,  nil,                                              Sufia::Models::AccessRight::VISIBILITY_TEXT_VALUE_PUBLIC,        nil,             true, false, false, false],
-    [true,  nil,                                              Sufia::Models::AccessRight::VISIBILITY_TEXT_VALUE_AUTHENTICATED, nil,             false, true, false, false],
-    [true,  nil,                                              Sufia::Models::AccessRight::VISIBILITY_TEXT_VALUE_PRIVATE,       nil,             false, false, true, false],
-    [true,  nil,                                              Sufia::Models::AccessRight::VISIBILITY_TEXT_VALUE_EMBARGO,       nil,             false, false, false, true],
-  ].each do |given_persisted, givin_permission, given_visibility, given_embargo_release_date, expected_open_access, expected_authentication_only, expected_private, expected_open_access_with_embargo_release_date|
-    spec_text = <<-TEXT
-
-    GIVEN: {
-      persisted: #{given_persisted.inspect},
-      permission: #{givin_permission.inspect},
-      visibility: #{given_visibility.inspect},
-      embargo_release_date: #{given_embargo_release_date}
-    },
-    EXPECTED: {
-      open_access: #{expected_open_access.inspect},
-      restricted: #{expected_authentication_only.inspect},
-      private: #{expected_private.inspect},
-      open_access_with_embargo_release_date: #{expected_open_access_with_embargo_release_date}
-    },
-    TEXT
-
-    it spec_text do
-      permissions = [{access: :edit, name: givin_permission}]
-      permissionable = double(
-        'permissionable',
-        permissions: permissions,
-        visibility: given_visibility,
-        persisted?: given_persisted,
-        embargo_release_date: given_embargo_release_date
-      )
-      access_right = Sufia::Models::AccessRight.new(permissionable)
-
-      expect(access_right.open_access?).to eq(expected_open_access)
-      expect(access_right.authenticated_only?).to eq(expected_authentication_only)
-      expect(access_right.private?).to eq(expected_private)
-      expect(access_right.open_access_with_embargo_release_date?).to eq(expected_open_access_with_embargo_release_date)
-    end
-  end
-end

data/sufia-models/app/models/concerns/sufia/models/access_right.rb

@@ -1,79 +0,0 @@
-module Sufia
-  module Models
-    class AccessRight
-      PERMISSION_TEXT_VALUE_PUBLIC = 'public'.freeze
-      PERMISSION_TEXT_VALUE_AUTHENTICATED = 'registered'.freeze
-      VISIBILITY_TEXT_VALUE_PUBLIC = 'open'.freeze
-      VISIBILITY_TEXT_VALUE_EMBARGO = 'open_with_embargo_release_date'.freeze
-      VISIBILITY_TEXT_VALUE_AUTHENTICATED = 'psu'.freeze
-      VISIBILITY_TEXT_VALUE_PRIVATE = 'restricted'.freeze
-
-      # @param permissionable [#visibility, #permissions]
-      # @example
-      #   file = GenericFile.find('sufia:1234')
-      #   access = Sufia::AccessRight.new(file)
-      def initialize(permissionable)
-        @permissionable = permissionable
-      end
-
-      attr_reader :permissionable
-      delegate :persisted?, :permissions, :visibility, to: :permissionable
-      protected :persisted?, :permissions, :visibility
-
-
-      def open_access?
-        return true if has_visibility_text_for?(VISIBILITY_TEXT_VALUE_PUBLIC)
-        # We don't want to know if its under embargo, simply does it have a date.
-        # In this way, we can properly inform the label input
-        persisted_open_access_permission? && !permissionable.embargo_release_date.present?
-      end
-
-      def open_access_with_embargo_release_date?
-        return false unless permissionable_is_embargoable?
-        return true if has_visibility_text_for?(VISIBILITY_TEXT_VALUE_EMBARGO)
-        # We don't want to know if its under embargo, simply does it have a date.
-        # In this way, we can properly inform the label input
-        persisted_open_access_permission? && permissionable.embargo_release_date.present?
-      end
-
-      def authenticated_only?
-        return false if open_access?
-        has_permission_text_for?(PERMISSION_TEXT_VALUE_AUTHENTICATED) ||
-          has_visibility_text_for?(VISIBILITY_TEXT_VALUE_AUTHENTICATED)
-      end
-
-      def private?
-        return false if open_access?
-        return false if authenticated_only?
-        return false if open_access_with_embargo_release_date?
-        true
-      end
-
-      private
-
-        def persisted_open_access_permission?
-          if persisted?
-            has_permission_text_for?(PERMISSION_TEXT_VALUE_PUBLIC)
-          else
-            visibility.to_s == ''
-          end
-        end
-
-        def on_or_after_any_embargo_release_date?
-          return true unless permissionable.embargo_release_date
-          permissionable.embargo_release_date.to_date < Date.today
-        end
-
-        def permissionable_is_embargoable?
-          permissionable.respond_to?(:embargo_release_date)
-        end
-
-        def has_visibility_text_for?(text)
-          visibility == text
-        end
-        def has_permission_text_for?(text)
-          !!permissions.detect { |perm| perm[:name] == text }
-        end
-    end
-  end
-end

data/sufia-models/app/models/concerns/sufia/models/with_access_right.rb

@@ -1,33 +0,0 @@
-module Sufia
-  module Models
-    module WithAccessRight
-      extend ActiveSupport::Concern
-
-      def under_embargo?
-        @under_embargo ||= rightsMetadata.under_embargo?
-      end
-
-      def open_access?
-        access_rights.open_access?
-      end
-
-      def open_access_with_embargo_release_date?
-        access_rights.open_access_with_embargo_release_date?
-      end
-
-      def authenticated_only_access?
-        access_rights.authenticated_only?
-      end
-
-      def private_access?
-        access_rights.private?
-      end
-
-      def access_rights
-        @access_rights ||= AccessRight.new(self)
-      end
-      protected :access_rights
-
-    end
-  end
-end