hyrax 1.0.0.rc1 → 1.0.0.rc2

data/hyrax.gemspec

@@ -19,19 +19,16 @@ Gem::Specification.new do |spec|
   spec.license       = 'Apache2'
 
   spec.add_dependency 'hydra-head', '>= 10.4.0'
-  spec.add_dependency 'hydra-editor', '~> 3.1'
+  spec.add_dependency 'hydra-editor', '~> 3.2'
   spec.add_dependency 'hydra-works', '~> 0.16'
   spec.add_dependency 'browse-everything', '>= 0.10.5'
-  # Workaround for https://github.com/projecthydra-labs/hyrax/issues/546
-  spec.add_dependency 'blacklight', '~> 6.6', '< 6.8.0'
+  spec.add_dependency 'blacklight', '~> 6.9'
   spec.add_dependency 'blacklight-gallery', '~> 0.7'
   spec.add_dependency 'tinymce-rails', '~> 4.1'
   spec.add_dependency 'tinymce-rails-imageupload', '~> 4.0.17.beta'
-  spec.add_dependency 'daemons', '~> 1.1'
-  spec.add_dependency 'yaml_db', '~> 0.2'
   spec.add_dependency 'font-awesome-rails', '~> 4.2'
   spec.add_dependency 'select2-rails', '~> 3.5.9'
-  spec.add_dependency 'json-schema'
+  spec.add_dependency 'json-schema' # for Arkivio
   spec.add_dependency 'nest', '~> 2.0'
   spec.add_dependency 'mailboxer', '~> 0.12'
   spec.add_dependency 'carrierwave', '~> 1.0'
@@ -43,11 +40,11 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'jquery-ui-rails', '~> 5.0'
   spec.add_dependency 'redis-namespace', '~> 1.5.2'
   spec.add_dependency 'flot-rails', '~> 0.0.6'
-  spec.add_dependency 'almond-rails', '~> 0.0.1'
+  spec.add_dependency 'almond-rails', '~> 0.1'
   spec.add_dependency 'qa', '~> 1.0' # questioning_authority
   spec.add_dependency 'flipflop', '~> 2.3'
   spec.add_dependency 'jquery-datatables-rails', '~> 3.4.0'
-  spec.add_dependency 'rdf-rdfxml'
+  spec.add_dependency 'rdf-rdfxml' # controlled vocabulary importer
   spec.add_dependency 'railties', '~> 5.0'
   spec.add_dependency 'clipboard-rails', '~> 1.5'
   spec.add_dependency 'rails_autolink', '~> 1.1'

data/lib/generators/hyrax/install_generator.rb

@@ -29,11 +29,10 @@ module Hyrax
          """
 
     def run_required_generators
-      say_status('warning', '[Hyrax] GENERATING BLACKLIGHT', :yellow)
+      say_status('info', '[Hyrax] GENERATING BLACKLIGHT', :blue)
       generate 'blacklight:install --devise'
-      say_status('warning', '[Hyrax] GENERATING HYDRA-HEAD', :yellow)
+      say_status('info', '[Hyrax] GENERATING HYDRA-HEAD', :blue)
       generate 'hydra:head -f'
-      say_status('warning', '[Hyrax] GENERATING MODELS', :yellow)
       generate "hyrax:models#{options[:force] ? ' -f' : ''}"
     end
 

data/lib/generators/hyrax/models_generator.rb

@@ -8,7 +8,7 @@ This generator makes the following changes to your application:
  3. Generates the clam anti-virus configuration.
        '
   def banner
-    say_status('warning', 'GENERATING HYRAX MODELS', :yellow)
+    say_status('info', 'GENERATING HYRAX MODELS', :blue)
   end
 
   # Setup the database migrations

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

@@ -36,19 +36,19 @@ class CatalogController < ApplicationController
     #   The ordering of the field names is the order of the display
     config.add_facet_field solr_name("human_readable_type", :facetable), label: "Type", limit: 5
     config.add_facet_field solr_name("resource_type", :facetable), label: "Resource Type", limit: 5
-    config.add_facet_field solr_name("creator", :facetable), label: "Creator", limit: 5
+    config.add_facet_field solr_name("creator", :facetable), limit: 5
     config.add_facet_field solr_name("contributor", :facetable), label: "Contributor", limit: 5
-    config.add_facet_field solr_name("keyword", :facetable), label: "Keyword", limit: 5
-    config.add_facet_field solr_name("subject", :facetable), label: "Subject", limit: 5
-    config.add_facet_field solr_name("language", :facetable), label: "Language", limit: 5
-    config.add_facet_field solr_name("based_near", :facetable), label: "Location", limit: 5
-    config.add_facet_field solr_name("publisher", :facetable), label: "Publisher", limit: 5
-    config.add_facet_field solr_name("file_format", :facetable), label: "File Format", limit: 5
+    config.add_facet_field solr_name("keyword", :facetable), limit: 5
+    config.add_facet_field solr_name("subject", :facetable), limit: 5
+    config.add_facet_field solr_name("language", :facetable), limit: 5
+    config.add_facet_field solr_name("based_near", :facetable), limit: 5
+    config.add_facet_field solr_name("publisher", :facetable), limit: 5
+    config.add_facet_field solr_name("file_format", :facetable), limit: 5
     config.add_facet_field solr_name('member_of_collections', :symbol), limit: 5, label: 'Collections'
 
     # The generic_type isn't displayed on the facet list
     # It's used to give a label to the filter that comes from the user profile
-    config.add_facet_field solr_name("generic_type", :facetable), label: "Type", if: false
+    config.add_facet_field solr_name("generic_type", :facetable), if: false
 
     # Have BL send all facet field names to Solr, which has been the default
     # previously. Simply remove these lines if you'd rather use Solr request
@@ -58,44 +58,44 @@ class CatalogController < ApplicationController
     # solr fields to be displayed in the index (search results) view
     #   The ordering of the field names is the order of the display
     config.add_index_field solr_name("title", :stored_searchable), label: "Title", itemprop: 'name', if: false
-    config.add_index_field solr_name("description", :stored_searchable), label: "Description", itemprop: 'description', helper_method: :iconify_auto_link
-    config.add_index_field solr_name("keyword", :stored_searchable), label: "Keyword", itemprop: 'keywords', link_to_search: solr_name("keyword", :facetable)
-    config.add_index_field solr_name("subject", :stored_searchable), label: "Subject", itemprop: 'about', link_to_search: solr_name("subject", :facetable)
-    config.add_index_field solr_name("creator", :stored_searchable), label: "Creator", itemprop: 'creator', link_to_search: solr_name("creator", :facetable)
-    config.add_index_field solr_name("contributor", :stored_searchable), label: "Contributor", itemprop: 'contributor', link_to_search: solr_name("contributor", :facetable)
+    config.add_index_field solr_name("description", :stored_searchable), itemprop: 'description', helper_method: :iconify_auto_link
+    config.add_index_field solr_name("keyword", :stored_searchable), itemprop: 'keywords', link_to_search: solr_name("keyword", :facetable)
+    config.add_index_field solr_name("subject", :stored_searchable), itemprop: 'about', link_to_search: solr_name("subject", :facetable)
+    config.add_index_field solr_name("creator", :stored_searchable), itemprop: 'creator', link_to_search: solr_name("creator", :facetable)
+    config.add_index_field solr_name("contributor", :stored_searchable), itemprop: 'contributor', link_to_search: solr_name("contributor", :facetable)
     config.add_index_field solr_name("proxy_depositor", :symbol), label: "Depositor", helper_method: :link_to_profile
     config.add_index_field solr_name("depositor"), label: "Owner", helper_method: :link_to_profile
-    config.add_index_field solr_name("publisher", :stored_searchable), label: "Publisher", itemprop: 'publisher', link_to_search: solr_name("publisher", :facetable)
-    config.add_index_field solr_name("based_near", :stored_searchable), label: "Location", itemprop: 'contentLocation', link_to_search: solr_name("based_near", :facetable)
-    config.add_index_field solr_name("language", :stored_searchable), label: "Language", itemprop: 'inLanguage', link_to_search: solr_name("language", :facetable)
-    config.add_index_field solr_name("date_uploaded", :stored_sortable, type: :date), label: "Date Uploaded", itemprop: 'datePublished', helper_method: :human_readable_date
-    config.add_index_field solr_name("date_modified", :stored_sortable, type: :date), label: "Date Modified", itemprop: 'dateModified', helper_method: :human_readable_date
-    config.add_index_field solr_name("date_created", :stored_searchable), label: "Date Created", itemprop: 'dateCreated'
-    config.add_index_field solr_name("rights", :stored_searchable), label: "Rights", helper_method: :license_links
+    config.add_index_field solr_name("publisher", :stored_searchable), itemprop: 'publisher', link_to_search: solr_name("publisher", :facetable)
+    config.add_index_field solr_name("based_near", :stored_searchable), itemprop: 'contentLocation', link_to_search: solr_name("based_near", :facetable)
+    config.add_index_field solr_name("language", :stored_searchable), itemprop: 'inLanguage', link_to_search: solr_name("language", :facetable)
+    config.add_index_field solr_name("date_uploaded", :stored_sortable, type: :date), itemprop: 'datePublished', helper_method: :human_readable_date
+    config.add_index_field solr_name("date_modified", :stored_sortable, type: :date), itemprop: 'dateModified', helper_method: :human_readable_date
+    config.add_index_field solr_name("date_created", :stored_searchable), itemprop: 'dateCreated'
+    config.add_index_field solr_name("rights", :stored_searchable), helper_method: :license_links
     config.add_index_field solr_name("resource_type", :stored_searchable), label: "Resource Type", link_to_search: solr_name("resource_type", :facetable)
-    config.add_index_field solr_name("file_format", :stored_searchable), label: "File Format", link_to_search: solr_name("file_format", :facetable)
-    config.add_index_field solr_name("identifier", :stored_searchable), label: "Identifier", helper_method: :index_field_link, field_name: 'identifier'
+    config.add_index_field solr_name("file_format", :stored_searchable), link_to_search: solr_name("file_format", :facetable)
+    config.add_index_field solr_name("identifier", :stored_searchable), helper_method: :index_field_link, field_name: 'identifier'
     config.add_index_field solr_name("embargo_release_date", :stored_sortable, type: :date), label: "Embargo release date", helper_method: :human_readable_date
     config.add_index_field solr_name("lease_expiration_date", :stored_sortable, type: :date), label: "Lease expiration date", helper_method: :human_readable_date
 
     # solr fields to be displayed in the show (single result) view
     #   The ordering of the field names is the order of the display
-    config.add_show_field solr_name("title", :stored_searchable), label: "Title"
-    config.add_show_field solr_name("description", :stored_searchable), label: "Description"
-    config.add_show_field solr_name("keyword", :stored_searchable), label: "Keyword"
-    config.add_show_field solr_name("subject", :stored_searchable), label: "Subject"
-    config.add_show_field solr_name("creator", :stored_searchable), label: "Creator"
-    config.add_show_field solr_name("contributor", :stored_searchable), label: "Contributor"
-    config.add_show_field solr_name("publisher", :stored_searchable), label: "Publisher"
-    config.add_show_field solr_name("based_near", :stored_searchable), label: "Location"
-    config.add_show_field solr_name("language", :stored_searchable), label: "Language"
-    config.add_show_field solr_name("date_uploaded", :stored_searchable), label: "Date Uploaded"
-    config.add_show_field solr_name("date_modified", :stored_searchable), label: "Date Modified"
-    config.add_show_field solr_name("date_created", :stored_searchable), label: "Date Created"
-    config.add_show_field solr_name("rights", :stored_searchable), label: "Rights"
+    config.add_show_field solr_name("title", :stored_searchable)
+    config.add_show_field solr_name("description", :stored_searchable)
+    config.add_show_field solr_name("keyword", :stored_searchable)
+    config.add_show_field solr_name("subject", :stored_searchable)
+    config.add_show_field solr_name("creator", :stored_searchable)
+    config.add_show_field solr_name("contributor", :stored_searchable)
+    config.add_show_field solr_name("publisher", :stored_searchable)
+    config.add_show_field solr_name("based_near", :stored_searchable)
+    config.add_show_field solr_name("language", :stored_searchable)
+    config.add_show_field solr_name("date_uploaded", :stored_searchable)
+    config.add_show_field solr_name("date_modified", :stored_searchable)
+    config.add_show_field solr_name("date_created", :stored_searchable)
+    config.add_show_field solr_name("rights", :stored_searchable)
     config.add_show_field solr_name("resource_type", :stored_searchable), label: "Resource Type"
-    config.add_show_field solr_name("format", :stored_searchable), label: "File Format"
-    config.add_show_field solr_name("identifier", :stored_searchable), label: "Identifier"
+    config.add_show_field solr_name("format", :stored_searchable)
+    config.add_show_field solr_name("identifier", :stored_searchable)
 
     # "fielded" search configuration. Used by pulldown among other places.
     # For supported keys in hash, see rdoc for Blacklight::SearchFields

data/lib/generators/hyrax/templates/config/locales/hyrax.en.yml

@@ -1,4 +1,47 @@
 en:
+  blacklight:
+    search:
+      fields:
+        facet:
+          based_near_sim: Location
+          creator_sim: Creator
+          file_format_sim: Format
+          generic_type_sim: Type
+          keyword_sim: Keyword
+          language_sim: Language
+          publisher_sim: Publisher
+          subject_sim: Subject
+        index:
+          based_near_tesim: Location
+          contributor_tesim: Contributor
+          creator_tesim: Creator
+          date_created_tesim: Date Created
+          date_modified_dtsi: Date Modified
+          date_uploaded_dtsi: Date Uploaded
+          description_tesim: Description
+          file_format_tesim: File Format
+          identifier_tesim: Identifier
+          keyword_tesim: Keyword
+          language_tesim: Language
+          publisher_tesim: Publisher
+          rights_tesim: Rights
+          subject_tesim: Subject
+        show:
+          based_near_tesim: Location
+          contributor_tesim: Contributor
+          creator_tesim: Creator
+          date_created_tesim: Date Created
+          date_modified_dtsi: Date Modified
+          date_uploaded_dtsi: Date Uploaded
+          description_tesim: Description
+          file_format_tesim: File Format
+          identifier_tesim: Identifier
+          keyword_tesim: Keyword
+          language_tesim: Language
+          publisher_tesim: Publisher
+          rights_tesim: Rights
+          subject_tesim: Subject
+          title_tesim: Title
   hyrax:
     product_name:           "Hyrax"
     product_twitter_handle: "@HydraSphere"

data/lib/generators/hyrax/templates/config/locales/hyrax.es.yml

@@ -1,4 +1,47 @@
 es:
+  blacklight:
+    search:
+      fields:
+        facet:
+          based_near_sim: Ubicación
+          creator_sim: Creador
+          file_format_sim: Formato
+          generic_type_sim: Tipo
+          keyword_sim: Palabra clave
+          language_sim: Idioma
+          publisher_sim: Editor
+          subject_sim: Tema
+        index:
+          based_near_tesim: Ubicación
+          contributor_tesim: Contribuidor
+          creator_tesim: Creador
+          date_created_tesim: Fecha de Creacion
+          date_modified_dtsi: Fecha Modificada
+          date_uploaded_dtsi: Fecha de Subida
+          description_tesim: Descripción
+          file_format_tesim: Formato de Archivo
+          identifier_tesim: Identificador
+          keyword_tesim: Palabra clave
+          language_tesim: Idioma
+          publisher_tesim: Editor
+          rights_tesim: Derechos
+          subject_tesim: Tema
+        show:
+          based_near_tesim: Ubicación
+          contributor_tesim: Contribuidor
+          creator_tesim: Creador
+          date_created_tesim: Fecha de Creacion
+          date_modified_dtsi: Fecha Modificada
+          date_uploaded_dtsi: Fecha de Subida
+          description_tesim: Descripción
+          file_format_tesim: Formato de Archivo
+          identifier_tesim: Identificador
+          keyword_tesim: Palabra clave
+          language_tesim: Idioma
+          publisher_tesim: Editor
+          rights_tesim: Derechos
+          subject_tesim: Tema
+          title_tesim: Título
   hyrax:
     product_name:           "Hyrax"
     product_twitter_handle: "@HydraSphere"

data/lib/generators/hyrax/templates/config/locales/hyrax.zh.yml

@@ -0,0 +1,55 @@
+zh:
+  blacklight:
+    search:
+      fields:
+        facet:
+          based_near_sim: 位置
+          creator_sim: 创造者
+          file_format_sim: 文件格式
+          generic_type_sim: 类型
+          keyword_sim: 关键词
+          language_sim: 语言
+          publisher_sim: 出版者
+          subject_sim: 学科
+        index:
+          based_near_tesim: 位置
+          contributor_tesim: 贡献者
+          creator_tesim: 创造者
+          date_created_tesim: 创建日期
+          date_modified_dtsi: 修改日期
+          date_uploaded_dtsi: 日期上传
+          description_tesim: 描述
+          file_format_tesim: 文件格式
+          identifier_tesim: 识别码
+          keyword_tesim: 关键词
+          language_tesim: 语言
+          publisher_tesim: 出版者
+          rights_tesim: 权
+          subject_tesim: 学科
+        show:
+          based_near_tesim: 位置
+          contributor_tesim: 贡献者
+          creator_tesim: 创造者
+          date_created_tesim: 创建日期
+          date_modified_dtsi: 修改日期
+          date_uploaded_dtsi: 日期上传
+          description_tesim: 描述
+          file_format_tesim: 文件格式
+          identifier_tesim: 识别码
+          keyword_tesim: 关键词
+          language_tesim: 语言
+          publisher_tesim: 出版者
+          rights_tesim: 权
+          subject_tesim: 学科
+          title_tesim: 标题
+  hyrax:
+    product_name:           "蹄兔"
+    product_twitter_handle: "@HydraSphere"
+    institution_name:       "机构"
+    institution_name_full:  "机构名称"
+    account_name:           "我的机构帐户标识符"
+    directory:
+      suffix:               "@example.org"
+    footer:
+      copyright_html: "<strong>版权所有 &copy; 2017 Project Hydra</strong> 根据Apache许可证2.0版许可"
+      service_html: 的服务<a href="http://projecthydra.org/" class="navbar-link" target="_blank">Hydra项目</a>.

data/lib/generators/hyrax/templates/mediated_deposit_workflow.json.erb

@@ -32,7 +32,8 @@
                         }
                     ],
                     "methods": [
-                        "Hyrax::Workflow::DeactivateObject"
+                        "Hyrax::Workflow::DeactivateObject",
+                        "Hyrax::Workflow::GrantEditToDepositor"
                     ]
                 }, {
                     "name": "approve",
@@ -46,6 +47,8 @@
                         }
                     ],
                     "methods": [
+                        "Hyrax::Workflow::GrantReadToDepositor",
+                        "Hyrax::Workflow::RevokeEditFromDepositor",
                         "Hyrax::Workflow::ActivateObject"
                     ]
                 }, {

data/lib/generators/hyrax/work/templates/controller.rb.erb

@@ -6,6 +6,6 @@ module Hyrax
     # Adds Hyrax behaviors to the controller.
     include Hyrax::WorksControllerBehavior
     include Hyrax::BreadcrumbsForWorks
-    self.curation_concern_type = <%= class_name %>
+    self.curation_concern_type = ::<%= class_name %>
   end
 end

data/lib/generators/hyrax/work/templates/feature_spec.rb.erb

@@ -3,7 +3,8 @@
 require 'rails_helper'
 include Warden::Test::Helpers
 
-RSpec.feature 'Create a <%= class_name %>' do
+# NOTE: If you generated more than one work, you have to set "js: true"
+RSpec.feature 'Create a <%= class_name %>', js: false do
   context 'a logged in user' do
     let(:user_attributes) do
       { <%= Devise.authentication_keys.first %>: 'test@example.com' }
@@ -13,14 +14,20 @@ RSpec.feature 'Create a <%= class_name %>' do
     end
 
     before do
+      AdminSet.find_or_create_default_admin_set_id
       login_as user
     end
 
     scenario do
-      visit new_curation_concerns_<%= file_name %>_path
-      fill_in 'Title', with: 'Test <%= class_name %>'
-      click_button 'Create <%= class_name %>'
-      expect(page).to have_content 'Test <%= class_name %>'
+      visit '/dashboard'
+      click_link "Works"
+      click_link "Add new work"
+
+      # If you generate more than one work uncomment these lines
+      # choose "payload_concern", option: "<%= class_name %>"
+      # click_button "Create work"
+
+      expect(page).to have_content "Add New <%= human_name %>"
     end
   end
 end

data/lib/generators/hyrax/work/templates/locale.zh.yml.erb

@@ -0,0 +1,10 @@
+zh:
+  hyrax:
+    icons:
+      <%= file_name %>:     'fa fa-file-text-o'
+    select_type:
+      <%= file_name %>:
+        # TODO: translate `human_name` into Chinese
+        name:               "<%= human_name.titleize %>"
+        # TODO: translate `human_name` into Chinese
+        description:        "<%= human_name %> 作品"

data/lib/generators/hyrax/work/work_generator.rb

@@ -1,6 +1,13 @@
 require 'rails/generators'
+require 'rails/generators/model_helpers'
 
 class Hyrax::WorkGenerator < Rails::Generators::NamedBase
+  # ActiveSupport can interpret models as plural which causes
+  # counter-intuitive route paths. Pull in ModelHelpers from
+  # Rails which warns users about pluralization when generating
+  # new models or scaffolds.  include Rails::Generators::ModelHelpers
+  include Rails::Generators::ModelHelpers
+
   source_root File.expand_path('../templates', __FILE__)
 
   argument :attributes, type: :array, default: [], banner: 'field:type field:type'
@@ -16,23 +23,23 @@ class Hyrax::WorkGenerator < Rails::Generators::NamedBase
   end
 
   def create_actor
-    template('actor.rb.erb', "app/actors/hyrax/actors/#{file_name}_actor.rb")
+    template('actor.rb.erb', File.join('app/actors/hyrax/actors', class_path, "#{file_name}_actor.rb"))
   end
 
   def create_controller
-    template('controller.rb.erb', "app/controllers/hyrax/#{plural_file_name}_controller.rb")
+    template('controller.rb.erb', File.join('app/controllers/hyrax', class_path, "#{plural_file_name}_controller.rb"))
   end
 
   def create_form
-    template('form.rb.erb', "app/forms/hyrax/#{file_name}_form.rb")
+    template('form.rb.erb', File.join('app/forms/hyrax', class_path, "#{file_name}_form.rb"))
   end
 
   def create_model
-    template('model.rb.erb', "app/models/#{file_name}.rb")
+    template('model.rb.erb', File.join('app/models', class_path, "#{file_name}.rb"))
   end
 
   def create_views
-    create_file "app/views/hyrax/#{plural_file_name}/_#{file_name}.html.erb" do
+    create_file File.join('app/views/hyrax', class_path, "#{plural_file_name}/_#{file_name}.html.erb") do
       "<%# This is a search result view %>\n" \
       "<%= render 'catalog/document', document: #{file_name}, document_counter: #{file_name}_counter  %>\n"
     end
@@ -47,7 +54,7 @@ class Hyrax::WorkGenerator < Rails::Generators::NamedBase
         lastmatch = line if line =~ /config.register_curation_concern :(?!#{file_name})/
       end
       content = "  # Injected via `rails g hyrax:work #{class_name}`\n" \
-                "  config.register_curation_concern :#{file_name}\n"
+                "  config.register_curation_concern #{registration_path_symbol}\n"
       anchor = lastmatch || "Hyrax.config do |config|\n"
       inject_into_file config, after: anchor do
         content
@@ -56,33 +63,34 @@ class Hyrax::WorkGenerator < Rails::Generators::NamedBase
   end
 
   def create_i18n
-    template('locale.en.yml.erb', "config/locales/#{file_name}.en.yml")
-    template('locale.es.yml.erb', "config/locales/#{file_name}.es.yml")
+    template('locale.en.yml.erb', File.join('config/locales/', class_path, "#{file_name}.en.yml"))
+    template('locale.es.yml.erb', File.join('config/locales/', class_path, "#{file_name}.es.yml"))
+    template('locale.zh.yml.erb', File.join('config/locales/', class_path, "#{file_name}.zh.yml"))
   end
 
   def create_actor_spec
     return unless rspec_installed?
-    template('actor_spec.rb.erb', "spec/actors/hyrax/actors/#{file_name}_actor_spec.rb")
+    template('actor_spec.rb.erb', File.join('spec/actors/hyrax/actors', class_path, "#{file_name}_actor_spec.rb"))
   end
 
   def create_controller_spec
     return unless rspec_installed?
-    template('controller_spec.rb.erb', "spec/controllers/hyrax/#{plural_file_name}_controller_spec.rb")
+    template('controller_spec.rb.erb', File.join('spec/controllers/hyrax', class_path, "#{plural_file_name}_controller_spec.rb"))
   end
 
   def create_feature_spec
     return unless rspec_installed?
-    template('feature_spec.rb.erb', "spec/features/create_#{file_name}_spec.rb")
+    template('feature_spec.rb.erb', File.join('spec/features', class_path, "create_#{file_name}_spec.rb"))
   end
 
   def create_form_spec
     return unless rspec_installed?
-    template('form_spec.rb.erb', "spec/forms/hyrax/#{file_name}_form_spec.rb")
+    template('form_spec.rb.erb', File.join('spec/forms/hyrax', class_path, "#{file_name}_form_spec.rb"))
   end
 
   def create_model_spec
     return unless rspec_installed?
-    template('model_spec.rb.erb', "spec/models/#{file_name}_spec.rb")
+    template('model_spec.rb.erb', File.join('spec/models', class_path, "#{file_name}_spec.rb"))
   end
 
   def display_readme
@@ -98,4 +106,12 @@ class Hyrax::WorkGenerator < Rails::Generators::NamedBase
     def revoking?
       behavior == :revoke
     end
+
+    def registration_path_symbol
+      return ":#{file_name}" if class_path.blank?
+      # this next line creates a symbol with a path like
+      # "abc/scholarly_paper" where abc is the namespace and
+      #                              scholarly_paper is the concern
+      ":\"#{File.join(class_path, file_name)}\""
+    end
 end