curation_concerns 0.13.1 → 0.14.0.pre1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dbbc06a003809c33500df0e776f198252bedd77b
-  data.tar.gz: 6a6dec48311509540d871cf371455c03b2b90674
+  metadata.gz: f74821b31213e7a844b8f8e5314eac62b792ccba
+  data.tar.gz: 3d63bba8d048b922a52e544b6296a58622137cf5
 SHA512:
-  metadata.gz: c0f6df730b3733a86e9df107fbadd1a6ae88e81f833b202a9647f590a33ece77a13ba61af525b07504813f5f3b221ec4f77262ce9a7e42a300de392f04077bd0
-  data.tar.gz: d1278f599af0eead707bd40eb9d8b981fd1dbd3d369d99988e772bb5c506cd7f385c87a059d3fd2a81ca76fe8f56567367c97092ecde7e3d18bac40903d07000
+  metadata.gz: 07a68173b77edab2e48638220ce12435e500aae53c28cb634bbe80a3ceec77e0eaba25bf722e3ad02836e0d9b4d955320247b749f035eeefe2c145bbaa60a6ba
+  data.tar.gz: dcd8ca994910c1f326147e3a5d261a3d4e5afbec84fb3884d09801921c80463bd6435762a54fc8cbd9116d205c60ad537857a47bbe9414b112739238db75a1e4

data/app/controllers/curation_concerns/operations_controller.rb

@@ -0,0 +1,12 @@
+module CurationConcerns
+  class OperationsController < ApplicationController
+    load_and_authorize_resource
+
+    def index
+      @operations = @operations.where(parent_id: nil)
+    end
+
+    def show
+    end
+  end
+end

data/app/jobs/import_url_job.rb

@@ -5,7 +5,13 @@ require 'tempfile'
 class ImportUrlJob < ActiveJob::Base
   queue_as :import_url
 
-  def perform(file_set)
+  before_enqueue do |job|
+    log = job.arguments.last
+    log.pending_job(job)
+  end
+
+  def perform(file_set, log)
+    log.performing!
     user = User.find_by_user_key(file_set.depositor)
 
     Tempfile.open(file_set.id.tr('/', '_')) do |f|
@@ -18,8 +24,10 @@ class ImportUrlJob < ActiveJob::Base
       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)
+        log.success!
       else
         CurationConcerns.config.callback.run(:after_import_url_failure, file_set, user)
+        log.fail!(file_set.errors.full_messages.join(' '))
       end
     end
   end

data/app/models/concerns/curation_concerns/ability.rb

@@ -2,7 +2,9 @@ module CurationConcerns
   module Ability
     extend ActiveSupport::Concern
     included do
-      self.ability_logic += [:curation_concerns_permissions, :add_to_collection]
+      self.ability_logic += [:curation_concerns_permissions,
+                             :operation_abilities,
+                             :add_to_collection]
     end
 
     def curation_concerns_permissions
@@ -21,6 +23,10 @@ module CurationConcerns
       end
     end
 
+    def operation_abilities
+      can :read, Operation, user_id: current_user.id
+    end
+
     def admin_permissions
       alias_action :edit, to: :update
       alias_action :show, to: :read

data/app/models/curation_concerns/operation.rb

@@ -0,0 +1,44 @@
+module CurationConcerns
+  class Operation < ActiveRecord::Base
+    PENDING = 'pending'.freeze
+    PERFORMING = 'performing'.freeze
+    FAILURE = 'failure'.freeze
+    SUCCESS = 'success'.freeze
+
+    acts_as_nested_set
+    define_callbacks :success, :failure
+    belongs_to :user, class_name: '::User'
+
+    # If this is a batch job (has children), check to see if all the children are complete
+    def rollup_status
+      with_lock do
+        stats = children.pluck(:status)
+        return if stats.include?(PENDING) || stats.include?(PERFORMING)
+        return fail! if stats.include?(FAILURE)
+        success!
+      end
+    end
+
+    def success!
+      run_callbacks :success do
+        update(status: SUCCESS)
+        parent.rollup_status if parent
+      end
+    end
+
+    def fail!(message = nil)
+      run_callbacks :failure do
+        update(status: FAILURE, message: message)
+        parent.rollup_status if parent
+      end
+    end
+
+    def performing!
+      update(status: PERFORMING)
+    end
+
+    def pending_job(job)
+      update(job_class: job.class.to_s, job_id: job.job_id, status: CurationConcerns::Operation::PENDING)
+    end
+  end
+end

data/app/views/curation_concerns/operations/index.html.erb

@@ -0,0 +1,23 @@
+<% provide :page_title, 'Operations' %>
+<% provide :page_header do %>
+  <h1>Operations</h1>
+<% end %>
+
+<div class="row">
+  <div class="col-sm-4">
+    <table class="table">
+      <thead>
+        <th>Operation Type</th>
+        <th>Status</th>
+      </thead>
+      <tbody>
+        <% @operations.each do |op| %>
+          <tr>
+            <td><%= link_to op.operation_type, sufia.user_operation_path(params[:user_id], op) %></td>
+            <td><span class="label <%= op.status == 'failure' ? 'label-danger' : 'label-success' %>"><%= op.status %></span></td>
+          </tr>
+        <% end %>
+      </tbody>
+    </table>
+  </div>
+</div>

data/app/views/curation_concerns/operations/show.html.erb

@@ -0,0 +1,30 @@
+<% provide :page_title, 'Operations' %>
+<% provide :page_header do %>
+  <h1><%= @operation.operation_type %> status</h1>
+<% end %>
+
+<p><strong>Status:</strong> <span class="label <%= @operation.status == 'failure' ? 'label-danger' : 'label-success' %>"><%= @operation.status %></span></p>
+<p><strong>Message:</strong> <span class="message"><%= @operation.message %></span></p>
+
+<% if @operation.children.any? %>
+  <div class="row">
+    <div class="col-sm-4">
+      <table class="table">
+        <thead>
+          <th>Operation Type</th>
+          <th>Status</th>
+          <th>Message</th>
+        </thead>
+        <tbody>
+          <% @operation.children.each do |op| %>
+            <tr>
+              <td><%= link_to op.operation_type, sufia.user_operation_path(params[:user_id], op) %></td>
+              <td><span class="label <%= op.status == 'failure' ? 'label-danger' : 'label-success' %>"><%= op.status %></span></td>
+              <td><%= op.message %></td>
+            </tr>
+          <% end %>
+        </tbody>
+      </table>
+    </div>
+  </div>
+<% end %>

data/config/routes.rb

@@ -6,4 +6,8 @@ CurationConcerns::Engine.routes.draw do
 
   # mount BrowseEverything::Engine => '/remote_files/browse'
   resources :classify_concerns, only: [:new, :create]
+
+  resources :users, only: [] do
+    resources :operations, only: [:index, :show]
+  end
 end

data/curation_concerns.gemspec

@@ -40,6 +40,8 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'deprecation', '~> 0.1'
   spec.add_dependency 'rdf', '~> 1.99'
   spec.add_dependency 'rdf-vocab', '~> 0'
+  spec.add_dependency 'awesome_nested_set', '~> 3.0'
+  
 
   spec.add_development_dependency 'solr_wrapper', '~> 0.4'
   spec.add_development_dependency 'fcrepo_wrapper', '~> 0.1'

data/lib/curation_concerns/engine.rb

@@ -13,6 +13,7 @@ module CurationConcerns
 
   class Engine < ::Rails::Engine
     isolate_namespace CurationConcerns
+    require 'awesome_nested_set'
     require 'breadcrumbs_on_rails'
 
     config.autoload_paths += %W(

data/lib/curation_concerns/version.rb

@@ -1,3 +1,3 @@
 module CurationConcerns
-  VERSION = "0.13.1".freeze
+  VERSION = "0.14.0.pre1".freeze
 end

data/lib/generators/curation_concerns/models_generator.rb

@@ -18,7 +18,8 @@ This generator makes the following changes to your application:
     [
       'create_version_committers.rb',
       'create_checksum_audit_logs.rb',
-      'create_single_use_links.rb' # ,
+      'create_single_use_links.rb',
+      'create_operations.rb'
     ].each do |file|
       better_migration_template file
     end

data/lib/generators/curation_concerns/templates/migrations/create_checksum_audit_logs.rb

@@ -7,7 +7,7 @@ class CreateChecksumAuditLogs < ActiveRecord::Migration
       t.integer :pass
       t.string :expected_result
       t.string :actual_result
-      t.timestamps
+      t.timestamps null: false
     end
     add_index :checksum_audit_logs, [:file_set_id, :file_id], name: 'by_file_set_id_and_file_id', order: { created_at: 'DESC' }
   end

data/lib/generators/curation_concerns/templates/migrations/create_operations.rb

@@ -0,0 +1,23 @@
+class CreateOperations < ActiveRecord::Migration
+  def change
+    create_table :curation_concerns_operations do |t|
+      t.string :status
+      t.string :operation_type
+      t.string :job_class
+      t.string :job_id
+      t.string :type # For Single Table Inheritance
+      t.text :message
+      t.references :user, index: true, foreign_key: true
+
+      t.integer :parent_id, null: true, index: true
+      t.integer :lft, null: false, index: true
+      t.integer :rgt, null: false, index: true
+
+      # optional fields
+      t.integer :depth, null: false, default: 0
+      t.integer :children_count, null: false, default: 0
+
+      t.timestamps null: false
+    end
+  end
+end

data/lib/generators/curation_concerns/templates/migrations/create_single_use_links.rb

@@ -6,7 +6,7 @@ class CreateSingleUseLinks < ActiveRecord::Migration
       t.string :itemId
       t.datetime :expires
 
-      t.timestamps
+      t.timestamps null: false
     end
   end
 end

data/lib/generators/curation_concerns/templates/migrations/create_version_committers.rb

@@ -5,7 +5,7 @@ class CreateVersionCommitters < ActiveRecord::Migration
       t.string :datastream_id
       t.string :version_id
       t.string :committer_login
-      t.timestamps
+      t.timestamps null: false
     end
   end
 

data/spec/abilities/operation_ability_spec.rb

@@ -0,0 +1,11 @@
+require 'spec_helper'
+require 'cancan/matchers'
+
+describe CurationConcerns::Ability, type: :model do
+  describe "a registered user" do
+    let(:user) { create(:user) }
+    subject { Ability.new(user) }
+    it { is_expected.to be_able_to(:read, build(:operation, user: user)) }
+    it { is_expected.not_to be_able_to(:read, build(:operation)) }
+  end
+end

data/spec/controllers/curation_concerns/operations_controller_spec.rb

@@ -0,0 +1,28 @@
+require 'spec_helper'
+
+describe CurationConcerns::OperationsController do
+  routes { CurationConcerns::Engine.routes }
+  let(:parent) { create(:operation, :pending, user: user) }
+  let!(:child1) { create(:operation, :failing, parent: parent, user: user) }
+  let!(:child2) { create(:operation, :pending, parent: parent, user: user) }
+  let(:user) { create(:user) }
+  before do
+    sign_in user
+  end
+
+  describe "#index" do
+    it "is successful" do
+      get :index, user_id: user
+      expect(response).to be_successful
+      expect(assigns[:operations]).to eq [parent]
+    end
+  end
+
+  describe "#show" do
+    it "is successful" do
+      get :show, user_id: user, id: parent
+      expect(response).to be_successful
+      expect(assigns[:operation]).to eq parent
+    end
+  end
+end

data/spec/factories/operations.rb

@@ -0,0 +1,17 @@
+FactoryGirl.define do
+  factory :operation, class: CurationConcerns::Operation do
+    operation_type "Test batch operation"
+
+    trait :failing do
+      status CurationConcerns::Operation::FAILURE
+    end
+
+    trait :pending do
+      status CurationConcerns::Operation::PENDING
+    end
+
+    trait :successful do
+      status CurationConcerns::Operation::SUCCESS
+    end
+  end
+end

data/spec/jobs/import_url_job_spec.rb

@@ -20,6 +20,7 @@ describe ImportUrlJob do
       allow(http_res).to receive(:read_body).and_yield(File.open(File.expand_path(file_path, __FILE__)).read)
     end
   end
+  let(:log) { create(:operation) }
 
   context 'after running the job' do
     let(:actor) { double }
@@ -33,7 +34,8 @@ describe ImportUrlJob do
     it 'creates the content' do
       expect_any_instance_of(Net::HTTP).to receive(:request_get).with(file_hash).and_yield(mock_response)
       expect(actor).to receive(:create_content).and_return(true)
-      described_class.perform_now(file_set)
+      described_class.perform_now(file_set, log)
+      expect(log.status).to eq 'success'
     end
   end
 
@@ -57,7 +59,7 @@ describe ImportUrlJob do
       file_set.update(title: ['File One'])
 
       # run the import job
-      described_class.perform_now(file_set)
+      described_class.perform_now(file_set, log)
 
       # import job should not override the title set another process
       file = FileSet.find(file_set_id)

data/spec/models/curation_concerns/operation_spec.rb

@@ -0,0 +1,40 @@
+require 'spec_helper'
+
+describe CurationConcerns::Operation do
+  describe "rollup_status" do
+    let(:parent) { create(:operation, :pending) }
+    describe "with a pending process" do
+      let!(:child1) { create(:operation, :failing, parent: parent) }
+      let!(:child2) { create(:operation, :pending, parent: parent) }
+      it "sets status to pending" do
+        parent.rollup_status
+        expect(parent.status).to eq CurationConcerns::Operation::PENDING
+      end
+    end
+
+    describe "with a failure" do
+      let!(:child1) { create(:operation, :failing, parent: parent) }
+      let!(:child2) { create(:operation, :successful, parent: parent) }
+      it "sets status to failure" do
+        parent.rollup_status
+        expect(parent.status).to eq CurationConcerns::Operation::FAILURE
+      end
+    end
+
+    describe "with a successes" do
+      let!(:child1) { create(:operation, :successful, parent: parent) }
+      let!(:child2) { create(:operation, :successful, parent: parent) }
+      it "sets status to success" do
+        parent.rollup_status
+        expect(parent.status).to eq CurationConcerns::Operation::SUCCESS
+      end
+    end
+  end
+
+  describe "performing!" do
+    it "changes the status to performing" do
+      subject.performing!
+      expect(subject.status).to eq CurationConcerns::Operation::PERFORMING
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: curation_concerns
 version: !ruby/object:Gem::Version
-  version: 0.13.1
+  version: 0.14.0.pre1
 platform: ruby
 authors:
 - Matt Zumwalt
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-22 00:00:00.000000000 Z
+date: 2016-04-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hydra-head
@@ -326,6 +326,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: awesome_nested_set
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: solr_wrapper
   requirement: !ruby/object:Gem::Requirement
@@ -690,6 +704,7 @@ files:
 - app/controllers/curation_concerns/application_controller.rb
 - app/controllers/curation_concerns/classify_concerns_controller.rb
 - app/controllers/curation_concerns/file_sets_controller.rb
+- app/controllers/curation_concerns/operations_controller.rb
 - app/controllers/curation_concerns/permissions_controller.rb
 - app/controllers/curation_concerns/single_use_links_controller.rb
 - app/controllers/curation_concerns/single_use_links_viewer_controller.rb
@@ -756,6 +771,7 @@ files:
 - app/models/concerns/curation_concerns/with_file_sets.rb
 - app/models/concerns/curation_concerns/work_behavior.rb
 - app/models/curation_concerns/classify_concern.rb
+- app/models/curation_concerns/operation.rb
 - app/models/curation_concerns/quick_classification_query.rb
 - app/models/single_use_link.rb
 - app/models/version_committer.rb
@@ -922,6 +938,8 @@ files:
 - app/views/curation_concerns/file_sets/upload/_form.html.erb
 - app/views/curation_concerns/file_sets/upload/_form_fields.html.erb
 - app/views/curation_concerns/file_sets/upload/_script_templates.html.erb
+- app/views/curation_concerns/operations/index.html.erb
+- app/views/curation_concerns/operations/show.html.erb
 - app/views/curation_concerns/permissions/confirm.html.erb
 - app/views/curation_concerns/single_use_links_viewer/show.html.erb
 - app/views/embargoes/_embargo_history.html.erb
@@ -998,6 +1016,7 @@ files:
 - lib/generators/curation_concerns/templates/curation_concerns.scss
 - lib/generators/curation_concerns/templates/curation_concerns_helper.rb
 - lib/generators/curation_concerns/templates/migrations/create_checksum_audit_logs.rb
+- lib/generators/curation_concerns/templates/migrations/create_operations.rb
 - lib/generators/curation_concerns/templates/migrations/create_single_use_links.rb
 - lib/generators/curation_concerns/templates/migrations/create_version_committers.rb
 - lib/generators/curation_concerns/work/USAGE
@@ -1036,6 +1055,7 @@ files:
 - spec/abilities/embargo_and_lease_ability_spec.rb
 - spec/abilities/file_set_abilities_spec.rb
 - spec/abilities/generic_work_abilities_spec.rb
+- spec/abilities/operation_ability_spec.rb
 - spec/actors/curation_concerns/add_to_collections_actor_spec.rb
 - spec/actors/curation_concerns/embargo_actor_spec.rb
 - spec/actors/curation_concerns/file_actor_spec.rb
@@ -1051,6 +1071,7 @@ files:
 - spec/controllers/curation_concerns/file_sets_controller_spec.rb
 - spec/controllers/curation_concerns/generic_works_controller_json_spec.rb
 - spec/controllers/curation_concerns/generic_works_controller_spec.rb
+- spec/controllers/curation_concerns/operations_controller_spec.rb
 - spec/controllers/curation_concerns/permissions_controller_spec.rb
 - spec/controllers/curation_concerns/single_use_links_controller_spec.rb
 - spec/controllers/curation_concerns/single_use_links_viewer_controller_spec.rb
@@ -1063,6 +1084,7 @@ files:
 - spec/factories/create_curation_concern.rb
 - spec/factories/file_sets.rb
 - spec/factories/generic_works.rb
+- spec/factories/operations.rb
 - spec/factories/users.rb
 - spec/features/add_file_spec.rb
 - spec/features/catalog_search_spec.rb
@@ -1123,6 +1145,7 @@ files:
 - spec/models/collection_spec.rb
 - spec/models/curation_concerns/collection_behavior_spec.rb
 - spec/models/curation_concerns/file_set/derivatives_spec.rb
+- spec/models/curation_concerns/operation_spec.rb
 - spec/models/curation_concerns/work_behavior_spec.rb
 - spec/models/file_set_spec.rb
 - spec/models/generic_work_spec.rb
@@ -1219,9 +1242,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.5.1
@@ -1234,6 +1257,7 @@ test_files:
 - spec/abilities/embargo_and_lease_ability_spec.rb
 - spec/abilities/file_set_abilities_spec.rb
 - spec/abilities/generic_work_abilities_spec.rb
+- spec/abilities/operation_ability_spec.rb
 - spec/actors/curation_concerns/add_to_collections_actor_spec.rb
 - spec/actors/curation_concerns/embargo_actor_spec.rb
 - spec/actors/curation_concerns/file_actor_spec.rb
@@ -1249,6 +1273,7 @@ test_files:
 - spec/controllers/curation_concerns/file_sets_controller_spec.rb
 - spec/controllers/curation_concerns/generic_works_controller_json_spec.rb
 - spec/controllers/curation_concerns/generic_works_controller_spec.rb
+- spec/controllers/curation_concerns/operations_controller_spec.rb
 - spec/controllers/curation_concerns/permissions_controller_spec.rb
 - spec/controllers/curation_concerns/single_use_links_controller_spec.rb
 - spec/controllers/curation_concerns/single_use_links_viewer_controller_spec.rb
@@ -1261,6 +1286,7 @@ test_files:
 - spec/factories/create_curation_concern.rb
 - spec/factories/file_sets.rb
 - spec/factories/generic_works.rb
+- spec/factories/operations.rb
 - spec/factories/users.rb
 - spec/features/add_file_spec.rb
 - spec/features/catalog_search_spec.rb
@@ -1321,6 +1347,7 @@ test_files:
 - spec/models/collection_spec.rb
 - spec/models/curation_concerns/collection_behavior_spec.rb
 - spec/models/curation_concerns/file_set/derivatives_spec.rb
+- spec/models/curation_concerns/operation_spec.rb
 - spec/models/curation_concerns/work_behavior_spec.rb
 - spec/models/file_set_spec.rb
 - spec/models/generic_work_spec.rb