ddr-models 3.0.4 → 3.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 14a5ebae258900b3ecacd4333e27c10b8155fe3d
-  data.tar.gz: 73c7362207e3f7ce2bec8a212e9b48dcbe40d1d1
+  metadata.gz: 25b698d864605b30560a52da370edfb2aee42519
+  data.tar.gz: 65bb6a5854806d2e432b6d837c6cb4f1ff4fb73e
 SHA512:
-  metadata.gz: 95ba2765a7f3173831984f2743fe375771dcc7fe75ef5a4aa0a76de85d0f38700aadb7b5420e1c7269dbb6d15856a30f000347afe8da571388dbfa75892a06e3
-  data.tar.gz: f924f57463b6c6e348c02528c53636b2ec00e7de189b2e8077081d6e7fd8a6a747626398ce722701cc41a4b3cabdfce3f99f78d4afc3e9f28719ad17c2ab3a06
+  metadata.gz: bbdaa4da26ee09bc60d25e7282e2d49308dd61eea88b7e6c24304845cceb9054c42db497ea16700353bed2833ccdb6f6e83ee708dce0713b435e1e8eb2a285d8
+  data.tar.gz: 5c79458107d236444075c651fb32d0b465f370362a4a0be30a089bb9f893c0338441f39a56f171831cb548b20ae303ccf9d3fcdefda7bc39dda49413c7530118

data/lib/ddr/models.rb

@@ -27,7 +27,6 @@ module Ddr
     autoload :AdminSet
     autoload :AttachedFileProfile
     autoload :AttachedFilesProfile
-    autoload :AutoVersion
     autoload :Base
     autoload :ChecksumInvalid, 'ddr/models/error'
     autoload :Contact
@@ -57,7 +56,6 @@ module Ddr
     autoload :UrlSafeId
     autoload :Validatable
     autoload :Validator
-    autoload :Versionable
     autoload :WithContentFile
     autoload :YearFacet
 

data/lib/ddr/models/base.rb

@@ -9,7 +9,6 @@ module Ddr::Models
     include Indexing
     include Hydra::Validations
     include HasAdminMetadata
-    # extend AutoVersion
     extend Relation
 
     SAVE_NOTIFICATION = "save.base.models.ddr"
@@ -184,5 +183,12 @@ module Ddr::Models
       raise NotImplementedError, "Must be implemented by subclasses"
     end
 
+    # Override AF::Versionable
+    # @example
+    #   => "version.20160205153424.643252000"
+    def version_name
+      "version.#{Time.now.utc.strftime('%Y%m%d%H%M%S.%N')}"
+    end
+
   end
 end

data/lib/ddr/models/version.rb

@@ -1,5 +1,5 @@
 module Ddr
   module Models
-    VERSION = "3.0.4"
+    VERSION = "3.0.5"
   end
 end

data/spec/support/shared_examples_for_ddr_models.rb

@@ -1,3 +1,5 @@
+require "time"
+
 RSpec.shared_examples "a DDR model" do
   describe "#desc_metadata_terms" do
     it "should have a default value" do
@@ -237,4 +239,12 @@ RSpec.shared_examples "a DDR model" do
       expect(events).to eq([subject.id])
     }
   end
+
+  describe "#version_name" do
+    let(:now) { DateTime.parse("2016-06-29T18:01:15Z").to_time }
+    before {
+      allow(Time).to receive(:now) { now }
+    }
+    its(:version_name) { is_expected.to eq("version.20160629180115.000000000") }
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ddr-models
 version: !ruby/object:Gem::Version
-  version: 3.0.4
+  version: 3.0.5
 platform: ruby
 authors:
 - Jim Coble
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-22 00:00:00.000000000 Z
+date: 2016-06-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -532,7 +532,6 @@ files:
 - lib/ddr/models/admin_set.rb
 - lib/ddr/models/attached_file_profile.rb
 - lib/ddr/models/attached_files_profile.rb
-- lib/ddr/models/auto_version.rb
 - lib/ddr/models/base.rb
 - lib/ddr/models/contact.rb
 - lib/ddr/models/engine.rb
@@ -576,7 +575,6 @@ files:
 - lib/ddr/models/validatable.rb
 - lib/ddr/models/validator.rb
 - lib/ddr/models/version.rb
-- lib/ddr/models/versionable.rb
 - lib/ddr/models/with_content_file.rb
 - lib/ddr/models/year_facet.rb
 - lib/ddr/notifications.rb

data/lib/ddr/models/auto_version.rb

@@ -1,13 +0,0 @@
-module Ddr::Models
-  module AutoVersion
-
-    def self.extended(base)
-      base.include Versionable
-
-      base.class_eval do
-        after_save :create_version
-      end
-    end
-
-  end
-end

data/lib/ddr/models/versionable.rb

@@ -1,12 +0,0 @@
-module Ddr::Models
-  module Versionable
-
-    # Override AF::Versionable
-    # @example
-    #   => "version.20160205153424.643252000"
-    def version_name
-      "version.#{Time.now.utc.strftime('%Y%m%d%H%M%S.%N')}"
-    end
-
-  end
-end