ocfl 0.2.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5b7d95d43fc87d3ce3d87f27aa4c89bf5692df05b2a144e31ba364beafa9d829
-  data.tar.gz: c04004d43c6147808882b8c126e218c655787469c5c0565f41714adb93cceb63
+  metadata.gz: 256cd51a71d4728f32b12904cd02153e92a3a054e0b7b9ee7f18f7aca7a34320
+  data.tar.gz: d8bfb5f8571e998710fb6e7e5f245e7723886d3db26c0c54537f2b172d456d46
 SHA512:
-  metadata.gz: 408709f7faedf25af358673629d874844b915f6023ab842732f5625f17ae6903b3f39f9f7e4fa37a7ebfdae4824eab1f6b780af5ed2c5ecfcf7476555d484a13
-  data.tar.gz: bd5a83be543d91953d85f9ab712ebdd3f4f4c714c626afb4c92ee355351deec6e5a398fc29a087b1876fcaeebe4ae4328b2dc4a502201b491bf2b443307d678a
+  metadata.gz: e3aad0f2020ef90a36b3fdf71129e9bd84fce068e665eecb08e00d37cd897d7d5c91298ed8dfaadc0b6d8a27060cb5306eb85bbbe630267fb8889989279a795f
+  data.tar.gz: '07609a37af93df25a2d836f46d42591972514265272f6a4fe3e1bf333198f7c98eae07e8ce5f21499967340627a2013f2f6e450433af3824f0146d855f0c03c8'

data/lib/ocfl/object/directory_builder.rb

@@ -18,11 +18,16 @@ module OCFL
       attr_reader :id, :object_root, :object_directory
 
       def copy_file(...)
-        create_directory
+        create_object_directory
         version.copy_file(...)
       end
 
-      def create_directory
+      def copy_recursive(...)
+        create_object_directory
+        version.copy_recursive(...)
+      end
+
+      def create_object_directory
         FileUtils.mkdir_p(object_root)
       end
 

data/lib/ocfl/object/draft_version.rb

@@ -25,25 +25,38 @@ module OCFL
         FileUtils.mv(incoming_path, content_path)
       end
 
-      def copy_file(incoming_path)
+      def copy_file(incoming_path, destination_path: '')
         prepare_content_directory
-        add(incoming_path)
-        FileUtils.cp(incoming_path, content_path)
+        copy_one(File.basename(incoming_path), incoming_path, destination_path)
       end
 
       # Copies files into the object and preserves their relative paths as logical directories in the object
-      def copy_recursive(incoming_path)
+      def copy_recursive(incoming_path, destination_path: '')
         prepare_content_directory
         incoming_path = incoming_path.delete_suffix("/")
         Dir.glob("#{incoming_path}/**/*").reject { |fn| File.directory?(fn) }.each do |file|
-          logical_file_path = file.delete_prefix(incoming_path).delete_prefix("/")
-          add(file, logical_file_path:)
-          parent_dir = (content_path + logical_file_path).parent
-          FileUtils.mkdir_p(parent_dir)
-          FileUtils.cp(file, content_path + logical_file_path)
+          copy_one(file.delete_prefix(incoming_path).delete_prefix("/"), file, destination_path)
         end
       end
 
+      def save
+        inventory = build_inventory
+        InventoryWriter.new(inventory:, path:).write
+        FileUtils.cp(path + "inventory.json", object_directory.object_root)
+        FileUtils.cp(path + "inventory.json.sha512", object_directory.object_root)
+        object_directory.reload
+      end
+
+      private
+
+      def copy_one(logical_file_path, incoming_path, destination_path)
+        logical_file_path = File.join(destination_path, logical_file_path) unless destination_path.empty?
+        add(incoming_path, logical_file_path:)
+        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
+
       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)
@@ -95,14 +108,6 @@ module OCFL
         shas_in_versions = versions.values.flat_map { |v| v.state.keys }.uniq
         manifest.slice(*shas_in_versions)
       end
-
-      def save
-        inventory = build_inventory
-        InventoryWriter.new(inventory:, path:).write
-        FileUtils.cp(path + "inventory.json", object_directory.object_root)
-        FileUtils.cp(path + "inventory.json.sha512", object_directory.object_root)
-        object_directory.reload
-      end
     end
   end
 end

data/lib/ocfl/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ocfl
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Justin Coyne
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-03-13 00:00:00.000000000 Z
+date: 2024-03-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport