ddr-models 3.0.0.beta.8 → 3.0.0.beta.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b9040fdb0b6cda2736d299291211c5a4dde620d7
-  data.tar.gz: 42b318beb27882963fc49a4d1278cb94e1116851
+  metadata.gz: 423038a832d4b54a31f8f97b4db56125f018baae
+  data.tar.gz: c0a001fc155f0d5b810974cd7800b3b2cd4c2dac
 SHA512:
-  metadata.gz: 54f897c2bd20fe04d9877aa5e7b761fe3a29896128009d03d2cf2b80ab3cca5761cfac041bf11043e2fff9cf879f0bfdd714eb72a4355a934876f76c00a33515
-  data.tar.gz: 8a7a65a4d731561e19baf8b19439bffd467d0ec02cfcf68951af458c4645e1238b04aee7b8497ce2f16d1d015423cf6dc8e99776b5f431d94fdf44ae3ce71332
+  metadata.gz: d9fc9f1685c4cd2401742d4604da2f36e68cb02f5a4a40e6933e5c460b15c48f14f39d1e0eccb5f78cfb608504b4569fdb80bf6dabb0805a22ced925fc322775
+  data.tar.gz: 1ebe59d6ab822b9abbecbde28876a0bdc050533e6b3cf965056bf4a4105de19037bf5e48dc64e25777f2433936e90432ac58d1e7fbc2b6bdd9595193cb91fdf6

data/config/initializers/subscriptions.rb

@@ -16,4 +16,3 @@ ActiveSupport::Notifications.subscribe(Ddr::Notifications::UPDATE, Ddr::Events::
 
 # Deletion
 ActiveSupport::Notifications.subscribe(Ddr::Notifications::DELETION, Ddr::Events::DeletionEvent)
-ActiveSupport::Notifications.subscribe(Ddr::Notifications::DELETION, Ddr::Jobs::DeleteMultiresImage)

data/lib/ddr/events/event.rb

@@ -39,9 +39,7 @@ module Ddr
       # Receive message sent by ActiveSupport::Notifications
       def self.call(*args)
         notification = ActiveSupport::Notifications::Event.new(*args)
-        evt = new
-        attrs = notification.payload.dup.keep_if { |k, v| evt.has_attribute?(k) }
-        evt.update(attrs)
+        create(notification.payload)
       end
 
       # Scopes

data/lib/ddr/jobs.rb

@@ -2,7 +2,6 @@ module Ddr
   module Jobs
     extend ActiveSupport::Autoload
 
-    autoload :DeleteMultiresImage
     autoload :FitsFileCharacterization
     autoload :FixityCheck
     autoload :Job

data/lib/ddr/models/base.rb

@@ -14,7 +14,7 @@ module Ddr::Models
     extend AutoVersion
 
     after_destroy do
-      notify_event(:deletion, deletion_event_payload)
+      notify_event :deletion
     end
 
     DescriptiveMetadata.mapping.each do |name, term|
@@ -116,9 +116,5 @@ module Ddr::Models
       self
     end
 
-    def deletion_event_payload
-      {}
-    end
-
   end
 end

data/lib/ddr/models/has_multires_image.rb

@@ -6,9 +6,5 @@ module Ddr::Models
       property :multires_image_file_path, predicate: Ddr::Vocab::Asset.multiresImageFilePath, multiple: false
     end
 
-    def deletion_event_payload
-      super.merge(multires_image_file_path: multires_image_file_path)
-    end
-
   end
 end

data/lib/ddr/models/has_thumbnail.rb

@@ -13,7 +13,7 @@ module Ddr::Models
     def copy_thumbnail_from(other)
       if other && other.has_thumbnail?
         self.thumbnail.content = other.thumbnail.content
-        self.thumbnail.mimeType = other.thumbnail.mimeType if thumbnail_changed?
+        self.thumbnail.mime_type = other.thumbnail.mime_type if thumbnail_changed?
       end
       thumbnail_changed?
     end

data/lib/ddr/models/version.rb

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

data/spec/models/has_thumbnail_spec.rb

@@ -0,0 +1,32 @@
+require 'spec_helper'
+
+module Ddr::Models
+  RSpec.describe HasThumbnail, type: :model do
+
+    let(:component) { Component.new }
+    let(:item) { Item.new }
+
+    describe '#copy_thumbnail_from' do
+      describe 'other has thumbnail' do
+        before do
+          component.thumbnail.content = 'abcdef'
+          component.thumbnail.mime_type = 'image/png'
+        end
+        it "should copy the thumbnail content and mime type" do
+          result = item.copy_thumbnail_from(component)
+          expect(result).to be(true)
+          expect(item.thumbnail.content).to eq('abcdef')
+          expect(item.thumbnail.mime_type).to eq('image/png')
+        end
+      end
+      describe 'other does not hav thumbnail' do
+        it "should copy the thumbnail content and mime type" do
+          result = item.copy_thumbnail_from(component)
+          expect(result).to be(false)
+          expect(item.thumbnail.content).to be_nil
+        end
+      end
+    end
+
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ddr-models
 version: !ruby/object:Gem::Version
-  version: 3.0.0.beta.8
+  version: 3.0.0.beta.9
 platform: ruby
 authors:
 - Jim Coble
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-06 00:00:00.000000000 Z
+date: 2016-02-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -510,7 +510,6 @@ files:
 - lib/ddr/index/sort_order.rb
 - lib/ddr/index/unique_key_field.rb
 - lib/ddr/jobs.rb
-- lib/ddr/jobs/delete_multires_image.rb
 - lib/ddr/jobs/fits_file_characterization.rb
 - lib/ddr/jobs/fixity_check.rb
 - lib/ddr/jobs/job.rb
@@ -707,8 +706,8 @@ files:
 - spec/models/finding_aid_spec.rb
 - spec/models/has_admin_metadata_spec.rb
 - spec/models/has_children_spec.rb
-- spec/models/has_multires_image_spec.rb
 - spec/models/has_struct_metadata_spec.rb
+- spec/models/has_thumbnail_spec.rb
 - spec/models/indexing_spec.rb
 - spec/models/item_spec.rb
 - spec/models/license_spec.rb
@@ -881,8 +880,8 @@ test_files:
 - spec/models/finding_aid_spec.rb
 - spec/models/has_admin_metadata_spec.rb
 - spec/models/has_children_spec.rb
-- spec/models/has_multires_image_spec.rb
 - spec/models/has_struct_metadata_spec.rb
+- spec/models/has_thumbnail_spec.rb
 - spec/models/indexing_spec.rb
 - spec/models/item_spec.rb
 - spec/models/license_spec.rb

data/lib/ddr/jobs/delete_multires_image.rb

@@ -1,21 +0,0 @@
-module Ddr::Jobs
-  class DeleteMultiresImage
-    extend Job
-
-    @queue = :general
-
-    def self.call(*args)
-      event = ActiveSupport::Notifications::Event.new(*args)
-      if event.name == Ddr::Notifications::DELETION &&
-         file_uri = event.payload[:multires_image_file_path]
-        Resque.enqueue(self, file_uri)
-      end
-    end
-
-    def self.perform(file_uri)
-      path = Ddr::Utils.path_from_uri(file_uri)
-      File.unlink(path)
-    end
-
-  end
-end

data/spec/models/has_multires_image_spec.rb

@@ -1,23 +0,0 @@
-module Ddr::Models
-  RSpec.describe HasMultiresImage do
-
-    subject { FactoryGirl.create(:component) }
-
-    describe "cleaning up multires image file after destroy" do
-      before {
-        @file = Tempfile.create('foo')
-        @path = @file.path
-      }
-      after {
-        ::File.unlink(@path) if ::File.exist?(@path)
-      }
-      it "deletes the file" do
-        subject.multires_image_file_path = "file:#{@path}"
-        subject.save!
-        subject.destroy
-        expect(::File.exist?(@path)).to be false
-      end
-    end
-
-  end
-end