hyrax 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a3425401f62c2b4c3509f2254c84fef91e55d34c
-  data.tar.gz: c959faf3cc3c45eb8ccc024d48567ec5e41d41af
+  metadata.gz: 7ba1e774b9fb00e5c4384e30c0001161c3dac629
+  data.tar.gz: b3c1f51c995c1a56bbbeeb447dbd9d0c2f41161a
 SHA512:
-  metadata.gz: 79d50f4747368ff6908659683221905c45f041ccad389580824119ddcdd346c4a9015aa5685dded91e83ba6101defb82608fe52bfc133ef1be81f905fe458f58
-  data.tar.gz: 5fd59a562ca1c3420d8f662a116fe0bdb6975eb6884b0c228b86039ff7e699cfbbd63b0ace358a7fa6855ed67bcae6a1b5d5aa693c6a72734e411244713d8de3
+  metadata.gz: a7fede837b32421d36837ebea2aaec223fc81c89005009336cedf60fbf6e9605b726a30c8cbcbb17b3e30ebf23cdb80d7fe32aaf0ad3142882b45b50c6a88a24
+  data.tar.gz: d05a6e8047084d8de30add25123d815c634f6880ea37d6a0b681667ddb46bd7be8594f5b6722af92b25fd1b7678b86801fe6a2d9cc2c3c52d0de545b1566d121

data/.travis.yml

@@ -22,7 +22,8 @@ env:
   global:
     - NOKOGIRI_USE_SYSTEM_LIBRARIES=true
   matrix:
-    - "RAILS_VERSION=5.0.2"
+    - "RAILS_VERSION=5.0.3"
+    - "RAILS_VERSION=5.1.1"
 services:
   - redis-server
 before_script:

data/README.md

@@ -59,7 +59,7 @@ If you have questions or need help, please email [the Hydra community tech list]
 # Getting started
 
 This document contains instructions specific to setting up an app with __Hyrax
-v1.0.0.rc2__. If you are looking for instructions on installing a different
+v1.0.2__. If you are looking for instructions on installing a different
 version, be sure to select the appropriate branch or tag from the drop-down
 menu above.
 
@@ -133,7 +133,7 @@ Rails requires that you have a JavaScript runtime -- for example, nodejs -- inst
 Generate a new Rails application using the template.
 
 ```
-rails new my_app -m https://raw.githubusercontent.com/projecthydra-labs/hyrax/master/template.rb
+rails new my_app -m https://raw.githubusercontent.com/samvera/hyrax/v1.0.2/template.rb
 ```
 
 Generating a new Rails application using Hyrax's template above takes cares of a number of steps for you, including:

data/app/assets/javascripts/hyrax/file_manager/member.es6

@@ -1,4 +1,10 @@
 export class InputTracker {
+  /*
+   * @param element {jQuery} The field to bind to. Typically instantiated for
+   *                         the titles of each member (file_set) object as well
+   *                         the hidden work thumbnail_id and representative_id
+   * @param notifier {FileManagerMember}
+   */
   constructor(element, notifier) {
     this.element = element
     this.notifier = notifier

data/app/models/concerns/hyrax/file_set/derivatives.rb

@@ -44,7 +44,7 @@ module Hyrax
         Hydra::Derivatives.source_file_service = Hyrax::LocalFileService
         Hydra::Derivatives.output_file_service = Hyrax::PersistDerivatives
         Hydra::Derivatives::FullTextExtract.output_file_service = Hyrax::PersistDirectlyContainedOutputFileService
-        after_destroy :cleanup_derivatives
+        before_destroy :cleanup_derivatives
         # This completely overrides the version in Hydra::Works so that we
         # read and write to a local file. It's important that characterization runs
         # before derivatives so that we have a credible mime_type field to work with.

data/app/models/concerns/hyrax/work_behavior.rb

@@ -3,7 +3,7 @@ module Hyrax
     extend ActiveSupport::Concern
     include Hydra::Works::WorkBehavior
     include HumanReadableType
-    include Noid
+    include Hyrax::Noid
     include Permissions
     include Serializers
     include Hydra::WithDepositor

data/app/models/hyrax/operation.rb

@@ -18,7 +18,9 @@ module Hyrax
     self.table_name = 'curation_concerns_operations'
     acts_as_nested_set
     define_callbacks :success, :failure
-    belongs_to :user, class_name: '::User'
+    belongs_to :user,
+               optional: true,
+               class_name: '::User'
 
     # If this is a batch job (has children), check to see if all the children are complete
     # @see #fail! when none of the children are in a PENDING nor PERFORMING state but at least one is in a FAILURE state

data/app/models/sipity/agent.rb

@@ -9,7 +9,6 @@ module Sipity
     ENTITY_LEVEL_AGENT_RELATIONSHIP = 'entity_level'.freeze
     WORKFLOW_LEVEL_AGENT_RELATIONSHIP = 'workflow_level'.freeze
 
-    belongs_to :proxy_for, polymorphic: true
     has_many :workflow_responsibilities, dependent: :destroy, class_name: 'Sipity::WorkflowResponsibility'
     has_many :entity_specific_responsibilities, dependent: :destroy, class_name: 'Sipity::EntitySpecificResponsibility'
 
@@ -17,5 +16,19 @@ module Sipity
              foreign_key: :agent_id,
              dependent: :destroy,
              class_name: 'Sipity::Comment'
+
+    # Presently Hyrax::Group is a PORO not an ActiveRecord object, so
+    # creating a belongs to causes Rails 5.1 to try to access methods that don't exist.
+    # We do have this relationship, abet only conceptually:
+    # belongs_to :proxy_for, polymorphic: true
+
+    def proxy_for=(target)
+      self.proxy_for_id = target.id
+      self.proxy_for_type = target.class.name
+    end
+
+    def proxy_for
+      @proxy_for ||= proxy_for_type.constantize.find(proxy_for_id)
+    end
   end
 end

data/app/models/sipity/entity.rb

@@ -9,7 +9,9 @@ module Sipity
     self.table_name = 'sipity_entities'
 
     belongs_to :workflow, class_name: 'Sipity::Workflow'
-    belongs_to :workflow_state, class_name: 'Sipity::WorkflowState'
+    belongs_to :workflow_state,
+               optional: true,
+               class_name: 'Sipity::WorkflowState'
 
     has_many :entity_specific_responsibilities, dependent: :destroy, class_name: 'Sipity::EntitySpecificResponsibility'
 

data/app/models/sipity/workflow_action.rb

@@ -12,7 +12,9 @@ module Sipity
     self.table_name = 'sipity_workflow_actions'
 
     belongs_to :workflow, class_name: 'Sipity::Workflow'
-    belongs_to :resulting_workflow_state, class_name: 'Sipity::WorkflowState'
+    belongs_to :resulting_workflow_state,
+               optional: true,
+               class_name: 'Sipity::WorkflowState'
 
     has_many :workflow_state_actions, dependent: :destroy, class_name: 'Sipity::WorkflowStateAction'
     has_many :triggered_methods, dependent: :destroy, class_name: 'Sipity::Method'

data/app/models/sipity/workflow_state.rb

@@ -4,7 +4,9 @@ module Sipity
   class WorkflowState < ActiveRecord::Base
     self.table_name = 'sipity_workflow_states'
 
-    belongs_to :workflow, class_name: 'Sipity::Workflow'
+    belongs_to :workflow,
+               class_name: 'Sipity::Workflow'
+
     has_many :originating_workflow_state_actions,
              dependent: :destroy,
              class_name: 'Sipity::WorkflowStateAction',

data/app/presenters/hyrax/presents_attributes.rb

@@ -34,7 +34,7 @@ module Hyrax
 
     def microdata_type_to_html
       return "" unless display_microdata?
-      value = I18n.t(microdata_type_key, default: Hyrax.config.microdata_default_type)
+      value = Microdata.fetch(microdata_type_key, default: Hyrax.config.microdata_default_type)
       " itemscope itemtype=\"#{value}\"".html_safe
     end
 
@@ -64,7 +64,7 @@ module Hyrax
       end
 
       def microdata_type_key
-        "hyrax.schema_org.resource_type.#{human_readable_type}"
+        "resource_type.#{human_readable_type}"
       end
   end
 end

data/app/renderers/hyrax/renderers/configured_microdata.rb

@@ -1,8 +1,6 @@
 module Hyrax
   module Renderers
     module ConfiguredMicrodata
-      PREFIX = 'hyrax.schema_org'.freeze
-
       def microdata?(field)
         return false unless Hyrax.config.display_microdata?
         translate_microdata(field: field, field_context: 'property', default: false)
@@ -41,7 +39,7 @@ module Hyrax
       private
 
         def translate_microdata(field:, field_context:, default: true)
-          t("#{PREFIX}.#{field}.#{field_context}", default: default)
+          Microdata.fetch("#{field}.#{field_context}", default: default)
         end
     end
   end

data/app/search_builders/hyrax/catalog_search_builder.rb

@@ -7,7 +7,7 @@ class Hyrax::CatalogSearchBuilder < Hyrax::SearchBuilder
 
   # show both works that match the query and works that contain files that match the query
   def show_works_or_works_that_contain_files(solr_parameters)
-    return if blacklight_params[:q].blank? || blacklight_params[:search_field]
+    return if blacklight_params[:q].blank? || blacklight_params[:search_field] != 'all_fields'
     solr_parameters[:user_query] = blacklight_params[:q]
     solr_parameters[:q] = new_query
   end

data/app/services/hyrax/microdata.rb

@@ -0,0 +1,66 @@
+module Hyrax
+  class Microdata
+    include Singleton
+    FILENAME = 'config/schema_org.yml'.freeze
+    TOP_KEY = 'schema_org'.freeze
+
+    def self.fetch(key, options = {})
+      instance.fetch(key, options)
+    end
+
+    def fetch(key, options)
+      data.fetch(key) { options[:default] }
+    end
+
+    # Allow clients to register paths providing config data sources.
+    # Register a config files like this:
+    #   Microdata.load_path << 'path/to/locale/en.yml'
+    def self.load_path
+      @load_path ||= [FILENAME]
+    end
+
+    # Sets the load path instance.
+    class << self
+      attr_writer :load_path
+    end
+
+    def self.reload!
+      instance.reload!
+    end
+
+    def reload!
+      @data = nil
+    end
+
+    private
+
+      def data
+        @data ||= begin
+          flatten(yaml)
+        end
+      end
+
+      def yaml
+        yaml = {}
+        self.class.load_path.each do |path|
+          from_file = YAML.safe_load(File.open(path))[TOP_KEY]
+          yaml.deep_merge!(from_file) if from_file
+        end
+        yaml
+      end
+
+      # Given a deeply nested hash, return a single hash
+      def flatten(hash)
+        hash.each_with_object({}) do |(key, value), h|
+          if value.instance_of?(Hash)
+            value.map do |k, v|
+              # We could add recursion here if we ever had more than 2 levels
+              h["#{key}.#{k}"] = v
+            end
+          else
+            h[key] = value
+          end
+        end
+      end
+  end
+end

data/app/services/hyrax/resource_types_service.rb

@@ -16,8 +16,7 @@ module Hyrax
     # @param [String] id identifier of the resource type
     def self.microdata_type(id)
       return Hyrax.config.microdata_default_type if id.nil?
-      I18n.t("#{Hyrax::Renderers::ConfiguredMicrodata::PREFIX}.resource_type.#{id}",
-             default: Hyrax.config.microdata_default_type)
+      Microdata.fetch("resource_type.#{id}", default: Hyrax.config.microdata_default_type)
     end
   end
 end

data/config/locales/hyrax.en.yml

@@ -493,52 +493,6 @@ en:
         subject: "Batch upload complete"
         title:  "Files uploaded successfully"
     passive_consent_to_agreement: "By saving this work I agree to the"
-    schema_org:
-      based_near:
-        property: contentLocation
-        type: "http://schema.org/Place"
-        value: name
-      contributor:
-        property: contributor
-        # used as the itemprop value for itemscoped attributes
-        type: "http://schema.org/Person"
-        value: name
-      creator:
-        property: creator
-        type: "http://schema.org/Person"
-        value: name
-      date_created:
-        property: dateCreated
-      description:
-        property: description
-      keyword:
-        property: keywords
-      language:
-        property: inLanguage
-      publisher:
-        property: publisher
-        type: "http://schema.org/Organization"
-        value: name
-      resource_type:
-        Article: "http://schema.org/Article"
-        Audio: "http://schema.org/AudioObject"
-        Book: "http://schema.org/Book"
-        Conference Proceeding: "http://schema.org/ScholarlyArticle"
-        Dataset: "http://schema.org/Dataset"
-        Dissertation: "http://schema.org/ScholarlyArticle"
-        Image: "http://schema.org/ImageObject"
-        Map or Cartographic Material: "http://schema.org/Map"
-        Masters Thesis: "http://schema.org/ScholarlyArticle"
-        Part of Book: "http://schema.org/Book"
-        Research Paper: "http://schema.org/ScholarlyArticle"
-        Software or Program Code: "http://schema.org/Code"
-        Video: "http://schema.org/VideoObject"
-      subject:
-        property: about
-        type: "http://schema.org/Thing"
-        value: name
-      title:
-        property: name
     search:
       button:
         html: '<span class="glyphicon glyphicon-search"></span> Go'

data/config/locales/hyrax.es.yml

@@ -492,52 +492,6 @@ es:
         subject: "Carga en lote completa"
         title:  "Archivos cargados satisfactoriamente"
     passive_consent_to_agreement: "Al salvar este trabajo yo acepto a"
-    schema_org:
-      based_near:
-        property: contentLocation
-        type: "http://schema.org/Place"
-        value: name
-      contributor:
-        property: contributor
-        # used as the itemprop value for itemscoped attributes
-        type: "http://schema.org/Person"
-        value: name
-      creator:
-        property: creator
-        type: "http://schema.org/Person"
-        value: name
-      date_created:
-        property: dateCreated
-      description:
-        property: description
-      keyword:
-        property: keywords
-      language:
-        property: inLanguage
-      publisher:
-        property: publisher
-        type: "http://schema.org/Organization"
-        value: name
-      resource_type:
-        Article: "http://schema.org/Article"
-        Audio: "http://schema.org/AudioObject"
-        Book: "http://schema.org/Book"
-        Conference Proceeding: "http://schema.org/ScholarlyArticle"
-        Dataset: "http://schema.org/Dataset"
-        Dissertation: "http://schema.org/ScholarlyArticle"
-        Image: "http://schema.org/ImageObject"
-        Map or Cartographic Material: "http://schema.org/Map"
-        Masters Thesis: "http://schema.org/ScholarlyArticle"
-        Part of Book: "http://schema.org/Book"
-        Research Paper: "http://schema.org/ScholarlyArticle"
-        Software or Program Code: "http://schema.org/Code"
-        Video: "http://schema.org/VideoObject"
-      subject:
-        property: about
-        type: "http://schema.org/Thing"
-        value: name
-      title:
-        property: name
     search:
       button:
         html: '<span class="glyphicon glyphicon-search"></span> Ir'

data/config/schema_org.yml

@@ -0,0 +1,46 @@
+schema_org:
+  based_near:
+    property: contentLocation
+    type: "http://schema.org/Place"
+    value: name
+  contributor:
+    property: contributor
+    # used as the itemprop value for itemscoped attributes
+    type: "http://schema.org/Person"
+    value: name
+  creator:
+    property: creator
+    type: "http://schema.org/Person"
+    value: name
+  date_created:
+    property: dateCreated
+  description:
+    property: description
+  keyword:
+    property: keywords
+  language:
+    property: inLanguage
+  publisher:
+    property: publisher
+    type: "http://schema.org/Organization"
+    value: name
+  resource_type:
+    Article: "http://schema.org/Article"
+    Audio: "http://schema.org/AudioObject"
+    Book: "http://schema.org/Book"
+    Conference Proceeding: "http://schema.org/ScholarlyArticle"
+    Dataset: "http://schema.org/Dataset"
+    Dissertation: "http://schema.org/ScholarlyArticle"
+    Image: "http://schema.org/ImageObject"
+    Map or Cartographic Material: "http://schema.org/Map"
+    Masters Thesis: "http://schema.org/ScholarlyArticle"
+    Part of Book: "http://schema.org/Book"
+    Research Paper: "http://schema.org/ScholarlyArticle"
+    Software or Program Code: "http://schema.org/Code"
+    Video: "http://schema.org/VideoObject"
+  subject:
+    property: about
+    type: "http://schema.org/Thing"
+    value: name
+  title:
+    property: name

data/db/migrate/20160328222152_create_version_committers.rb

@@ -1,4 +1,4 @@
-class CreateVersionCommitters < ActiveRecord::Migration
+class CreateVersionCommitters < ActiveRecord::Migration[4.2]
   def self.up
     create_table :version_committers do |t|
       t.string :obj_id

data/db/migrate/20160328222153_create_checksum_audit_logs.rb

@@ -1,4 +1,4 @@
-class CreateChecksumAuditLogs < ActiveRecord::Migration
+class CreateChecksumAuditLogs < ActiveRecord::Migration[4.2]
   def self.up
     create_table :checksum_audit_logs do |t|
       t.string :file_set_id

data/db/migrate/20160328222154_create_single_use_links.rb

@@ -1,4 +1,4 @@
-class CreateSingleUseLinks < ActiveRecord::Migration
+class CreateSingleUseLinks < ActiveRecord::Migration[4.2]
   def change
     create_table :single_use_links do |t|
       t.string :downloadKey

data/db/migrate/20160328222156_add_social_to_users.rb

@@ -1,4 +1,4 @@
-class AddSocialToUsers < ActiveRecord::Migration
+class AddSocialToUsers < ActiveRecord::Migration[4.2]
   def self.up
     add_column :users, :facebook_handle, :string
     add_column :users, :twitter_handle, :string

data/db/migrate/20160328222157_add_ldap_attrs_to_user.rb

@@ -1,4 +1,4 @@
-class AddLdapAttrsToUser < ActiveRecord::Migration
+class AddLdapAttrsToUser < ActiveRecord::Migration[4.2]
   def self.up
     add_column :users, :display_name, :string
     add_column :users, :address, :string

data/db/migrate/20160328222158_add_avatars_to_users.rb

@@ -1,4 +1,4 @@
-class AddAvatarsToUsers < ActiveRecord::Migration
+class AddAvatarsToUsers < ActiveRecord::Migration[4.2]
   def self.up
     add_column :users, "avatar_file_name",    :string
     add_column :users, "avatar_content_type", :string

data/db/migrate/20160328222161_create_trophies.rb

@@ -1,4 +1,4 @@
-class CreateTrophies < ActiveRecord::Migration
+class CreateTrophies < ActiveRecord::Migration[4.2]
   def change
     create_table :trophies do |t|
       t.integer :user_id

data/db/migrate/20160328222162_add_linkedin_to_users.rb

@@ -1,4 +1,4 @@
-class AddLinkedinToUsers < ActiveRecord::Migration
+class AddLinkedinToUsers < ActiveRecord::Migration[4.2]
   def change
     add_column :users, :linkedin_handle, :string
   end

data/db/migrate/20160328222163_create_tinymce_assets.rb

@@ -1,4 +1,4 @@
-class CreateTinymceAssets < ActiveRecord::Migration
+class CreateTinymceAssets < ActiveRecord::Migration[4.2]
   def change
     create_table :tinymce_assets do |t|
       t.string :file

data/db/migrate/20160328222164_create_content_blocks.rb

@@ -1,4 +1,4 @@
-class CreateContentBlocks < ActiveRecord::Migration
+class CreateContentBlocks < ActiveRecord::Migration[4.2]
   def change
     create_table :content_blocks do |t|
       t.string :name

data/db/migrate/20160328222165_create_featured_works.rb

@@ -1,4 +1,4 @@
-class CreateFeaturedWorks < ActiveRecord::Migration
+class CreateFeaturedWorks < ActiveRecord::Migration[4.2]
   def change
     create_table :featured_works do |t|
       t.integer :order, default: 5

data/db/migrate/20160328222166_add_external_key_to_content_blocks.rb

@@ -1,4 +1,4 @@
-class AddExternalKeyToContentBlocks < ActiveRecord::Migration
+class AddExternalKeyToContentBlocks < ActiveRecord::Migration[4.2]
   def change
     add_column :content_blocks, :external_key, :string
     remove_index :content_blocks, :name

data/db/migrate/20160328222226_create_proxy_deposit_rights.rb

@@ -1,4 +1,4 @@
-class CreateProxyDepositRights < ActiveRecord::Migration
+class CreateProxyDepositRights < ActiveRecord::Migration[4.2]
   def change
     create_table :proxy_deposit_rights do |t|
       t.references :grantor

data/db/migrate/20160328222227_create_proxy_deposit_requests.rb

@@ -1,4 +1,4 @@
-class CreateProxyDepositRequests < ActiveRecord::Migration
+class CreateProxyDepositRequests < ActiveRecord::Migration[4.2]
   def change
     create_table :proxy_deposit_requests do |t|
       t.string :generic_file_id, null: false

data/db/migrate/20160328222228_create_file_view_stats.rb

@@ -1,4 +1,4 @@
-class CreateFileViewStats < ActiveRecord::Migration
+class CreateFileViewStats < ActiveRecord::Migration[4.2]
   def change
     create_table :file_view_stats do |t|
       t.datetime :date

data/db/migrate/20160328222229_create_file_download_stats.rb

@@ -1,4 +1,4 @@
-class CreateFileDownloadStats < ActiveRecord::Migration
+class CreateFileDownloadStats < ActiveRecord::Migration[4.2]
   def change
     create_table :file_download_stats do |t|
       t.datetime :date

data/db/migrate/20160328222230_add_orcid_to_users.rb

@@ -1,4 +1,4 @@
-class AddOrcidToUsers < ActiveRecord::Migration
+class AddOrcidToUsers < ActiveRecord::Migration[4.2]
   def change
     add_column :users, :orcid, :string
   end

data/db/migrate/20160328222231_create_user_stats.rb

@@ -1,4 +1,4 @@
-class CreateUserStats < ActiveRecord::Migration
+class CreateUserStats < ActiveRecord::Migration[4.2]
   def change
     create_table :user_stats do |t|
       t.integer :user_id

data/db/migrate/20160328222232_create_work_view_stats.rb

@@ -1,4 +1,4 @@
-class CreateWorkViewStats < ActiveRecord::Migration
+class CreateWorkViewStats < ActiveRecord::Migration[4.2]
   def change
     create_table :work_view_stats do |t|
       t.datetime :date

data/db/migrate/20160328222233_add_works_to_user_stats.rb

@@ -1,4 +1,4 @@
-class AddWorksToUserStats < ActiveRecord::Migration
+class AddWorksToUserStats < ActiveRecord::Migration[4.2]
   def self.up
     add_column :user_stats, :work_views, :integer
     add_column :work_view_stats, :user_id, :integer

data/db/migrate/20160328222236_change_trophy_generic_file_id_to_work_id.rb

@@ -1,4 +1,4 @@
-class ChangeTrophyGenericFileIdToWorkId < ActiveRecord::Migration
+class ChangeTrophyGenericFileIdToWorkId < ActiveRecord::Migration[4.2]
   def change
     rename_column :trophies, :generic_file_id, :work_id
   end

data/db/migrate/20160328222237_change_proxy_deposit_generic_file_id_to_work_id.rb

@@ -1,4 +1,4 @@
-class ChangeProxyDepositGenericFileIdToWorkId < ActiveRecord::Migration
+class ChangeProxyDepositGenericFileIdToWorkId < ActiveRecord::Migration[4.2]
   def change
     rename_column :proxy_deposit_requests, :generic_file_id, :work_id
   end

data/db/migrate/20160328222238_change_audit_log_generic_file_id_to_file_set_id.rb

@@ -1,4 +1,4 @@
-class ChangeAuditLogGenericFileIdToFileSetId < ActiveRecord::Migration
+class ChangeAuditLogGenericFileIdToFileSetId < ActiveRecord::Migration[4.2]
   def change
     rename_column :checksum_audit_logs, :generic_file_id, :file_set_id unless ChecksumAuditLog.column_names.include?('file_set_id')
   end

data/db/migrate/20160328222239_change_proxy_deposit_request_generic_file_id_to_work_id.rb

@@ -1,4 +1,4 @@
-class ChangeProxyDepositRequestGenericFileIdToWorkId < ActiveRecord::Migration
+class ChangeProxyDepositRequestGenericFileIdToWorkId < ActiveRecord::Migration[4.2]
   def change
     rename_column :proxy_deposit_requests, :generic_file_id, :generic_id if ProxyDepositRequest.column_names.include?('generic_file_id')
   end

data/db/migrate/20160401142419_create_uploaded_files.rb

@@ -1,4 +1,4 @@
-class CreateUploadedFiles < ActiveRecord::Migration
+class CreateUploadedFiles < ActiveRecord::Migration[4.2]
   def change
     create_table :uploaded_files do |t|
       t.string :file

data/db/migrate/20160415212015_create_features.rb

@@ -1,4 +1,4 @@
-class CreateFeatures < ActiveRecord::Migration
+class CreateFeatures < ActiveRecord::Migration[4.2]
   def change
     create_table :hyrax_features do |t|
       t.string :key, null: false

data/db/migrate/20160427155928_create_operations.rb

@@ -1,4 +1,4 @@
-class CreateOperations < ActiveRecord::Migration
+class CreateOperations < ActiveRecord::Migration[4.2]
   def change
     create_table :curation_concerns_operations do |t|
       t.string :status

data/db/migrate/20160510000007_change_featured_work_generic_file_id_to_work_id.rb

@@ -1,4 +1,4 @@
-class ChangeFeaturedWorkGenericFileIdToWorkId < ActiveRecord::Migration
+class ChangeFeaturedWorkGenericFileIdToWorkId < ActiveRecord::Migration[4.2]
   def change
     return unless column_exists?(:featured_works, :generic_file_id)
     rename_column :featured_works, :generic_file_id, :work_id

data/db/migrate/20160516190435_add_arkivo_to_users.rb

@@ -1,4 +1,4 @@
-class AddArkivoToUsers < ActiveRecord::Migration
+class AddArkivoToUsers < ActiveRecord::Migration[4.2]
   def change
     add_column :users, :arkivo_token, :string
     add_column :users, :arkivo_subscription, :string

data/db/migrate/20160919151348_create_sipity.rb

@@ -1,4 +1,4 @@
-class CreateSipity < ActiveRecord::Migration
+class CreateSipity < ActiveRecord::Migration[4.2]
   def change
     create_table "sipity_notification_recipients" do |t|
       t.integer  "notification_id",                null: false

data/db/migrate/20161012182404_create_sipity_workflow_methods.rb

@@ -1,4 +1,4 @@
-class CreateSipityWorkflowMethods < ActiveRecord::Migration
+class CreateSipityWorkflowMethods < ActiveRecord::Migration[4.2]
   def change
     create_table :sipity_workflow_methods do |t|
       t.string   "service_name",                    null: false

data/db/migrate/20161021175854_create_permission_template.rb

@@ -1,4 +1,4 @@
-class CreatePermissionTemplate < ActiveRecord::Migration
+class CreatePermissionTemplate < ActiveRecord::Migration[4.2]
   def change
     create_table :permission_templates do |t|
       t.belongs_to :workflow

data/db/migrate/20161021180154_create_permission_template_access.rb

@@ -1,4 +1,4 @@
-class CreatePermissionTemplateAccess < ActiveRecord::Migration
+class CreatePermissionTemplateAccess < ActiveRecord::Migration[4.2]
   def change
     create_table :permission_template_accesses do |t|
       t.references :permission_template, foreign_key: true

data/db/migrate/20161116222307_add_release_to_permission_templates.rb

@@ -1,4 +1,4 @@
-class AddReleaseToPermissionTemplates < ActiveRecord::Migration
+class AddReleaseToPermissionTemplates < ActiveRecord::Migration[4.2]
   def change
     add_column :permission_templates, :release_date, :date
     add_column :permission_templates, :release_period, :string

data/db/migrate/20170131142607_add_permission_template_to_sipity_workflow.rb

@@ -1,4 +1,4 @@
-class AddPermissionTemplateToSipityWorkflow < ActiveRecord::Migration
+class AddPermissionTemplateToSipityWorkflow < ActiveRecord::Migration[4.2]
   def change
     add_column :sipity_workflows, :permission_template_id, :integer, index: true
     remove_index :sipity_workflows, :name

data/db/migrate/20170307142607_tidy_up_because_of_bad_exception.rb

@@ -1,4 +1,4 @@
-class TidyUpBecauseOfBadException < ActiveRecord::Migration
+class TidyUpBecauseOfBadException < ActiveRecord::Migration[4.2]
   def change
     if Hyrax::PermissionTemplate.column_names.include?('workflow_id')
       Hyrax::PermissionTemplate.all.each do |permission_template|

data/db/migrate/20170308175556_add_allows_access_grant_to_workflow.rb

@@ -1,4 +1,4 @@
-class AddAllowsAccessGrantToWorkflow < ActiveRecord::Migration
+class AddAllowsAccessGrantToWorkflow < ActiveRecord::Migration[4.2]
   def change
     add_column :sipity_workflows, :allows_access_grant, :boolean
   end

data/hyrax.gemspec

@@ -56,7 +56,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'dry-validation', '~> 0.9'
   spec.add_dependency 'dry-equalizer', '~> 0.2'
   spec.add_dependency 'dry-struct', '~> 0.1'
-  spec.add_dependency 'active_attr', '~> 0.9.0'
+  spec.add_dependency 'active_attr', '~> 0.9'
   spec.add_dependency 'redlock', '~> 0.1.2'
   spec.add_dependency 'retriable', '>= 2.9', '< 4.0'
   spec.add_dependency 'active-fedora', '>= 11.1.3'

data/lib/generators/hyrax/install_generator.rb

@@ -23,7 +23,7 @@ module Hyrax
   13. Installs hyrax assets
   14. Updates simple_form to use browser validations
   15. Installs Blacklight gallery (and removes it's scss)
-  16. Runs the jquery-datatables generator
+  16. Install jquery-datatables
   17. Initializes the active-fedora_noid database-backed minter
   18. Adds configuration to config/application.rb to fix tinymce asset compiling
          """
@@ -143,7 +143,23 @@ module Hyrax
     end
 
     def datatables
-      generate 'jquery:datatables:install bootstrap3'
+      javascript_manifest = 'app/assets/javascripts/application.js'
+      # Generator is broken https://github.com/rweng/jquery-datatables-rails/issues/225
+      # generate 'jquery:datatables:install bootstrap3'
+      insert_into_file javascript_manifest, after: /jquery.?\n/ do
+        "//= require jquery_ujs\n" \
+        "//= require dataTables/jquery.dataTables\n" \
+        "//= require dataTables/bootstrap/3/jquery.dataTables.bootstrap\n"
+      end
+
+      # This is only necessary for Rails 5.1 and hopefully is temporary.
+      # There was some trouble getting the file-manager javascript (remote forms) to work well
+      # with rails-ujs. Note jquery_ujs was added to the block above (after jQuery)
+      gsub_file javascript_manifest, 'require rails-ujs', ''
+
+      insert_into_file 'app/assets/stylesheets/application.css', before: ' *= require_self' do
+        " *= require dataTables/bootstrap/3/jquery.dataTables.bootstrap\n"
+      end
     end
 
     def af_noid_database_minter_initialize

data/lib/hyrax/version.rb

@@ -1,3 +1,3 @@
 module Hyrax
-  VERSION = '1.0.1'.freeze
+  VERSION = '1.0.2'.freeze
 end

data/spec/actors/hyrax/create_with_files_actor_spec.rb

@@ -9,9 +9,9 @@ describe Hyrax::CreateWithFilesActor do
     Hyrax::Actors::ActorStack.new(work, ::Ability.new(user), [described_class])
   end
   let(:user) { create(:user) }
-  let(:uploaded_file1) { Hyrax::UploadedFile.create(user: user) }
-  let(:uploaded_file2) { Hyrax::UploadedFile.create(user: user) }
   let(:work) { create(:generic_work, user: user) }
+  let(:uploaded_file1) { create(:uploaded_file, user: user) }
+  let(:uploaded_file2) { create(:uploaded_file, user: user) }
   let(:uploaded_file_ids) { [uploaded_file1.id, uploaded_file2.id] }
   let(:attributes) { { uploaded_files: uploaded_file_ids } }
 
@@ -38,7 +38,7 @@ describe Hyrax::CreateWithFilesActor do
       end
 
       context "when uploaded_file_ids don't belong to me" do
-        let(:uploaded_file2) { Hyrax::UploadedFile.create }
+        let(:uploaded_file2) { create(:uploaded_file) }
         it "doesn't attach files" do
           expect(AttachFilesToWorkJob).not_to receive(:perform_later)
           expect(actor.public_send(mode, attributes)).to be false

data/spec/controllers/catalog_controller_spec.rb

@@ -113,18 +113,18 @@ describe CatalogController, type: :controller do
           edit_access_person_ssim: [user.user_key] }
       end
 
-      it "finds work and work that contains file with title" do
-        get :index, params: { q: 'find me' }
+      it "finds a work and a work that contains a file set with a matching title" do
+        get :index, params: { q: 'find me', search_field: 'all_fields' }
         expect(assigns(:document_list).map(&:id)).to contain_exactly(work1[:id], work2[:id])
       end
 
-      it "finds work that contains file with title" do
-        get :index, params: { q: 'other file' }
+      it "finds a work that contains a file set with a matching title" do
+        get :index, params: { q: 'other file', search_field: 'all_fields' }
         expect(assigns(:document_list).map(&:id)).to contain_exactly(work1[:id])
       end
 
-      it "finds work with title" do
-        get :index, params: { q: 'me too' }
+      it "finds a work with a matching title" do
+        get :index, params: { q: 'me too', search_field: 'all_fields' }
         expect(assigns(:document_list).map(&:id)).to contain_exactly(work1[:id])
       end
     end

data/spec/controllers/hyrax/uploads_controller_spec.rb

@@ -26,7 +26,7 @@ describe Hyrax::UploadsController do
 
   describe "#destroy" do
     let(:file) { File.open(fixture_path + '/world.png') }
-    let(:uploaded_file) { Hyrax::UploadedFile.create(file: file, user: user) }
+    let(:uploaded_file) { create(:uploaded_file, file: file, user: user) }
 
     context "when signed in" do
       before do
@@ -39,9 +39,12 @@ describe Hyrax::UploadsController do
         expect(File.exist?(uploaded_file.file.file.file)).to be false
       end
 
-      it "doesn't destroy files that don't belong to me" do
-        delete :destroy, params: { id: Hyrax::UploadedFile.create(file: file) }
-        expect(response.status).to eq 401
+      context "for a file that doesn't belong to me" do
+        let(:uploaded_file) { create(:uploaded_file, file: file) }
+        it "doesn't destroy" do
+          delete :destroy, params: { id: uploaded_file }
+          expect(response.status).to eq 401
+        end
       end
     end
 

data/spec/conversions/power_converters/sipity_workflow_state_spec.rb

@@ -3,13 +3,13 @@ require 'spec_helper'
 RSpec.describe 'PowerConverter', no_clean: true do
   context 'sipity_workflow_state' do
     let(:workflow_state) { Sipity::WorkflowState.new(id: 1, name: 'hello') }
-    let(:workflow) { Sipity::Workflow.new(id: 2, name: 'workflow') }
+    let(:workflow) { create(:workflow) }
     it 'will convert a Sipity::WorkflowState' do
       expect(PowerConverter.convert(workflow_state, to: :sipity_workflow_state)).to eq(workflow_state)
     end
 
     it 'will convert a string based on scope' do
-      Sipity::WorkflowState.create!(workflow_id: workflow.id, name: 'hello')
+      create(:workflow_state, workflow_id: workflow.id, name: 'hello')
       PowerConverter.convert('hello', scope: workflow, to: :sipity_workflow_state)
     end
 

data/spec/factories/uploaded_files.rb

@@ -0,0 +1,5 @@
+FactoryGirl.define do
+  factory :uploaded_file, class: Hyrax::UploadedFile do
+    user
+  end
+end

data/spec/features/delete_work_spec.rb

@@ -0,0 +1,23 @@
+RSpec.feature 'Deleting a work', type: :feature do
+  let(:user) { create(:user) }
+  let(:work) { build(:work, user: user) }
+  let(:file_set) { create(:file_set, user: user, title: ['ABC123xyz']) }
+  let(:file) { File.open(fixture_path + '/world.png') }
+
+  before do
+    sign_in user
+    Hydra::Works::AddFileToFileSet.call(file_set, file, :original_file)
+    work.ordered_members << file_set
+    work.read_groups = []
+    work.save!
+  end
+
+  context 'After deleting a work from the work show page' do
+    it 'redirects to my dashboard' do
+      visit hyrax_generic_work_path(work)
+      click_on('Delete', match: :first)
+      expect(page).to have_current_path(hyrax.dashboard_works_path, only_path: true)
+      expect(page).to have_content 'Deleted Test title'
+    end
+  end
+end

data/spec/fixtures/config/schema_org.yml

@@ -0,0 +1,5 @@
+schema_org:
+  name:
+    type: "http://schema.org/Person"
+    property: name
+    value: firstName

data/spec/jobs/attach_files_to_work_job_spec.rb

@@ -2,8 +2,8 @@ describe AttachFilesToWorkJob do
   context "happy path" do
     let(:file1) { File.open(fixture_path + '/world.png') }
     let(:file2) { File.open(fixture_path + '/image.jp2') }
-    let(:uploaded_file1) { Hyrax::UploadedFile.create(file: file1) }
-    let(:uploaded_file2) { Hyrax::UploadedFile.create(file: file2) }
+    let(:uploaded_file1) { build(:uploaded_file, file: file1) }
+    let(:uploaded_file2) { build(:uploaded_file, file: file2) }
     let(:generic_work) { create(:public_generic_work) }
 
     context "with uploaded files on the filesystem" do

data/spec/jobs/create_derivatives_job_spec.rb

@@ -66,30 +66,31 @@ describe CreateDerivativesJob do
 
   context "with a pdf file" do
     let(:file_set) { create(:file_set) }
-    let(:params)   { { qt: "search", q: "CutePDF", qf: "all_text_timv" } }
 
     let(:file) do
-      Hydra::PCDM::File.new.tap do |f|
-        f.content = File.open(File.join(fixture_path, "hyrax/hyrax_test4.pdf")).read
+      Hydra::PCDM::File.new do |f|
+        f.content = File.open(File.join(fixture_path, "hyrax/hyrax_test4.pdf"))
         f.original_name = 'test.pdf'
-        f.save!
+        f.mime_type = 'application/pdf'
       end
     end
 
-    let(:search_response) do
-      Blacklight::Solr::Response.new(
-        Blacklight.default_index.connection.get("select", params: params),
-        params
-      )
-    end
-
     before do
-      allow(file_set).to receive(:mime_type).and_return('application/pdf')
-      described_class.perform_now(file_set, file.id)
+      file_set.original_file = file
+      file_set.save!
     end
 
-    it "searches the extracted content" do
-      expect(search_response.documents.count).to eq(1)
+    it "runs a full text extract" do
+      expect(Hydra::Derivatives::PdfDerivatives).to receive(:create)
+        .with(/test\.pdf/, outputs: [{ label: :thumbnail,
+                                       format: 'jpg',
+                                       size: '338x493',
+                                       url: String }])
+      expect(Hydra::Derivatives::FullTextExtract).to receive(:create)
+        .with(/test\.pdf/, outputs: [{ url: RDF::URI,
+                                       container: "extracted_text" }])
+
+      described_class.perform_now(file_set, file.id)
     end
   end
 end

data/spec/models/sipity/entity_spec.rb

@@ -18,8 +18,9 @@ module Sipity
 
     describe '#proxy_for' do
       let(:work) { FactoryGirl.create(:generic_work) }
+      let(:entity) { Sipity::Entity.new(proxy_for_global_id: work.to_global_id) }
+
       it 'will retrieve based on a GlobalID of the object' do
-        entity = Sipity::Entity.create!(proxy_for_global_id: work.to_global_id, workflow_state_id: 1, workflow_id: 2)
         expect(entity.proxy_for).to eq(work)
       end
     end

data/spec/models/sipity/workflow_state_spec.rb

@@ -5,8 +5,8 @@ module Sipity
     its(:column_names) { is_expected.to include("name") }
 
     describe "#entities" do
-      let(:workflow_state) { described_class.create name: 'test', workflow_id: 'abc123' }
-      let!(:entity)        { Sipity::Entity.create(workflow_state: workflow_state, proxy_for_global_id: "abc123", workflow_id: workflow_state.workflow_id) }
+      let(:workflow_state) { create(:workflow_state, name: 'test') }
+      let!(:entity)        { Sipity::Entity.create!(workflow_state: workflow_state, proxy_for_global_id: "abc123", workflow_id: workflow_state.workflow_id) }
       it "has entites" do
         expect(workflow_state.entities).to match_array([entity])
       end

data/spec/renderers/hyrax/renderers/attribute_renderer_spec.rb

@@ -3,14 +3,14 @@ require 'spec_helper'
 describe Hyrax::Renderers::AttributeRenderer do
   let(:field) { :name }
   let(:renderer) { described_class.new(field, ['Bob', 'Jessica']) }
-  let(:yml_path) { File.join(fixture_path, 'locales', '*.{rb,yml}') }
+  let(:yml_path) { File.join(fixture_path, 'config', 'schema_org.{yml}') }
   before do
-    I18n.load_path += Dir[yml_path]
-    I18n.reload!
+    Hyrax::Microdata.load_path += Dir[yml_path]
+    Hyrax::Microdata.reload!
   end
   after do
-    I18n.load_path -= Dir[yml_path]
-    I18n.reload!
+    Hyrax::Microdata.load_path -= Dir[yml_path]
+    Hyrax::Microdata.reload!
   end
 
   describe "#attribute_to_html" do

data/spec/search_builder/hyrax/catalog_search_builder_spec.rb

@@ -2,7 +2,7 @@ describe Hyrax::CatalogSearchBuilder do
   let(:context) { double }
   let(:builder) { described_class.new(context).with(blacklight_params) }
   let(:solr_params) { Blacklight::Solr::Request.new }
-  let(:blacklight_params) { { q: user_query } }
+  let(:blacklight_params) { { q: user_query, search_field: 'all_fields' } }
   let(:user_query) { "find me" }
 
   describe "#show_works_or_works_that_contain_files" do

data/spec/services/hyrax/workflow/action_taken_service_spec.rb

@@ -8,9 +8,9 @@ RSpec.describe Hyrax::Workflow::ActionTakenService do
 
   let(:triggered_methods) { [instance_double(Sipity::Method, service_name: 'FooBar')] }
   let(:triggered_methods_rel) do
-    instance_double(Sipity::Method::ActiveRecord_Relation,
-                    order: triggered_methods,
-                    any?: true)
+    double('Sipity::Method::ActiveRecord_Relation',
+           order: triggered_methods,
+           any?: true)
   end
   let(:work) { instance_double(GenericWork, id: '9999') }
   let(:action) { instance_double(Sipity::WorkflowAction, triggered_methods: triggered_methods_rel) }

data/spec/services/hyrax/workflow/notification_generator_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 module Hyrax
   module Workflow
     RSpec.describe NotificationGenerator, no_clean: true do
-      let(:workflow) { Sipity::Workflow.new(id: 1) }
+      let(:workflow) { create(:workflow) }
       let(:recipients) { { to: 'creating_user', cc: 'advising', bcc: "data_observing" } }
 
       context '#call' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hyrax
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Justin Coyne
@@ -14,7 +14,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-24 00:00:00.000000000 Z
+date: 2017-06-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hydra-head
@@ -566,14 +566,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.0
+        version: '0.9'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.0
+        version: '0.9'
 - !ruby/object:Gem::Dependency
   name: redlock
   requirement: !ruby/object:Gem::Requirement
@@ -1442,6 +1442,7 @@ files:
 - app/services/hyrax/lock_manager.rb
 - app/services/hyrax/lockable.rb
 - app/services/hyrax/message_user_service.rb
+- app/services/hyrax/microdata.rb
 - app/services/hyrax/noid.rb
 - app/services/hyrax/parent_service.rb
 - app/services/hyrax/persist_derivatives.rb
@@ -1829,6 +1830,7 @@ files:
 - config/locales/hyrax.zh.yml
 - config/locales/simple_form.en.yml
 - config/routes.rb
+- config/schema_org.yml
 - db/migrate/20160328222152_create_version_committers.rb
 - db/migrate/20160328222153_create_checksum_audit_logs.rb
 - db/migrate/20160328222154_create_single_use_links.rb
@@ -2081,6 +2083,7 @@ files:
 - spec/factories/proxy_deposit_requests.rb
 - spec/factories/single_use_links.rb
 - spec/factories/sipity_entities.rb
+- spec/factories/uploaded_files.rb
 - spec/factories/users.rb
 - spec/factories/workflow_actions.rb
 - spec/factories/workflow_states.rb
@@ -2097,6 +2100,7 @@ files:
 - spec/features/contact_form_spec.rb
 - spec/features/create_child_work_spec.rb
 - spec/features/create_work_spec.rb
+- spec/features/delete_work_spec.rb
 - spec/features/display_dashboard_spec.rb
 - spec/features/edit_file_spec.rb
 - spec/features/edit_work_spec.rb
@@ -2117,6 +2121,7 @@ files:
 - spec/fixtures/Example.ogg
 - spec/fixtures/authorities/licenses.yml
 - spec/fixtures/charter.docx
+- spec/fixtures/config/schema_org.yml
 - spec/fixtures/countdown.avi
 - spec/fixtures/docx_fits.xml
 - spec/fixtures/dublin_core_rdf_descMetadata.nt
@@ -2130,7 +2135,6 @@ files:
 - spec/fixtures/image.png
 - spec/fixtures/jp2_fits.xml
 - spec/fixtures/jpg_fits.xml
-- spec/fixtures/locales/renderer.en.yml
 - spec/fixtures/mp3_fits.xml
 - spec/fixtures/pdf_fits.xml
 - spec/fixtures/piano_note.wav
@@ -2559,7 +2563,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.12
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: Hyrax is a front-end based on the robust Hydra framework, providing a user
@@ -2668,6 +2672,7 @@ test_files:
 - spec/factories/proxy_deposit_requests.rb
 - spec/factories/single_use_links.rb
 - spec/factories/sipity_entities.rb
+- spec/factories/uploaded_files.rb
 - spec/factories/users.rb
 - spec/factories/workflow_actions.rb
 - spec/factories/workflow_states.rb
@@ -2684,6 +2689,7 @@ test_files:
 - spec/features/contact_form_spec.rb
 - spec/features/create_child_work_spec.rb
 - spec/features/create_work_spec.rb
+- spec/features/delete_work_spec.rb
 - spec/features/display_dashboard_spec.rb
 - spec/features/edit_file_spec.rb
 - spec/features/edit_work_spec.rb
@@ -2704,6 +2710,7 @@ test_files:
 - spec/fixtures/Example.ogg
 - spec/fixtures/authorities/licenses.yml
 - spec/fixtures/charter.docx
+- spec/fixtures/config/schema_org.yml
 - spec/fixtures/countdown.avi
 - spec/fixtures/docx_fits.xml
 - spec/fixtures/dublin_core_rdf_descMetadata.nt
@@ -2717,7 +2724,6 @@ test_files:
 - spec/fixtures/image.png
 - spec/fixtures/jp2_fits.xml
 - spec/fixtures/jpg_fits.xml
-- spec/fixtures/locales/renderer.en.yml
 - spec/fixtures/mp3_fits.xml
 - spec/fixtures/pdf_fits.xml
 - spec/fixtures/piano_note.wav

data/spec/fixtures/locales/renderer.en.yml

@@ -1,7 +0,0 @@
-en:
-  hyrax:
-    schema_org:
-      name:
-        type: "http://schema.org/Person"
-        property: name
-        value: firstName