sufia 7.3.0.rc2 → 7.3.0.rc3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: '009b9b30b853cbfba6072849c4ac71f9a0523b4d'
-  data.tar.gz: 0cc820c3c594a6cfb415f072eda5f00f7f59af51
+  metadata.gz: bac8c45d5973e94def8f5a7d7d2241e6d8e492a6
+  data.tar.gz: ff143be07e8ca19044b9cade1910e1843cd80b78
 SHA512:
-  metadata.gz: 7e745682238c01ef3eb98b1642ced091da5ea8e39ba4fc22a437efe835dedd02cdeedbd662abdb66c9b4f3c28318951d19bf7824347f9958b528066d213c180b
-  data.tar.gz: 269da7a4d986f1f38963333ae3b3c8b541e20bcb3b9ad744fe57d622bcb21cf3f290f2ad1854e23504306418c759704ad66a9bf297a77fd5b8a437bbde727cf3
+  metadata.gz: ce1118d2b2269c1eee9ff03dc78bc32bc4790fb0847ec26c62729596956b56013cb2289efa7c9856238522bd3a4e14ea184e2895fd5e90da6a296646d5496031
+  data.tar.gz: 36f2c7e153ed19f9f1034bb9364849bcbd262d89d4b47b6a5bfaa98d142655901f2bd433318f2aea01093a7220154f8b4541efd1cad0f636849aa6a39441fd93

data/.rubocop_todo.yml

@@ -81,6 +81,7 @@ RSpec/ExampleLength:
     - 'spec/models/generic_work_spec.rb'
     - 'spec/models/featured_work_spec.rb'
     - 'spec/services/sufia/actor_factory_spec.rb'
+    - 'spec/services/sufia/admin_set_create_service_spec.rb'
     - 'spec/services/sufia/user_stat_importer_spec.rb'
     - 'spec/views/catalog/_index_list_default.html.erb_spec.rb'
     - 'spec/views/collections/_form.html.erb_spec.rb'

data/README.md

@@ -68,8 +68,8 @@ After installing the Prerequisites:
 
 Sufia 7.x requires the following software to work:
 
-1. [Solr](http://lucene.apache.org/solr/) version >= 5.x (tested up to 6.3.0)
-1. [Fedora Commons](http://www.fedora-commons.org/) digital repository version >= 4.5.1 (tested up to 4.7.0)
+1. [Solr](http://lucene.apache.org/solr/) version >= 5.x (tested up to 6.4.1)
+1. [Fedora Commons](http://www.fedora-commons.org/) digital repository version >= 4.5.1 (tested up to 4.7.1)
 1. A SQL RDBMS (MySQL, PostgreSQL), though **note** that SQLite will be used by default if you're looking to get up and running quickly
 1. [Redis](http://redis.io/), a key-value store
 1. [ImageMagick](http://www.imagemagick.org/) with JPEG-2000 support
@@ -161,6 +161,16 @@ rake hydra:server
 
 And now you should be able to browse to [localhost:3000](http://localhost:3000/) and see the application. Note that this web server is purely for development purposes; you will want to use a more fully featured [web server](#web-server) for production-like environments.
 
+## Add Default Admin Set
+
+After Fedora and Solr are running, create the default administrative set by running the following rake task:
+
+```
+rake sufia:default_admin_set:create
+```
+
+You will want to run this command the first time this code is deployed to a new environment as well.
+
 # Managing a Sufia-based app
 
 The [Sufia Management Guide](https://github.com/projecthydra/sufia/wiki/Sufia-Management-Guide) provides tips for how to manage, customize, and enhance your Sufia application, including guidance specific to:

data/app/services/sufia/admin_set_create_service.rb

@@ -1,6 +1,21 @@
 module Sufia
   # Creates AdminSets
   class AdminSetCreateService
+    DEFAULT_ID = 'admin_sets/default'.freeze
+
+    def self.create_default!
+      return if AdminSet.exists?(DEFAULT_ID)
+      admin_set = AdminSet.new(id: DEFAULT_ID, title: ['Default Admin Set'])
+      begin
+        new(admin_set, nil).create
+      rescue ActiveFedora::IllegalOperation
+        # It is possible that another thread created the AdminSet just before this method
+        # was called, so ActiveFedora will raise IllegalOperation. In this case we can safely
+        # ignore the error.
+        Rails.logger.error("AdminSet ID=#{DEFAULT_ID} may or may not have been created due to threading issues.")
+      end
+    end
+
     # @param admin_set [AdminSet] the admin set to operate on
     # @param creating_user [User] the user who created the admin set.
     def initialize(admin_set, creating_user)
@@ -15,8 +30,20 @@ module Sufia
     def create
       admin_set.read_groups = ['public']
       admin_set.edit_groups = ['admin']
-      admin_set.creator = [creating_user.user_key]
-      admin_set.save
+      admin_set.creator = [creating_user.user_key] if creating_user
+      admin_set.save.tap do |result|
+        create_permission_template if result
+      end
+    end
+
+    def access_grants_attributes
+      return [] unless creating_user
+      [{ agent_type: 'user', agent_id: creating_user.user_key, access: 'manage' }]
+    end
+
+    def create_permission_template
+      PermissionTemplate.create!(admin_set_id: admin_set.id,
+                                 access_grants_attributes: access_grants_attributes)
     end
   end
 end

data/lib/sufia/version.rb

@@ -1,3 +1,3 @@
 module Sufia
-  VERSION = '7.3.0.rc2'.freeze
+  VERSION = '7.3.0.rc3'.freeze
 end

data/lib/tasks/default_admin_set.rake

@@ -0,0 +1,8 @@
+namespace :sufia do
+  namespace :default_admin_set do
+    desc "Create the default Admin Set"
+    task create: :environment do
+      Sufia::AdminSetCreateService.create_default!
+    end
+  end
+end

data/lib/tasks/migrate.rake

@@ -5,8 +5,8 @@ namespace :sufia do
       MoveAllWorksToAdminSet.run(AdminSet.find(Sufia::DefaultAdminSetActor::DEFAULT_ID))
     end
 
-    desc "Migrate data from 7.2.x to 7.3.0"
-    task from_7_2_x_to_7_3_0_release: :environment do
+    desc "Migrate workflow data from 7.3.0.rc1"
+    task from_7_3_0rc1_release: :environment do
       logger = Logger.new(STDOUT)
       logger.level = Logger::DEBUG
       logger.info(%(Starting migration to Sufia 7.3.0 in preparation for Hyrax 1.0.0))

data/spec/services/sufia/admin_set_create_service_spec.rb

@@ -9,12 +9,16 @@ RSpec.describe Sufia::AdminSetCreateService do
     subject { service.create }
 
     context "when the admin_set is valid" do
-      it "is successful" do
+      let(:permission_template) { Sufia::PermissionTemplate.find_by(admin_set_id: admin_set.id) }
+      let(:grant) { permission_template.access_grants.first }
+      it "creates an AdminSet, PermissionTemplate, and sets access" do
         expect do
           expect(subject).to be true
         end.to change { admin_set.persisted? }.from(false).to(true)
         expect(admin_set.read_groups).to eq ['public']
         expect(admin_set.edit_groups).to eq ['admin']
+        expect(grant.agent_id).to eq user.user_key
+        expect(grant.access).to eq 'manage'
         expect(admin_set.creator).to eq [user.user_key]
       end
     end
@@ -24,4 +28,17 @@ RSpec.describe Sufia::AdminSetCreateService do
       it { is_expected.to be false }
     end
   end
+
+  describe '.create_default!' do
+    let(:default_admin_set_id) { 'admin_sets/default' }
+    let(:permission_template) { Sufia::PermissionTemplate.find_by!(admin_set_id: default_admin_set_id) }
+    # It is important to test the side-effects as a default admin set is a fundamental assumption for Sufia >= 7.3
+    it 'creates AdminSet, PermissionTemplate' do
+      expect(AdminSet).not_to exist(default_admin_set_id)
+      described_class.create_default!
+      admin_set = AdminSet.find(default_admin_set_id)
+      expect(admin_set).to be_persisted
+      expect(permission_template).to be_persisted
+    end
+  end
 end

data/sufia.gemspec

@@ -18,6 +18,7 @@ Gem::Specification.new do |spec|
   spec.version       = Sufia::VERSION
   spec.license       = 'Apache2'
 
+  spec.add_dependency 'hydra-works', '~> 0.16'
   spec.add_dependency 'curation_concerns', '~> 1.7.5'
   spec.add_dependency 'hydra-head', '>= 10.4.0'
   spec.add_dependency 'hydra-batch-edit', '~> 2.0'

data/template.rb

@@ -1,4 +1,4 @@
-gem 'sufia', '7.3.0.rc1'
+gem 'sufia', '7.3.0.rc3'
 
 run 'bundle install'
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sufia
 version: !ruby/object:Gem::Version
-  version: 7.3.0.rc2
+  version: 7.3.0.rc3
 platform: ruby
 authors:
 - Justin Coyne
@@ -14,6 +14,20 @@ bindir: bin
 cert_chain: []
 date: 2017-03-02 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: hydra-works
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.16'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.16'
 - !ruby/object:Gem::Dependency
   name: curation_concerns
   requirement: !ruby/object:Gem::Requirement
@@ -1340,6 +1354,7 @@ files:
 - lib/sufia/version.rb
 - lib/sufia/zotero.rb
 - lib/sufia/zotero/config.rb
+- lib/tasks/default_admin_set.rake
 - lib/tasks/migrate.rake
 - solr/config/_rest_managed.json
 - solr/config/admin-extra.html