ddr-batch 2.0.0.beta.5 → 2.0.0.beta.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f52b28b53930c0204458dbfb40709475be9ae4bf
-  data.tar.gz: 4da8fc233fd01452375a83f61b674db283ebc699
+  metadata.gz: 73747d4603387e4d1eaf62e58ac7546f363c43ab
+  data.tar.gz: 3787b5ec988f6ad56317f58045247e184abb7d37
 SHA512:
-  metadata.gz: 7121eb02f4b7bbc39602e700998acd052488252876f28d98ef6aca4afcfd14caacaff09b170727651a559fbb482aed3a0d42f17e464eebd7b5051749d675c4c0
-  data.tar.gz: ad3d409b1a6eef57973011a66da9884349cecaafdd1570d90814aecc366f68505ff743e78526448ac386ba5b05096f185189f85c2de6b6120a89c30df5c07f73
+  metadata.gz: b43787906e4b2a0ef85305f28b6af85fdfa85ebbf05431bf2e24a7017a04fe41f391ddec66556c144bd3807c7f42f52cce001b7a25b8b716ed5e2e5c6ab80c7a
+  data.tar.gz: 659690a12708499ff7ae8c7e45b7907ab62c789e5b89c07d9f374ac7c0257a8b0843210fadd96ee893e02394af2487b478bf7a6e7be10f74cd0d9f89e96977e2

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

@@ -167,8 +167,8 @@ module Ddr::Batch
       end
 
       def verify_datastream(repo_object, datastream)
-        if repo_object.datastreams.include?(datastream.name) &&
-            repo_object.datastreams[datastream.name].has_content?
+        if repo_object.attached_files.include?(datastream.name) &&
+            repo_object.attached_files[datastream.name].has_content?
           VERIFICATION_PASS
         else
           VERIFICATION_FAIL
@@ -176,7 +176,7 @@ module Ddr::Batch
       end
 
       def verify_datastream_external_checksum(repo_object, datastream)
-        repo_object.datastreams[datastream.name].validate_checksum! datastream.checksum, datastream.checksum_type
+        repo_object.attached_files[datastream.name].validate_checksum! datastream.checksum, datastream.checksum_type
         return VERIFICATION_PASS
       rescue Ddr::Models::ChecksumInvalid
         return VERIFICATION_FAIL
@@ -199,7 +199,7 @@ module Ddr::Batch
         relationship_object_class = Ddr::Utils.reflection_object_class(relationship_reflection)
         relationship_object = repo_object.send(relationship.name)
         if !relationship_object.nil? &&
-            relationship_object.pid.eql?(repo_object_id) &&
+            relationship_object.id.eql?(repo_object_id) &&
             relationship_object.is_a?(relationship_object_class)
           VERIFICATION_PASS
         else
@@ -219,7 +219,7 @@ module Ddr::Batch
 
       def clear_attributes(repo_object, attribute)
         Ddr::Models::DescriptiveMetadata.unqualified_names.each do |term|
-          repo_object.desc_metadata.set_values(term, nil) if repo_object.descMetadata.values(term)
+          repo_object.desc_metadata.set_values(term, nil) if repo_object.desc_metadata.values(term)
         end
         return repo_object
       end
@@ -228,12 +228,12 @@ module Ddr::Batch
         case datastream[:payload_type]
         when BatchObjectDatastream::PAYLOAD_TYPE_BYTES
           ds_content = datastream[:payload]
-          if repo_object.datastreams[datastream[:name]].is_a? ActiveFedora::RDFDatastream
+          if repo_object.attached_files[datastream[:name]].is_a? ActiveFedora::RDFDatastream
             ds_content = set_rdf_subject(repo_object, ds_content)
           end
-          repo_object.datastreams[datastream[:name]].content = ds_content
+          repo_object.attached_files[datastream[:name]].content = ds_content
         when BatchObjectDatastream::PAYLOAD_TYPE_FILENAME
-          if repo_object.datastreams[datastream[:name]].is_a? ActiveFedora::RDFDatastream
+          if repo_object.attached_files[datastream[:name]].is_a? ActiveFedora::RDFDatastream
             ds_content = set_rdf_subject(repo_object, File.read(datastream[:payload]))
             mime_type = "application/n-triples"
           else

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

@@ -9,7 +9,7 @@ module Ddr::Batch
     end
 
     def model_datastream_keys
-      model.constantize.new.datastreams.keys
+      model.constantize.new.attached_files.keys
     end
 
     def process(user, opts = {})
@@ -31,7 +31,7 @@ module Ddr::Batch
       repo_object = create_repository_object
       if !repo_object.nil? && !repo_object.new_record?
         ingest_outcome_detail = []
-        ingest_outcome_detail << "Ingested #{model} #{identifier} into #{repo_object.pid}"
+        ingest_outcome_detail << "Ingested #{model} #{identifier} into #{repo_object.id}"
         Ddr::Events::IngestionEvent.new.tap do |event|
           event.object = repo_object
           event.user = user
@@ -76,7 +76,7 @@ module Ddr::Batch
       begin
         repo_object = model.constantize.new(:id => repo_pid)
         repo_object.save(validate: false)
-        update_attributes(:pid => repo_object.pid)
+        update_attributes(:pid => repo_object.id)
         batch_object_attributes.each { |a| repo_object = add_attribute(repo_object, a) }
         batch_object_datastreams.each { |d| repo_object = populate_datastream(repo_object, d) }
         batch_object_relationships.each { |r| repo_object = add_relationship(repo_object, r) }

data/lib/ddr/batch/version.rb

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

metadata

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