ddr-batch 2.0.0.beta.3 → 2.0.0.beta.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: edade02b9a093a2f96346cdd4c1be1a96dc72aca
-  data.tar.gz: 1cf48aa8494ccec2da2da86c76392c1b85269aa4
+  metadata.gz: eb88c80bdd36e256c998ae23cd5aa4152d583369
+  data.tar.gz: ff13f909b3e1f6173a2f3ec3d03beb2a3a6ba9c0
 SHA512:
-  metadata.gz: 87c19f8e727145795d87fb8e97a738049976da148b0030bf17efba95174b577c5a33224581577196a20ace8525edd8604d4b560bafe7de147f4d45545ee03136
-  data.tar.gz: 828a723bedeb17d3906f7ada5ea4a1b9485ecd125b60b67ef44f4e4fa20213506e576cd92bfc392254572aad55206ae28e71123320b7d2ba96f10d481762aa31
+  metadata.gz: 18a68231aa5aeed449af52933b358a85a1351266a5a7ffa8bd835920c2f39a3fd6cd39764172d21a1a6334a4960a1a7ffdface24d009f2f57a7cb161195c3ac5
+  data.tar.gz: 094397923c548008387114c51f01703a488ab55640b62b8456bc0bbb2892d2f3cc829a435d875fe303a24f37ed3fd7aa9c950171fee6829a90748e2154c7ce36

data/app/models/ddr/batch/batch_object.rb

@@ -138,8 +138,8 @@ module Ddr::Batch
               verifications["#{r.name} relationship is correct"] = verify_relationship(repo_object, r)
             end
           end
-          result = Ddr::Actions::FixityCheck.execute repo_object
-          verifications["Fixity check"] = result.success ? VERIFICATION_PASS : VERIFICATION_FAIL
+          result = repo_object.check_fixity
+          verifications["Fixity check"] = result.success? ? VERIFICATION_PASS : VERIFICATION_FAIL
         end
         verifications
       end
@@ -158,10 +158,10 @@ module Ddr::Batch
 
       def verify_attribute(repo_object, attribute)
         verified = case attribute.datastream
-          when 'descMetadata'
-            repo_object.descMetadata.values(attribute.name).include?(attribute.value)
-          when 'adminMetadata'
-            repo_object.adminMetadata.values(attribute.name).include?(attribute.value)
+          when Ddr::Models::Metadata::DESC_METADATA
+            repo_object.desc_metadata.values(attribute.name).include?(attribute.value)
+          when Ddr::Models::Metadata::ADMIN_METADATA
+            repo_object.admin_metadata.values(attribute.name).include?(attribute.value)
         end
         verified ? VERIFICATION_PASS : VERIFICATION_FAIL
       end
@@ -219,7 +219,7 @@ module Ddr::Batch
 
       def clear_attributes(repo_object, attribute)
         Ddr::Models::DescriptiveMetadata.unqualified_names.each do |term|
-          repo_object.descMetadata.set_values(term, nil) if repo_object.descMetadata.values(term)
+          repo_object.desc_metadata.set_values(term, nil) if repo_object.descMetadata.values(term)
         end
         return repo_object
       end

data/app/models/ddr/batch/batch_object_attribute.rb

@@ -28,7 +28,7 @@ module Ddr::Batch
 
     def valid_datastream_operation
       if operation == OPERATION_CLEAR_ALL
-        unless datastream == 'descMetadata'
+        unless datastream == Ddr::Models::Metadata::DESC_METADATA
           errors.add(:operation, "Operation #{operation} is not valid for #{datastream}")
         end
       end
@@ -55,14 +55,14 @@ module Ddr::Batch
     end
 
     def datastream_valid?
-        [ 'adminMetadata', 'descMetadata' ].include?(datastream)
+        [ Ddr::Models::Metadata::ADMIN_METADATA, Ddr::Models::Metadata::DESC_METADATA ].include?(datastream)
     end
 
     def attribute_name_valid?
       case datastream
-        when 'adminMetadata'
+        when Ddr::Models::Metadata::ADMIN_METADATA
           batch_object.model.constantize.properties.include?(name)
-        when 'descMetadata'
+        when Ddr::Models::Metadata::DESC_METADATA
           Ddr::Models::DescriptiveMetadata.unqualified_names.include?(name.to_sym)
       end
     end

data/lib/ddr/batch/version.rb

@@ -1,5 +1,5 @@
 module Ddr
   module Batch
-    VERSION = "2.0.0.beta.3"
+    VERSION = "2.0.0.beta.4"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ddr-batch
 version: !ruby/object:Gem::Version
-  version: 2.0.0.beta.3
+  version: 2.0.0.beta.4
 platform: ruby
 authors:
 - Jim Coble
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-16 00:00:00.000000000 Z
+date: 2016-02-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails