ddr-models 3.0.0.beta.12 → 3.0.0.beta.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4f083a735027958d5b91d4c88489f3fb4aa89c5d
-  data.tar.gz: 0a23cbc2083fa5981c83b51bd1fbf886a4b98e40
+  metadata.gz: bd624d042a8843b603251a3e2335de11250c7cc7
+  data.tar.gz: 475629a158b74fcf445d2e75bc6a02df8df0eaab
 SHA512:
-  metadata.gz: a140e0f42c7ccfceee28286980a357be7673b942b04d61ac032d8c6dd0c2f4d267318ea81f79830dce77c404c72ed2f9972efc99ae0eafe6481d10df59075454
-  data.tar.gz: c93e6bb6856409f9ef4fdd728839fc84f41b62073df089792b8b566895aec1b4aa61b0ccd82158538ee3310891a6176a37c78919a623a78de7dbc5dabdf4e778
+  metadata.gz: b9b86d95736d6d52758b5c9102fba56ec686a2e6c7d2e03904d52917009b002b4e6e533c51df410d6ef6ed2922fb38c36ffe7bcdacbeb607c6f6140e26818e10
+  data.tar.gz: 9bc4aab3edea2950ae8115ba3948eb976cb368b2dccb513eace66fb59bc8798e4963e0aea3560a0ec093354485c7a91c9688fefc3f6d9262ded9be1874f71e70

data/lib/ddr/events/fixity_check_event.rb

@@ -12,7 +12,7 @@ module Ddr
       def self.call(*args)
         super do |payload|
           results = payload.delete(:results)
-          payload[:outcome] = results.values.all? ? SUCCESS : FAILURE
+          payload[:outcome] = results.success? ? SUCCESS : FAILURE
           payload[:detail] = "Fixity check results:\n\n#{results}"
         end
       end

data/lib/ddr/models.rb

@@ -39,6 +39,7 @@ module Ddr
     autoload :FileCharacterization
     autoload :FileManagement
     autoload :FindingAid
+    autoload :FixityCheckResults
     autoload :Governable
     autoload :HasAdminMetadata
     autoload :HasAttachments

data/lib/ddr/models/base.rb

@@ -139,10 +139,12 @@ module Ddr::Models
     end
 
     def check_fixity
-      results = attached_files_having_content.each_with_object({}) do |(file_id, file), memo|
-        memo[file_id] = !!file.check_fixity
+      FixityCheckResults.new.tap do |results|
+        attached_files_having_content.each_with_object(results) do |(file_id, file), memo|
+          results[file_id] = !!file.check_fixity
+        end
+        notify_event(:fixity_check, results: results)
       end
-      notify_event(:fixity_check, results: results)
     end
     alias_method :fixity_check, :check_fixity
     deprecation_deprecate :fixity_check

data/lib/ddr/models/fixity_check_results.rb

@@ -0,0 +1,15 @@
+require 'delegate'
+
+module Ddr::Models
+  class FixityCheckResults < SimpleDelegator
+
+    def initialize
+      super Hash.new
+    end
+
+    def success?
+      values.all?
+    end
+
+  end
+end

data/lib/ddr/models/metadata/metadata.rb

@@ -7,7 +7,7 @@ module Ddr::Models
 
     included do
       def self.property_term(term)
-        property_terms[term]
+        property_terms[term.to_sym]
       end
     end
 

data/lib/ddr/models/version.rb

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

data/spec/models/administrative_metadata_spec.rb

@@ -8,6 +8,7 @@ module Ddr::Models
     describe ".property_term" do
       it "should return the correct property term" do
         expect(described_class.property_term(:local_id)).to eq(:local_id)
+        expect(described_class.property_term('local_id')).to eq(:local_id)
       end
     end
 

data/spec/models/descriptive_metadata_spec.rb

@@ -18,6 +18,7 @@ module Ddr::Models
     describe ".property_term" do
       it "should return the correct property term" do
         expect(described_class.property_term(:subject)).to eq(:dc_subject)
+        expect(described_class.property_term('subject')).to eq(:dc_subject)
       end
     end
     describe "using the set_values and add_value methods" do

data/spec/support/shared_examples_for_fixity_checkable_spec.rb

@@ -5,8 +5,25 @@ RSpec.shared_examples "a fixity checkable object" do
       subject.thumbnail.content = '1234567890'
       subject.save(validate: false)
     end
-    it "can check fixity" do
+    specify {
       expect { subject.check_fixity }.to change(subject.fixity_checks, :count).from(0).to(1)
+    }
+    describe "results" do
+      let(:results) { subject.check_fixity }
+      specify {
+        expect(results).to be_success
+      }
+      specify {
+        expect(results[:thumbnail]).to be true
+      }
+      describe "failure" do
+        before {
+          allow(subject.thumbnail).to receive(:check_fixity) { false }
+        }
+        specify {
+          expect(results).not_to be_success
+        }
+      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.12
+  version: 3.0.0.beta.13
 platform: ruby
 authors:
 - Jim Coble
@@ -537,6 +537,7 @@ files:
 - lib/ddr/models/files/fits_xml_file.rb
 - lib/ddr/models/files/structural_metadata_file.rb
 - lib/ddr/models/finding_aid.rb
+- lib/ddr/models/fixity_check_results.rb
 - lib/ddr/models/governable.rb
 - lib/ddr/models/has_admin_metadata.rb
 - lib/ddr/models/has_attachments.rb