Fix BagAdapter references

mlibrary · Aug 5, 2024 · be6cd9e · be6cd9e
1 parent d24709d
commit be6cd9e
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 11 deletions.
diff --git a/lib/bag_courier.rb b/lib/bag_courier.rb
@@ -108,7 +108,7 @@ def deliver
       begin
         track!(status: BagStatus::BAGGING)
         bag_path = File.join(@working_dir, @bag_id.to_s)
-        bag = BagAdapter::BagAdapter.new(bag_path, @detect_hidden)
+        bag = BagAdapter::BagAdapter.new(target_dir: bag_path, detect_hidden: @detect_hidden)
 
         track!(status: BagStatus::COPYING)
         logger.measure_info("Copied data for bag #{@bag_id} in #{@working_dir}.") do

diff --git a/test/test_bag_courier.rb b/test/test_bag_courier.rb
@@ -58,7 +58,9 @@ def setup
     FileUtils.rm_r(@test_dir_path) if File.exist?(@test_dir_path)
     FileUtils.mkdir_p([@test_dir_path, @prep_path, @export_path, @package_path])
     @detect_hidden = true
-    innerbag = BagAdapter::BagAdapter.new(@package_path, @detect_hidden)
+    innerbag = BagAdapter::BagAdapter.new(
+      target_dir: @package_path, detect_hidden: @detect_hidden
+    )
 
     File.write(
       File.join(@package_path, "data", "something.txt"),

diff --git a/test/test_bag_validator.rb b/test/test_bag_validator.rb
@@ -27,10 +27,13 @@
         file.puts "Some sample text for testing inner bag"
       end
       @detect_hidden_no = false
-      @innerbag = BagAdapter::BagAdapter.new(@data_dir_path, @detect_hidden_no)
+      @innerbag = BagAdapter::BagAdapter.new(
+        target_dir: @data_dir_path, detect_hidden: @detect_hidden_no)
       @innerbag.add_manifests
 
-      @bag = BagAdapter::BagAdapter.new(@test_dir_path, @detect_hidden_no)
+      @bag = BagAdapter::BagAdapter.new(
+        target_dir: @test_dir_path, detect_hidden: @detect_hidden_no
+      )
       @test_data_dir = @bag.data_dir
       @bag.add_manifests
     end
@@ -80,15 +83,18 @@
         file.puts "Some sample text for testing inner bag"
       end
       @detect_hidden_yes = true
-      @innerbag = BagAdapter::BagAdapter.new(@data_dir_path, @detect_hidden_yes)
+      @innerbag = BagAdapter::BagAdapter.new(
+        target_dir: @data_dir_path, detect_hidden: @detect_hidden_yes
+      )
       @innerbag.add_manifests
 
-      @bag = BagAdapter::BagAdapter.new(@test_dir_path, @detect_hidden_yes)
+      @bag = BagAdapter::BagAdapter.new(
+        target_dir: @test_dir_path, detect_hidden: @detect_hidden_yes)
       @test_data_dir = @bag.data_dir
       @bag.add_manifests
     end
 
-     it "returns true if the bag is valid" do
+    it "returns true if the bag is valid" do
       result = InnerBagValidator.new(@inner_bag_path, @detect_hidden_yes).validate(@test_data_dir)
       assert(result)
     end
@@ -157,10 +163,14 @@
         file.write(@txt_file_content)
       end
 
-      @innerbag = BagAdapter::BagAdapter.new(@data_dir_path, @detect_hidden_yes)
+      @innerbag = BagAdapter::BagAdapter.new(
+        target_dir: @data_dir_path, detect_hidden: @detect_hidden_yes
+      )
       @innerbag.add_manifests
 
-      @bag = BagAdapter::BagAdapter.new(@test_dir_path, @detect_hidden_yes)
+      @bag = BagAdapter::BagAdapter.new(
+        target_dir: @test_dir_path, detect_hidden: @detect_hidden_yes
+      )
       @test_data_dir = @bag.data_dir
       @bag.add_manifests
     end
@@ -234,10 +244,14 @@
         file.write(@txt_file_content)
       end
 
-      @innerbag = BagAdapter::BagAdapter.new(@data_dir_path, @detect_hidden_no)
+      @innerbag = BagAdapter::BagAdapter.new(
+        target_dir: @data_dir_path, detect_hidden: @detect_hidden_no
+      )
       @innerbag.add_manifests
 
-      @bag = BagAdapter::BagAdapter.new(@test_dir_path, @detect_hidden_no)
+      @bag = BagAdapter::BagAdapter.new(
+        target_dir: @test_dir_path, detect_hidden: @detect_hidden_no
+      )
       @test_data_dir = @bag.data_dir
       @bag.add_manifests
     end