sufia 3.1.0 → 3.2.1

data/lib/generators/sufia/sufia_generator.rb

@@ -1,85 +1,46 @@
 # -*- encoding : utf-8 -*-
 require 'rails/generators'
-require 'rails/generators/migration'     
+require 'rails/generators/migration'
 
 class SufiaGenerator < Rails::Generators::Base
   include Rails::Generators::Migration
 
   source_root File.expand_path('../templates', __FILE__)
-  
+
   argument     :model_name, :type => :string , :default => "user"
   desc """
 This generator makes the following changes to your application:
- 1. Creates several database migrations if they do not exist in /db/migrate
- 2. Adds user behavior to the user model
- 3. Adds controller behavior to the application controller
- 4. Creates the sufia.rb configuration file
- 5. Copies the catalog controller into the local app
- 6. Adds Sufia::SolrDocumentBehavior to app/models/solr_document.rb
- 7. Generates mailboxer
-       """ 
-
-  # Implement the required interface for Rails::Generators::Migration.
-  # taken from http://github.com/rails/rails/blob/master/activerecord/lib/generators/active_record.rb
-  def self.next_migration_number(path)
-    unless @prev_migration_nr
-      @prev_migration_nr = Time.now.utc.strftime("%Y%m%d%H%M%S").to_i
-    else
-      @prev_migration_nr += 1
-    end
-    @prev_migration_nr.to_s
-  end
+ 1. Runs sufia-models:install
+ 2. Adds controller behavior to the application controller
+ 3. Copies the catalog controller into the local app
+       """
 
-  # Setup the database migrations
-  def copy_migrations
-    # Can't get this any more DRY, because we need this order.
-    %w{acts_as_follower_migration.rb	add_social_to_users.rb		create_single_use_links.rb	add_ldap_attrs_to_user.rb
-add_avatars_to_users.rb		create_checksum_audit_logs.rb	create_version_committers.rb
-add_groups_to_users.rb		create_local_authorities.rb	create_trophies.rb}.each do |f|
-      better_migration_template f
-    end
-  end
-
-  # Add behaviors to the user model
-  def inject_sufia_user_behavior
-    file_path = "app/models/#{model_name.underscore}.rb"
-    if File.exists?(file_path) 
-      inject_into_class file_path, model_name.classify do 
-        "# Connects this user object to Sufia behaviors. " +
-        "\n include Sufia::User\n"        
-      end
-    else
-      puts "     \e[31mFailure\e[0m  Sufia requires a user object. This generators assumes that the model is defined in the file #{file_path}, which does not exist.  If you used a different name, please re-run the generator and provide that name as an argument. Such as \b  rails -g sufia client" 
-    end    
+  def run_required_generators
+    generate "blacklight --devise"
+    generate "hydra:head -f"
+    generate "sufia:models:install"
   end
 
   # Add behaviors to the application controller
-  def inject_sufia_controller_behavior    
+  def inject_sufia_controller_behavior
     controller_name = "ApplicationController"
     file_path = "app/controllers/application_controller.rb"
-    if File.exists?(file_path) 
-      insert_into_file file_path, :after => 'include Blacklight::Controller' do 
-        "  \n# Adds Sufia behaviors into the application controller \n" +        
+    if File.exists?(file_path)
+      insert_into_file file_path, :after => 'include Blacklight::Controller' do
+        "  \n# Adds Sufia behaviors into the application controller \n" +
         "  include Sufia::Controller\n"
       end
       gsub_file file_path, "layout 'blacklight'", "layout :search_layout"
     else
-      puts "     \e[31mFailure\e[0m  Could not find #{file_path}.  To add Sufia behaviors to your  Controllers, you must include the Sufia::Controller module in the Controller class definition." 
+      puts "     \e[31mFailure\e[0m  Could not find #{file_path}.  To add Sufia behaviors to your  Controllers, you must include the Sufia::Controller module in the Controller class definition."
     end
   end
-  
-  def create_configuration_files
-    copy_file "config/sufia.rb", "config/initializers/sufia.rb"
-    copy_file "config/redis.yml", "config/redis.yml"
-    copy_file "config/redis_config.rb", "config/initializers/redis_config.rb"
-    copy_file "config/resque_admin.rb", "config/initializers/resque_admin.rb"
-    copy_file "config/resque_config.rb", "config/initializers/resque_config.rb"
-  end
+
 
   def catalog_controller
     copy_file "catalog_controller.rb", "app/controllers/catalog_controller.rb"
   end
-  
+
 
   # The engine routes have to come after the devise routes so that /users/sign_in will work
   def inject_routes
@@ -92,37 +53,9 @@ add_groups_to_users.rb		create_local_authorities.rb	create_trophies.rb}.each do
   mount Sufia::Engine => '/'\n"
     sentinel = /devise_for :users/
     inject_into_file 'config/routes.rb', routing_code, { :after => sentinel, :verbose => false }
-    
-  end
-
-  # Add behaviors to the SolrDocument model
-  def inject_sufia_solr_document_behavior
-    file_path = "app/models/solr_document.rb"
-    if File.exists?(file_path) 
-      inject_into_class file_path, "SolrDocument" do 
-        "  # Adds Sufia behaviors to the SolrDocument.\n" +
-        "  include Sufia::SolrDocumentBehavior\n"        
-      end
-    else
-      puts "     \e[31mFailure\e[0m  Sufia requires a SolrDocument object. This generators assumes that the model is defined in the file #{file_path}, which does not exist." 
-    end    
-  end
 
-  def install_mailboxer
-    generate "mailboxer:install" 
-  end
-
-  private  
-  
-  def better_migration_template (file)
-    begin
-      migration_template "migrations/#{file}", "db/migrate/#{file}"
-      sleep 1 # ensure scripts have different time stamps
-    rescue
-      puts "  \e[1m\e[34mMigrations\e[0m  " + $!.message
-    end
   end
 
-end  
+end
 
 

data/lib/generators/sufia/templates/catalog_controller.rb

@@ -1,18 +1,4 @@
 # -*- coding: utf-8 -*-
-# Copyright © 2012 The Pennsylvania State University
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
 # -*- encoding : utf-8 -*-
 require 'blacklight/catalog'
 require 'blacklight_advanced_search'

data/lib/generators/sufia/templates/config/action_dispatch_http_upload_monkey_patch.rb

@@ -1,17 +1,3 @@
-# Copyright © 2012 The Pennsylvania State University
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
 module ActionDispatch
   module Http
     class UploadedFile

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

@@ -1,17 +1,3 @@
-# Copyright © 2012 The Pennsylvania State University
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
 class ActsAsFollowerMigration < ActiveRecord::Migration
   def self.up
     create_table :follows, :force => true do |t|

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

@@ -1,17 +1,3 @@
-# Copyright © 2012 The Pennsylvania State University
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
 class AddAvatarsToUsers < ActiveRecord::Migration
   def self.up
     add_attachment :users, :avatar

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

@@ -1,17 +1,3 @@
-# Copyright © 2012 The Pennsylvania State University
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
 class AddGroupsToUsers < ActiveRecord::Migration
   def self.up
     add_column :users, :group_list, :text

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

@@ -1,17 +1,3 @@
-# Copyright © 2012 The Pennsylvania State University
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
 class AddLdapAttrsToUser < ActiveRecord::Migration
   def self.up
     add_column :users, :display_name, :string

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

@@ -1,17 +1,3 @@
-# Copyright © 2012 The Pennsylvania State University
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
 class AddSocialToUsers < ActiveRecord::Migration
   def self.up
     add_column :users, :facebook_handle, :string

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

@@ -1,17 +1,3 @@
-# Copyright © 2012 The Pennsylvania State University
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
 class CreateChecksumAuditLogs < ActiveRecord::Migration
   def self.up
     create_table :checksum_audit_logs do |t|

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

@@ -1,17 +1,3 @@
-# Copyright © 2012 The Pennsylvania State University
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
 class CreateLocalAuthorities < ActiveRecord::Migration
   def self.up
     create_table :local_authority_entries, :force => true do |t|

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

@@ -1,17 +1,3 @@
-# Copyright © 2012 The Pennsylvania State University
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
 class CreateVersionCommitters < ActiveRecord::Migration
   def self.up
     create_table :version_committers do |t|

data/lib/sufia/batch_edits_controller_behavior.rb

@@ -46,7 +46,7 @@ module Sufia
     def update_document(obj)
       super
       obj.date_modified = Time.now.ctime
-      obj.set_visibility(params[:visibility])
+      obj.visibility = params[:visibility]
     end
 
     def update

data/lib/sufia/contact_form_controller_behavior.rb

@@ -1,17 +1,3 @@
-# Copyright © 2012 The Pennsylvania State University
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
 module Sufia
   module ContactFormControllerBehavior
 

data/lib/sufia/controller.rb

@@ -1,17 +1,3 @@
-# Copyright © 2012 The Pennsylvania State University
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
 module Sufia::Controller
   extend ActiveSupport::Concern
 
@@ -53,7 +39,7 @@ module Sufia::Controller
     return if action_name == "index" && controller_name == "mailbox"
     if user_signed_in? 
       @notify_number= current_user.mailbox.inbox(:unread => true).count
-      @batches=current_user.mailbox.inbox.map {|msg| msg.last_message.body[/<a class="batchid ui-helper-hidden">(.*)<\/a>The file(.*)/,1]}.select{|val| !val.blank?}
+      @batches=current_user.mailbox.inbox.map {|msg| msg.last_message.body[/<span class="batchid ui-helper-hidden">(.*)<\/span>The file(.*)/,1]}.select{|val| !val.blank?}
     end
   end
   

data/lib/sufia/downloads_controller_behavior.rb

@@ -1,17 +1,3 @@
-# Copyright © 2012 The Pennsylvania State University
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
 module Sufia
   module DownloadsControllerBehavior
     extend ActiveSupport::Concern

data/lib/sufia/files_controller/upload_complete_behavior.rb

@@ -3,5 +3,10 @@ module Sufia
     def upload_complete_path(batch_id)
       Sufia::Engine.routes.url_helpers.batch_edit_path(batch_id)
     end
+
+    def destroy_complete_path(params)
+      Sufia::Engine.routes.url_helpers.dashboard_index_path
+    end
+
   end # /FilesController::UploadCompleteBehavior
 end # /Sufia

data/lib/sufia/files_controller_behavior.rb

@@ -1,18 +1,3 @@
-# -*- coding: utf-8 -*-
-# Copyright © 2012 The Pennsylvania State University
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
 module Sufia
   module FilesController
     autoload :LocalIngestBehavior, 'sufia/files_controller/local_ingest_behavior'
@@ -72,7 +57,7 @@ module Sufia
       pid = @generic_file.noid
       @generic_file.destroy
       Sufia.queue.push(ContentDeleteEventJob.new(pid, current_user.user_key))
-      redirect_to sufia.dashboard_index_path, :notice => render_to_string(:partial=>'generic_files/asset_deleted_flash', :locals => { :generic_file => @generic_file })
+      redirect_to self.class.destroy_complete_path(params), :notice => render_to_string(:partial=>'generic_files/asset_deleted_flash', :locals => { :generic_file => @generic_file })
     end
 
     # routed to /files (POST)
@@ -182,6 +167,7 @@ module Sufia
 
     protected
 
+
     def json_error(error, name=nil, additional_arguments={})
       args = {:error => error}
       args[:name] = name if name
@@ -241,7 +227,7 @@ module Sufia
     # this is provided so that implementing application can override this behavior and map params to different attributes
     def update_metadata
       @generic_file.attributes = @generic_file.sanitize_attributes(params[:generic_file])
-      @generic_file.set_visibility(params[:visibility])
+      @generic_file.visibility = params[:visibility]
       @generic_file.date_modified = DateTime.now
     end
 

data/lib/sufia/role_mapper.rb

@@ -1,17 +1,3 @@
-# Copyright © 2012 The Pennsylvania State University
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
 class RoleMapper
   def self.roles(uid)
     u = User.find_by_login(uid)

data/lib/sufia/version.rb

@@ -1,3 +1,3 @@
 module Sufia
-  VERSION = "3.1.0"
+  VERSION = "3.2.1"
 end

data/lib/tasks/fixtures.rake

@@ -1,17 +1,3 @@
-# Copyright © 2012 The Pennsylvania State University
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
 # sufia-fixtures
 #
 # This was extracted from the original Hydra version in 

data/spec/factories/checksum_audit_logs.rb

@@ -1,17 +1,3 @@
-# Copyright © 2012 The Pennsylvania State University
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
 # Read about factories at http://github.com/thoughtbot/factory_girl
 
 FactoryGirl.define do

data/spec/lib/sufia/upload_complete_behavior_spec.rb

@@ -9,6 +9,10 @@ class UploadThingRedefine
     return "example.com"
   end
 
+  def self.destroy_complete_path(id)
+    return "destroy.com"
+  end
+
 end
 
 describe Sufia::FilesController::UploadCompleteBehavior do
@@ -17,10 +21,16 @@ describe Sufia::FilesController::UploadCompleteBehavior do
     it "respond with the batch edit path" do
       UploadThing.upload_complete_path(test_id).should == Sufia::Engine.routes.url_helpers.batch_edit_path(test_id)
     end
+    it "respond with the dashboard path" do
+      UploadThing.destroy_complete_path({}).should ==   Sufia::Engine.routes.url_helpers.dashboard_index_path
+    end
   end
   context "overriden path" do
     it "respond with the batch edit path" do
       UploadThingRedefine.upload_complete_path(test_id).should == "example.com"
     end
+    it "respond with the batch edit path" do
+      UploadThingRedefine.destroy_complete_path(test_id).should == "destroy.com"
+    end
   end
 end

data/spec/models/access_right_spec.rb

@@ -0,0 +1,57 @@
+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/spec/models/generic_file/visibility_spec.rb

@@ -0,0 +1,19 @@
+require 'spec_helper'
+
+describe Sufia::GenericFile::Visibility do
+  module VisibilityOverride
+    extend ActiveSupport::Concern
+    include Sufia::GenericFile::Permissions
+    def visibility; super; end
+    def visibility=(value); super(value); end
+  end
+  class MockParent < ActiveFedora::Base
+    include VisibilityOverride
+  end
+
+  it 'allows for overrides of visibility' do
+    expect{
+      MockParent.new(visibility: Sufia::Models::AccessRight::VISIBILITY_TEXT_VALUE_PRIVATE)
+    }.to_not raise_error
+  end
+end