sufia 3.3.0 → 3.4.0

data/lib/generators/sufia/templates/migrations/create_single_use_links.rb

@@ -1,12 +0,0 @@
-class CreateSingleUseLinks < ActiveRecord::Migration
-  def change
-    create_table :single_use_links do |t|
-      t.string :downloadKey
-      t.string :path
-      t.string :itemId
-      t.datetime :expires
-
-      t.timestamps
-    end
-  end
-end

data/lib/generators/sufia/templates/migrations/create_trophies.rb

@@ -1,10 +0,0 @@
-class CreateTrophies < ActiveRecord::Migration
-  def change
-    create_table :trophies do |t|
-      t.integer :user_id
-      t.string :generic_file_id
-
-      t.timestamps
-    end
-  end
-end

data/lib/generators/sufia/templates/migrations/create_version_committers.rb

@@ -1,15 +0,0 @@
-class CreateVersionCommitters < ActiveRecord::Migration
-  def self.up
-    create_table :version_committers do |t|
-      t.string :obj_id
-      t.string :datastream_id
-      t.string :version_id
-      t.string :committer_login
-      t.timestamps
-    end
-  end
-
-  def self.down
-    drop_table :version_committers
-  end
-end

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

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

@@ -1,65 +0,0 @@
-module Sufia
-  module GenericFile
-    module Visibility
-      extend ActiveSupport::Concern
-      extend Deprecation
-
-      def visibility=(value)
-        return if value.nil?
-        # only set explicit permissions
-        case value
-        when Sufia::Models::AccessRight::VISIBILITY_TEXT_VALUE_PUBLIC
-          public_visibility!
-        when Sufia::Models::AccessRight::VISIBILITY_TEXT_VALUE_AUTHENTICATED
-          registered_visibility!
-        when Sufia::Models::AccessRight::VISIBILITY_TEXT_VALUE_PRIVATE
-          private_visibility!
-        else
-          raise ArgumentError, "Invalid visibility: #{value.inspect}"
-        end
-      end
-
-      def visibility
-        if read_groups.include? Sufia::Models::AccessRight::PERMISSION_TEXT_VALUE_PUBLIC
-          Sufia::Models::AccessRight::VISIBILITY_TEXT_VALUE_PUBLIC
-        elsif read_groups.include? Sufia::Models::AccessRight::PERMISSION_TEXT_VALUE_AUTHENTICATED
-          Sufia::Models::AccessRight::VISIBILITY_TEXT_VALUE_AUTHENTICATED
-        else
-          Sufia::Models::AccessRight::VISIBILITY_TEXT_VALUE_PRIVATE
-        end
-      end
-
-      def set_visibility(visibility)
-        Deprecation.warn Visibility, "set_visibility is deprecated, use visibility= instead.  set_visibility will be removed in sufia 3.0", caller
-        self.visibility= visibility
-      end
-
-      def visibility_changed?
-        @visibility_will_change
-      end
-
-      private
-      def visibility_will_change!
-        @visibility_will_change = true
-      end
-
-      def public_visibility!
-        visibility_will_change! unless visibility == Sufia::Models::AccessRight::VISIBILITY_TEXT_VALUE_PUBLIC
-        self.datastreams["rightsMetadata"].permissions({:group=>Sufia::Models::AccessRight::PERMISSION_TEXT_VALUE_PUBLIC}, "read")
-      end
-
-      def registered_visibility!
-        visibility_will_change! unless visibility == Sufia::Models::AccessRight::VISIBILITY_TEXT_VALUE_AUTHENTICATED
-        self.datastreams["rightsMetadata"].permissions({:group=>Sufia::Models::AccessRight::PERMISSION_TEXT_VALUE_AUTHENTICATED}, "read")
-        self.datastreams["rightsMetadata"].permissions({:group=>Sufia::Models::AccessRight::PERMISSION_TEXT_VALUE_PUBLIC}, "none")
-      end
-
-      def private_visibility!
-        visibility_will_change! unless visibility == Sufia::Models::AccessRight::VISIBILITY_TEXT_VALUE_PRIVATE
-        self.datastreams["rightsMetadata"].permissions({:group=>Sufia::Models::AccessRight::PERMISSION_TEXT_VALUE_AUTHENTICATED}, "none")
-        self.datastreams["rightsMetadata"].permissions({:group=>Sufia::Models::AccessRight::PERMISSION_TEXT_VALUE_PUBLIC}, "none")
-      end
-
-    end
-  end
-end