ocfl 0.8.0 → 0.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9b1b7553fa1d862a3aa1f6a7f63b148f424f1448c321f7b534776c857ce932f2
-  data.tar.gz: 8408cf71f4a08fc2c44485ea69e6f77eb5e49366a80d460d20e7ab7961ef9442
+  metadata.gz: c21578c64e68d5bdab7fcea3b08bf8210a967a52d0d6b0f2ecdc203a4f2eaca4
+  data.tar.gz: 48503dd0f9011c88bbf20bc6adf073d2b1ff422ac1ed06063c332f7c3bbf619e
 SHA512:
-  metadata.gz: 5420543eb4d07840970600fbc1f4a475e2ae3f09dea57de76087e626ed87a99ec9b02cf4dd38598398fb75aaa1e8eb61fb20d2af4d4b2b9939a269cf811d7b13
-  data.tar.gz: f3f6b84156e307897c3be76ed247043ce5d5f161536267b2ee5cfb8a91b50c6080da57ba6fc5c063349603784a13689ef4bbc74c624cbf302ec3f50810b53307
+  metadata.gz: 74169c05ca7d91082db0198d252234956c7a47139d57419f5be14e8e23168af39e75b9d9e78d397bd1b65fbc688834ee84cd1456d452795163c777c6c7da15c7
+  data.tar.gz: acd185ad8a09d1b016d9c6867d5b4b68005fbe1227abe8848912f917c3d71f4d535cd1847cc4422606fec0d5fc01b9dbf59b6b613c4e5701dfca1703ebae79dc

data/.rubocop.yml

@@ -22,6 +22,9 @@ Metrics/BlockLength:
     - describe
     - context
 
+Metrics/ClassLength:
+  Max: 110
+
 RSpec/MultipleExpectations:
   Enabled: false
 

data/lib/ocfl/object/draft_version.rb

@@ -21,7 +21,9 @@ module OCFL
 
       def move_file(incoming_path)
         prepare_content_directory
-        add(incoming_path)
+        already_stored = add(incoming_path)
+        return if already_stored
+
         FileUtils.mv(incoming_path, content_path)
       end
 
@@ -80,18 +82,26 @@ module OCFL
       # @param [String] logical_file_path where we're going to store the file (e.g. 'object/directory_builder_spec.rb')
       # @param [String] incoming_path where's this file from (e.g. 'spec/ocfl/object/directory_builder_spec.rb')
       def copy_one(logical_file_path, incoming_path)
-        add(incoming_path, logical_file_path:)
+        already_stored = add(incoming_path, logical_file_path:)
+        return if already_stored
+
         parent_dir = (content_path / logical_file_path).parent
         FileUtils.mkdir_p(parent_dir) unless parent_dir == content_path
         FileUtils.cp(incoming_path, content_path / logical_file_path)
       end
 
+      # @return [Boolean] true if the file already existed in this object. If false, the object must be
+      #                   moved to the content directory.
       def add(incoming_path, logical_file_path: File.basename(incoming_path))
         digest = Digest::SHA512.file(incoming_path).to_s
         version_content_path = content_path.relative_path_from(object_directory.object_root)
         file_path_relative_to_root = (version_content_path / logical_file_path).to_s
-        @manifest[digest] = [file_path_relative_to_root]
-        @state[digest] = [logical_file_path]
+        result = @manifest.key?(digest)
+        @manifest[digest] ||= []
+        @state[digest] ||= []
+        @manifest[digest].push(file_path_relative_to_root)
+        @state[digest].push(logical_file_path)
+        result
       end
 
       def prepare_content_directory

data/lib/ocfl/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module OCFL
-  VERSION = "0.8.0"
+  VERSION = "0.8.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ocfl
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.8.1
 platform: ruby
 authors:
 - Justin Coyne
@@ -103,6 +103,7 @@ files:
 - lib/ocfl/object/version.rb
 - lib/ocfl/version.rb
 - sig/ocfl.rbs
+- tmp/.keep
 homepage: https://github.com/sul-dlss/ocfl-rb
 licenses: []
 metadata: