ddr-models 2.5.3 → 2.6.0.rc1

data/spec/support/shared_examples_for_ddr_models.rb

@@ -30,11 +30,63 @@ RSpec.shared_examples "a DDR model" do
     end
   end
 
+  describe "notification on create" do
+    let(:events) { [] }
+    before {
+      @subscriber = ActiveSupport::Notifications.subscribe("create.#{described_class.to_s.underscore}") do |name, start, finish, id, payload|
+        events << payload
+      end
+    }
+    after {
+      ActiveSupport::Notifications.unsubscribe(@subscriber)
+    }
+    it "happens after create" do
+      subject.title = [ "My Title Changed" ]
+      subject.save
+      subject.title = [ "My Title Changed Again" ]
+      subject.save
+      expect(events.size).to eq(1)
+      expect(events.first[:pid]).to eq(subject.pid)
+    end
+  end
+
+  describe "notification on workflow state change" do
+    let(:events) { [] }
+    before {
+      @subscriber = ActiveSupport::Notifications.subscribe(/workflow\.#{described_class.to_s.underscore}/) do |*args|
+        events << ActiveSupport::Notifications::Event.new(*args)
+      end
+    }
+    after {
+      ActiveSupport::Notifications.unsubscribe(@subscriber)
+    }
+    it "doesn't happen on create" do
+      subject.workflow_state = "published"
+      subject.save(validate: false)
+      expect(events).to be_empty
+    end
+    describe "with a previously persisted object" do
+      before do
+        subject.save(validate: false)
+      end
+      it "happens on publish!" do
+        subject.workflow_state = "published"
+        subject.save(validate: false)
+        expect(events.size).to eq(1)
+        expect(events.first.name).to eq("published.workflow.#{described_class.to_s.underscore}")
+      end
+      it "happens on unpublish!" do
+        subject.workflow_state = "unpublished"
+        subject.save(validate: false)
+        expect(events.size).to eq(1)
+        expect(events.first.name).to eq("unpublished.workflow.#{described_class.to_s.underscore}")
+      end
+    end
+  end
+
   describe "events" do
     before {
-      subject.permanent_id = "ark:/99999/fk4zzz"
       subject.save(validate: false)
-      allow(Ddr::Jobs::PermanentId::MakeUnavailable).to receive(:perform) { nil }
     }
     describe "deaccession" do
       it "creates a deaccession event" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ddr-models
 version: !ruby/object:Gem::Version
-  version: 2.5.3
+  version: 2.6.0.rc1
 platform: ruby
 authors:
 - Jim Coble
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-02 00:00:00.000000000 Z
+date: 2016-12-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -17,14 +17,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.1.6
+        version: '4.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.1.6
+        version: '4.1'
 - !ruby/object:Gem::Dependency
   name: activeresource
   requirement: !ruby/object:Gem::Requirement
@@ -241,6 +241,20 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: 3.4.4
+- !ruby/object:Gem::Dependency
+  name: edtf
+  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: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -382,6 +396,7 @@ files:
 - config/initializers/active_fedora_base.rb
 - config/initializers/active_fedora_datastream.rb
 - config/initializers/devise.rb
+- config/initializers/rsolr_monkey_patches.rb
 - config/initializers/subscriptions.rb
 - config/locales/ddr-models.en.yml
 - config/routes.rb
@@ -501,13 +516,11 @@ files:
 - lib/ddr/jobs/fits_file_characterization.rb
 - lib/ddr/jobs/fixity_check.rb
 - lib/ddr/jobs/job.rb
-- lib/ddr/jobs/permanent_id.rb
 - lib/ddr/jobs/queue.rb
 - lib/ddr/jobs/update_index.rb
 - lib/ddr/managers.rb
 - lib/ddr/managers/derivatives_manager.rb
 - lib/ddr/managers/manager.rb
-- lib/ddr/managers/permanent_id_manager.rb
 - lib/ddr/managers/technical_metadata_manager.rb
 - lib/ddr/managers/workflow_manager.rb
 - lib/ddr/metadata.rb
@@ -723,9 +736,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.4.3

data/lib/ddr/jobs/permanent_id.rb

@@ -1,35 +0,0 @@
-require "ezid-client"
-
-module Ddr
-  module Jobs
-    module PermanentId
-
-      class Job
-        def self.inherited(subclass)
-          subclass.instance_variable_set("@queue", :permanent_id)
-        end
-      end
-
-      class MakeUnavailable < Job
-        def self.call(*args)
-          event = ActiveSupport::Notifications::Event.new(*args)
-          id = event.payload[:permanent_id]
-          reason = case event.name.split(".").first
-                   when "destroy"
-                     "deleted"
-                   when "deaccession"
-                     "deaccessioned"
-                   end
-          Resque.enqueue(self, id, reason) if id.present?
-        end
-
-        def self.perform(id, reason = nil)
-          identifier = Ezid::Identifier.find(id)
-          identifier.unavailable!(reason)
-          identifier.save
-        end
-      end
-
-    end
-  end
-end

data/lib/ddr/managers/permanent_id_manager.rb

@@ -1,93 +0,0 @@
-require "ezid-client"
-require "resque"
-
-module Ddr
-  module Managers
-    #
-    # PermanentIdManager is responsible for managing the permanent id for an object.
-    #
-    # @api private
-    #
-    class PermanentIdManager
-
-      PERMANENT_URL_BASE = "https://idn.duke.edu/"
-      ASSIGN_EVENT_SUMMARY = "Permanent ID assignment"
-      SOFTWARE = Ezid::Client.version
-      FCREPO3_PID = "fcrepo3.pid"
-
-      attr_reader :object
-
-      def initialize(object)
-        @object = object
-      end
-
-      def assign_later
-        Resque.enqueue(AssignmentJob, object.pid)
-      end
-
-      def assign
-        raise Ddr::Models::Error, "Permanent ID already assigned." if object.permanent_id
-        ActiveSupport::Notifications.instrument(Ddr::Notifications::UPDATE,
-                                                pid: object.pid,
-                                                software: SOFTWARE,
-                                                summary: ASSIGN_EVENT_SUMMARY
-                                                ) do |payload|
-
-          assign!
-          payload[:detail] = <<-EOS
-Permanent ID:  #{object.permanent_id}
-Permanent URL: #{object.permanent_url}
-EZID Metadata:
-#{record.metadata}
-          EOS
-        end
-      end
-
-      # A job class for background execution
-      class AssignmentJob
-        @queue = :permanent_id
-
-        def self.perform(pid)
-          object = ActiveFedora::Base.find(pid)
-          object.permanent_id_manager.assign
-        end
-      end
-
-      def default_metadata
-        { :profile => "dc",
-          :export => "no",
-          FCREPO3_PID => object.pid
-        }
-      end
-
-      def record
-        return @record if @record
-        if object.permanent_id
-          @record = Ezid::Identifier.find(object.permanent_id.to_s)
-        end
-      end
-
-      private
-
-        def assign!
-          @record = mint
-          object.permanent_id = record.id
-          object.permanent_url = (PERMANENT_URL_BASE + object.permanent_id)
-          object.save!
-        end
-
-        # @return [Ezid::Identifier]
-        def mint
-          ezid = Ezid::Identifier.create(default_metadata)
-          ezid.target = default_target_url(ezid.id)
-          ezid.save
-          ezid
-        end
-
-        def default_target_url(id)
-          Ddr::Models.permanent_id_target_url_base + id
-        end
-
-    end
-  end
-end