hydra-works 0.11.0 → 0.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1ab0358efa05c2000773dbf94f9fdce307613889
-  data.tar.gz: 15dddd5f77310395add9882e5cf2887135bf0721
+  metadata.gz: e77105c445c81cd7873a54cad597eadb5a198fe0
+  data.tar.gz: 7d44f5ff84c003281edbc1bddc215990d82fdd6d
 SHA512:
-  metadata.gz: 2063fa30e2d4f5d26cd34d8b6968bcb046b414375a3c704974f10678630f4d72bf4bc92cec360734b6119c539b30eb28c3143b544cf7d9026e7b75d5ee95d151
-  data.tar.gz: 9002fa2a214853d15d44ff95eb96009d8d78c0a3e6bc826309d0bb7475cc0de7b69c7c4a9d69a8c6d5aa27433d3d152a200ba246e56faa35c7986483d00ac8db
+  metadata.gz: 64a1886d82a60a5924ca47df852189f02018d2c258385a0a537394946974291d0e09a3c54c4cadda75c1fadc94b74b1a3b1e0b8278d13d48aeb11c2270f362f6
+  data.tar.gz: 9de36d3c3e4c1c60a8f257f15794bbe6f5494adff7a6e6b1c466cea7796dae3a8d3fbd02e0981abb2786205f0e62134dfb7d91dd0fa139bf14c8014fcd38bf31

data/lib/hydra/works/characterization.rb

@@ -10,7 +10,7 @@ module Hydra::Works
 
       def mapper_defaults
         { audio_duration: :duration, audio_sample_rate: :sample_rate, exif_tool_version: :exif_version,
-          file_author: :creator, file_language: :language, file_mime_type: :has_mime_type,
+          file_author: :creator, file_language: :language, file_mime_type: :mime_type,
           video_audio_sample_rate: :sample_rate, video_duration: :duration, video_height: :height,
           video_sample_rate: :sample_rate, video_width: :width }
       end

data/lib/hydra/works/characterization/schema/base_schema.rb

@@ -8,6 +8,5 @@ module Hydra::Works::Characterization
     property :fits_version, predicate: RDF::Vocab::PREMIS.hasCreatingApplicationVersion
     property :exif_version, predicate: RDF::Vocab::EXIF.exifVersion
     property :original_checksum, predicate: RDF::Vocab::NFO.hashValue
-    property :mime_type, predicate: RDF::Vocab::EBUCore.hasMimeType
   end
 end

data/lib/hydra/works/services/characterization_service.rb

@@ -37,6 +37,7 @@ module Hydra::Works
       def source_to_content
         return object.content if source.nil?
         return File.open(source).read if source.is_a? String
+        source.rewind
         source.read
       end
 
@@ -99,8 +100,8 @@ module Hydra::Works
       end
 
       def append_property_value(property, value)
-        value = object.send(property) + [value]
-        object.send("#{property}=", value.uniq)
+        value = object.send(property) + [value] unless property == :mime_type
+        object.send("#{property}=", value)
       end
   end
 end

data/lib/hydra/works/version.rb

@@ -1,5 +1,5 @@
 module Hydra
   module Works
-    VERSION = '0.11.0'.freeze
+    VERSION = '0.12.0'.freeze
   end
 end

data/spec/hydra/works/characterization_spec.rb

@@ -10,7 +10,7 @@ describe Hydra::Works::Characterization do
       it { is_expected.to respond_to(:file_name) }
       it { is_expected.to respond_to(:file_size) }
       it { is_expected.to respond_to(:date_created) }
-      it { is_expected.to respond_to(:has_mime_type) }
+      it { is_expected.to respond_to(:mime_type) }
       it { is_expected.to respond_to(:date_modified) }
       it { is_expected.to respond_to(:byte_order) }
     end
@@ -23,7 +23,6 @@ describe Hydra::Works::Characterization do
       it { is_expected.to respond_to(:fits_version) }
       it { is_expected.to respond_to(:exif_version) }
       it { is_expected.to respond_to(:original_checksum) }
-      it { is_expected.to respond_to(:mime_type) }
     end
     context "with Image schema" do
       it { is_expected.to respond_to(:byte_order) }

data/spec/hydra/works/services/characterization_service_spec.rb

@@ -16,9 +16,10 @@ describe Hydra::Works::CharacterizationService do
       expect(file.file_size).to eq(["7618"])
       expect(file.file_title).to eq(["sample-file"])
       expect(file.page_count).to eq(["1"])
-      # Persist and reload from persistence layer
-      expect(file.save).to be nil
-      expect(file.reload).to be nil
+      # Persist our file with some content and reload
+      file.content = "junk"
+      expect(file.save).to be true
+      expect(file.reload).to eq({})
       # Re-check property values
       expect(file.file_size).to eq(["7618"])
       expect(file.file_title).to eq(["sample-file"])
@@ -73,6 +74,7 @@ describe Hydra::Works::CharacterizationService do
       it 'passes the File to FileCharacterization.' do
         file_inst = File.new(File.join(fixture_path, filename))
         expect(Hydra::FileCharacterization).to receive(:characterize).with(file_content, filename, :fits)
+        expect(file_inst).to receive(:rewind)
         described_class.run(file, file_inst)
       end
     end
@@ -151,7 +153,7 @@ describe Hydra::Works::CharacterizationService do
       let(:fits_response) { IO.read(File.join(fixture_path, fits_filename)) }
 
       it 'assigns expected values to audio properties.' do
-        expect(file.has_mime_type).to eq(["audio/mpeg"])
+        expect(file.mime_type).to eq("audio/mpeg")
         expect(file.duration).to eq(["0:0:15:261"])
         expect(file.sample_rate).to eq(["44100"])
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hydra-works
 version: !ruby/object:Gem::Version
-  version: 0.11.0
+  version: 0.12.0
 platform: ruby
 authors:
 - Justin Coyne
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-17 00:00:00.000000000 Z
+date: 2016-05-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hydra-pcdm
@@ -304,7 +304,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.6.4
 signing_key: 
 specification_version: 4
 summary: Fundamental repository data model for hydra