ddr-models 3.0.0.beta.21 → 3.0.0.beta.22

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a4e3d477eef945d6636d2efdfd19053988b54b7b
-  data.tar.gz: 9775e2a63e01749a0594c131803133e57e38156a
+  metadata.gz: be76ea6556d342a363b32dbb38bad6951106d26f
+  data.tar.gz: 9847925960b3a93eec7de2fba2b2e5f3b5a4148b
 SHA512:
-  metadata.gz: d9180d73d0e6c23c52bba318e5cf823172531819fc16696ec885a342a2ffde4918fa97167bcd093d1a64f0c5f7a3d428c6dd83f4c494f72a8b757650541af58e
-  data.tar.gz: d04f18db69f8183c65d6eef39ccfe915a220b5b4914f9a20ecea5f5add682e78d9bb709d5d572c1ad5ce45a7281130a7197f2cf0ef44e1b4214af48ac33e1dda
+  metadata.gz: 8107313d9506c0070bc6cd3b67807b823e511ea95f7cc1c461cbed2b40b983a67e777822bd63428c8e3d9fdd5fcb89e4f453b42a242e19b1b958f39f3c499a37
+  data.tar.gz: d5d0fdc1fa5b567e0a523d9192c1fbb14eeb5b59bce69e7162c3981677caa03b895e156d1b5882cbf5bcbae509f3a322d381c4e192d0464f3d954386e4563b23

data/Gemfile

@@ -3,3 +3,4 @@ source 'https://rubygems.org'
 gemspec
 
 gem "devise"
+gem "linkeddata", "<= 1.99.0"

data/lib/ddr/models.rb

@@ -50,7 +50,6 @@ module Ddr
     autoload :HasThumbnail
     autoload :Indexing
     autoload :NotFoundError, 'ddr/models/error'
-    autoload :ObjectApi
     autoload :Relation
     autoload :SolrDocument
     autoload :StructDiv

data/lib/ddr/models/base.rb

@@ -2,7 +2,6 @@ module Ddr::Models
   class Base < ActiveFedora::Base
     extend Deprecation
 
-    include ObjectApi
     include Governable
     include HasThumbnail
     include EventLoggable
@@ -13,6 +12,12 @@ module Ddr::Models
     extend AutoVersion
     extend Relation
 
+    SAVE_NOTIFICATION = "save.base.models.ddr"
+
+    after_save do
+      ActiveSupport::Notifications.instrument(SAVE_NOTIFICATION, id: id)
+    end
+
     after_destroy do
       notify_event :deletion
     end

data/lib/ddr/models/solr_document.rb

@@ -4,7 +4,6 @@ module Ddr::Models
   module SolrDocument
     extend ActiveSupport::Concern
     extend Deprecation
-    include ObjectApi
 
     class NotFound < Error; end
 

data/lib/ddr/models/version.rb

@@ -1,5 +1,5 @@
 module Ddr
   module Models
-    VERSION = "3.0.0.beta.21"
+    VERSION = "3.0.0.beta.22"
   end
 end

data/spec/support/shared_examples_for_ddr_models.rb

@@ -213,4 +213,20 @@ RSpec.shared_examples "a DDR model" do
       end
     end
   end
+
+  describe "after save notification" do
+    let(:events) { [] }
+    before {
+      @subscriber = ActiveSupport::Notifications.subscribe(Ddr::Models::Base::SAVE_NOTIFICATION) do |name, start, finish, id, payload|
+        events << payload[:id]
+      end
+    }
+    after {
+      ActiveSupport::Notifications.unsubscribe(@subscriber)
+    }
+    specify {
+      subject.save(validate: false)
+      expect(events).to eq([subject.id])
+    }
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ddr-models
 version: !ruby/object:Gem::Version
-  version: 3.0.0.beta.21
+  version: 3.0.0.beta.22
 platform: ruby
 authors:
 - Jim Coble
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-20 00:00:00.000000000 Z
+date: 2016-04-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -554,7 +554,6 @@ files:
 - lib/ddr/models/metadata/metadata_term.rb
 - lib/ddr/models/metadata/metadata_vocabularies.rb
 - lib/ddr/models/metadata/metadata_vocabulary.rb
-- lib/ddr/models/object_api.rb
 - lib/ddr/models/relation.rb
 - lib/ddr/models/search/catalog.rb
 - lib/ddr/models/search/search_builder.rb

data/lib/ddr/models/object_api.rb

@@ -1,11 +0,0 @@
-module Ddr::Models
-  #
-  # ObjectApi
-  #
-  # Common methods abstracted from classes that represent repository objects,
-  # principally SolrDocument and subclasses of Ddr::Models::Base.
-  #
-  module ObjectApi
-
-  end
-end