Point at the Hyrax repo

.rubocop_todo.yml

@@ -15,12 +15,12 @@ RSpec/SubjectStub:
 # Offense count: 10
 RSpec/LeadingSubject:
   Exclude:
-    - 'spec/controllers/sufia/generic_works_controller_spec.rb'
+    - 'spec/controllers/hyrax/generic_works_controller_spec.rb'
     - 'spec/helpers/admin_stats_helper_spec.rb'
     - 'spec/lib/active_job_tenant_spec.rb'
     - 'spec/lib/importer/factory/string_literal_processor_spec.rb'
     - 'spec/lib/stanford/importer/mods_parser_spec.rb'
-    - 'spec/presenters/sufia/generic_work_show_presenter_spec.rb'
+    - 'spec/presenters/hyrax/generic_work_show_presenter_spec.rb'
     - 'spec/services/create_account_spec.rb'
     - 'spec/services/iiif_thumbnail_path_service_spec.rb'
     - 'spec/services/solr_config_uploader_spec.rb'

Gemfile

@@ -60,7 +60,7 @@ end
 
 gem 'blacklight', '~> 6.7'
 
-gem 'sufia', git: 'https://github.com/projecthydra/sufia.git', branch: 'cc_subtree'
+gem 'hyrax', git: 'https://github.com/projecthydra-labs/hyrax.git'
 gem 'rsolr', '~> 1.1.2'
 
 gem 'devise'

Gemfile.lock

@@ -7,11 +7,10 @@ GIT
       activesupport (>= 4.0)
 
 GIT
-  remote: https://github.com/projecthydra/sufia.git
-  revision: eb5e3d416a4a9da2ea2f06498683a095d6c5c7cd
-  branch: cc_subtree
+  remote: https://github.com/projecthydra-labs/hyrax.git
+  revision: f9c6586a5a566bbb2b481cc934128cf69ade4cc1
   specs:
-    sufia (8.0.0.alpha)
+    hyrax (0.0.1.alpha)
       active_attr (~> 0.9.0)
       active_fedora-noid (~> 2.0)
       almond-rails (~> 0.0.1)
@@ -255,11 +254,11 @@ GEM
       dry-equalizer (~> 0.2)
       dry-types (~> 0.9, >= 0.9.0)
       ice_nine (~> 0.11)
-    dry-types (0.9.2)
+    dry-types (0.9.3)
       concurrent-ruby (~> 1.0)
       dry-configurable (~> 0.1)
       dry-container (~> 0.3)
-      dry-core (~> 0.2)
+      dry-core (~> 0.2, >= 0.2.1)
       dry-equalizer (~> 0.2)
       dry-logic (~> 0.4, >= 0.4.0)
       inflecto (~> 0.0.0, >= 0.0.2)
@@ -462,7 +461,7 @@ GEM
       mime-types-data (~> 3.2015)
     mime-types-data (3.2016.0521)
     mimemagic (0.3.2)
-    mini_magick (4.5.1)
+    mini_magick (4.6.0)
     mini_portile2 (2.1.0)
     minitest (5.10.1)
     mods (2.1.0)
@@ -778,6 +777,7 @@ DEPENDENCIES
   flipflop!
   fog-aws
   honeybadger (~> 2.0)
+  hyrax!
   iiif_manifest (~> 0.1.2)
   is_it_working
   jbuilder (~> 2.0)
@@ -809,7 +809,6 @@ DEPENDENCIES
   simplecov
   solr_wrapper (~> 0.10)
   spring (~> 1.7)
-  sufia!
   turbolinks
   uglifier (>= 1.3.0)
   web-console (>= 3.3.0)

app/actors/sufia/actors/generic_work_actor.rb → app/actors/hyrax/actors/generic_work_actor.rb

@@ -1,8 +1,8 @@
 # Generated via
 #  `rails generate curation_concerns:work GenericWork`
-module Sufia
+module Hyrax
   module Actors
-    class GenericWorkActor < Sufia::Actors::BaseActor
+    class GenericWorkActor < Hyrax::Actors::BaseActor
     end
   end
 end

app/actors/sufia/actors/image_actor.rb → app/actors/hyrax/actors/image_actor.rb

@@ -1,8 +1,8 @@
 # Generated via
 #  `rails generate curation_concerns:work Image`
-module Sufia
+module Hyrax
   module Actors
-    class ImageActor < Sufia::Actors::BaseActor
+    class ImageActor < Hyrax::Actors::BaseActor
     end
   end
 end

app/assets/javascripts/application.js

@@ -21,7 +21,7 @@
 // Required by Blacklight
 //= require blacklight/blacklight
 
-//= require sufia
+//= require hyrax
 //= require jquery.flot.pie
 //= require flot_graph
 //= require statistics_tab_manager

app/assets/stylesheets/application.css

@@ -10,7 +10,7 @@
  * defined in the other CSS/SCSS files in this directory. It is generally better to create a new
  * file per style scope.
  *
- *= require sufia
+ *= require hyrax
  *= require peek
  *= require peek/views/faraday
  *= require peek/views/performance_bar

app/assets/stylesheets/sufia.scss → app/assets/stylesheets/hyrax.scss

@@ -8,7 +8,7 @@
 @import "bootstrap";
 @import "blacklight/blacklight";
 @import "font-awesome";
-@import "sufia/sufia";
+@import "hyrax/hyrax";
 @import "hyku";
 @import "accounts";
 @import "viewer";

app/controllers/account_sign_up_controller.rb

@@ -4,7 +4,7 @@ class AccountSignUpController < ApplicationController
 
   # GET /accounts/new
   def new
-    add_breadcrumb t(:'sufia.controls.home'), root_path
+    add_breadcrumb t(:'hyrax.controls.home'), root_path
     add_breadcrumb 'New account', new_account_path
   end
 

app/controllers/accounts_controller.rb

@@ -8,9 +8,9 @@ class AccountsController < ApplicationController
   # GET /accounts.json
   def index
     authorize! :manage, Account
-    add_breadcrumb t(:'sufia.controls.home'), root_path
-    add_breadcrumb t(:'sufia.toolbar.admin.menu'), sufia.admin_path
-    add_breadcrumb t(:'sufia.admin.sidebar.accounts'), accounts_path
+    add_breadcrumb t(:'hyrax.controls.home'), root_path
+    add_breadcrumb t(:'hyrax.toolbar.admin.menu'), hyrax.admin_path
+    add_breadcrumb t(:'hyrax.admin.sidebar.accounts'), accounts_path
   end
 
   # GET /accounts/1
@@ -20,17 +20,17 @@ def show
 
   # GET /accounts/new
   def new
-    add_breadcrumb t(:'sufia.controls.home'), root_path
-    add_breadcrumb t(:'sufia.toolbar.admin.menu'), sufia.admin_path
-    add_breadcrumb t(:'sufia.admin.sidebar.accounts'), accounts_path
+    add_breadcrumb t(:'hyrax.controls.home'), root_path
+    add_breadcrumb t(:'hyrax.toolbar.admin.menu'), hyrax.admin_path
+    add_breadcrumb t(:'hyrax.admin.sidebar.accounts'), accounts_path
     add_breadcrumb 'New account', new_account_path
   end
 
   # GET /accounts/1/edit
   def edit
-    add_breadcrumb t(:'sufia.controls.home'), root_path
-    add_breadcrumb t(:'sufia.toolbar.admin.menu'), sufia.admin_path
-    add_breadcrumb t(:'sufia.admin.sidebar.accounts'), accounts_path
+    add_breadcrumb t(:'hyrax.controls.home'), root_path
+    add_breadcrumb t(:'hyrax.toolbar.admin.menu'), hyrax.admin_path
+    add_breadcrumb t(:'hyrax.admin.sidebar.accounts'), accounts_path
     add_breadcrumb @account.tenant, edit_account_path(@account)
   end
 

app/controllers/admin/users_controller.rb

@@ -1,11 +1,11 @@
 module Admin
   class UsersController < ApplicationController
     before_action :ensure_admin!
-    include Sufia::UsersControllerBehavior
+    include Hyrax::UsersControllerBehavior
     layout 'admin'
 
     def self.local_prefixes
-      ['sufia/users']
+      ['hyrax/users']
     end
 
     private

app/controllers/appearances_controller.rb

@@ -5,9 +5,9 @@ class AppearancesController < ApplicationController
 
   # GET /sites/appearances/edit
   def edit
-    add_breadcrumb t(:'sufia.controls.home'), root_path
-    add_breadcrumb t(:'sufia.toolbar.admin.menu'), sufia.admin_path
-    add_breadcrumb t(:'sufia.admin.sidebar.appearance'), edit_site_appearances_path
+    add_breadcrumb t(:'hyrax.controls.home'), root_path
+    add_breadcrumb t(:'hyrax.toolbar.admin.menu'), hyrax.admin_path
+    add_breadcrumb t(:'hyrax.admin.sidebar.appearance'), edit_site_appearances_path
   end
 
   # PATCH/PUT /sites/1

app/controllers/application_controller.rb

@@ -10,10 +10,10 @@ class ApplicationController < ActionController::Base
   include Blacklight::Controller
   include Hydra::Controller::ControllerBehavior
 
-  # Adds Sufia behaviors into the application controller
-  include Sufia::Controller
+  # Adds Hyrax behaviors into the application controller
+  include Hyrax::Controller
 
-  include Sufia::ThemedLayoutController
+  include Hyrax::ThemedLayoutController
   with_themed_layout '1_column'
 
   helper_method :peek_enabled?, :current_account

app/controllers/catalog_controller.rb

@@ -27,7 +27,7 @@ def self.modified_field
     config.advanced_search[:query_parser] ||= 'dismax'
     config.advanced_search[:form_solr_parameters] ||= {}
 
-    config.search_builder_class = Sufia::CatalogSearchBuilder
+    config.search_builder_class = Hyrax::CatalogSearchBuilder
 
     # Show gallery view
     config.view.gallery.partials = [:index_header, :index]

app/controllers/content_blocks_controller.rb

@@ -5,9 +5,9 @@ class ContentBlocksController < ApplicationController
 
   # GET /sites/1/edit
   def edit
-    add_breadcrumb t(:'sufia.controls.home'), root_path
-    add_breadcrumb t(:'sufia.toolbar.admin.menu'), sufia.admin_path
-    add_breadcrumb t(:'sufia.admin.sidebar.content_blocks'), edit_site_content_blocks_path
+    add_breadcrumb t(:'hyrax.controls.home'), root_path
+    add_breadcrumb t(:'hyrax.toolbar.admin.menu'), hyrax.admin_path
+    add_breadcrumb t(:'hyrax.admin.sidebar.content_blocks'), edit_site_content_blocks_path
   end
 
   # PATCH/PUT /sites/1

app/controllers/sufia/file_sets_controller.rb → app/controllers/hyrax/file_sets_controller.rb

@@ -1,7 +1,7 @@
-module Sufia
+module Hyrax
   class FileSetsController < ApplicationController
-    include Sufia::FileSetsControllerBehavior
-    include Sufia::FileSetsControllerBehavior
+    include Hyrax::FileSetsControllerBehavior
+    include Hyrax::FileSetsControllerBehavior
     self.show_presenter = Hyku::FileSetPresenter
   end
 end

app/controllers/sufia/generic_works_controller.rb → app/controllers/hyrax/generic_works_controller.rb

@@ -1,12 +1,12 @@
 require 'iiif_manifest'
-module Sufia
+module Hyrax
   class GenericWorksController < ApplicationController
-    include Sufia::CurationConcernController
-    # Adds Sufia behaviors to the controller.
-    include Sufia::WorksControllerBehavior
+    include Hyrax::CurationConcernController
+    # Adds Hyrax behaviors to the controller.
+    include Hyrax::WorksControllerBehavior
 
     self.curation_concern_type = GenericWork
-    self.show_presenter = Sufia::GenericWorkShowPresenter
+    self.show_presenter = Hyrax::GenericWorkShowPresenter
 
     skip_load_and_authorize_resource only: :manifest
 

app/controllers/sufia/images_controller.rb → app/controllers/hyrax/images_controller.rb

@@ -1,11 +1,11 @@
 # Generated via
 #  `rails generate curation_concerns:work Image`
 
-module Sufia
+module Hyrax
   class ImagesController < ApplicationController
-    include Sufia::CurationConcernController
-    # Adds Sufia behaviors to the controller.
-    include Sufia::WorksControllerBehavior
+    include Hyrax::CurationConcernController
+    # Adds Hyrax behaviors to the controller.
+    include Hyrax::WorksControllerBehavior
 
     self.curation_concern_type = Image
   end

app/controllers/labels_controller.rb

@@ -5,9 +5,9 @@ class LabelsController < ApplicationController
 
   # GET /sites/1/edit
   def edit
-    add_breadcrumb t(:'sufia.controls.home'), root_path
-    add_breadcrumb t(:'sufia.toolbar.admin.menu'), sufia.admin_path
-    add_breadcrumb t(:'sufia.admin.sidebar.labels'), edit_site_labels_path
+    add_breadcrumb t(:'hyrax.controls.home'), root_path
+    add_breadcrumb t(:'hyrax.toolbar.admin.menu'), hyrax.admin_path
+    add_breadcrumb t(:'hyrax.admin.sidebar.labels'), edit_site_labels_path
   end
 
   # PATCH/PUT /sites/1

app/controllers/mailbox_controller.rb

@@ -1,4 +1,4 @@
-require File.join(Sufia::Engine.paths['app/controllers'].first, 'mailbox_controller.rb')
+require File.join(Hyrax::Engine.paths['app/controllers'].first, 'mailbox_controller.rb')
 
 class MailboxController
   layout 'admin'

app/controllers/roles_controller.rb

@@ -11,9 +11,9 @@ class RolesController < ApplicationController
 
   def index
     @users = @users.where(guest: false)
-    add_breadcrumb t(:'sufia.controls.home'), root_path
-    add_breadcrumb t(:'sufia.toolbar.admin.menu'), sufia.admin_path
-    add_breadcrumb t(:'sufia.admin.sidebar.roles_and_permissions'), site_roles_path
+    add_breadcrumb t(:'hyrax.controls.home'), root_path
+    add_breadcrumb t(:'hyrax.toolbar.admin.menu'), hyrax.admin_path
+    add_breadcrumb t(:'hyrax.admin.sidebar.roles_and_permissions'), site_roles_path
   end
 
   def update

app/controllers/transfers_controller.rb

@@ -1,5 +1,5 @@
 class TransfersController < ApplicationController
-  include Sufia::TransfersControllerBehavior
+  include Hyrax::TransfersControllerBehavior
 
   layout 'admin'
 end

app/forms/sufia/generic_work_form.rb → app/forms/hyrax/generic_work_form.rb

@@ -1,7 +1,7 @@
 # Generated via
 #  `rails generate curation_concerns:work GenericWork`
-module Sufia
-  class GenericWorkForm < Sufia::Forms::WorkForm
+module Hyrax
+  class GenericWorkForm < Hyrax::Forms::WorkForm
     self.model_class = ::GenericWork
     include HydraEditor::Form::Permissions
     self.terms += [:resource_type]

app/forms/sufia/image_form.rb → app/forms/hyrax/image_form.rb

@@ -1,7 +1,7 @@
 # Generated via
 #  `rails generate curation_concerns:work Image`
-module Sufia
-  class ImageForm < Sufia::Forms::WorkForm
+module Hyrax
+  class ImageForm < Hyrax::Forms::WorkForm
     self.model_class = ::Image
     self.terms += [:resource_type]
   end

app/helpers/application_helper.rb

@@ -1,5 +1,5 @@
 module ApplicationHelper
-  include ::SufiaHelper
+  include ::HyraxHelper
   include ContentBlockHelper
 
   def nav_link(href)

app/helpers/content_block_helper.rb

@@ -1,7 +1,7 @@
 module ContentBlockHelper
-  include Sufia::ContentBlockHelperBehavior
+  include Hyrax::ContentBlockHelperBehavior
 
-  # This is like editable_content_block in sufia, but it doesn't allow editing
+  # This is like editable_content_block in hyrax, but it doesn't allow editing
   # rubocop:disable Rails/OutputSafety
   def displayable_content_block(content_block, **options)
     return if content_block.value.blank?

app/helpers/sufia_helper.rb → app/helpers/hyrax_helper.rb

@@ -1,7 +1,7 @@
-module SufiaHelper
+module HyraxHelper
   include ::BlacklightHelper
-  include Sufia::BlacklightOverride
-  include Sufia::SufiaHelperBehavior
+  include Hyrax::BlacklightOverride
+  include Hyrax::HyraxHelperBehavior
 
   def application_name
     Site.application_name || super

app/indexers/file_set_indexer.rb

@@ -1,3 +1,3 @@
-class FileSetIndexer < Sufia::FileSetIndexer
+class FileSetIndexer < Hyrax::FileSetIndexer
   self.thumbnail_path_service = IIIFThumbnailPathService
 end

app/indexers/work_indexer.rb

@@ -1,3 +1,3 @@
-class WorkIndexer < Sufia::WorkIndexer
+class WorkIndexer < Hyrax::WorkIndexer
   self.thumbnail_path_service = IIIFThumbnailPathService
 end

app/models/ability.rb

@@ -1,6 +1,6 @@
 class Ability
   include Hydra::Ability
-  include Sufia::Ability
+  include Hyrax::Ability
 
   self.ability_logic += [:everyone_can_create_curation_concerns, :superadmin_permissions]
 

app/models/collection.rb

@@ -1,6 +1,6 @@
 # Generated by curation_concerns:models:install
 class Collection < ActiveFedora::Base
-  include ::Sufia::CollectionBehavior
+  include ::Hyrax::CollectionBehavior
   # You can replace these metadata if they're not suitable
-  include Sufia::BasicMetadata
+  include Hyrax::BasicMetadata
 end