Merge pull request #506 from projecthydra-labs/hyrax

[WIP] Hyrax!
samvera · Dec 3, 2016 · 737ef19 · 737ef19
2 parents 9d27873 + 5d005c9
commit 737ef19
Show file tree

Hide file tree

Showing 55 changed files with 91 additions and 180 deletions.
diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
@@ -8,15 +8,19 @@ require: rubocop-rspec
 # Note that changes in the inspected code, or installation of new
 # versions of RuboCop, may require this file to be generated again.
 
+RSpec/SubjectStub:
+  Exclude:
+    - 'spec/models/solr_endpoint_spec.rb'
+
 # Offense count: 10
 RSpec/LeadingSubject:
   Exclude:
-    - 'spec/controllers/curation_concerns/generic_works_controller_spec.rb'
+    - 'spec/controllers/sufia/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/curation_concerns/generic_work_show_presenter_spec.rb'
+    - 'spec/presenters/sufia/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'

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

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -8,37 +8,51 @@ GIT
 
 GIT
   remote: https://github.com/projecthydra/sufia.git
-  revision: fe71a588caf3233ac303e8ab4bebf450e20934b9
+  revision: eb5e3d416a4a9da2ea2f06498683a095d6c5c7cd
+  branch: cc_subtree
   specs:
-    sufia (7.2.0)
+    sufia (8.0.0.alpha)
+      active_attr (~> 0.9.0)
+      active_fedora-noid (~> 2.0)
       almond-rails (~> 0.0.1)
+      awesome_nested_set (~> 3.1)
       blacklight (~> 6.6)
       blacklight-gallery (~> 0.1)
-      browse-everything (>= 0.10.3)
+      breadcrumbs_on_rails (~> 3.0)
+      browse-everything (>= 0.10.5)
       carrierwave (~> 0.9)
-      curation_concerns (~> 1.7.0.beta1)
+      clipboard-rails (~> 1.5)
       daemons (~> 1.1)
+      dry-equalizer (~> 0.2)
+      dry-struct (~> 0.1)
+      dry-validation (~> 0.9)
       flipflop (~> 2.2)
       flot-rails (~> 0.0.6)
       font-awesome-rails (~> 4.2)
-      hydra-batch-edit (~> 2.0)
-      hydra-head (>= 10.1)
+      hydra-editor (~> 3.1)
+      hydra-head (~> 10.3)
+      hydra-works (~> 0.15)
       jquery-datatables-rails (~> 3.4.0)
       jquery-ui-rails (~> 5.0)
       json-schema
+      kaminari_route_prefix (~> 0.0.1)
       legato (~> 0.3)
       mailboxer (~> 0.12)
       nest (~> 2.0)
       oauth
       oauth2 (~> 1.2)
       posix-spawn
+      power_converter (~> 0.1, >= 0.1.2)
       qa (~> 0.8)
+      rails_autolink (~> 1.1)
+      railties (~> 5.0)
       rdf-rdfxml
       redis-namespace (~> 1.5.2)
+      redlock (~> 0.1.2)
       select2-rails (~> 3.5.9)
       signet
       tinymce-rails (~> 4.1)
-      tinymce-rails-imageupload (~> 4.0.16.beta)
+      tinymce-rails-imageupload (~> 4.0.17.beta)
       yaml_db (~> 0.2)
 
 GEM
@@ -207,34 +221,6 @@ GEM
       term-ansicolor (~> 1.3.0)
       thor (~> 0.19.1)
       tins (>= 1.6.0, < 2)
-    curation_concerns (1.7.0.beta1)
-      active-fedora (>= 10.3.0.rc1)
-      active_attr
-      active_fedora-noid (~> 2.0.0.beta5)
-      awesome_nested_set (~> 3.0)
-      blacklight (~> 6.3)
-      breadcrumbs_on_rails (>= 3.0.1, < 4)
-      browse-everything (~> 0.10)
-      clipboard-rails (~> 1.5)
-      dry-equalizer (~> 0.2)
-      dry-struct (~> 0.1)
-      dry-validation (~> 0.9)
-      flot-rails (~> 0.0.7)
-      highcharts-rails
-      hydra-editor (>= 2, < 4)
-      hydra-head (>= 10.0.0, < 11)
-      hydra-works (>= 0.14.0)
-      jquery-ui-rails
-      kaminari_route_prefix (~> 0.0.1)
-      power_converter (~> 0.1, >= 0.1.2)
-      qa (~> 0.5)
-      rails_autolink
-      rdf (>= 1.99)
-      rdf-vocab (>= 0.8)
-      redlock (~> 0.1.2)
-      simple_form (~> 3.1)
-      solrizer (~> 3.4)
-      sprockets-es6
     daemons (1.2.4)
     debug_inspector (0.0.2)
     deep_merge (1.1.1)
@@ -353,8 +339,6 @@ GEM
       tilt
     hamster (3.0.0)
       concurrent-ruby (~> 1.0)
-    highcharts-rails (4.2.5)
-      railties (>= 3.1)
     hiredis (0.6.1)
     honeybadger (2.7.1)
     htmlentities (4.3.4)
@@ -372,10 +356,6 @@ GEM
       blacklight-access_controls (~> 0.6)
       cancancan (~> 1.8)
       deprecation (~> 1.0)
-    hydra-batch-edit (2.1.0)
-      blacklight
-      curation_concerns (>= 0.12.0.pre2)
-      rails
     hydra-core (10.3.4)
       hydra-access-controls (= 10.3.4)
       railties (>= 4.0.0, < 6)

diff --git a/...ion_concerns/actors/generic_work_actor.rb → ...actors/sufia/actors/generic_work_actor.rb b/...ion_concerns/actors/generic_work_actor.rb → ...actors/sufia/actors/generic_work_actor.rb
@@ -1,8 +1,8 @@
 # Generated via
 #  `rails generate curation_concerns:work GenericWork`
-module CurationConcerns
+module Sufia
   module Actors
-    class GenericWorkActor < CurationConcerns::Actors::BaseActor
+    class GenericWorkActor < Sufia::Actors::BaseActor
     end
   end
 end
diff --git a/...s/curation_concerns/actors/image_actor.rb → app/actors/sufia/actors/image_actor.rb b/...s/curation_concerns/actors/image_actor.rb → app/actors/sufia/actors/image_actor.rb
@@ -1,8 +1,8 @@
 # Generated via
 #  `rails generate curation_concerns:work Image`
-module CurationConcerns
+module Sufia
   module Actors
-    class ImageActor < CurationConcerns::Actors::BaseActor
+    class ImageActor < Sufia::Actors::BaseActor
     end
   end
 end
diff --git a/app/assets/javascripts/batch_edit.js b/app/assets/javascripts/batch_edit.js
diff --git a/app/assets/stylesheets/batch_edit.scss b/app/assets/stylesheets/batch_edit.scss
diff --git a/app/controllers/admin/users_controller.rb b/app/controllers/admin/users_controller.rb
@@ -5,7 +5,7 @@ class UsersController < ApplicationController
     layout 'admin'
 
     def self.local_prefixes
-      ['users']
+      ['sufia/users']
     end
 
     private

diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
@@ -10,12 +10,10 @@ class ApplicationController < ActionController::Base
   include Blacklight::Controller
   include Hydra::Controller::ControllerBehavior
 
-  # Adds CurationConcerns behaviors to the application controller.
-  include CurationConcerns::ApplicationControllerBehavior
   # Adds Sufia behaviors into the application controller
   include Sufia::Controller
 
-  include CurationConcerns::ThemedLayoutController
+  include Sufia::ThemedLayoutController
   with_themed_layout '1_column'
 
   helper_method :peek_enabled?, :current_account

diff --git a/app/controllers/catalog_controller.rb b/app/controllers/catalog_controller.rb
@@ -1,7 +1,6 @@
 class CatalogController < ApplicationController
   include Hydra::Catalog
   include Hydra::Controller::ControllerBehavior
-  include Sufia::Catalog
 
   # These before_filters apply the hydra access controls
   before_action :enforce_show_permissions, only: :show
@@ -28,7 +27,7 @@ def self.modified_field
     config.advanced_search[:query_parser] ||= 'dismax'
     config.advanced_search[:form_solr_parameters] ||= {}
 
-    config.search_builder_class = Sufia::SearchBuilder
+    config.search_builder_class = Sufia::CatalogSearchBuilder
 
     # Show gallery view
     config.view.gallery.partials = [:index_header, :index]

diff --git a/app/controllers/curation_concerns/admin_controller.rb b/app/controllers/curation_concerns/admin_controller.rb
diff --git a/...curation_concerns/file_sets_controller.rb → ...controllers/sufia/file_sets_controller.rb b/...curation_concerns/file_sets_controller.rb → ...controllers/sufia/file_sets_controller.rb
@@ -1,6 +1,6 @@
-module CurationConcerns
+module Sufia
   class FileSetsController < ApplicationController
-    include CurationConcerns::FileSetsControllerBehavior
+    include Sufia::FileSetsControllerBehavior
     include Sufia::FileSetsControllerBehavior
     self.show_presenter = Hyku::FileSetPresenter
   end

diff --git a/...tion_concerns/generic_works_controller.rb → ...rollers/sufia/generic_works_controller.rb b/...tion_concerns/generic_works_controller.rb → ...rollers/sufia/generic_works_controller.rb
@@ -1,12 +1,12 @@
 require 'iiif_manifest'
-module CurationConcerns
+module Sufia
   class GenericWorksController < ApplicationController
-    include CurationConcerns::CurationConcernController
+    include Sufia::CurationConcernController
     # Adds Sufia behaviors to the controller.
     include Sufia::WorksControllerBehavior
 
     self.curation_concern_type = GenericWork
-    self.show_presenter = CurationConcerns::GenericWorkShowPresenter
+    self.show_presenter = Sufia::GenericWorkShowPresenter
 
     skip_load_and_authorize_resource only: :manifest
 

diff --git a/...rs/curation_concerns/images_controller.rb → app/controllers/sufia/images_controller.rb b/...rs/curation_concerns/images_controller.rb → app/controllers/sufia/images_controller.rb
@@ -1,9 +1,9 @@
 # Generated via
 #  `rails generate curation_concerns:work Image`
 
-module CurationConcerns
+module Sufia
   class ImagesController < ApplicationController
-    include CurationConcerns::CurationConcernController
+    include Sufia::CurationConcernController
     # Adds Sufia behaviors to the controller.
     include Sufia::WorksControllerBehavior
 

diff --git a/...ms/curation_concerns/generic_work_form.rb → app/forms/sufia/generic_work_form.rb b/...ms/curation_concerns/generic_work_form.rb → app/forms/sufia/generic_work_form.rb
@@ -1,6 +1,6 @@
 # Generated via
 #  `rails generate curation_concerns:work GenericWork`
-module CurationConcerns
+module Sufia
   class GenericWorkForm < Sufia::Forms::WorkForm
     self.model_class = ::GenericWork
     include HydraEditor::Form::Permissions

diff --git a/app/forms/curation_concerns/image_form.rb → app/forms/sufia/image_form.rb b/app/forms/curation_concerns/image_form.rb → app/forms/sufia/image_form.rb
@@ -1,6 +1,6 @@
 # Generated via
 #  `rails generate curation_concerns:work Image`
-module CurationConcerns
+module Sufia
   class ImageForm < Sufia::Forms::WorkForm
     self.model_class = ::Image
     self.terms += [:resource_type]

diff --git a/app/helpers/sufia_helper.rb b/app/helpers/sufia_helper.rb
@@ -1,6 +1,5 @@
 module SufiaHelper
   include ::BlacklightHelper
-  include CurationConcerns::MainAppHelpers
   include Sufia::BlacklightOverride
   include Sufia::SufiaHelperBehavior
 

diff --git a/app/indexers/file_set_indexer.rb b/app/indexers/file_set_indexer.rb
@@ -1,3 +1,3 @@
-class FileSetIndexer < CurationConcerns::FileSetIndexer
+class FileSetIndexer < Sufia::FileSetIndexer
   self.thumbnail_path_service = IIIFThumbnailPathService
 end
diff --git a/app/models/ability.rb b/app/models/ability.rb
@@ -1,7 +1,5 @@
 class Ability
   include Hydra::Ability
-
-  include CurationConcerns::Ability
   include Sufia::Ability
 
   self.ability_logic += [:everyone_can_create_curation_concerns, :superadmin_permissions]
@@ -12,6 +10,7 @@ def custom_permissions
   end
 
   def admin_permissions
+    return unless admin?
     super
     can [:manage], [Site, Role, User]
 

diff --git a/app/models/collection.rb b/app/models/collection.rb
@@ -1,6 +1,6 @@
 # Generated by curation_concerns:models:install
 class Collection < ActiveFedora::Base
-  include ::CurationConcerns::CollectionBehavior
+  include ::Sufia::CollectionBehavior
   # You can replace these metadata if they're not suitable
-  include CurationConcerns::BasicMetadata
+  include Sufia::BasicMetadata
 end
diff --git a/app/models/file_set.rb b/app/models/file_set.rb
@@ -1,6 +1,6 @@
 # Generated by curation_concerns:models:install
 class FileSet < ActiveFedora::Base
-  include ::CurationConcerns::FileSetBehavior
+  include ::Sufia::FileSetBehavior
   include Sufia::FileSetBehavior
   self.indexer = FileSetIndexer
 end
diff --git a/app/models/generic_work.rb b/app/models/generic_work.rb
@@ -1,6 +1,6 @@
 class GenericWork < ActiveFedora::Base
-  include ::CurationConcerns::WorkBehavior
-  include ::CurationConcerns::BasicMetadata
+  include ::Sufia::WorkBehavior
+  include ::Sufia::BasicMetadata
   include Sufia::WorkBehavior
   validates :title, presence: { message: 'Your work must have a title.' }
 

diff --git a/app/models/image.rb b/app/models/image.rb
@@ -1,8 +1,8 @@
 # Generated via
 #  `rails generate curation_concerns:work Image`
 class Image < ActiveFedora::Base
-  include ::CurationConcerns::WorkBehavior
-  include ::CurationConcerns::BasicMetadata
+  include ::Sufia::WorkBehavior
+  include ::Sufia::BasicMetadata
   include Sufia::WorkBehavior
   self.human_readable_type = 'Image'
   # Change this to restrict which works can be added as a child.

diff --git a/app/models/search_builder.rb b/app/models/search_builder.rb
@@ -2,5 +2,5 @@
 class SearchBuilder < Blacklight::SearchBuilder
   include Blacklight::Solr::SearchBuilderBehavior
   include Hydra::AccessControlsEnforcement
-  include CurationConcerns::SearchFilters
+  include Sufia::SearchFilters
 end