ocfl 0.3.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9a442976eed04ea8bd466b2a423d99e18e3de2eace9950419102a26762a0f279
-  data.tar.gz: 998da7270a92ba987015aed961ce9d07571c9e97bdd8fb739ebce53409f0f6cf
+  metadata.gz: 664b853647982b285f37270e111f75fe19fce52217c50eebed68c6e23340c6fc
+  data.tar.gz: 32fa2fc95e646671dde3f4b0e3349ad84b77816f4087abe63623ae3d59028e20
 SHA512:
-  metadata.gz: 9649b239dcd0d542e772eefcc1a177eb6c9a3367a347a05277661ff5605bfd1713f7610a8b0411852c2665b594a392d6db8f2248e3d9a3578bff7bce6b4f8240
-  data.tar.gz: db00dc92ce3bad0b059f45f90d4ff59162d6a7532aee3160406d1088fbfcb4cf274617e4d1781577a3c1f47992f0b8109ac24226f00043b9aec0799984048189
+  metadata.gz: 1f023ae4faca8ac12ba46782a68a099c04a9623f9ed11ce26005ae96a1d259dfe7ca6c0cc2039c20154dda3bed64d9faa8f4181327920a5ebec8b6a597f4f7b1
+  data.tar.gz: 33db1c161b1e24ba2859c98c65a5071745f2815956903ca45ad7faff8f1c8046040156d42d2483fa832379fd4cf880b39880d40c1b231ba0b44c6a85dc6ddb60

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.3.0"
+  VERSION = "0.4.1"
 end

data/lib/ocfl.rb

@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 
-require_relative "ocfl/version"
 require "zeitwerk"
 require "json"
 require "dry/monads"
@@ -9,17 +8,8 @@ require "dry-struct"
 require "active_support"
 require "active_support/core_ext/module/delegation"
 
-# Custom zeitwerk inflector for OCFL
-class OCFLInflector < Zeitwerk::Inflector
-  def camelize(basename, _abspath)
-    return "OCFL" if basename == "ocfl"
-
-    super
-  end
-end
-
 loader = Zeitwerk::Loader.for_gem
-loader.inflector = OCFLInflector.new
+loader.inflector.inflect("ocfl" => "OCFL")
 loader.setup
 
 module OCFL

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ocfl
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Justin Coyne
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-03-14 00:00:00.000000000 Z
+date: 2024-05-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -125,7 +125,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.4
+rubygems_version: 3.5.10
 signing_key:
 specification_version: 4
 summary: A ruby library for interacting with the Oxford Common File Layout (OCFL)