curation_concerns 0.14.0.pre3 → 0.14.0.pre4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 499d0f504305d4a3527b20952256ca5c479495f6
-  data.tar.gz: 198f23262a6af4305f350622678666ae444d4c9f
+  metadata.gz: 0f26ce391fb38ff166cbb42ab25a0672e00c4afb
+  data.tar.gz: 147ccb6fca4723a76d739f63209605c6fc60dab1
 SHA512:
-  metadata.gz: fc6d2a67ff1711383d698b083ccbd4e869f1031354fd302512787abddeb656a43ac12b6b87d1bb163230ee1db5da17684190deff4fa28f1f2dc99b240870c503
-  data.tar.gz: 48549fbe68acc204baf000be4464be9363b00dff9ebb77198deb2c8eb2f15115143881f2f07f80176ea38b5be71cf9c576fcb614f0e4c37573c985abd521a79f
+  metadata.gz: a6e502b77d4b2dceb8516c696bc0a79325eab35f666b642d279a329109cce3924973ccd489c214a084449130aad4f391f781c0f153f73b785c8dd94901821fb1
+  data.tar.gz: 34ecae91255788a87ff51aff846b1ecdaba2c68eb9456bec585a08315a8a6256e9ef9aa1d1424766ec79b262f5301831bb6be222791e9d63de91511103340cfa

data/app/actors/curation_concerns/file_set_actor.rb

@@ -143,12 +143,12 @@ module CurationConcerns
       end
 
       def unlink_from_work
-        work = file_set.in_works.first
+        work = file_set.parent
         return unless work && (work.thumbnail_id == file_set.id || work.representative_id == file_set.id)
-        # This is required to clear the thumbnail_id and representative_id fields on the work
-        # and force it to be re-solrized. Although ActiveFedora::Aggregation clears the
-        # children nodes it leaves the GenericWork.thumbnail_id and GenericWork.representative_id
-        # fields in Solr populated.
+        # This is required to clear the thumbnail_id and representative_id
+        # fields on the work and force it to be re-solrized. Although
+        # ActiveFedora clears the children nodes it leaves the work's
+        # thumbnail_id and representative_id fields in Solr populated.
         work.thumbnail = nil if work.thumbnail_id == file_set.id
         work.representative = nil if work.representative_id == file_set.id
         work.save!

data/app/controllers/concerns/curation_concerns/curation_concern_controller.rb

@@ -40,7 +40,6 @@ module CurationConcerns::CurationConcernController
   end
 
   def create
-    # return unless verify_acceptance_of_user_agreement!
     if actor.create(attributes_for_actor)
       after_create_response
     else

data/app/controllers/concerns/curation_concerns/file_sets_controller_behavior.rb

@@ -70,7 +70,7 @@ module CurationConcerns
     end
 
     def destroy
-      parent = @file_set.in_works.first
+      parent = @file_set.parent
       actor.destroy
       redirect_to [main_app, parent], notice: 'The file has been deleted.'
     end
@@ -194,7 +194,7 @@ module CurationConcerns
               if request.xhr?
                 render 'jq_upload', formats: 'json', content_type: 'text/html'
               else
-                redirect_to [main_app, @file_set.in_works.first]
+                redirect_to [main_app, @file_set.parent]
               end
             end
             format.json do
@@ -204,7 +204,7 @@ module CurationConcerns
         else
           msg = @file_set.errors.full_messages.join(', ')
           flash[:error] = msg
-          json_error "Error creating generic file #{file.original_filename}: #{msg}"
+          json_error "Error creating file #{file.original_filename}: #{msg}"
         end
       end
 

data/app/forms/curation_concerns/forms/collection_edit_form.rb

@@ -18,7 +18,7 @@ module CurationConcerns
         model_class.validators_on(key).any? { |v| v.is_a? ActiveModel::Validations::PresenceValidator }
       end
 
-      # @return [Hash] All generic files in the collection, file.to_s is the key, file.id is the value
+      # @return [Hash] All FileSets in the collection, file.to_s is the key, file.id is the value
       def select_files
         Hash[all_files]
       end

data/app/helpers/curation_concerns/url_helper.rb

@@ -10,7 +10,7 @@ module CurationConcerns
       end
     end
 
-    # generated new GenericWork models get registered as curation concerns and need a
+    # generated models get registered as curation concerns and need a
     # track_model_path to render Blacklight-related views
     (['FileSet', 'Collection'] + CurationConcerns.config.registered_curation_concern_types).each do |concern|
       define_method("track_#{concern.constantize.model_name.singular_route_key}_path") { |*args| main_app.track_solr_document_path(*args) }

data/app/indexers/curation_concerns/file_set_indexer.rb

@@ -14,7 +14,6 @@ module CurationConcerns
         solr_doc[Solrizer.solr_name('file_format', :facetable)] = file_format
         solr_doc[Solrizer.solr_name(:file_size, STORED_INTEGER)] = object.file_size[0]
         solr_doc['all_text_timv'] = object.full_text.content
-        solr_doc[Solrizer.solr_name('generic_work_ids', :symbol)] = object.generic_work_ids unless object.generic_work_ids.empty?
         solr_doc['height_is'] = Integer(object.height.first) if object.height.present?
         solr_doc['width_is'] = Integer(object.width.first) if object.width.present?
         solr_doc[Solrizer.solr_name('mime_type', :stored_sortable)] = object.mime_type

data/app/indexers/curation_concerns/work_indexer.rb

@@ -3,10 +3,6 @@ module CurationConcerns
     include IndexesThumbnails
     def generate_solr_document
       super.tap do |solr_doc|
-        # We know that all the members of GenericWorks are FileSets so we can use
-        # member_ids which requires fewer Fedora API calls than file_set_ids.
-        # file_set_ids requires loading all the members from Fedora but member_ids
-        # looks just at solr
         solr_doc[Solrizer.solr_name('member_ids', :symbol)] = object.member_ids
         Solrizer.set_field(solr_doc, 'generic_type', 'Work', :facetable)
       end

data/app/jobs/import_url_job.rb

@@ -17,10 +17,10 @@ class ImportUrlJob < ActiveJob::Base
     Tempfile.open(file_set.id.tr('/', '_')) do |f|
       copy_remote_file(file_set, f)
 
-      # reload the generic file once the data is copied since this is a long running task
+      # reload the FileSet once the data is copied since this is a long running task
       file_set.reload
 
-      # attach downloaded file to generic file stubbed out
+      # attach downloaded file to FileSet stubbed out
       if CurationConcerns::FileSetActor.new(file_set, user).create_content(f)
         # send message to user on download success
         CurationConcerns.config.callback.run(:after_import_url_success, file_set, user)

data/app/models/concerns/curation_concerns/file_set/belongs_to_works.rb

@@ -7,19 +7,14 @@ module CurationConcerns
         before_destroy :remove_representative_relationship
       end
 
-      def generic_works
-        in_objects # in_objects is provided by Hydra::PCDM::ObjectBehavior
-      end
-
-      # OPTIMIZE: We can load this from Solr much faster than loading the objects
-      def generic_work_ids
-        generic_works.map(&:id)
+      def parents
+        in_works
       end
 
       # Returns the first parent object
       # This is a hack to handle things like FileSets inheriting access controls from their parent.  (see CurationConcerns::ParentContainer in app/controllers/concerns/curation_concers/parent_container.rb)
       def parent
-        in_objects.first
+        parents.first
       end
 
       # Returns the id of first parent object
@@ -27,21 +22,28 @@ module CurationConcerns
       delegate :id, to: :parent, prefix: true
 
       # Files with sibling relationships
-      # Returns all FileSets aggregated by any of the GenericWorks that aggregate the current object
+      # Returns all FileSets aggregated by any of the parent objects that
+      # aggregate the current object
       def related_files
-        generic_works = self.generic_works
-        return [] if generic_works.empty?
-        generic_works.flat_map { |work| work.file_sets.select { |file_set| file_set.id != id } }
+        parent_objects = parents
+        return [] if parent_objects.empty?
+        parent_objects.flat_map do |work|
+          work.file_sets.select do |file_set|
+            file_set.id != id
+          end
+        end
       end
 
-      # If any parent works are pointing at this object as their representative, remove that pointer.
+      # If any parent objects are pointing at this object as their
+      # representative, remove that pointer.
       def remove_representative_relationship
-        generic_works = self.generic_works
-        return if generic_works.empty?
-        generic_works.each do |work|
+        parent_objects = parents
+        return if parent_objects.empty?
+        parent_objects.each do |work|
           work.update(representative_id: nil) if work.representative_id == id
         end
       end
     end
   end
 end
+\

data/app/presenters/curation_concerns/presenter_factory.rb

@@ -3,7 +3,7 @@ module CurationConcerns
     class << self
       # @param [Array] ids the list of ids to load
       # @param [Class] klass the class of presenter to make
-      # @return [Array] presenters for the generic files in order of the ids
+      # @return [Array] presenters for the documents in order of the ids
       def build_presenters(ids, klass, ability)
         new(ids, klass, ability).build
       end

data/app/services/curation_concerns/lock_manager.rb

@@ -33,7 +33,7 @@ module CurationConcerns
       end
 
       def options
-        ::Resque.redis.redis.client.options
+        ::Redis.current.client.options
       end
   end
 end

data/curation_concerns.gemspec

@@ -31,8 +31,6 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'active_attr'
   spec.add_dependency 'hydra-works', '~> 0.8', '>= 0.8.1'
   spec.add_dependency 'active_fedora-noid', '~> 1.0'
-  spec.add_dependency 'resque', '~> 1.23'
-  spec.add_dependency 'resque-pool', '~> 0.3'
   spec.add_dependency 'qa', '~> 0.5'
   spec.add_dependency 'redlock', '~> 0.1.2'
   spec.add_dependency 'solrizer', '~> 3.4'

data/lib/curation_concerns/name.rb

@@ -3,11 +3,11 @@ module CurationConcerns
   # without changing the param key.
   #
   # Example:
-  #   name = CurationConcerns::Name.new(GenericWork)
+  #   name = CurationConcerns::Name.new(MyWork)
   #   name.param_key
-  #   # => 'generic_work'
+  #   # => 'my_work'
   #   name.route_key
-  #   # => 'curation_concerns_generic_works'
+  #   # => 'curation_concerns_my_works'
   #
   class Name < ActiveModel::Name
     def initialize(klass, namespace = nil, name = nil)

data/lib/curation_concerns/rails/routes.rb

@@ -71,9 +71,9 @@ module ActionDispatch::Routing
       ROUTE_OPTIONS = { 'curation_concerns' => { path: :concern } }.freeze
 
       # Namespaces routes appropriately
-      # @example namespaced_resources("curation_concerns/generic_work") is equivalent to
+      # @example namespaced_resources("curation_concerns/my_work") is equivalent to
       #   namespace "curation_concerns", path: :concern do
-      #     resources "generic_work", except: [:index]
+      #     resources "my_work", except: [:index]
       #   end
       def namespaced_resources(target, opts = {}, &block)
         if target.include?('/')

data/lib/curation_concerns/version.rb

@@ -1,3 +1,3 @@
 module CurationConcerns
-  VERSION = "0.14.0.pre3".freeze
+  VERSION = "0.14.0.pre4".freeze
 end

data/lib/generators/curation_concerns/models_generator.rb

@@ -43,9 +43,7 @@ This generator makes the following changes to your application:
                 "\nMime::Type.register 'application/x-endnote-refer', :endnote", verbose: false
     copy_file 'config/curation_concerns.rb', 'config/initializers/curation_concerns.rb'
     copy_file 'config/redis.yml', 'config/redis.yml'
-    copy_file 'config/resque-pool.yml', 'config/resque-pool.yml'
     copy_file 'config/redis_config.rb', 'config/initializers/redis_config.rb'
-    copy_file 'config/resque_config.rb', 'config/initializers/resque_config.rb'
   end
 
   def create_collection

data/lib/generators/curation_concerns/templates/config/redis_config.rb

@@ -13,9 +13,6 @@ if defined?(PhusionPassenger)
                       rescue
                         nil
                       end
-      Resque.redis = Redis.current
-      Resque.redis.namespace = "#{CurationConcerns.config.redis_namespace}:#{Rails.env}"
-      Resque.redis.client.reconnect if Resque.redis
     end
   end
 else

data/lib/generators/curation_concerns/work/USAGE

@@ -1,6 +1,5 @@
 Description:
-  This generator creates the necessary files for work that extends
-  CurationConcerns's GenericWork.
+  This generator creates the necessary files for new work types.
 
 Example:
   rails generate curation_concerns:work ScholarlyPaper

data/lib/generators/curation_concerns/work/templates/README

@@ -4,9 +4,9 @@ After creating your work you may wish to:
 
   1. Add custom views:
 
-      Your newly created work's controller extends from
-      CurationConcerns::GenericWorksController; This means that it will use the
-      views found in CurationConcerns::Engine.root/app/views/curation_concerns/base.
+      By default, the views found in
+      CurationConcerns::Engine.root/app/views/curation_concerns/base
+      will be used.
 
   2. Modify the model, actor, form or presenter.
 

data/spec/actors/curation_concerns/file_set_actor_spec.rb

@@ -30,15 +30,15 @@ describe CurationConcerns::FileSetActor do
 
     context 'when a work is not provided' do
       it "leaves the association blank" do
-        expect(subject.generic_works).to be_empty
+        expect(subject.parents).to be_empty
       end
     end
 
     context 'when a work is provided' do
       let(:work) { create(:generic_work) }
 
-      it 'adds the generic file to the parent work' do
-        expect(subject.generic_works).to eq [work]
+      it 'adds the FileSet to the parent work' do
+        expect(subject.parents).to eq [work]
         expect(work.reload.file_sets).to include(subject)
 
         # Confirming that date_uploaded and date_modified were set

data/spec/controllers/curation_concerns/file_sets_controller_spec.rb

@@ -81,7 +81,7 @@ describe CurationConcerns::FileSetsController do
         it 'errors out of create after on continuous rsolr error' do
           xhr :post, :create, parent_id: parent, file_set: { files: [file] },
                               permission: { group: { 'public' => 'read' } }, terms_of_service: '1'
-          expect(response.body).to include('Error creating generic file image.png')
+          expect(response.body).to include('Error creating file image.png')
         end
       end
     end

data/spec/factories/generic_works.rb

@@ -19,7 +19,7 @@ FactoryGirl.define do
 
     factory :work_with_one_file do
       before(:create) do |work, evaluator|
-        work.ordered_members << FactoryGirl.create(:file_set, user: evaluator.user, title: ['A Contained Generic File'], filename: 'filename.pdf')
+        work.ordered_members << FactoryGirl.create(:file_set, user: evaluator.user, title: ['A Contained FileSet'], filename: 'filename.pdf')
       end
     end
 

data/spec/features/collection_spec.rb

@@ -12,13 +12,7 @@ feature 'collection' do
   let(:gw1) { create(:generic_work, user: user, title: ['First test work']) }
   let(:gw2) { create(:generic_work, user: user, title: ['Second test work']) }
 
-  before(:all) do
-    @old_resque_inline_value = Resque.inline
-    Resque.inline = true
-  end
-
   after(:all) do
-    Resque.inline = @old_resque_inline_value
     GenericWork.destroy_all
     Collection.destroy_all
   end

data/spec/features/update_file_spec.rb

@@ -20,7 +20,7 @@ feature 'Editing attached files' do
     attach_file('Upload a file', fixture_file_path('files/image.png'))
     click_button 'Update Attached File'
 
-    expect(page).to have_content 'The file A Contained Generic File has been updated.'
+    expect(page).to have_content 'The file A Contained FileSet has been updated.'
 
     # TODO: this stuff belongs in an Actor or Controller test:
     file_set.reload

data/spec/models/file_set_spec.rb

@@ -416,7 +416,7 @@ describe FileSet do
     let(:work) { create(:work_with_one_file) }
     subject { work.file_sets.first.reload }
     it 'belongs to works' do
-      expect(subject.generic_works).to eq [work]
+      expect(subject.parents).to eq [work]
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: curation_concerns
 version: !ruby/object:Gem::Version
-  version: 0.14.0.pre3
+  version: 0.14.0.pre4
 platform: ruby
 authors:
 - Matt Zumwalt
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-29 00:00:00.000000000 Z
+date: 2016-05-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hydra-head
@@ -200,34 +200,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
-- !ruby/object:Gem::Dependency
-  name: resque
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.23'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.23'
-- !ruby/object:Gem::Dependency
-  name: resque-pool
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.3'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.3'
 - !ruby/object:Gem::Dependency
   name: qa
   requirement: !ruby/object:Gem::Requirement
@@ -1010,8 +982,6 @@ files:
 - lib/generators/curation_concerns/templates/config/mime_types.rb
 - lib/generators/curation_concerns/templates/config/redis.yml
 - lib/generators/curation_concerns/templates/config/redis_config.rb
-- lib/generators/curation_concerns/templates/config/resque-pool.yml
-- lib/generators/curation_concerns/templates/config/resque_config.rb
 - lib/generators/curation_concerns/templates/curation_concerns.js
 - lib/generators/curation_concerns/templates/curation_concerns.scss
 - lib/generators/curation_concerns/templates/curation_concerns_helper.rb
@@ -1033,7 +1003,6 @@ files:
 - lib/generators/curation_concerns/work/work_generator.rb
 - lib/tasks/curation_concerns.rake
 - lib/tasks/migrate.rake
-- lib/tasks/resque.rake
 - lib/tasks/solr_reindex.rake
 - solr/config/_rest_managed.json
 - solr/config/admin-extra.html

data/lib/generators/curation_concerns/templates/config/resque-pool.yml

@@ -1 +0,0 @@
- "*": 1

data/lib/generators/curation_concerns/templates/config/resque_config.rb

@@ -1,6 +0,0 @@
-require 'resque'
-config = YAML.load(ERB.new(IO.read(File.join(Rails.root, 'config', 'redis.yml'))).result)[Rails.env].with_indifferent_access
-Resque.redis = Redis.new(host: config[:host], port: config[:port], thread_safe: true)
-
-Resque.inline = Rails.env.test?
-Resque.redis.namespace = "#{CurationConcerns.config.redis_namespace}:#{Rails.env}"

data/lib/tasks/resque.rake

@@ -1,14 +0,0 @@
-require 'resque/pool/tasks'
-
-# This provides access to the Rails env within all Resque workers
-task 'resque:setup' => :environment
-
-# Set up resque-pool
-task 'resque:pool:setup' do
-  ActiveRecord::Base.connection.disconnect!
-  require 'resque/pool'
-  Resque::Pool.after_prefork do |job|
-    ActiveRecord::Base.establish_connection
-    Resque.redis.client.reconnect
-  end
-end